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

Favourite -> Favorite

Browse Source
This commit is contained in:
Sam 2018-08-16 13:33:09 +01:00 committed by Alexander Meech
parent 2bcc108858
commit ae581eff68
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
View File

@ -481,7 +481,7 @@ public class FriendManager extends MiniDbClientPlugin<List<FriendStatus>>
{ {
runSync(() -> runSync(() ->
{ {
caller.sendMessage(F.main(getName(), F.name(status.Name) + " is " + (status.Favourite ? "no longer" : "now") + " on your favourite friends.")); caller.sendMessage(F.main(getName(), F.name(status.Name) + " is " + (status.Favourite ? "no longer" : "now") + " on your favorite friends."));
if (onSuccess != null) if (onSuccess != null)
{ {
@ -675,7 +675,7 @@ public class FriendManager extends MiniDbClientPlugin<List<FriendStatus>>
name.setColor(ChatColor.GRAY); name.setColor(ChatColor.GRAY);
} }
name.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder((friend.Favourite ? "Remove " + friend.Name + " from" : "Add " + friend.Name + " to") + " your favourite friends") name.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder((friend.Favourite ? "Remove " + friend.Name + " from" : "Add " + friend.Name + " to") + " your favorite friends")
.create())); .create()));
name.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, favouriteCommand + friend.Name)); name.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, favouriteCommand + friend.Name));
message.addExtra(name); message.addExtra(name);

2
Plugins/Mineplex.Core/src/mineplex/core/friend/command/FriendFavouriteCommand.java
View File

@ -9,7 +9,7 @@ import mineplex.core.friend.FriendManager.Perm;
public class FriendFavouriteCommand extends CommandBase<FriendManager> public class FriendFavouriteCommand extends CommandBase<FriendManager>
{ {
public static final String COMMAND = "friendfavourite"; public static final String COMMAND = "friendfavorite";
public FriendFavouriteCommand(FriendManager plugin) public FriendFavouriteCommand(FriendManager plugin)
{ {

2
Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendMainPage.java
View File

@ -209,7 +209,7 @@ public class FriendMainPage extends ShopPageBase<FriendManager, FriendShop>
builder.addLore( builder.addLore(
"Shift-Click to " + (status.Favourite ? "remove them from" : "add them to"), "Shift-Click to " + (status.Favourite ? "remove them from" : "add them to"),
"your favourite friends." "your favorite friends."
); );
addButton(slot, builder.build(), (player, clickType) -> addButton(slot, builder.build(), (player, clickType) ->

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

@ -39,7 +39,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 everyone's favourite player when you use one of these!", LineFormat.LORE), UtilText.splitLineToArray(C.cWhite + "It's party time! You'll be everyone's favorite 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));