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

Merge branch 'master' into masterdev

Browse Source 
Conflicts:
	BankEconomyMod/src/me/kaZep/Base/Main.java
This commit is contained in:
sigonasr2 2013-11-26 06:54:32 -07:00
commit 6f05142cc6
3 changed files with 716 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ import org.bukkit.entity.Monster;
import org.bukkit.entity.PigZombie; import org.bukkit.entity.PigZombie;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Sheep; import org.bukkit.entity.Sheep;
import org.bukkit.entity.Skeleton;
import org.bukkit.entity.Wither; import org.bukkit.entity.Wither;
import org.bukkit.entity.Zombie; import org.bukkit.entity.Zombie;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
@ -66,6 +67,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.ShapedRecipe;
import org.bukkit.inventory.meta.FireworkMeta; import org.bukkit.inventory.meta.FireworkMeta;
import org.bukkit.inventory.ShapelessRecipe;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.inventory.meta.SkullMeta;
import org.bukkit.map.MapRenderer; import org.bukkit.map.MapRenderer;
@ -247,7 +249,8 @@ public class Main extends JavaPlugin
getConfig().addDefault("payday.amount", Integer.valueOf(0)); getConfig().addDefault("payday.amount", Integer.valueOf(0));
getConfig().addDefault("fed.mobs", String.valueOf("")); getConfig().addDefault("fed.mobs", String.valueOf(""));
getConfig().addDefault("maintenance-mode", Boolean.valueOf(false)); getConfig().addDefault("maintenance-mode", Boolean.valueOf(false));
getConfig().addDefault("halloween-enabled", Boolean.valueOf(true)); getConfig().addDefault("halloween-enabled", Boolean.valueOf(false));
getConfig().addDefault("thanksgiving-enabled", Boolean.valueOf(false));
getConfig().addDefault("item-cube-numb", Integer.valueOf(0)); getConfig().addDefault("item-cube-numb", Integer.valueOf(0));
getConfig().addDefault("server-tick-time", Long.valueOf(143000000l)); getConfig().addDefault("server-tick-time", Long.valueOf(143000000l));
saveConfig(); saveConfig();
@ -310,6 +313,60 @@ public class Main extends JavaPlugin
melon_slice.setIngredient('a', Material.MELON_BLOCK); melon_slice.setIngredient('a', Material.MELON_BLOCK);
Bukkit.addRecipe(melon_slice); Bukkit.addRecipe(melon_slice);
//Add Recipe for nether star crafting.
ShapedRecipe nether_star = new ShapedRecipe(new ItemStack(Material.NETHER_STAR, 2));
nether_star.shape("aaa", "bbb", "cbd");
nether_star.setIngredient('a', new MaterialData(Material.SKULL_ITEM, (byte) 1));
nether_star.setIngredient('b', Material.SOUL_SAND);
nether_star.setIngredient('c', Material.NETHER_STAR);
nether_star.setIngredient('d', Material.DIAMOND);
Bukkit.addRecipe(nether_star);
//Add Recipe for water source crafting.
ItemStack water = new ItemStack(Material.WATER, 8);
ItemMeta water_name = water.getItemMeta();
List<String> waterlore = new ArrayList<String>();
waterlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"Infused with the power of a");
waterlore.add(ChatColor.AQUA+"Nether Star"+ChatColor.GRAY+""+ChatColor.ITALIC+", this water can");
waterlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"be carried without a bucket,");
waterlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"and does not evaporate when");
waterlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"placed in the Nether.");
water_name.setLore(waterlore);
water_name.setDisplayName(ChatColor.AQUA+"Enchanted Water");
water.setItemMeta(water_name);
ShapedRecipe nether_water = new ShapedRecipe(water);
nether_water.shape("aaa", "aba", "aaa");
nether_water.setIngredient('a', Material.WATER_BUCKET);
nether_water.setIngredient('b', Material.NETHER_STAR);
Bukkit.addRecipe(nether_water);
//Add Recipe for pocket crafting table
ItemStack table = new ItemStack(Material.WORKBENCH);
ItemMeta table_name = table.getItemMeta();
table_name.setDisplayName(ChatColor.YELLOW+"Pocket Crafting Table");
List<String> tablelore = new ArrayList<String>();
tablelore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"This workbench can be");
tablelore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"used anywhere! Simply");
tablelore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"right click to open its");
tablelore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"crafting interface.");
table_name.setLore(tablelore);
table.setItemMeta(table_name);
ShapelessRecipe portable_table = new ShapelessRecipe(table);
portable_table.addIngredient(Material.WORKBENCH);
portable_table.addIngredient(Material.CHEST);
portable_table.addIngredient(Material.IRON_AXE);
Bukkit.addRecipe(portable_table);
//Add wood slab recombining recipes. //Add wood slab recombining recipes.
ShapedRecipe oak_planks = new ShapedRecipe(new ItemStack(Material.WOOD, 1, (short) 0)); ShapedRecipe oak_planks = new ShapedRecipe(new ItemStack(Material.WOOD, 1, (short) 0));
oak_planks.shape("aa"); oak_planks.shape("aa");
@ -1278,6 +1335,11 @@ public void runTick() {
} }
i.setTicksLived(3600); i.setTicksLived(3600);
} }
if (getConfig().getBoolean("thanksgiving-enabled") && Bukkit.getWorld("world").hasStorm() && Main.SERVER_TICK_TIME%160==0) {
Item i = null;
i=Bukkit.getWorld("world").dropItemNaturally(p.getLocation().add((int)(Math.random()*20)-(int)(Math.random()*20), 256, (int)(Math.random()*20)-(int)(Math.random()*20)),new ItemStack(Material.EGG));
i.setTicksLived(3600);
}
if (Main.SERVER_TICK_TIME%90==0) { if (Main.SERVER_TICK_TIME%90==0) {
for (int i=-15;i<=15;i++) { for (int i=-15;i<=15;i++) {
for (int j=-15;j<=15;j++) { for (int j=-15;j<=15;j++) {
@ -1966,6 +2028,7 @@ public void runTick() {
} }
} }
} }
} }
} catch (ConcurrentModificationException ex_e) { } catch (ConcurrentModificationException ex_e) {
Bukkit.getLogger().warning("Could not check nearby entities in the nether."); Bukkit.getLogger().warning("Could not check nearby entities in the nether.");
@ -2570,7 +2633,7 @@ public void checkJukeboxes() {
{ {
public void run() { public void run() {
//DURING 'THE END' EVENT ONLY. //DURING 'THE END' EVENT ONLY.
if (Math.random()<=0.001) { if (Math.random()<=0.001 || (getConfig().getBoolean("thanksgiving-enabled") && Math.random()<=0.01)) {
//5% chance it will start storming. //5% chance it will start storming.
Bukkit.getWorld("world").setWeatherDuration((int)(Math.random()*6000)); Bukkit.getWorld("world").setWeatherDuration((int)(Math.random()*6000));
Bukkit.getWorld("world").setThundering(true); Bukkit.getWorld("world").setThundering(true);
@ -4557,6 +4620,30 @@ public void payDay(int time)
return false; return false;
} }
public boolean is_PocketWorkbench(ItemStack workbench) {
if (workbench.hasItemMeta() && workbench.getItemMeta().hasLore()) {
//Check to see if the Lore contains anything.
for (int i=0;i<workbench.getItemMeta().getLore().size();i++) {
if (workbench.getItemMeta().getLore().get(i).equalsIgnoreCase(ChatColor.GRAY+""+ChatColor.ITALIC+"This workbench can be")) {
return true;
}
}
}
return false;
}
public boolean is_LootChest(ItemStack chest) {
if (chest.hasItemMeta() && chest.getItemMeta().hasLore()) {
//Check to see if the Lore contains anything.
for (int i=0;i<chest.getItemMeta().getLore().size();i++) {
if (chest.getItemMeta().getLore().get(i).equalsIgnoreCase(ChatColor.GRAY+""+ChatColor.ITALIC+"A mysterious chest!")) {
return true;
}
}
}
return false;
}
public PlayerListener.Cube get_ItemCubeType(ItemStack item_cube) { public PlayerListener.Cube get_ItemCubeType(ItemStack item_cube) {
if (item_cube.hasItemMeta() && item_cube.getItemMeta().hasLore()) { if (item_cube.hasItemMeta() && item_cube.getItemMeta().hasLore()) {
//Check to see if the Lore contains anything. //Check to see if the Lore contains anything.

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

@ -18,6 +18,8 @@ import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
//import net.minecraft.server.v1_4_R1.EntityWolf; //import net.minecraft.server.v1_4_R1.EntityWolf;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Chunk; import org.bukkit.Chunk;
@ -839,6 +841,17 @@ implements Listener
} }
} }
@EventHandler
public void onPlayerItemConsume(PlayerItemConsumeEvent e) {
Player p = e.getPlayer();
if (e.getItem().getType() == Material.COOKED_CHICKEN) {
p.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION, 18000, 0), true);
p.addPotionEffect(new PotionEffect(PotionEffectType.HEALTH_BOOST, 18000, 4), true);
p.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 18000, 2), true);
p.playSound(p.getLocation(), Sound.CHICKEN_IDLE, 0.9f, 1);
}
}
@EventHandler @EventHandler
public void onFurnaceItemConsume(FurnaceBurnEvent e) { public void onFurnaceItemConsume(FurnaceBurnEvent e) {
String owner=""; String owner="";
@ -2094,7 +2107,13 @@ implements Listener
s.setSkeletonType(SkeletonType.WITHER); s.setSkeletonType(SkeletonType.WITHER);
s.setMaxHealth(150); s.setMaxHealth(150);
s.setHealth(s.getMaxHealth()); s.setHealth(s.getMaxHealth());
s.getEquipment().setItemInHand(new ItemStack(Material.IRON_SWORD));
ItemStack sword = new ItemStack(Material.STONE_SWORD);
sword.addEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random() * 3) + 2);
sword.addEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()) + 1);
sword.addEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()) + 1);
s.getEquipment().setItemInHand(sword);
} }
}break; }break;
case SLIME: { case SLIME: {
@ -5968,6 +5987,25 @@ implements Listener
f.getType()==EntityType.SPIDER || f.getType()==EntityType.SPIDER ||
f.getType()==EntityType.CREEPER || f.getType()==EntityType.CREEPER ||
f.getType()==EntityType.ENDERMAN) { f.getType()==EntityType.ENDERMAN) {
if (this.plugin.getConfig().getBoolean("thanksgiving-enabled") && Math.random()<=0.005) {
// 0.5% chance of loot chest dropping
ItemStack chest = new ItemStack(Material.CHEST);
ItemMeta chest_name = chest.getItemMeta();
chest_name.setDisplayName(ChatColor.YELLOW+"Closed Chest");
List<String> chestlore = new ArrayList<String>();
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"A mysterious chest!");
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"");
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"It feels heavy; there");
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"might be items inside.");
chest_name.setLore(chestlore);
chest.setItemMeta(chest_name);
f.getWorld().dropItemNaturally(f.getLocation(), chest);
}
//if (Math.random()<=0.005) { //if (Math.random()<=0.005) {
/* /*
if (Math.random()<=0.005) { if (Math.random()<=0.005) {
@ -9021,8 +9059,27 @@ implements Listener
e.setCancelled(true); e.setCancelled(true);
} }
if (this.plugin.is_ItemCube(e.getItemInHand())) { if (this.plugin.is_ItemCube(e.getItemInHand())) {
p.updateInventory();
e.setCancelled(true); e.setCancelled(true);
} }
if (this.plugin.is_PocketWorkbench(e.getItemInHand())) {
p.updateInventory();
e.setCancelled(true);
return;
}
if (this.plugin.is_LootChest(e.getItemInHand())) {
e.setCancelled(true);
if (e.getItemInHand().getAmount() > 1) {
e.getItemInHand().setAmount(e.getItemInHand().getAmount() - 1);
} else {
e.getPlayer().setItemInHand(null);
}
e.getPlayer().getWorld().dropItemNaturally(e.getBlockPlaced().getLocation(), getGoodie());
p.sendMessage(ChatColor.GREEN+"You open the chest and find treasure inside!");
p.playSound(p.getLocation(), Sound.ORB_PICKUP, 10, 1);
p.updateInventory();
return;
}
return; return;
} }
@ -9900,6 +9957,11 @@ implements Listener
return; return;
} }
} }
if (this.plugin.is_PocketWorkbench(event.getCurrentItem()) && event.getClick()==ClickType.RIGHT) {
p.openWorkbench(null, true);
event.setCancelled(true);
return;
}
} }
}else }else
if (event.getInventory().getType()==InventoryType.CHEST && event.getInventory().getName().contains("Item Cube")) { if (event.getInventory().getType()==InventoryType.CHEST && event.getInventory().getName().contains("Item Cube")) {
@ -10080,18 +10142,18 @@ implements Listener
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) { event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") || } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) { 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); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) { } 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.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1);
} }
event.getInventory().setItem(OUTPUT, new ItemStack(Material.AIR)); event.getInventory().setItem(OUTPUT, new ItemStack(Material.AIR));
@ -10164,18 +10226,18 @@ implements Listener
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) { event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") || } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) { 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); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) { } 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.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1);
} }
@ -10230,18 +10292,18 @@ implements Listener
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) { event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) { } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) {
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") || } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") ||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) { 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); Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1);
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) { } 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.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1);
} }
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName())); Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
@ -10930,6 +10992,9 @@ implements Listener
)) { )) {
allow=false; allow=false;
} }
if (this.plugin.getConfig().getBoolean("thanksgiving-enabled") && i.getItemStack().getType()==Material.EGG) {
allow=false;
}
if (i.getItemStack().getType()==Material.BEDROCK) { //Add a hard check. if (i.getItemStack().getType()==Material.BEDROCK) { //Add a hard check.
allow=false; allow=false;
} }
@ -11140,6 +11205,499 @@ implements Listener
} }
} }
} }
@EventHandler
public void onEggThrow(ProjectileHitEvent e) {
LivingEntity l = e.getEntity().getShooter();
if (l!=null && l.getType()==EntityType.PLAYER && e.getEntity().getType() == EntityType.EGG && this.plugin.getConfig().getBoolean("thanksgiving-enabled")) {
// Threw an egg during thanksgiving. Generate loot.
Location loc = e.getEntity().getLocation();
ItemStack item = null;
switch ((int)(Math.random()*112)) {
case 0:{
item = new ItemStack(Material.WOOD_HOE);
}break;
case 1:{
item = new ItemStack(Material.WOOD_AXE);
}break;
case 2:{
item = new ItemStack(Material.WOOD_SWORD);
}break;
case 3:{
item = new ItemStack(Material.WOOD_SPADE);
}break;
case 4:{
item = new ItemStack(Material.WOOD_PICKAXE);
}break;
case 5:{
item = new ItemStack(Material.SIGN);
}break;
case 6:
case 7:
case 8:
case 9:
case 10:{
item = new ItemStack(Material.STICK);
}break;
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:{
item = new ItemStack(Material.DIRT);
}break;
case 17:
case 18:
case 19:{
item = new ItemStack(Material.GRASS);
}break;
case 20:
case 21:
case 22:{
item = new ItemStack(Material.GRAVEL);
}break;
case 23:{
item = new ItemStack(Material.PUMPKIN);
}break;
case 24:{
item = new ItemStack(Material.SOUL_SAND);
}break;
case 25:
case 26:{
item = new ItemStack(Material.NETHERRACK);
}break;
case 27:{
item = new ItemStack(Material.BONE);
}break;
case 28:
case 29:{
item = new ItemStack(Material.ROTTEN_FLESH);
}break;
case 30:{
item = new ItemStack(Material.GRILLED_PORK);
}break;
case 31:{
item = new ItemStack(Material.COOKED_BEEF);
}break;
case 32:{
item = new ItemStack(Material.COOKED_FISH);
}break;
case 33:
case 34:{
item = new ItemStack(Material.APPLE);
}break;
case 35:
case 36:{
item = new ItemStack(Material.BREAD);
}break;
case 37:{
item = new ItemStack(Material.CAKE);
}break;
case 38:{
item = new ItemStack(Material.PAPER);
}break;
case 39:
case 40:{
item = new ItemStack(Material.SUGAR_CANE);
}break;
case 41:{
item = new ItemStack(Material.SUGAR);
}break;
case 42:{
item = new ItemStack(Material.FEATHER);
}break;
case 43:{
item = new ItemStack(Material.WOOD);
}break;
case 44:{
item = new ItemStack(Material.LOG);
}break;
case 45:
case 46:{
item = new ItemStack(Material.CLAY_BALL);
}break;
case 47:{
item = new ItemStack(Material.CLAY);
}break;
case 48:{
item = new ItemStack(Material.SLIME_BALL);
}break;
case 49:{
item = new ItemStack(Material.REDSTONE);
}break;
case 50:{
item = new ItemStack(Material.GLOWSTONE_DUST);
}break;
case 51:{
item = new ItemStack(Material.COAL);
}break;
case 52:{
item = new ItemStack(Material.FERMENTED_SPIDER_EYE);
}break;
case 53:{
item = new ItemStack(Material.IRON_INGOT);
}break;
case 54:{
item = new ItemStack(Material.GOLD_NUGGET);
}break;
case 55:{
item = new ItemStack(Material.FLINT);
}break;
case 56:{
item = new ItemStack(Material.ARROW);
}break;
case 57:{
item = new ItemStack(Material.SAPLING);
}break;
case 58:{
item = new ItemStack(Material.POTATO_ITEM);
}break;
case 59:{
item = new ItemStack(Material.CARROT_ITEM);
}break;
case 60:{
item = new ItemStack(Material.PORK);
}break;
case 61:{
item = new ItemStack(Material.FLOWER_POT_ITEM);
}break;
case 62:{
item = new ItemStack(Material.RAW_BEEF);
}break;
case 63:{
item = new ItemStack(Material.RAW_FISH);
}break;
case 64:{
item = new ItemStack(Material.MELON);
}break;
case 65:{
item = new ItemStack(Material.CACTUS);
}break;
case 66:{
item = new ItemStack(Material.LEATHER);
}break;
case 67:{
item = new ItemStack(Material.STRING);
}break;
case 68:{
item = new ItemStack(Material.WOOL);
}break;
case 69:{
item = new ItemStack(Material.QUARTZ);
}break;
case 70:
case 71:
case 72:
case 73:
case 74:
case 75:
case 76:
case 77:
case 78:
case 79:{
item = new ItemStack(Material.TORCH);
}break;
case 80:
case 81:
case 82:{
item = new ItemStack(Material.SAND);
}break;
case 83:{
item = new ItemStack(Material.SANDSTONE);
}break;
case 84:{
item = new ItemStack(Material.GLASS);
}break;
case 85:{
item = new ItemStack(Material.GLASS_BOTTLE);
}break;
case 86:{
item = new ItemStack(Material.SULPHUR);
}break;
case 87:{
item = new ItemStack(Material.INK_SACK);
}break;
case 88:{
item = new ItemStack(Material.BRICK);
}break;
case 89:{
item = new ItemStack(Material.BOOK);
}break;
case 90:{
item = new ItemStack(Material.RED_MUSHROOM);
}break;
case 91:{
item = new ItemStack(Material.BROWN_MUSHROOM);
}break;
case 92:{
item = new ItemStack(Material.SNOW_BALL);
}break;
case 93:{
item = new ItemStack(Material.FENCE);
}break;
case 94:{
item = new ItemStack(Material.NETHER_BRICK_ITEM);
}break;
case 95:{
item = new ItemStack(Material.WATER_LILY);
}break;
case 96:{
item = new ItemStack(Material.COBBLESTONE);
}break;
case 97:{
item = new ItemStack(Material.STONE);
}break;
case 98:{
item = new ItemStack(Material.VINE);
}break;
case 99:{
item = new ItemStack(Material.WHEAT);
}break;
case 100:
case 101:
case 102:
case 103:
case 104:{
// Uncommon items here
switch((int)(Math.random() * 40)){
case 0:{
item = new ItemStack(Material.WATCH);
}break;
case 1:{
item = new ItemStack(Material.WORKBENCH);
}break;
case 2:{
item = new ItemStack(Material.FURNACE);
}break;
case 3:{
item = new ItemStack(Material.REDSTONE_ORE);
}break;
case 4:{
item = new ItemStack(Material.ANVIL);
}break;
case 5:{
item = new ItemStack(Material.CAULDRON);
}break;
case 6:{
item = new ItemStack(Material.ENDER_CHEST);
}break;
case 7:{
item = new ItemStack(Material.GLOWSTONE);
}break;
case 8:{
item = new ItemStack(Material.LAVA_BUCKET);
}break;
case 9:{
item = new ItemStack(Material.QUARTZ_BLOCK);
}break;
case 10:{
item = new ItemStack(Material.LAPIS_ORE);
}break;
case 11:{
item = new ItemStack(Material.CHEST);
}break;
case 12:{
item = new ItemStack(Material.TRAPPED_CHEST);
}break;
case 13:{
item = new ItemStack(Material.NETHER_STALK);
}break;
case 14:{
item = new ItemStack(Material.COMPASS);
}break;
case 15:{
item = new ItemStack(Material.IRON_DOOR);
}break;
case 16:{
item = new ItemStack(Material.COAL_ORE);
}break;
case 17:{
item = new ItemStack(Material.JUKEBOX);
}break;
case 18:{
item = new ItemStack(Material.ENCHANTMENT_TABLE);
}break;
case 19:{
item = new ItemStack(Material.BOOKSHELF);
}break;
case 20:{
item = new ItemStack(Material.DISPENSER);
}break;
case 21:{
item = new ItemStack(Material.DIODE);
}break;
case 22:{
item = new ItemStack(Material.MINECART);
}break;
case 23:{
item = new ItemStack(Material.ITEM_FRAME);
}break;
case 24:{
item = new ItemStack(Material.BREWING_STAND_ITEM);
}break;
case 25:{
item = new ItemStack(Material.HOPPER);
}break;
case 26:{
item = new ItemStack(Material.DAYLIGHT_DETECTOR);
}break;
case 27:{
item = new ItemStack(Material.PISTON_BASE);
}break;
case 28:{
item = new ItemStack(Material.RAILS);
}break;
case 29:{
item = new ItemStack(Material.POWERED_RAIL);
}break;
case 30:{
item = new ItemStack(Material.DETECTOR_RAIL);
}break;
case 31:{
item = new ItemStack(Material.ICE);
}break;
case 32:{
item = new ItemStack(Material.TNT);
}break;
case 33:{
item = new ItemStack(Material.LADDER);
}break;
case 34:{
item = new ItemStack(Material.MAGMA_CREAM);
}break;
case 35:{
item = new ItemStack(Material.FIREBALL);
}break;
case 36:{
item = new ItemStack(Material.FLINT_AND_STEEL);
}break;
case 37:{
item = new ItemStack(Material.FENCE_GATE);
}break;
case 38:{
item = new ItemStack(Material.FISHING_ROD);
}break;
case 39:{
item = new ItemStack(Material.BED);
}break;
}
}break;
case 105:{
item = new ItemStack(Material.OBSIDIAN);
}break;
case 106:{
// Rare items here
switch((int)(Math.random() * 20)){
case 0:{
item = new ItemStack(Material.MYCEL);
}break;
case 1:{
item = new ItemStack(Material.EMERALD);
}break;
case 2:{
item = new ItemStack(Material.DIAMOND);
}break;
case 3:{
item = new ItemStack(Material.GOLD_INGOT);
}break;
case 4:{
item = new ItemStack(Material.GOLDEN_APPLE);
}break;
case 5:{
item = new ItemStack(Material.GOLDEN_CARROT);
}break;
case 6:{
item = new ItemStack(Material.IRON_BARDING);
}break;
case 7:{
item = new ItemStack(Material.IRON_AXE);
}break;
case 8:{
item = new ItemStack(Material.IRON_PICKAXE);
}break;
case 9:{
item = new ItemStack(Material.IRON_SPADE);
}break;
case 10:{
item = new ItemStack(Material.IRON_SWORD);
}break;
case 11:{
item = new ItemStack(Material.ENDER_STONE);
}break;
case 12:{
item = new ItemStack(Material.NAME_TAG);
}break;
case 13:{
item = new ItemStack(Material.REDSTONE_COMPARATOR);
}break;
case 14:{
item = new ItemStack(Material.GHAST_TEAR);
}break;
case 15:{
item = new ItemStack(Material.EMPTY_MAP);
}break;
case 16:{
item = new ItemStack(Material.GOLD_BARDING);
}break;
case 17:{
item = new ItemStack(Material.DIAMOND_SWORD);
}break;
case 18:{
item = new ItemStack(Material.DIAMOND_SPADE);
}break;
case 19:{
item = new ItemStack(Material.DIAMOND_PICKAXE);
}break;
case 20:{
// ULTRA RARES WHOO
switch((int)(Math.random() * 25)){
case 0:{
item = new ItemStack(Material.DIAMOND_BARDING);
}break;
case 1:
case 2:
case 3:{
item = new ItemStack(Material.SKULL_ITEM);
item.setData(new MaterialData(Material.SKULL_ITEM, (byte) 1));
}break;
case 4:{
item = new ItemStack(Material.BEACON);
}break;
case 5:{
item = new ItemStack(Material.DRAGON_EGG);
}break;
default:{
// Roll failed; generate standard item
item = new ItemStack(Material.BOAT);
}
}
}break;
}
}break;
case 107:{
item = new ItemStack(Material.COOKIE, 8);
}break;
case 108:{
item = new ItemStack(Material.SEEDS, 42);
}break;
case 109:{
item = new ItemStack(Material.PAINTING, 16);
}break;
case 110:{
item = getGoodie(0);
}break;
default: {
item = getGoodie(1);
}
}
e.getEntity().getWorld().dropItemNaturally(loc, item);
ExperienceOrb exp = (ExperienceOrb)l.getWorld().spawnEntity(e.getEntity().getLocation(), EntityType.EXPERIENCE_ORB);
exp.setExperience((int)(Math.random() * 5) + 1);
}
}
@EventHandler @EventHandler
public void onEntityExpode(ExplosionPrimeEvent e) { public void onEntityExpode(ExplosionPrimeEvent e) {
@ -12520,6 +13078,25 @@ implements Listener
e.setCancelled(true); e.setCancelled(true);
return; return;
} }
if (p.getItemInHand()!=null && this.plugin.is_PocketWorkbench(p.getItemInHand())) {
p.openWorkbench(null, true);
e.setCancelled(true);
return;
}
if (this.plugin.is_LootChest(p.getItemInHand())) {
e.setCancelled(true);
if (p.getItemInHand().getAmount() > 1) {
p.getItemInHand().setAmount(p.getItemInHand().getAmount() - 1);
} else {
p.setItemInHand(null);
}
p.getWorld().dropItemNaturally(p.getLocation(), getGoodie());
p.sendMessage(ChatColor.GREEN+"You open the chest and find treasure inside!");
p.playSound(p.getLocation(), Sound.ORB_PICKUP, 10, 1);
p.updateInventory();
return;
}
} }
if (blockAction == Action.RIGHT_CLICK_BLOCK) { if (blockAction == Action.RIGHT_CLICK_BLOCK) {
/*//CREATE THE GIANT PUMPKIN /*//CREATE THE GIANT PUMPKIN

28
BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java
View File

@ -399,7 +399,7 @@ public String convertToItemName(String val) {
} else } else
if (cmd.getName().equalsIgnoreCase("event")) { if (cmd.getName().equalsIgnoreCase("event")) {
if (p.hasPermission("maintenance-mode-admin")) { if (p.hasPermission("maintenance-mode-admin")) {
p.sendMessage("Events available: halloween. Use: /event <eventname>"); p.sendMessage("Events available: halloween, thanksgiving. Use: /event <eventname>");
} }
} else } else
if (cmd.getName().equalsIgnoreCase("maintenance")) { if (cmd.getName().equalsIgnoreCase("maintenance")) {
@ -513,6 +513,32 @@ public String convertToItemName(String val) {
} }
this.plugin.saveConfig(); this.plugin.saveConfig();
} }
if (args[0].equalsIgnoreCase("thanksgiving")) {
if (this.plugin.getConfig().getBoolean("thanksgiving-enabled")) {
this.plugin.getConfig().set("thanksgiving-enabled", Boolean.valueOf(false));
p.sendMessage("Thanksgiving event disabled.");
} else {
this.plugin.getConfig().set("thanksgiving-enabled", Boolean.valueOf(true));
p.sendMessage("Thanksgiving event enabled.");
}
this.plugin.saveConfig();
}
if (args[0].equalsIgnoreCase("loot")) {
ItemStack chest = new ItemStack(Material.CHEST);
ItemMeta chest_name = chest.getItemMeta();
chest_name.setDisplayName(ChatColor.YELLOW+"Closed Chest");
List<String> chestlore = new ArrayList<String>();
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"A mysterious chest!");
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"");
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"It feels heavy; there");
chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"might be items inside.");
chest_name.setLore(chestlore);
chest.setItemMeta(chest_name);
p.getWorld().dropItemNaturally(p.getLocation(), chest);
}
} else } else
if (cmd.getName().equalsIgnoreCase("event") && args.length==2 && p.hasPermission("maintenance-mode-admin")) { if (cmd.getName().equalsIgnoreCase("event") && args.length==2 && p.hasPermission("maintenance-mode-admin")) {
if (args[0].equalsIgnoreCase("head")) { if (args[0].equalsIgnoreCase("head")) {