From 31cea3342e027ca591b4c022060bac278ea7eb0f Mon Sep 17 00:00:00 2001 From: Cheese Date: Fri, 11 Dec 2015 13:17:38 +1100 Subject: [PATCH] some gadget stuff --- .../core/cosmetic/ui/page/GadgetPage.java | 23 +++++++++++------ .../arrowtrail/ArrowTrailCandyCane.java | 2 +- .../arrowtrail/ArrowTrailFrostLord.java | 2 +- .../gadgets/arrowtrail/ArrowTrailTitan.java | 2 +- .../gadget/gadgets/death/DeathCandyCane.java | 2 +- .../gadget/gadgets/death/DeathFrostLord.java | 2 +- .../core/gadget/gadgets/death/DeathTitan.java | 2 +- .../doublejump/DoubleJumpCandyCane.java | 2 +- .../doublejump/DoubleJumpFrostLord.java | 2 +- .../gadgets/doublejump/DoubleJumpTitan.java | 2 +- .../core/gadget/gadgets/hat/HatCoal.java | 2 +- .../core/gadget/gadgets/hat/HatPresent.java | 2 +- .../core/gadget/gadgets/hat/HatSanta.java | 2 +- .../core/gadget/gadgets/hat/HatSnowman.java | 2 +- .../core/gadget/gadgets/item/ItemCoal.java | 6 ++--- .../gadget/gadgets/item/ItemFreezeCannon.java | 4 +-- .../gadget/gadgets/item/ItemPartyPopper.java | 25 ++++++++++--------- .../gadget/gadgets/item/ItemSnowball.java | 4 +-- .../gadget/gadgets/morph/MorphSnowman.java | 2 +- .../core/gadget/gadgets/morph/MorphTitan.java | 5 +--- .../gadgets/particle/ParticleCandyCane.java | 2 +- .../gadgets/particle/ParticleFrostLord.java | 4 +-- .../gadgets/particle/ParticleLegend.java | 2 +- .../gadgets/particle/ParticleTitan.java | 2 +- .../core/mount/types/MountBabyReindeer.java | 2 +- 25 files changed, 56 insertions(+), 51 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java index 317f6503c..d94654926 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import net.md_5.bungee.api.ChatColor; + import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -83,22 +85,29 @@ public class GadgetPage extends ShopPageBase List itemLore = new ArrayList(); + + itemLore.add(C.cBlack); + itemLore.addAll(Arrays.asList(gadget.GetDescription())); + if (gadget.GetCost(CurrencyType.Coins) >= 0) { - itemLore.add(C.cYellow + gadget.GetCost(CurrencyType.Coins) + " Coins"); + itemLore.add(C.cBlack); + itemLore.add(C.cAqua + "Cost: " + ChatColor.RESET + gadget.GetCost(CurrencyType.Coins) + " Treasure Shards"); + } + else if (gadget.GetCost(CurrencyType.Coins) == -1) + { + //Nothing } else if (gadget.GetCost(CurrencyType.Coins) == -2) { - itemLore.add(C.cGold + "Found in Treasure Chests."); + itemLore.add(C.cBlack); + itemLore.add(C.cGray + "Found in Treasure Chests"); } else if (gadget.GetCost(CurrencyType.Coins) == -3) { - + itemLore.add(C.cBlack); + itemLore.add(C.cRed + "Found in Winter Holiday Treasure Chests"); } - - - itemLore.add(C.cBlack); - itemLore.addAll(Arrays.asList(gadget.GetDescription())); if (gadget instanceof ItemGadget) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java index 1b9741cfe..85cb085d6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCandyCane.java @@ -21,7 +21,7 @@ public class ArrowTrailCandyCane extends ArrowEffectGadget { C.cWhite + "We whish you a marry " + C.Scramble + "christmas" + C.cWhite + ".", }, - 1, + -3, Material.SNOW_BALL, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java index 41659abca..020cac190 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailFrostLord.java @@ -21,7 +21,7 @@ public class ArrowTrailFrostLord extends ArrowEffectGadget C.cWhite + "Your double jumps and arrows", C.cWhite + "are enchanted with snow powers.", }, - 10, + -3, Material.SNOW_BALL, (byte)0, "Frost Lord"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailTitan.java index 534d7f3b0..051684e25 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailTitan.java @@ -26,7 +26,7 @@ public class ArrowTrailTitan extends ArrowEffectGadget " ", C.cRed + "Unlocked with Titan Rank", }, - -3, + -1, Material.FIREBALL, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java index 524b45244..8a82b7519 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCandyCane.java @@ -21,7 +21,7 @@ public class DeathCandyCane extends DeathEffectGadget C.cWhite + "COLORS FTW!", C.cWhite + "Take damage with SWAG B)", }, - 10, + -3, Material.SNOW_BALL, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFrostLord.java index f0e5d5d42..2896ca7af 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathFrostLord.java @@ -18,7 +18,7 @@ public class DeathFrostLord extends DeathEffectGadget C.cWhite + "Your double jumps and arrows", C.cWhite + "are enchanted with snow powers.", }, - 10, + -3, Material.SNOW_BALL, (byte)0, "Frost Lord"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathTitan.java index e7f205cf6..fe8dc0982 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathTitan.java @@ -22,7 +22,7 @@ public class DeathTitan extends DeathEffectGadget " ", C.cRed + "Unlocked with Titan Rank", }, - -3, + -1, Material.FIREBALL, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCandyCane.java index 090963762..8a4e17a29 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCandyCane.java @@ -20,7 +20,7 @@ public class DoubleJumpCandyCane extends DoubleJumpEffectGadget { C.cWhite + "We whish you a marry " + C.Scramble + "christmas" + C.cWhite + ".", }, - 1, + -3, Material.SNOW_BALL, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFrostLord.java index ab1047715..d40c8388d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFrostLord.java @@ -19,7 +19,7 @@ public class DoubleJumpFrostLord extends DoubleJumpEffectGadget { C.cWhite + "More snow incomming.", }, - 1, + -3, Material.SNOW_BALL, (byte)0, "Frost Lord"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpTitan.java index ed418db96..7749ce217 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpTitan.java @@ -27,7 +27,7 @@ public class DoubleJumpTitan extends DoubleJumpEffectGadget " ", C.cRed + "Unlocked with Titan Rank", }, - -3, + -1, Material.FIREBALL, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java index 5a58edd2e..4bc85b096 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCoal.java @@ -12,7 +12,7 @@ public class HatCoal extends HatGadget public HatCoal(GadgetManager manager) { - super(manager, "Coal Hat", new String[]{C.cWhite + "Coal Hat"}, 10, new ItemStack(Material.COAL_BLOCK)); + super(manager, "Coal Hat", new String[]{C.cWhite + "Coal Hat"}, -3, new ItemStack(Material.COAL_BLOCK)); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java index 393f956b2..41f74c93e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatPresent.java @@ -9,7 +9,7 @@ public class HatPresent extends HatGadget public HatPresent(GadgetManager manager) { - super(manager, "Present Hat", new String[]{C.cWhite + "Present Hat"}, 10, "christmasgift"); + super(manager, "Present Hat", new String[]{C.cWhite + "Present Hat"}, -3, "christmasgift"); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSanta.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSanta.java index 618e1005e..f2fa35bbc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSanta.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSanta.java @@ -9,7 +9,7 @@ public class HatSanta extends HatGadget public HatSanta(GadgetManager manager) { - super(manager, "Santa Hat", new String[]{C.cWhite + "Santa Hat"}, 10, "Presents"); + super(manager, "Santa Hat", new String[]{C.cWhite + "Santa Hat"}, -3, "Presents"); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSnowman.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSnowman.java index 69a2ca1f5..209d78015 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSnowman.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSnowman.java @@ -9,7 +9,7 @@ public class HatSnowman extends HatGadget public HatSnowman(GadgetManager manager) { - super(manager, "Snowman Hat", new String[]{C.cWhite + "Snowman Hat"}, 10, "snowman002"); + super(manager, "Snowman Hat", new String[]{C.cWhite + "Snowman Hat"}, -3, "snowman002"); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java index b0fae1e93..4d5c06203 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java @@ -45,12 +45,12 @@ public class ItemCoal extends ItemGadget C.cDGray + "Exclusive Coal!", C.cDGray + "Earned by beeing naughty" } - , -1, Material.COAL, (byte) 0, 1000, new Ammo("Coal", "1 Piece of Coal", Material.COAL, (byte) 0, new String[] + , 1, Material.COAL, (byte) 0, 1000, new Ammo("Coal", "1 Piece of Coal", Material.COAL, (byte) 0, new String[] { C.cDGray + "Exclusive Coal!", C.cDGray + "Earned by beeing naughty" } - , 100, 100)); + , 1, 1)); } @Override @@ -65,7 +65,7 @@ public class ItemCoal extends ItemGadget { if(data) { - player.sendMessage(F.main("Coal", "You unlocked " + C.cDGray + "COAL FUMES!")); + player.sendMessage(F.main("Coal", "You unlocked " + C.cGreen + "Legendary Coal Fumes" + C.cGray + ".")); UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation().add(0, 0.5, 0), 0.2f, 0.5f, 0.2f, 0, 500, ViewDist.LONG); UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation(), 1.5f, 0.0f, 1.5f, 0, 500, ViewDist.LONG); player.getWorld().playSound(player.getLocation(), Sound.WITHER_DEATH, 0.8f, 0); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java index d8ac3177e..c630f69cb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java @@ -51,10 +51,10 @@ public class ItemFreezeCannon extends ItemGadget implements IThrown { C.cWhite + "Freeze your nemesis inside a block of ice!" } - , -1, Material.ICE, (byte) 0, 2000, new Ammo("Freeze Cannon", "100 Ice Blocks", Material.ICE, (byte) 0, new String[] + , 1, Material.ICE, (byte) 0, 2000, new Ammo("Freeze Cannon", "100 Ice Blocks", Material.ICE, (byte) 0, new String[] { C.cWhite + "100 Ice Blocks for you to launch!" - }, 500, 100)); + }, -1, 1)); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java index 2a44e16da..2338a8424 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java @@ -9,6 +9,7 @@ import org.bukkit.entity.Item; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.util.Vector; import mineplex.core.common.util.C; import mineplex.core.common.util.UtilAction; @@ -33,29 +34,29 @@ public class ItemPartyPopper extends ItemGadget implements IThrown super(manager, "Confetti Bomb", new String[] { C.cWhite + "POP BANG!", - }, -1, Material.GOLDEN_CARROT, (byte) 0, 1000, new Ammo("Confetti Bomb", "100 Party Poppers", Material.DIAMOND_BARDING, + }, 1, Material.GOLDEN_CARROT, (byte) 0, 1000, new Ammo("Confetti Bomb", "1 Party Popper", Material.GOLDEN_CARROT, (byte) 0, new String[] { C.cWhite + "100 Party Poppers for you to shoot!" - }, 500, 100)); + }, -2, 1)); } @Override public void ActivateCustom(Player player) { - Item ent = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()), - ItemStackFactory.Instance.CreateStack(Material.REDSTONE_LAMP_OFF, (byte)0, 1, "Lamp" + Math.random())); +// Item ent = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()), +// ItemStackFactory.Instance.CreateStack(Material.REDSTONE_LAMP_OFF, (byte)0, 1, "Lamp" + Math.random())); +// +// UtilAction.velocity(ent, player.getLocation().getDirection().normalize().multiply(0.1), 1, false, 0, 0.2, 10, false); +// +// Manager.getProjectileManager().AddThrow(ent, player, this, 3000, false, false, true, true, 0.5f); - UtilAction.velocity(ent, player.getLocation().getDirection().normalize().multiply(0.1), 1, false, 0, 0.2, 10, false); - Manager.getProjectileManager().AddThrow(ent, player, this, 3000, false, false, true, true, 0.5f); - - /* for(int data : new int[]{1,2,4,5,6,9,10,11,12,13,14,15}) { UtilParticle.PlayParticleToAll(ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, data), player.getEyeLocation(), null, 0.4f, 50, ViewDist.LONG); - /* + for(int i = 0; i < 10; i++) { Vector v = new Vector(Math.random() - 0.5, Math.random() - 0.3, Math.random() - 0.5); @@ -67,7 +68,7 @@ public class ItemPartyPopper extends ItemGadget implements IThrown UtilParticle.PlayParticleToAll(ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, data), player.getEyeLocation(), v, 1, 0, ViewDist.LONG); } - /* + Item ent = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()), ItemStackFactory.Instance.CreateStack(Material.INK_SACK, (byte)data, 1, "Ink" + Math.random())); _items.add(ent); @@ -79,8 +80,8 @@ public class ItemPartyPopper extends ItemGadget implements IThrown UtilAction.velocity(ent, player.getLocation().getDirection().normalize().multiply(0.3).add(random), 1 + 0.4 * Math.random(), false, 0, 0.2, 10, false); Manager.getProjectileManager().AddThrow(ent, player, this, 3000, false, false, true, true, 0.5f); - */ -// } + + } // Sound for(int i = 0; i < 3; i++) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java index ce1f5dc79..8c5a232d3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java @@ -29,11 +29,11 @@ public class ItemSnowball extends ItemGadget C.cWhite + "Throw snowball!", C.cWhite + "Start epic snowfights!" } - , -1, Material.SNOW_BALL, (byte) 0, 1, new Ammo("Snowball", "50 Snowballs", Material.SNOW_BALL, (byte) 0, new String[] + , 1, Material.SNOW_BALL, (byte) 0, 1, new Ammo("Snowball", "1 Snowball", Material.SNOW_BALL, (byte) 0, new String[] { C.cWhite + "50 Snowballs for you to throw!" } - , 100, 50)); + , -3, 1)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java index 40a7ff8cd..4451b7b72 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java @@ -42,7 +42,7 @@ public class MorphSnowman extends MorphGadget super(manager, "Snowman Morph", new String[]{ C.cWhite + "Do you wanna build a snowman?", C.cWhite + "It doesn't have to be a snowman...", C.cWhite + "Or... it kind of does...", " ", C.cYellow + "Left Click" + C.cGray + " to use " + C.cGreen + "Snowball", }, - 6000, Material.SNOW_BALL, (byte) 0); + -3, Material.SNOW_BALL, (byte) 0); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java index 1e36b454e..213332edf 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java @@ -9,9 +9,7 @@ import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Entity; -import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.entity.Zombie; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; @@ -19,7 +17,6 @@ import org.bukkit.util.Vector; import mineplex.core.common.Rank; import mineplex.core.common.util.C; -import mineplex.core.common.util.MapUtil; import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilEnt; @@ -54,7 +51,7 @@ public class MorphTitan extends MorphGadget C.cRed + "Unlocked with Titan Rank", }, -1, - Material.PRISMARINE_SHARD, (byte)0); + Material.PRISMARINE_CRYSTALS, (byte)0); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java index 110cbc4e8..b28852051 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java @@ -25,7 +25,7 @@ public class ParticleCandyCane extends ParticleGadget public ParticleCandyCane(GadgetManager manager) { - super(manager, "Candy Cane Particle", new String[]{"Christmas. Nuf said."}, 10, Material.CHEST, (byte)0); + super(manager, "Candy Cane Particle", new String[]{"Christmas. Nuf said."}, -3, Material.CHEST, (byte)0); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java index e01e24201..7b5005624 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java @@ -23,8 +23,6 @@ import mineplex.core.updater.event.UpdateEvent; public class ParticleFrostLord extends ParticleGadget { - private HashSet _arrows = new HashSet(); - public ParticleFrostLord(GadgetManager manager) { super(manager, "Wind of the Frost Lord", new String[] @@ -33,7 +31,7 @@ public class ParticleFrostLord extends ParticleGadget C.cWhite + "Your double jumps and arrows", C.cWhite + "are enchanted with snow powers.", }, - 10, + -3, Material.SNOW_BALL, (byte)0, "Frost Lord"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java index 6c510f664..639d85d23 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java @@ -26,7 +26,7 @@ public class ParticleLegend extends ParticleGadget " ", C.cGreen + "Unlocked with Legend Rank", }, - -3, + -1, Material.ENDER_PORTAL_FRAME, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleTitan.java index 12353e872..7d5aa7025 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleTitan.java @@ -32,7 +32,7 @@ public class ParticleTitan extends ParticleGadget " ", C.cRed + "Unlocked with Titan Rank", }, - -3, + -1, Material.FIREBALL, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java index 0c5b84e98..04559e60e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java @@ -33,7 +33,7 @@ public class MountBabyReindeer extends HorseMount { C.cWhite + "One of Santa's baby reindeers", C.cWhite + "Still trying to learn how to fly" - }, Material.SNOW_BALL, (byte) 0, 10, Color.CREAMY, Style.WHITEFIELD, Variant.HORSE, 0, null); + }, Material.SNOW_BALL, (byte) 0, -3, Color.CREAMY, Style.WHITEFIELD, Variant.HORSE, 0, null); } @EventHandler