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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Shaun Bennett 2014-09-18 22:41:32 -05:00
commit 1a9f676a61
7 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/BuildFiles/common.xml
View File

@ -60,6 +60,9 @@
<fileset dir="../Mineplex.Hub">
<include name="*.yml"/>
</fileset>
<fileset dir="../Mineplex.Database/bin">
<include name="**/*.class"/>
</fileset>
<fileset dir="../Mineplex.ServerData/bin">
<include name="**/*.class"/>
</fileset>

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
View File

@ -93,13 +93,13 @@ public class GadgetManager extends MiniPlugin
//addGadget(new ItemDuelingSword(this));
// Costume
addGadget(new OutfitRaveSuit(this, "Rave Helmet", -2, ArmorSlot.Helmet, Material.LEATHER_HELMET, (byte)0));
addGadget(new OutfitRaveSuit(this, "Rave Hat", -2, ArmorSlot.Helmet, Material.LEATHER_HELMET, (byte)0));
addGadget(new OutfitRaveSuit(this, "Rave Shirt", -2, ArmorSlot.Chest, Material.LEATHER_CHESTPLATE, (byte)0));
addGadget(new OutfitRaveSuit(this, "Rave Pants", -2, ArmorSlot.Legs, Material.LEATHER_LEGGINGS, (byte)0));
addGadget(new OutfitRaveSuit(this, "Rave Boots", -2, ArmorSlot.Boots, Material.LEATHER_BOOTS, (byte)0));
addGadget(new OutfitSpaceSuit(this, "Space Helmet", -2, ArmorSlot.Helmet, Material.GLASS, (byte)0));
addGadget(new OutfitSpaceSuit(this, "Space Suit", -2, ArmorSlot.Chest, Material.GOLD_CHESTPLATE, (byte)0));
addGadget(new OutfitSpaceSuit(this, "Space Jacket", -2, ArmorSlot.Chest, Material.GOLD_CHESTPLATE, (byte)0));
addGadget(new OutfitSpaceSuit(this, "Space Pants", -2, ArmorSlot.Legs, Material.GOLD_LEGGINGS, (byte)0));
addGadget(new OutfitSpaceSuit(this, "Space Boots", -2, ArmorSlot.Boots, Material.GOLD_BOOTS, (byte)0));

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java
View File

@ -136,7 +136,7 @@ public class MorphPig extends MorphGadget
continue;
if (Manager.collideEvent(this, other))
continue;
continue;
//Cooldown
Recharge.Instance.useForce(other, GetName() + " Collide", 200);

35
Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
View File

@ -162,29 +162,29 @@ public class RewardManager
// Music Discs
addReward(new UnknownPackageReward(this, donationManager, "13 Disc", "13 Disc",
new ItemStack(2256), rarity, 30));
new ItemStack(2256), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Cat Disc", "Cat Disc",
new ItemStack(2257), rarity, 30));
new ItemStack(2257), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Blocks Disc", "Blocks Disc",
new ItemStack(2258), rarity, 30));
new ItemStack(2258), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Chirp Disc", "Chirp Disc",
new ItemStack(2259), rarity, 30));
new ItemStack(2259), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Far Disc", "Far Disc",
new ItemStack(2260), rarity, 30));
new ItemStack(2260), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Mall Disc", "Mall Disc",
new ItemStack(2261), rarity, 30));
new ItemStack(2261), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Mellohi Disc", "Mellohi Disc",
new ItemStack(2262), rarity, 30));
new ItemStack(2262), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Stal Disc", "Stal Disc",
new ItemStack(2263), rarity, 30));
new ItemStack(2263), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Strad Disc", "Strad Disc",
new ItemStack(2264), rarity, 30));
new ItemStack(2264), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Ward Disc", "Ward Disc",
new ItemStack(2265), rarity, 30));
new ItemStack(2265), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "11 Disc", "11 Disc",
new ItemStack(2266), rarity, 30));
new ItemStack(2266), rarity, 25));
addReward(new UnknownPackageReward(this, donationManager, "Wait Disc", "Wait Disc",
new ItemStack(2267), rarity, 30));
new ItemStack(2267), rarity, 25));
}
public void addRare(DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, double minValue, double maxValue)
@ -220,19 +220,19 @@ public class RewardManager
new ItemStack(Material.getMaterial(175)), rarity, 100));
// Costumes
addReward(new UnknownPackageReward(this, donationManager, "Rave Helmet", "Rave Helmet",
addReward(new UnknownPackageReward(this, donationManager, "Rave Hat", "Rave Hat",
new ItemStack(Material.LEATHER_HELMET), rarity, 30));
addReward(new UnknownPackageReward(this, donationManager, "Rave Chestplate", "Rave Chestplate",
addReward(new UnknownPackageReward(this, donationManager, "Rave Shirt", "Rave Shirt",
new ItemStack(Material.LEATHER_CHESTPLATE), rarity, 30));
addReward(new UnknownPackageReward(this, donationManager, "Rave Leggings", "Rave Leggings",
addReward(new UnknownPackageReward(this, donationManager, "Rave Pants", "Rave Pants",
new ItemStack(Material.LEATHER_LEGGINGS), rarity, 30));
addReward(new UnknownPackageReward(this, donationManager, "Rave Boots", "Rave Boots",
new ItemStack(Material.LEATHER_BOOTS), rarity, 30));
addReward(new UnknownPackageReward(this, donationManager, "Space Helmet", "Space Helmet",
new ItemStack(Material.GLASS), rarity, 50));
addReward(new UnknownPackageReward(this, donationManager, "Space Chestplate", "Space Chestplate",
addReward(new UnknownPackageReward(this, donationManager, "Space Jacket", "Space Jacket",
new ItemStack(Material.GOLD_CHESTPLATE), rarity, 50));
addReward(new UnknownPackageReward(this, donationManager, "Space Leggings", "Space Leggings",
addReward(new UnknownPackageReward(this, donationManager, "Space Pants", "Space Pants",
new ItemStack(Material.GOLD_LEGGINGS), rarity, 50));
addReward(new UnknownPackageReward(this, donationManager, "Space Boots", "Space Boots",
new ItemStack(Material.GOLD_BOOTS), rarity, 50));
@ -403,6 +403,5 @@ public class RewardManager
_repository.logReward(player, type, rarity, parsedReward);
}
});
}
}

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

@ -367,7 +367,13 @@ public class TreasureManager extends MiniPlugin
if (!event.getPlayer().isOp())
return;
//TODO Remove
if (event.getMessage().startsWith("/treasurechest"))
{
event.getPlayer().sendMessage(C.cGreen + C.Bold + "Received 10 Treasure Chest...");
_inventoryManager.addItemToInventory(event.getPlayer(), "Utility", "Treasure Chest", 10);
event.setCancelled(true);
}
if (event.getMessage().startsWith("/treasuredebug"))
{
event.getPlayer().sendMessage(C.cGreen + C.Bold + "Treasure Debug...");

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

@ -30,7 +30,7 @@ public enum TreasureStyle
Material.PACKED_ICE, (byte) 5,
Material.STAINED_GLASS_PANE, (byte) 8,
null,
ParticleType.SPLASH,
ParticleType.SNOW_SHOVEL,
ParticleType.SNOWBALL_POOF);
// FANCY(Material.DIAMOND_BLOCK,(byte) 0,

4
Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java
View File

@ -99,8 +99,8 @@ public class TextManager extends MiniPlugin
UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -15), faceOther, 159, (byte)4, TextAlign.CENTER);
UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -16), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("DRAW MY THING", locClassics.clone().add(0, 21, -15), faceOther, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText("DRAW MY THING", locClassics.clone().add(0, 21, -16), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("MINE STRIKE", locClassics.clone().add(0, 21, -15), faceOther, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText("MINE STRIKE", locClassics.clone().add(0, 21, -16), faceOther, 159, (byte)15, TextAlign.CENTER);
UtilText.MakeText("BLOCK HUNT", locClassics.clone().add(0, 28, -15), faceOther, 159, (byte)14, TextAlign.CENTER);
UtilText.MakeText("BLOCK HUNT", locClassics.clone().add(0, 28, -16), faceOther, 159, (byte)15, TextAlign.CENTER);