JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge treasure

Browse Source
This commit is contained in:
Chiss 2014-09-13 13:41:37 +10:00
parent 88ef0ce35b
commit e511df4605
3 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
View File

@ -67,8 +67,8 @@ public class TreasureManager extends MiniPlugin
new ItemStack(Material.EMERALD), RewardRarity.VERY_RARE, 200));
_rewardManager.addReward(new UnknownPackageReward(donationManager, "Rain Particles", "Rain Cloud",
new ItemStack(Material.INK_SACK), RewardRarity.VERY_RARE, 300));
_rewardManager.addReward(new UnknownPackageReward(donationManager, "Notch Morph", "Notch",
new ItemStack(Material.INK_SACK), RewardRarity.VERY_RARE, 10));
// _rewardManager.addReward(new UnknownPackageReward(donationManager, "Notch Morph", "Notch",
// new ItemStack(Material.INK_SACK), RewardRarity.VERY_RARE, 10));
_rewardManager.addReward(new InventoryReward(inventoryManager, "Gem Boosters", "Gem Booster", 50, 100,
new ItemStack(Material.EMERALD_BLOCK), RewardRarity.VERY_RARE, 500));
@ -264,16 +264,16 @@ public class TreasureManager extends MiniPlugin
_playerTreasureMap.remove(event.getPlayer());
}
// @EventHandler
// public void command(PlayerCommandPreprocessEvent event)
// {
// //TODO Remove
// if (event.getMessage().startsWith("/treasure"))
// {
// event.getPlayer().sendMessage("Attempting to open treasure...");
// attemptOpenTreasure(event.getPlayer());
// event.setCancelled(true);
// }
// }
@EventHandler
public void command(PlayerCommandPreprocessEvent event)
{
//TODO Remove
if (event.getMessage().startsWith("/treasure"))
{
event.getPlayer().sendMessage("Attempting to open treasure...");
attemptOpenTreasure(event.getPlayer());
event.setCancelled(true);
}
}
}

42
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java
View File

@ -12,34 +12,26 @@ public enum TreasureStyle
/**
* These are examples, not final!
*/
ORANGE(Material.STAINED_CLAY, (byte) 4,
Material.STAINED_CLAY, (byte) 1,
Material.STAINED_GLASS_PANE, (byte) 0,
ParticleType.HEART,
NETHER(Material.NETHERRACK, (byte) 0,
Material.NETHER_BRICK, (byte) 0,
Material.NETHER_FENCE, (byte) 0,
null,
ParticleType.FLAME,
ParticleType.EXPLODE),
ParticleType.LAVA),
ORANGE_2(Material.STAINED_CLAY, (byte) 1,
Material.STAINED_CLAY, (byte) 9,
Material.STAINED_GLASS_PANE, (byte) 0,
ParticleType.HEART,
ParticleType.FLAME,
null),
PINK(Material.STAINED_CLAY, (byte) 0,
Material.STAINED_CLAY, (byte) 6,
Material.STAINED_GLASS_PANE, (byte) 0,
ParticleType.HEART,
ParticleType.CLOUD,
null),
GREEN(Material.STAINED_CLAY,(byte) 9,
Material.STAINED_CLAY, (byte) 5,
Material.STAINED_GLASS_PANE, (byte) 8,
ParticleType.FLAME,
NATURE(Material.GRASS, (byte) 0,
Material.LOG, (byte) 0,
Material.LEAVES, (byte) 0,
null,
ParticleType.HAPPY_VILLAGER,
ParticleType.LAVA);
ParticleType.SLIME),
WATER(Material.ICE,(byte) 9,
Material.PACKED_ICE, (byte) 5,
Material.STAINED_GLASS_PANE, (byte) 8,
null,
ParticleType.SPLASH,
ParticleType.SNOWBALL_POOF);
// FANCY(Material.DIAMOND_BLOCK,(byte) 0,
// Material.GOLD_BLOCK, (byte) 0,

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -153,7 +153,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
new MapManager(this);
new WorldManager(this);
new JumpManager(this);
new UHCManager(this);
//new UHCManager(this);
_news = new NewsManager(this);