Fix accidentally refactoring "thanks" in strings
This commit is contained in:
Shaun Bennett
parent
72f078fe54
commit
e113bedea5
@ -287,7 +287,7 @@ public class Chat extends MiniPlugin
|
||||
|
||||
if (response == null)
|
||||
{
|
||||
System.out.println("[ERROR] Unable to filter chat message...thank a lot CleanSpeak.");
|
||||
System.out.println("[ERROR] Unable to filter chat message...thanks a lot CleanSpeak.");
|
||||
return originalMessage;
|
||||
}
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ public class Courtship
|
||||
"Mmmmmm, that's delicious! But I still don't like you very much.",
|
||||
"For a moment there, I thought you were my friend... But you're not! Leave me alone!",
|
||||
"Just because I'm drinking your drink, doesn't mean we're friends!",
|
||||
"Hmmm... I don't know. I think I have enough friends right now, thank.",
|
||||
"Hmmm... I don't know. I think I have enough friends right now, thanks.",
|
||||
"Ugh why are you always trying to talk to me?",
|
||||
"Just because I eat grass sometimes, doesn't mean I'm desperate enough to be your friend."
|
||||
};
|
||||
@ -38,15 +38,15 @@ public class Courtship
|
||||
* Created by: Mysticate
|
||||
* Timestamp: February 6, 2016
|
||||
*/
|
||||
|
||||
|
||||
private ValentinesManager _manager;
|
||||
private Player _player;
|
||||
private Sheep _sheep;
|
||||
private String _prefix;
|
||||
private final boolean _success;
|
||||
|
||||
|
||||
private int _tick = 0;
|
||||
|
||||
|
||||
public Courtship(ValentinesManager manager, Player player, Sheep sheep, String prefix, boolean success)
|
||||
{
|
||||
_manager = manager;
|
||||
@ -55,14 +55,14 @@ public class Courtship
|
||||
_prefix = prefix;
|
||||
_success = success;
|
||||
}
|
||||
|
||||
|
||||
public boolean tick()
|
||||
{
|
||||
if (!_player.isOnline())
|
||||
return true;
|
||||
|
||||
|
||||
_tick++;
|
||||
|
||||
|
||||
{
|
||||
Vector vec = UtilAlg.getTrajectory(_sheep, _player);
|
||||
UtilEnt.CreatureForceLook(_sheep, UtilAlg.GetPitch(vec), UtilAlg.GetYaw(vec));
|
||||
@ -77,21 +77,21 @@ public class Courtship
|
||||
Entity bottom = player;
|
||||
while (bottom.getVehicle() != null)
|
||||
bottom = bottom.getVehicle();
|
||||
|
||||
|
||||
UtilAction.velocity(bottom, UtilAlg.getTrajectory2d(_sheep, bottom), .5, true, 0.8, 0, 10, true);
|
||||
player.playSound(player.getLocation(), Sound.CHICKEN_EGG_POP, 2f, 0.5f);
|
||||
|
||||
|
||||
UtilPlayer.message(player, F.main(_prefix, "I'm talking to someone else right now!"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (_tick == 20)
|
||||
{
|
||||
message("What do we have here?");
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.NOTE_BASS, 1F, 1F);
|
||||
}
|
||||
|
||||
|
||||
if (_tick == 40)
|
||||
{
|
||||
if (_success)
|
||||
@ -105,16 +105,16 @@ public class Courtship
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.NOTE_BASS, .5F, 1F);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (_tick > 40 && _tick < 80)
|
||||
{
|
||||
if (_tick % 2 == 0)
|
||||
{
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.DIG_GRASS, 1F, 1F);
|
||||
|
||||
|
||||
UtilParticle.PlayParticle(ParticleType.HEART, _sheep.getLocation().clone().add(0, 1, 0), new Vector(), 0F, 1, ViewDist.NORMAL, _player);
|
||||
UtilParticle.PlayParticle(ParticleType.FIREWORKS_SPARK, _sheep.getLocation(), 1F, 1F, 1F, 0F, 1, ViewDist.NORMAL, _player);
|
||||
|
||||
|
||||
_sheep.setColor(DyeColor.PINK);
|
||||
}
|
||||
else
|
||||
@ -122,7 +122,7 @@ public class Courtship
|
||||
_sheep.setColor(DyeColor.WHITE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (_tick == 80)
|
||||
{
|
||||
if (_success)
|
||||
@ -134,10 +134,10 @@ public class Courtship
|
||||
{
|
||||
message(UtilMath.randomElement(FAIL_MESSAGES));
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.ANVIL_BREAK, 1F, 1F);
|
||||
_sheep.setColor(DyeColor.BLACK);
|
||||
_sheep.setColor(DyeColor.BLACK);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (_tick > 80 && _tick < 120 && _success)
|
||||
{
|
||||
if (_tick % 2 == 0)
|
||||
@ -149,31 +149,31 @@ public class Courtship
|
||||
_sheep.setColor(DyeColor.RED);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (_tick == 90 && _success)
|
||||
{
|
||||
message("I think...");
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.FIZZ, 1F, 1F);
|
||||
}
|
||||
|
||||
|
||||
if (_tick == 100 && _success)
|
||||
{
|
||||
message("I think I'm in love!");
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.LEVEL_UP, 1F, 1F);
|
||||
}
|
||||
|
||||
|
||||
if (_tick == 120 && _success)
|
||||
{
|
||||
message("Here, take this present as a token of my admiration.");
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.LEVEL_UP, 1F, 1F);
|
||||
|
||||
_sheep.getWorld().playSound(_sheep.getLocation(), Sound.LEVEL_UP, 1F, 1F);
|
||||
|
||||
_manager.giveReward(_player);
|
||||
|
||||
|
||||
_sheep.setColor(DyeColor.RED);
|
||||
|
||||
|
||||
UtilServer.broadcast(C.cYellowB + _player.getName() + C.cWhiteB + " tricked " + C.cGoldB + "Polly the Pink Sheep" + C.cWhiteB + " with a love potion!");
|
||||
}
|
||||
|
||||
|
||||
if (_tick == 130)
|
||||
{
|
||||
_sheep.setColor(DyeColor.PINK);
|
||||
@ -183,7 +183,7 @@ public class Courtship
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
private void message(String message)
|
||||
{
|
||||
UtilPlayer.message(_player, " ");
|
||||
|
||||
@ -10,57 +10,57 @@ import mineplex.core.map.MapText;
|
||||
public class CardFactory
|
||||
{
|
||||
private MapText _mapText;
|
||||
|
||||
|
||||
public CardFactory()
|
||||
{
|
||||
_mapText = new MapText();
|
||||
}
|
||||
|
||||
|
||||
private String[] _questions = new String[]
|
||||
{
|
||||
"When I get home from school, I crave _____.", "I was playing One in the Quiver when I ran into ____.", "Ultra+ now get free _____ every month.", "Everything was fine until _____ joined.", "Help me! My mom is _______.", "_________ crashed the server again…", "_______ ate his pet rabbit when he saw __________.", "My mouse batteries died because I was using it for ______.", "______ is the #1 reason of deaths on the server.", "Ugh, I'm lagging thank to _____!", "I need to go to the doctor, I'm sick with _________!", "My best friend thinks he is _____.", "The cure for all diseases is partially made out of _____.", "When i was little i wanted to become a ______ and use _____ to save the world.", "I painted a beautiful painting of ____!", "When you grow up you will realize that ______ is all you need.", "_______ knew he had made the wrong choice when he realised he was _______.", "While falling asleep, I dreamt of ______ kissing ______.", "I went to a fancy restaurant, but the chef gave me _____!", "What am I supposed to do when I see _____ ______?", "There is absolutely nothing worse in this world than ___________.", "I get all excited and tingly when I see ________!", "I would rather be _________ than _________.", "I think my brother is a big fan of _______.", "Why can't I sleep at night?", "What's that smell?", "I got 99 problems but ________ ain't one.", "What's the next game coming out on Mineplex?", "What is the next trend on YouTube?", "It's a pity that kids these days are getting involved with ________.", "What's that sound?", "What should I look for in a girlfriend?", "I wish I could forget about _______.", "What don't you want to find in your treasure chest?", "I can't take you seriously when you are always _________.", "I'm sorry, but I couldn't finish my homework because of _________.", "What does Batman do in his spare time?", "What's a girl's best friend?", "___________. That's how I want to die.", "For my next trick, I will pull _______ out of ________.", "________ is a slippery slope that leads to ________.", "Instead of coal, Santa now gives the bad children ________.", "An exciting game of The Bridges would be incomplete without _________.", "War! What is it good for?", "While mining diamonds, I like to think about ________.", "What are my parents hiding from me?", "What will always make girls like you?", "What did I bring back from the Nether?", "What don't you want to find in your Mushroom Soup?", "Step 1: __________, Step 2: __________, Step 3: Profit!" ,"What makes you need to fart?", "What do old people smell like?", "What's your secret power?", "The class field trip was completely ruined by _______.", "I never understood _______, until I found ________.", "What does Justin Beiber enjoy in his spare time?", "Why is the Villager sticky?", "Scientists think that Creepers explode because of _________.", "Why do you hurt all over?", "When you are a billionaire, you will spend all of your money on ________.", "How do you cheer up a sad friend?", "What is the new diet everyone is trying?", "What is the secret ingredient in Mountain Dew?", "________ is one of the few things that makes me happy.", "The most important thing you need to build a house is ________.", "What is the best way to get unbanned from Mineplex?", "_________ is the secret to winning at Super Smash Mobs.",
|
||||
"When I get home from school, I crave _____.", "I was playing One in the Quiver when I ran into ____.", "Ultra+ now get free _____ every month.", "Everything was fine until _____ joined.", "Help me! My mom is _______.", "_________ crashed the server again…", "_______ ate his pet rabbit when he saw __________.", "My mouse batteries died because I was using it for ______.", "______ is the #1 reason of deaths on the server.", "Ugh, I'm lagging thanks to _____!", "I need to go to the doctor, I'm sick with _________!", "My best friend thinks he is _____.", "The cure for all diseases is partially made out of _____.", "When i was little i wanted to become a ______ and use _____ to save the world.", "I painted a beautiful painting of ____!", "When you grow up you will realize that ______ is all you need.", "_______ knew he had made the wrong choice when he realised he was _______.", "While falling asleep, I dreamt of ______ kissing ______.", "I went to a fancy restaurant, but the chef gave me _____!", "What am I supposed to do when I see _____ ______?", "There is absolutely nothing worse in this world than ___________.", "I get all excited and tingly when I see ________!", "I would rather be _________ than _________.", "I think my brother is a big fan of _______.", "Why can't I sleep at night?", "What's that smell?", "I got 99 problems but ________ ain't one.", "What's the next game coming out on Mineplex?", "What is the next trend on YouTube?", "It's a pity that kids these days are getting involved with ________.", "What's that sound?", "What should I look for in a girlfriend?", "I wish I could forget about _______.", "What don't you want to find in your treasure chest?", "I can't take you seriously when you are always _________.", "I'm sorry, but I couldn't finish my homework because of _________.", "What does Batman do in his spare time?", "What's a girl's best friend?", "___________. That's how I want to die.", "For my next trick, I will pull _______ out of ________.", "________ is a slippery slope that leads to ________.", "Instead of coal, Santa now gives the bad children ________.", "An exciting game of The Bridges would be incomplete without _________.", "War! What is it good for?", "While mining diamonds, I like to think about ________.", "What are my parents hiding from me?", "What will always make girls like you?", "What did I bring back from the Nether?", "What don't you want to find in your Mushroom Soup?", "Step 1: __________, Step 2: __________, Step 3: Profit!" ,"What makes you need to fart?", "What do old people smell like?", "What's your secret power?", "The class field trip was completely ruined by _______.", "I never understood _______, until I found ________.", "What does Justin Beiber enjoy in his spare time?", "Why is the Villager sticky?", "Scientists think that Creepers explode because of _________.", "Why do you hurt all over?", "When you are a billionaire, you will spend all of your money on ________.", "How do you cheer up a sad friend?", "What is the new diet everyone is trying?", "What is the secret ingredient in Mountain Dew?", "________ is one of the few things that makes me happy.", "The most important thing you need to build a house is ________.", "What is the best way to get unbanned from Mineplex?", "_________ is the secret to winning at Super Smash Mobs.",
|
||||
|
||||
};
|
||||
|
||||
|
||||
private String[] _answers = new String[]
|
||||
{
|
||||
"A Stinky Pig Butt", "Mouldy Raw Fish", "A sawed off 10-foot pole", "billions of diamonds", "A whiny forum post", "Sparkling Diamonds", "Sheep that don’t know when to stop", "Villager Legs", "Curdled cow milk", "That one popcorn piece stuck in your teeth.", "THE DIAMOND DANCE!", "an unstoppable addiction to fly hacks", "the biggest pile of poop you've ever seen!", "Bed time", "A bag of Doritos and a Mountain Dew.", "zombies chewing on my butt", "Jazz hands", "Brain surgery", "A disappointing birthday party.", "Overly friendly Iron Golems", "An Endermans favourite block", "Puppies!", "your friend who deleted you from Skype", "being on fire", "two cows stealing your wallet", "a lifetime of sadness", "a golden notch apple", "dragon eggs", "holding hands", "kissing", "wearing parents on your head", "soup that is too hot", "edible underpants", "people who are terrible at PvP", "obesity", "sheep eating potatoes", "my collection of spider eyes", "oversized fishing rods", "working as a team", "horse meat", "zombies screaming while on fire", "a ghast calling her dad to say happy birthday", "Microsoft releasing a good game", "bad childhood memories", "a bad haircut", "a steamy locker room", "armed robbery", "bankruptcy", "stacks of TNT", "a block of dirt", "cold pizza", "a pack of angry wolves", "eternal sadness", "the Nether", "a blaze having a barbeque", "Endermen robbing your house", "dental surgery", "religious villagers", "poor villagers", "flesh-eating bacteria", "the drive to win", "friends who take all your loot", "Morgan Freeman", "Darth Vader", "Villager #17", "Barrack Obama", "Lady Gaga", "That one hobo that lives down the street", "A Sad Creeper", "Parker Games", "A shaved sheep", "CaptainSparklez", "DanTDM", "SkyDoesMinecraft", "Mineplex", "A Mineplex Administrator", "Miley Cyrus", "Notch", "Mojang", "Pikachu", "BATMAN!!!", "The Hulk", "Justin Beiber", "Herobrine", "Pirates", "Vikings", "Ninjas", "Uncontrollably pooping", "Dancing until a helper warned me", "Making passive aggressive tweets", "complaining about balance on the forums", "Chopping down the mineplex lobby tree", "crashing servers", "falling off a cliff", "Realizing that you arent actually a ninja.", "Eating a hot pepper", "Digging straight down", "using xray hacks", "picking your nose", "Playing against a team in SSM", "Mining diamond with a stone pickaxe", "stepping on Legos", "Shaking it off", "Watching Parker games", "Accidentally hiding an egg as Easter bunny morph", "doing a poop and realizing there is no toilet paper", "Eating rotten flesh", "Understanding how magnets work", "watching videos on YouTube", "finding Legendary loot in a Treasure Chest", "Doing homework", "dividing by 0", "Finding out the meaning of life", "banning players for no reason", "dying", "so angry that he pooped himself.", "spending hours planting carrots", "doing the right thing", "sleeping in a cave", "getting drunk on potions", "trolling on the internet", "punching a tree", "leaving a stinky surprise", "doing math", "being devoured by zombie pigmen", "farting and walking away", "sneakily doing a poop", "blowing everything up with TNT", "peeing a little bit", "Tweeting about cats", "reading the instructions carefully",
|
||||
"leaving some poop in the corner of the room", "eating a balanced breakfast", "puking", "shooting arrows at bats", "typing /kill", "watching Frozen repeatedly", "building a house out of dirt", "winking at chickens", "yelling at a toaster", "putting in 110% effort", "paying a lot of money", "bribing with candy", "throwing rocks at people", "crying until everything is better"
|
||||
"A Stinky Pig Butt", "Mouldy Raw Fish", "A sawed off 10-foot pole", "billions of diamonds", "A whiny forum post", "Sparkling Diamonds", "Sheep that don’t know when to stop", "Villager Legs", "Curdled cow milk", "That one popcorn piece stuck in your teeth.", "THE DIAMOND DANCE!", "an unstoppable addiction to fly hacks", "the biggest pile of poop you've ever seen!", "Bed time", "A bag of Doritos and a Mountain Dew.", "zombies chewing on my butt", "Jazz hands", "Brain surgery", "A disappointing birthday party.", "Overly friendly Iron Golems", "An Endermans favourite block", "Puppies!", "your friend who deleted you from Skype", "being on fire", "two cows stealing your wallet", "a lifetime of sadness", "a golden notch apple", "dragon eggs", "holding hands", "kissing", "wearing parents on your head", "soup that is too hot", "edible underpants", "people who are terrible at PvP", "obesity", "sheep eating potatoes", "my collection of spider eyes", "oversized fishing rods", "working as a team", "horse meat", "zombies screaming while on fire", "a ghast calling her dad to say happy birthday", "Microsoft releasing a good game", "bad childhood memories", "a bad haircut", "a steamy locker room", "armed robbery", "bankruptcy", "stacks of TNT", "a block of dirt", "cold pizza", "a pack of angry wolves", "eternal sadness", "the Nether", "a blaze having a barbeque", "Endermen robbing your house", "dental surgery", "religious villagers", "poor villagers", "flesh-eating bacteria", "the drive to win", "friends who take all your loot", "Morgan Freeman", "Darth Vader", "Villager #17", "Barrack Obama", "Lady Gaga", "That one hobo that lives down the street", "A Sad Creeper", "Parker Games", "A shaved sheep", "CaptainSparklez", "DanTDM", "SkyDoesMinecraft", "Mineplex", "A Mineplex Administrator", "Miley Cyrus", "Notch", "Mojang", "Pikachu", "BATMAN!!!", "The Hulk", "Justin Beiber", "Herobrine", "Pirates", "Vikings", "Ninjas", "Uncontrollably pooping", "Dancing until a helper warned me", "Making passive aggressive tweets", "complaining about balance on the forums", "Chopping down the mineplex lobby tree", "crashing servers", "falling off a cliff", "Realizing that you arent actually a ninja.", "Eating a hot pepper", "Digging straight down", "using xray hacks", "picking your nose", "Playing against a team in SSM", "Mining diamond with a stone pickaxe", "stepping on Legos", "Shaking it off", "Watching Parker games", "Accidentally hiding an egg as Easter bunny morph", "doing a poop and realizing there is no toilet paper", "Eating rotten flesh", "Understanding how magnets work", "watching videos on YouTube", "finding Legendary loot in a Treasure Chest", "Doing homework", "dividing by 0", "Finding out the meaning of life", "banning players for no reason", "dying", "so angry that he pooped himself.", "spending hours planting carrots", "doing the right thing", "sleeping in a cave", "getting drunk on potions", "trolling on the internet", "punching a tree", "leaving a stinky surprise", "doing math", "being devoured by zombie pigmen", "farting and walking away", "sneakily doing a poop", "blowing everything up with TNT", "peeing a little bit", "Tweeting about cats", "reading the instructions carefully",
|
||||
"leaving some poop in the corner of the room", "eating a balanced breakfast", "puking", "shooting arrows at bats", "typing /kill", "watching Frozen repeatedly", "building a house out of dirt", "winking at chickens", "yelling at a toaster", "putting in 110% effort", "paying a lot of money", "bribing with candy", "throwing rocks at people", "crying until everything is better"
|
||||
};
|
||||
|
||||
|
||||
public String getQuestionCard()
|
||||
{
|
||||
return _questions[UtilMath.r(_questions.length)];
|
||||
}
|
||||
|
||||
|
||||
public String getAnswerCard()
|
||||
{
|
||||
return _answers[UtilMath.r(_answers.length)];
|
||||
}
|
||||
|
||||
public ItemStack getAnswerStack()
|
||||
public ItemStack getAnswerStack()
|
||||
{
|
||||
String text = getAnswerCard();
|
||||
|
||||
|
||||
ItemStack stack = _mapText.getMap(true, text);
|
||||
|
||||
|
||||
ItemMeta meta = stack.getItemMeta();
|
||||
meta.setDisplayName(C.cGreen + text);
|
||||
stack.setItemMeta(meta);
|
||||
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
|
||||
public ItemStack getQuestionStack()
|
||||
{
|
||||
String text = getQuestionCard();
|
||||
|
||||
|
||||
ItemStack stack = _mapText.getMap(true, text);
|
||||
|
||||
|
||||
ItemMeta meta = stack.getItemMeta();
|
||||
meta.setDisplayName(C.cYellow + text);
|
||||
stack.setItemMeta(meta);
|
||||
|
||||
|
||||
return stack;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user