Lots of typo fixes and such

This commit is contained in:
fooify 2015-12-24 11:13:54 -08:00
parent b356bce177
commit 41f56e9853
16 changed files with 18 additions and 18 deletions

View File

@ -165,7 +165,7 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
if (enabled.containsKey(type)) addGlow(gadgetSlot); if (enabled.containsKey(type)) addGlow(gadgetSlot);
type = GadgetType.Morph; type = GadgetType.Morph;
lore = getLore(ownedCount.get(type), maxCount.get(type), "Ever want to be a tiger? Well, you can't be a tiger! That's silly! But you can be many other things!", "Usable in Lobbies", enabled.get(type)); lore = getLore(ownedCount.get(type), maxCount.get(type), "Have you ever wanted to be a tiger? Well, you can't be a tiger! That's silly! But you can be many other things!", "Usable in Lobbies", enabled.get(type));
addButton(morphSlot, new ShopItem(Material.LEATHER, "Morphs", lore, 1, false), new OpenMorphs(this, enabled.get(type))); addButton(morphSlot, new ShopItem(Material.LEATHER, "Morphs", lore, 1, false), new OpenMorphs(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(morphSlot); if (enabled.containsKey(type)) addGlow(morphSlot);

View File

@ -193,7 +193,7 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
} }
else if (getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.WITHER) else if (getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.WITHER)
{ {
addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.Coins) + C.cGreen + " Coins", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this)); addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.Coins) + C.cGreen + " Shards", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this));
} }
slot++; slot++;

View File

@ -20,7 +20,7 @@ public class ArrowTrailCandyCane extends ArrowEffectGadget
public ArrowTrailCandyCane(GadgetManager manager) public ArrowTrailCandyCane(GadgetManager manager)
{ {
super(manager, "Candy Cane Arrows", super(manager, "Candy Cane Arrows",
UtilText.splitLineToArray(C.cGray + "The real reason no one visits the North Pole? Santas Elves are deadly shots.", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "The real reason no one visits the North Pole? Santa's Elves are deadly shots.", LineFormat.LORE),
-3, -3,
Material.INK_SACK, (byte)1); Material.INK_SACK, (byte)1);
} }

View File

@ -18,7 +18,7 @@ public class ArrowTrailFrostLord extends ArrowEffectGadget
public ArrowTrailFrostLord(GadgetManager manager) public ArrowTrailFrostLord(GadgetManager manager)
{ {
super(manager, "Arrows of the Frost Lord", super(manager, "Arrows of the Frost Lord",
UtilText.splitLineToArray(C.cGray + "The Frost Lords arrows bring a blast of winter in the wind of their passing.", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "The Frost Lord's arrows bring a blast of winter in the wind of their passing.", LineFormat.LORE),
-3, -3,
Material.SNOW_BALL, (byte)0, "Frost Lord"); Material.SNOW_BALL, (byte)0, "Frost Lord");
} }

View File

@ -13,7 +13,7 @@ public class HatGrinch extends HatGadget
public HatGrinch(GadgetManager manager) public HatGrinch(GadgetManager manager)
{ {
super(manager, "The Grinch", super(manager, "The Grinch",
UtilText.splitLineToArray(C.cGray + "Great! Now wheres the Roast Beast?!", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "Great! Now where's the Roast Beast?!", LineFormat.LORE),
-3, -3,
SkinData.THE_GRINCH.getSkull(), "The Grinch Hat"); SkinData.THE_GRINCH.getSkull(), "The Grinch Hat");
} }

View File

@ -13,7 +13,7 @@ public class HatPresent extends HatGadget
public HatPresent(GadgetManager manager) public HatPresent(GadgetManager manager)
{ {
super(manager, "Present", super(manager, "Present",
UtilText.splitLineToArray(C.cGray + "WHAT IN THE PRESENT? Oh, it's just you...", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "WHAT'S IN THE PRESENT? Oh, it's just you...", LineFormat.LORE),
-3, -3,
SkinData.PRESENT.getSkull()); SkinData.PRESENT.getSkull());
} }

View File

@ -13,7 +13,7 @@ public class HatRudolph extends HatGadget
public HatRudolph(GadgetManager manager) public HatRudolph(GadgetManager manager)
{ {
super(manager, "Rudolph", super(manager, "Rudolph",
UtilText.splitLineToArray(C.cGray + "WHAT'S IN THE PRESENT? Oh, it's just you...", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "HEY YOU! Wanna lead Santa's sleigh team?", LineFormat.LORE),
-3, -3,
SkinData.RUDOLPH.getSkull()); SkinData.RUDOLPH.getSkull());
} }

View File

@ -38,7 +38,7 @@ public class ItemCoinBomb extends ItemGadget
public ItemCoinBomb(GadgetManager manager) public ItemCoinBomb(GadgetManager manager)
{ {
super(manager, "Treasure Party Bomb", super(manager, "Treasure Party Bomb",
UtilText.splitLineToArray(C.cWhite + "It's party time! You'll be everyones favourite player when you use one of these!", LineFormat.LORE), UtilText.splitLineToArray(C.cWhite + "It's party time! You'll be everyone's favourite player when you use one of these!", LineFormat.LORE),
-1, -1,
Material.PRISMARINE, (byte)0, Material.PRISMARINE, (byte)0,
30000, new Ammo("Treasure Party Bomb", "1 Coin Party Bomb", Material.PRISMARINE, (byte)0, new String[] { C.cWhite + "1 Treasure Party Bomb" }, 2000, 1)); 30000, new Ammo("Treasure Party Bomb", "1 Coin Party Bomb", Material.PRISMARINE, (byte)0, new String[] { C.cWhite + "1 Treasure Party Bomb" }, 2000, 1));

View File

@ -59,7 +59,7 @@ public class MorphBunny extends MorphGadget
"#" + C.cWhite + "Charge Crouch to use Super Jump", "#" + C.cWhite + "Charge Crouch to use Super Jump",
"#" + C.cWhite + "Left Click to use Hide Easter Egg", "#" + C.cWhite + "Left Click to use Hide Easter Egg",
C.blankLine, C.blankLine,
"#" + C.cRed +C.Bold + "WARNING: " + ChatColor.RESET + "Hide Easter Egg uses 500 Coins" , "#" + C.cRed +C.Bold + "WARNING: " + ChatColor.RESET + "Hide Easter Egg uses 500 Shards" ,
}, LineFormat.LORE), }, LineFormat.LORE),
-5, -5,
Material.MONSTER_EGG, (byte)98); Material.MONSTER_EGG, (byte)98);
@ -154,7 +154,7 @@ public class MorphBunny extends MorphGadget
if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.Coins) < 500) if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.Coins) < 500)
{ {
UtilPlayer.message(player, F.main("Gadget", "You do not have enough Coins.")); UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards."));
return; return;
} }
@ -183,7 +183,7 @@ public class MorphBunny extends MorphGadget
ChatColor.RESET + C.Bold + " hid an " + ChatColor.RESET + C.Bold + " hid an " +
C.cYellow + C.Bold + "Easter Egg" + C.cYellow + C.Bold + "Easter Egg" +
ChatColor.RESET + C.Bold + " worth " + ChatColor.RESET + C.Bold + " worth " +
C.cYellow + C.Bold + "450 Coins"); C.cYellow + C.Bold + "450 Shards");
for (Player other : UtilServer.getPlayers()) for (Player other : UtilServer.getPlayers())
other.playSound(other.getLocation(), Sound.CAT_HIT, 1.5f, 1.5f); other.playSound(other.getLocation(), Sound.CAT_HIT, 1.5f, 1.5f);

View File

@ -29,7 +29,7 @@ public class MorphSlime extends MorphGadget
{ {
super(manager, "Big Larry Morph", UtilText.splitLinesToArray(new String[] super(manager, "Big Larry Morph", UtilText.splitLinesToArray(new String[]
{ {
C.cGray + "Have you ever looked at Big Larry and thought, \'I really want to be that guy!\'? Well, today is your lucky day!", C.cGray + "Have you ever looked at Big Larry and thought, \'I really want to be that guy\'!? Well, today is your lucky day!",
C.blankLine, C.blankLine,
"#" + C.cWhite + "Left Click to use Bounce", "#" + C.cWhite + "Left Click to use Bounce",
C.blankLine, C.blankLine,

View File

@ -46,7 +46,7 @@ public class MorphTitan extends MorphGadget
{ {
super(manager, "Elder Guardian Morph", UtilText.splitLinesToArray(new String[] super(manager, "Elder Guardian Morph", UtilText.splitLinesToArray(new String[]
{ {
C.cGray + "From the depths of the sea, the Elder Guardian posseses powers more amazing than any seen before!", C.cGray + "From the depths of the sea, the Elder Guardian possesses powers more amazing than any seen before!",
C.blankLine, C.blankLine,
"#" + C.cWhite + "Left-Click to use Guardians Laser", "#" + C.cWhite + "Left-Click to use Guardians Laser",
}, LineFormat.LORE), }, LineFormat.LORE),

View File

@ -29,7 +29,7 @@ public class ParticleCandyCane extends ParticleGadget
public ParticleCandyCane(GadgetManager manager) public ParticleCandyCane(GadgetManager manager)
{ {
super(manager, "Crushed Candy Cane", super(manager, "Crushed Candy Cane",
UtilText.splitLineToArray(C.cGray + "Theres no such thing as too much Christmas Candy. Don't listen to your dentist.", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "There's no such thing as too much Christmas Candy. Don't listen to your dentist.", LineFormat.LORE),
-3, Material.INK_SACK, (byte)1); -3, Material.INK_SACK, (byte)1);
} }

View File

@ -22,7 +22,7 @@ public class ParticleEnchant extends ParticleGadget
public ParticleEnchant(GadgetManager manager) public ParticleEnchant(GadgetManager manager)
{ {
super(manager, "Enchanted", super(manager, "Enchanted",
UtilText.splitLineToArray(C.cGray + "The wisdom of the universe suddenly find you extremely attractive, and wants to \'enchant\' you.", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "The wisdom of the universe suddenly finds you extremely attractive, and wants to \'enchant\' you.", LineFormat.LORE),
-2, -2,
Material.BOOK, (byte)0); Material.BOOK, (byte)0);
} }

View File

@ -24,7 +24,7 @@ public class ParticleGreen extends ParticleGadget
public ParticleGreen(GadgetManager manager) public ParticleGreen(GadgetManager manager)
{ {
super(manager, "Green Ring", super(manager, "Green Ring",
UtilText.splitLineToArray(C.cGray + "With these sparkles, you can sparkle while sparkle with CaptainSparklez!", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "With these sparkles, you can sparkle while sparkling with CaptainSparklez!", LineFormat.LORE),
-2, -2,
Material.EMERALD, (byte)0); Material.EMERALD, (byte)0);
} }

View File

@ -24,7 +24,7 @@ public class ParticleHelix extends ParticleGadget
public ParticleHelix(GadgetManager manager) public ParticleHelix(GadgetManager manager)
{ {
super(manager, "Blood Helix", super(manager, "Blood Helix",
UtilText.splitLineToArray(C.cGray + "Blood magic is very dangerous... but also very cool!", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "Blood magic is very dangerous...but also very cool!", LineFormat.LORE),
-2, -2,
Material.REDSTONE, (byte)0); Material.REDSTONE, (byte)0);
} }

View File

@ -122,7 +122,7 @@ public class Minion
"Purpose", "Symptom", "Sticks", "Measure", "Slimes", "Greece", "Spooky", "Coffee", "Aliens", "Cities", "Purpose", "Symptom", "Sticks", "Measure", "Slimes", "Greece", "Spooky", "Coffee", "Aliens", "Cities",
"Bikini", "Mortal", "Serena", "Future", "Bottle", "Helmet", "Crunch", "Afraid", "Threat", "Static", "Bikini", "Mortal", "Serena", "Future", "Bottle", "Helmet", "Crunch", "Afraid", "Threat", "Static",
"Happy", "Knife", "Scary", "Lapis", "Skirt", "Waves", "Calem", "Clock", "Taste", "Lucas", "Happy", "Knife", "Scary", "Lapis", "Skirt", "Waves", "Calem", "Clock", "Taste", "Lucas",
"Anger", "Spork", "Maike", "Candy", "Shirt", "Tides", "Ocean", "Crawl", "Smell", "React", "Anger", "Spork", "Make", "Candy", "Shirt", "Tides", "Ocean", "Crawl", "Smell", "React",
"Dolls", "Roses", "Trips", "Flute", "Pants", "Brick", "Three", "Ethan", "Uncle", "Lunch", "Dolls", "Roses", "Trips", "Flute", "Pants", "Brick", "Three", "Ethan", "Uncle", "Lunch",
"Legos", "Tulip", "Beach", "Wipes", "Heels", "Straw", "Seven", "Hands", "Queen", "Books", "Legos", "Tulip", "Beach", "Wipes", "Heels", "Straw", "Seven", "Hands", "Queen", "Books",
"Couch", "Grass", "Clans", "Frame", "Nails", "Cream", "Eight", "Belly", "Crown", "Polls", "Couch", "Grass", "Clans", "Frame", "Nails", "Cream", "Eight", "Belly", "Crown", "Polls",