More treasure rewards + tweaks

Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestData.java

@@ -18,13 +18,11 @@ public class ChestData
 	private Block _block;
 	private ITreasureReward _reward;
 	private boolean _opened;
-	private boolean _finishedOpen;
 
 	public ChestData(Block block, ITreasureReward reward)
 	{
 		_block = block;
 		_opened = false;
-		_finishedOpen = false;
 		_reward = reward;
 	}
 
@@ -33,21 +31,11 @@ public class ChestData
 		return _opened;
 	}
 
-	public boolean isFinishedOpen()
-	{
-		return _finishedOpen;
-	}
-
 	public void setOpened(boolean opened)
 	{
 		_opened = opened;
 	}
 
-	public void setFinishedOpen(boolean finishedOpen)
-	{
-		_finishedOpen = finishedOpen;
-	}
-
 	public Block getBlock()
 	{
 		return _block;

Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java

@@ -298,7 +298,6 @@ public class Treasure
 			if (!chestData.isOpened())
 			{
 				chestData.setOpened(true);
-				chestData.setFinishedOpen(true);
 				chestData.getReward().giveReward(_player);
 			}
 		}

Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java

@@ -29,7 +29,6 @@ import mineplex.core.treasure.reward.ITreasureReward;
 import mineplex.core.treasure.reward.RewardManager;
 import mineplex.core.treasure.reward.RewardRarity;
 import mineplex.core.treasure.reward.rewards.CoinReward;
-import mineplex.core.treasure.reward.rewards.GemReward;
 import mineplex.core.treasure.reward.rewards.InventoryReward;
 import mineplex.core.treasure.reward.rewards.UnknownPackageReward;
 import mineplex.core.updater.UpdateType;
@@ -70,6 +69,8 @@ public class TreasureManager extends MiniPlugin
 				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 InventoryReward(inventoryManager, "Gem Boosters", "Gem Booster", 50, 100,
+				new ItemStack(Material.EMERALD_BLOCK), RewardRarity.VERY_RARE, 500));
 
 		// Rare
 		_rewardManager.addReward(new CoinReward(donationManager, 500, 1000, 1000, RewardRarity.RARE));
@@ -83,12 +84,24 @@ public class TreasureManager extends MiniPlugin
 				new ItemStack(Material.LEATHER), RewardRarity.RARE, 500));
 		_rewardManager.addReward(new UnknownPackageReward(donationManager, "Enderman Morph", "Enderman Morph",
 				new ItemStack(Material.ENDER_PEARL), RewardRarity.RARE, 200));
+		_rewardManager.addReward(new InventoryReward(inventoryManager, "Gem Boosters", "Gem Booster", 10, 20,
+				new ItemStack(Material.EMERALD_BLOCK), RewardRarity.RARE, 500));
 
 		// Uncommon
-		_rewardManager.addReward(new CoinReward(donationManager, 100, 500, 1000, RewardRarity.UNCOMMON));
+		_rewardManager.addReward(new CoinReward(donationManager, 100, 500, 2000, RewardRarity.UNCOMMON));
+		_rewardManager.addReward(new InventoryReward(inventoryManager, "Ender Pearls", "Ethereal Pearl", 75, 150,
+				new ItemStack(Material.ENDER_PEARL), RewardRarity.UNCOMMON, 1000));
+		_rewardManager.addReward(new InventoryReward(inventoryManager, "Fireworks", "Fireworks", 75, 150,
+				new ItemStack(Material.FIREWORK), RewardRarity.UNCOMMON, 1000));
+		_rewardManager.addReward(new InventoryReward(inventoryManager, "TNT", "TNT", 30, 60,
+				new ItemStack(Material.TNT), RewardRarity.UNCOMMON, 1000));
+		_rewardManager.addReward(new InventoryReward(inventoryManager, "Melons", "Melon Launcher", 150, 300,
+				new ItemStack(Material.MELON_BLOCK), RewardRarity.UNCOMMON, 1000));
+		_rewardManager.addReward(new InventoryReward(inventoryManager, "Gem Boosters", "Gem Booster", 1, 10,
+				new ItemStack(Material.EMERALD_BLOCK), RewardRarity.UNCOMMON, 500));
 
 		// Common
-		_rewardManager.addReward(new CoinReward(donationManager, 0, 100, 1000, RewardRarity.COMMON));
+		_rewardManager.addReward(new CoinReward(donationManager, 0, 100, 2000, RewardRarity.COMMON));
 		_rewardManager.addReward(new InventoryReward(inventoryManager, "Ender Pearls", "Ethereal Pearl", 25, 75,
 				new ItemStack(Material.ENDER_PEARL), RewardRarity.COMMON, 1000));
 		_rewardManager.addReward(new InventoryReward(inventoryManager, "Fireworks", "Fireworks", 25, 75,

Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestExplodeAnimation.java

@@ -7,7 +7,6 @@ import org.bukkit.FireworkEffect;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
 
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.treasure.Treasure;
@@ -17,6 +16,10 @@ import mineplex.core.treasure.Treasure;
  */
 public class ChestExplodeAnimation extends Animation
 {
+	/**
+	 * Played when a "Very Rare" chest is opened
+	 */
+
 	private Random _random = new Random();
 	private Block _chestBlock;
 

Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestOpenAnimation.java

@@ -57,8 +57,6 @@ public class ChestOpenAnimation extends Animation
 		{
 			_hologram = new Hologram(_chestData.getBlock().getLocation().add(0.5, 1.1, 0.5), _text);
 			_hologram.sendToPlayers(_chestData.getBlock().getLocation().getWorld().getPlayers().toArray(new Player[0]));
-
-			_chestData.setFinishedOpen(true);
 		}
 	}
 

Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/CircleAnimation.java

@@ -16,7 +16,7 @@ import mineplex.core.treasure.Treasure;
 public class CircleAnimation extends Animation
 {
 	/**
-	 * Uncommon Rarity
+	 * Played when a "Rare" chest is opened
 	 */
 
 	private Location _centerLocation;

Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/FireworksAnimation.java

@@ -25,7 +25,7 @@ import mineplex.core.treasure.Treasure;
 public class FireworksAnimation extends Animation
 {
 	/**
-	 * Rare Rarity
+	 * Played when an "Uncommon" chest is opened
 	 */
 
 	private Random _random = new Random();