and the mounts

This commit is contained in:
Cheese 2015-12-11 16:38:44 +11:00
parent fe7ce40783
commit 7f8c9c02bc
12 changed files with 56 additions and 70 deletions

View File

@ -27,7 +27,7 @@ public class ParticleTitan extends ParticleGadget
public ParticleTitan(GadgetManager manager) public ParticleTitan(GadgetManager manager)
{ {
super(manager, "Flame of the Titans", super(manager, "Flame of the Titans",
UtilText.splitLineToArray(C.cWhite + "Only the legendary warriors known as Titans can survive the fiery pits of Hades.", LineFormat.LORE), UtilText.splitLineToArray(C.cWhite + "These flames are said to be the spirit of a Titan.", LineFormat.LORE),
-1, -1,
Material.FIREBALL, (byte)0); Material.FIREBALL, (byte)0);
} }

View File

@ -13,8 +13,10 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilText;
import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.mount.HorseMount; import mineplex.core.mount.HorseMount;
@ -29,11 +31,9 @@ public class MountBabyReindeer extends HorseMount
public MountBabyReindeer(MountManager manager) public MountBabyReindeer(MountManager manager)
{ {
super(manager, "Baby Rainder", new String[] super(manager, "Baby Rainder",
{ UtilText.splitLineToArray(C.cWhite + "One of Santas baby reindeers. He's still learning how to fly...", LineFormat.LORE),
C.cWhite + "One of Santa's baby reindeers", Material.SNOW_BALL, (byte) 0, -3, Color.CREAMY, Style.WHITEFIELD, Variant.HORSE, 0, null);
C.cWhite + "Still trying to learn how to fly"
}, Material.SNOW_BALL, (byte) 0, -3, Color.CREAMY, Style.WHITEFIELD, Variant.HORSE, 0, null);
} }
@EventHandler @EventHandler

View File

@ -11,12 +11,15 @@ import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.event.vehicle.VehicleDamageEvent;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilText;
import mineplex.core.mount.Mount; import mineplex.core.mount.Mount;
import mineplex.core.mount.MountManager; import mineplex.core.mount.MountManager;
import mineplex.core.mount.SingleEntityMountData; import mineplex.core.mount.SingleEntityMountData;
@ -28,11 +31,8 @@ public class MountCart extends Mount<SingleEntityMountData<Minecart>>
{ {
public MountCart(MountManager manager) public MountCart(MountManager manager)
{ {
super(manager, "Minecart", Material.MINECART, (byte)0, new String[] super(manager, "Minecart", Material.MINECART, (byte)0,
{ UtilText.splitLineToArray(C.cWhite + "Cruise around town in your shiny new Minecart RX Turbo!", LineFormat.LORE),
ChatColor.RESET + "Cruise around town in your",
ChatColor.RESET + "new Minecart VX Turbo!",
},
15000); 15000);
KnownPackage = false; KnownPackage = false;

View File

@ -10,7 +10,9 @@ import org.bukkit.event.player.PlayerJoinEvent;
import mineplex.core.common.Rank; import mineplex.core.common.Rank;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilText;
import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ParticleType;
@ -24,17 +26,11 @@ public class MountDragon extends DragonMount
{ {
public MountDragon(MountManager manager) public MountDragon(MountManager manager)
{ {
super(manager, "Ethereal Dragon", new String[] super(manager, "Ethereal Dragon",
{ UtilText.splitLineToArray(C.cWhite + "From the distant Ether Realm, this prized dragon is said to only obey true Heroes!", LineFormat.LORE),
C.cWhite + "From the distant ether realm,",
C.cWhite + "this prized dragon is said to",
C.cWhite + "obey only true Heroes!",
" ",
C.cPurple + "Unlocked with Hero Rank",
},
Material.DRAGON_EGG, Material.DRAGON_EGG,
(byte)0, (byte)0,
-1); -11);
} }
@EventHandler @EventHandler

View File

@ -8,7 +8,9 @@ import org.bukkit.entity.Horse.Variant;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilText;
import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.mount.HorseMount; import mineplex.core.mount.HorseMount;
@ -21,12 +23,8 @@ public class MountFrost extends HorseMount
{ {
public MountFrost(MountManager manager) public MountFrost(MountManager manager)
{ {
super(manager, "Glacial Steed", new String[] super(manager, "Glacial Steed",
{ UtilText.splitLineToArray(C.cWhite + "Born in the North Pole, it leaves a trail of frost as it moves!", LineFormat.LORE),
C.cWhite + "Born in the North Pole,",
C.cWhite + "it leaves a trail of frost",
C.cWhite + "as it moves!",
},
Material.SNOW_BALL, Material.SNOW_BALL,
(byte)0, (byte)0,
15000, 15000,

View File

@ -6,6 +6,9 @@ import org.bukkit.entity.Horse.Color;
import org.bukkit.entity.Horse.Style; import org.bukkit.entity.Horse.Style;
import org.bukkit.entity.Horse.Variant; import org.bukkit.entity.Horse.Variant;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
import mineplex.core.mount.HorseMount; import mineplex.core.mount.HorseMount;
import mineplex.core.mount.MountManager; import mineplex.core.mount.MountManager;
@ -13,10 +16,8 @@ public class MountMule extends HorseMount
{ {
public MountMule(MountManager manager) public MountMule(MountManager manager)
{ {
super(manager, "Mount Mule", new String[] super(manager, "Mount Mule",
{ UtilText.splitLineToArray(C.cWhite + "Your very own trusty pack mule!", LineFormat.LORE),
ChatColor.RESET + "Muley muley!"
},
Material.HAY_BLOCK, Material.HAY_BLOCK,
(byte)0, (byte)0,
3000, 3000,

View File

@ -11,8 +11,11 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguiseBase; import mineplex.core.disguise.disguises.DisguiseBase;
import mineplex.core.disguise.disguises.DisguiseSheep; import mineplex.core.disguise.disguises.DisguiseSheep;
import mineplex.core.mount.HorseMount; import mineplex.core.mount.HorseMount;
@ -25,10 +28,8 @@ public class MountSheep extends HorseMount
{ {
public MountSheep(MountManager manager) public MountSheep(MountManager manager)
{ {
super(manager, "Techno Sheep", new String[] super(manager, "Techno Sheep",
{ UtilText.splitLineToArray(C.cWhite + "Baaaaa with all the colors of the rainbow!", LineFormat.LORE),
ChatColor.RESET + "Muley muley!"
},
Material.WOOL, Material.WOOL,
(byte)14, (byte)14,
3000, 3000,

View File

@ -11,12 +11,15 @@ import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilText;
import mineplex.core.mount.Mount; import mineplex.core.mount.Mount;
import mineplex.core.mount.MountManager; import mineplex.core.mount.MountManager;
import mineplex.core.mount.SingleEntityMountData; import mineplex.core.mount.SingleEntityMountData;
@ -28,11 +31,8 @@ public class MountSlime extends Mount<SingleEntityMountData<Slime>>
{ {
public MountSlime(MountManager manager) public MountSlime(MountManager manager)
{ {
super(manager, "Slime Mount", Material.SLIME_BALL, (byte)0, new String[] super(manager, "Slime Mount", Material.SLIME_BALL, (byte)0,
{ UtilText.splitLineToArray(C.cWhite + "Bounce around on your very own slime friend!", LineFormat.LORE),
ChatColor.RESET + "Bounce around on your very",
ChatColor.RESET + "own personal slime friend!",
},
15000); 15000);
KnownPackage = false; KnownPackage = false;

View File

@ -19,11 +19,13 @@ import org.bukkit.util.Vector;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguiseSpider; import mineplex.core.disguise.disguises.DisguiseSpider;
import mineplex.core.mount.HorseMount; import mineplex.core.mount.HorseMount;
import mineplex.core.mount.MountManager; import mineplex.core.mount.MountManager;
@ -41,17 +43,15 @@ public class MountSpider extends HorseMount
public MountSpider(MountManager manager) public MountSpider(MountManager manager)
{ {
super(manager, "Spider Mount", new String[] super(manager, "Spider Mount",
UtilText.splitLinesToArray(new String[]
{ {
C.cWhite + "Why ride a horse when you can", C.cWhite + "Why ride a horse when you can ride a cute and cuddly spider!",
C.cWhite + "ride a cute and cuddly spider!",
C.cBlack, C.cBlack,
C.cYellow + "Look Up" + C.cGray + " to use " + C.cGreen + "Wall Climb", C.cYellow + "Look Up" + C.cGray + " to use " + C.cGreen + "Wall Climb",
C.cYellow + "Jump" + C.cGray + " to use " + C.cGreen + "Leap", C.cYellow + "Jump" + C.cGray + " to use " + C.cGreen + "Leap",
C.cBlack, }, LineFormat.LORE),
C.cPurple + "Only available during " + C.Line + "Halloween 2015", Material.WEB, (byte) 0, -4, Color.BLACK, Style.NONE, Variant.HORSE, 2.0, Material.AIR);
C.cPurple + "Purchase at " + C.Line + "www.mineplex.com/shop"
}, Material.WEB, (byte) 0, -1, Color.BLACK, Style.NONE, Variant.HORSE, 2.0, Material.AIR);
} }
@Override @Override

View File

@ -13,7 +13,9 @@ import org.bukkit.event.player.PlayerJoinEvent;
import mineplex.core.common.Rank; import mineplex.core.common.Rank;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilText;
import mineplex.core.mount.Mount; import mineplex.core.mount.Mount;
import mineplex.core.mount.MountManager; import mineplex.core.mount.MountManager;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
@ -23,14 +25,9 @@ public class MountTitan extends Mount<MountTitanData>
{ {
public MountTitan(MountManager manager) public MountTitan(MountManager manager)
{ {
super(manager, "Molten Snake", Material.MAGMA_CREAM, (byte)0, new String[] super(manager, "Molten Snake", Material.MAGMA_CREAM, (byte)0,
{ UtilText.splitLineToArray(C.cWhite + "Deep under the earths surface, there exists a mythical species of Molten Snakes. This one will serve you eternally.", LineFormat.LORE),
C.cWhite + "Deep under the earths surface, there", -13);
C.cWhite + "exists a mythical species of Molten",
C.cWhite + "Snakes. This one will serve you eternally.",
" ",
C.cRed + "Unlocked with Titan Rank",
}, -1);
} }
@Override @Override

View File

@ -8,7 +8,9 @@ import org.bukkit.entity.Horse.Variant;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilText;
import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.mount.HorseMount; import mineplex.core.mount.HorseMount;
@ -21,12 +23,8 @@ public class MountUndead extends HorseMount
{ {
public MountUndead(MountManager manager) public MountUndead(MountManager manager)
{ {
super(manager, "Infernal Horror", new String[] super(manager, "Infernal Horror",
{ UtilText.splitLineToArray(C.cWhite + "The most ghastly horse in existance, from the pits of the Nether.", LineFormat.LORE),
C.cWhite + "The most ghastly horse in",
C.cWhite + "existance, from the pits of",
C.cWhite + "the Nether.",
},
Material.BONE, Material.BONE,
(byte)0, (byte)0,
20000, 20000,

View File

@ -6,6 +6,8 @@ import org.bukkit.entity.Horse.Style;
import org.bukkit.entity.Horse.Variant; import org.bukkit.entity.Horse.Variant;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
import mineplex.core.mount.HorseMount; import mineplex.core.mount.HorseMount;
import mineplex.core.mount.MountManager; import mineplex.core.mount.MountManager;
@ -13,18 +15,11 @@ public class MountZombie extends HorseMount
{ {
public MountZombie(MountManager manager) public MountZombie(MountManager manager)
{ {
super(manager, "Decrepit Warhorse", new String[] super(manager, "Decrepit Warhorse",
{ UtilText.splitLineToArray(C.cWhite + "Once a fierce warhorse, this undead beast will send fear into the hearts of your enemies.", LineFormat.LORE),
C.cWhite + "Once a fierce warhorse, this",
C.cWhite + "undead beast will send fear",
C.cWhite + "into the hearts of your enemies.",
" ",
C.cYellow + "Earned by defeating the Pumpkin King",
C.cYellow + "in the 2015 Halloween Horror Event.",
},
Material.ROTTEN_FLESH, Material.ROTTEN_FLESH,
(byte)0, (byte)0,
-1, -4,
Color.BLACK, Style.BLACK_DOTS, Variant.UNDEAD_HORSE, 0.8, null); Color.BLACK, Style.BLACK_DOTS, Variant.UNDEAD_HORSE, 0.8, null);
} }
} }