Skip to content

Commit 3ce40de

Browse files
BenCodezBenCodez
committed
Update utils classes
1 parent 095cd2a commit 3ce40de

File tree

15 files changed

+75
-77
lines changed

15 files changed

+75
-77
lines changed

‎VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
4242
import com.bencodez.advancedcore.api.item.ItemBuilder;
4343
import com.bencodez.advancedcore.api.javascript.JavascriptPlaceholderRequest;
44-
import com.bencodez.advancedcore.api.messages.StringParser;
44+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
4545
import com.bencodez.advancedcore.api.misc.MiscUtils;
4646
import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
4747
import com.bencodez.advancedcore.api.rewards.Reward;
@@ -1178,7 +1178,7 @@ public String onRewardRequested(Reward arg0, com.bencodez.advancedcore.api.user.
11781178
ConfigurationSection section, HashMap<String, String> placeholders) {
11791179
if (section.getBoolean("Enabled")) {
11801180
user.sendBossBar(
1181-
StringParser.getInstance().replacePlaceHolder(section.getString("Message", ""),
1181+
PlaceholderUtils.replacePlaceHolder(section.getString("Message", ""),
11821182
placeholders),
11831183
section.getString("Color", "BLUE"), section.getString("Style", "SOLID"),
11841184
(double) getVotingPluginUserManager().getVotingPluginUser(user).getSitesVotedOn()

‎VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.bukkit.Bukkit;
1111
import org.bukkit.entity.Player;
1212

13-
import com.bencodez.advancedcore.api.messages.StringParser;
13+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
1414
import com.bencodez.advancedcore.api.misc.MiscUtils;
1515
import com.bencodez.simpleapi.messages.MessageAPI;
1616
import com.bencodez.votingplugin.VotingPluginMain;
@@ -42,7 +42,7 @@ public void check() {
4242
HashMap<String, String> placeholders = new HashMap<String, String>();
4343
placeholders.put("numberofplayers", "" + size);
4444
placeholders.put("players", playersText);
45-
bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
45+
bc = PlaceholderUtils.replacePlaceHolder(bc, placeholders);
4646
ArrayList<Player> players = new ArrayList<Player>();
4747
for (Player p : Bukkit.getOnlinePlayers()) {
4848
if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {

‎VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
3030
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
3131
import com.bencodez.advancedcore.api.item.ItemBuilder;
32-
import com.bencodez.advancedcore.api.messages.StringParser;
32+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
3333
import com.bencodez.advancedcore.api.misc.PlayerManager;
3434
import com.bencodez.advancedcore.api.rewards.RewardOptions;
3535
import com.bencodez.advancedcore.api.user.UserStorage;
@@ -2218,14 +2218,14 @@ public void execute(CommandSender sender, String[] args) {
22182218
plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
22192219
new RewardOptions().setPlaceholders(placeholders));
22202220

2221-
user.sendMessage(StringParser.getInstance().replacePlaceHolder(
2221+
user.sendMessage(PlaceholderUtils.replacePlaceHolder(
22222222
plugin.getConfigFile().getFormatShopPurchaseMsg(), placeholders));
22232223
if (limit > 0) {
22242224
user.setVoteShopIdentifierLimit(identifier,
22252225
user.getVoteShopIdentifierLimit(identifier) + 1);
22262226
}
22272227
} else {
2228-
user.sendMessage(StringParser.getInstance().replacePlaceHolder(
2228+
user.sendMessage(PlaceholderUtils.replacePlaceHolder(
22292229
plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
22302230
}
22312231
} else {
@@ -2272,7 +2272,7 @@ public void execute(CommandSender sender, String[] args) {
22722272
new VoteLast(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
22732273
.open();
22742274
} else {
2275-
sendMessage(sender, StringParser.getInstance()
2275+
sendMessage(sender, PlaceholderUtils
22762276
.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
22772277
}
22782278

@@ -2317,7 +2317,7 @@ public void execute(CommandSender sender, String[] args) {
23172317
new VoteNext(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
23182318
.open();
23192319
} else {
2320-
sendMessage(sender, StringParser.getInstance()
2320+
sendMessage(sender, PlaceholderUtils
23212321
.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
23222322
}
23232323
}
@@ -2338,7 +2338,7 @@ public void execute(CommandSender sender, String[] args) {
23382338
sender.sendMessage(MessageAPI.colorize(msg));
23392339
}
23402340
} else {
2341-
sendMessage(sender, StringParser.getInstance()
2341+
sendMessage(sender, PlaceholderUtils
23422342
.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
23432343
}
23442344

@@ -2376,7 +2376,7 @@ public void execute(CommandSender sender, String[] args) {
23762376
new VoteGUI(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
23772377
.open();
23782378
} else {
2379-
sendMessage(sender, StringParser.getInstance()
2379+
sendMessage(sender, PlaceholderUtils
23802380
.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
23812381
}
23822382

@@ -2550,7 +2550,7 @@ public void execute(CommandSender sender, String[] args) {
25502550
new VoteTotal(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
25512551
.open();
25522552
} else {
2553-
sendMessage(sender, StringParser.getInstance()
2553+
sendMessage(sender, PlaceholderUtils
25542554
.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
25552555
}
25562556

@@ -2586,7 +2586,7 @@ public void execute(CommandSender sender, String[] args) {
25862586
new VoteBest(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
25872587
.open();
25882588
} else {
2589-
sendMessage(sender, StringParser.getInstance()
2589+
sendMessage(sender, PlaceholderUtils
25902590
.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
25912591
}
25922592
}
@@ -2611,7 +2611,7 @@ public void execute(CommandSender sender, String[] args) {
26112611
new VoteStreak(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]))
26122612
.open();
26132613
} else {
2614-
sendMessage(sender, StringParser.getInstance()
2614+
sendMessage(sender, PlaceholderUtils
26152615
.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
26162616
}
26172617
}
@@ -2645,11 +2645,11 @@ public void execute(CommandSender sender, String[] args) {
26452645
placeholders.put("touser", "" + user.getPlayerName());
26462646
placeholders.put("fromuser", "" + cPlayer.getPlayerName());
26472647
sendMessage(sender,
2648-
StringParser.getInstance()
2648+
PlaceholderUtils
26492649
.replacePlaceHolder(plugin.getConfigFile()
26502650
.getFormatCommandsVoteGivePointsTransferFrom(),
26512651
placeholders));
2652-
user.sendMessage(StringParser.getInstance().replacePlaceHolder(
2652+
user.sendMessage(PlaceholderUtils.replacePlaceHolder(
26532653
plugin.getConfigFile().getFormatCommandsVoteGivePointsTransferTo(),
26542654
placeholders));
26552655
} else {
@@ -2662,7 +2662,7 @@ public void execute(CommandSender sender, String[] args) {
26622662
}
26632663
} else {
26642664
sendMessage(sender,
2665-
StringParser.getInstance().replacePlaceHolder(
2665+
PlaceholderUtils.replacePlaceHolder(
26662666
plugin.getConfigFile()
26672667
.getFormatCommandsVoteGivePointsNotJoinedServer(),
26682668
"player", args[1]));

‎VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteBest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
1313
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
1414
import com.bencodez.advancedcore.api.item.ItemBuilder;
15-
import com.bencodez.advancedcore.api.misc.ArrayUtils1;
15+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
1616
import com.bencodez.advancedcore.api.rewards.RewardBuilder;
1717
import com.bencodez.simpleapi.array.ArrayUtils;
1818
import com.bencodez.votingplugin.VotingPluginMain;
@@ -42,7 +42,7 @@ public ArrayList<String> getChat(CommandSender sender) {
4242

4343
placeholders.put("player", user.getPlayerName());
4444

45-
msg = ArrayUtils1.getInstance().replacePlaceHolder(msg, placeholders);
45+
msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
4646

4747
return ArrayUtils.colorize(msg);
4848
}

‎VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteLast.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
1313
import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
1414
import com.bencodez.advancedcore.api.item.ItemBuilder;
15-
import com.bencodez.advancedcore.api.messages.StringParser;
15+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
1616
import com.bencodez.advancedcore.api.rewards.RewardBuilder;
1717
import com.bencodez.simpleapi.array.ArrayUtils;
1818
import com.bencodez.simpleapi.messages.MessageAPI;
@@ -77,10 +77,10 @@ public void onClick(ClickEvent event) {
7777
VotingPluginUser user = plugin.getVotingPluginUserManager()
7878
.getVotingPluginUser(player);
7979
user.sendMessage(
80-
StringParser.getInstance()
80+
PlaceholderUtils
8181
.replacePlaceHolder(
82-
StringParser.getInstance().replacePlaceHolder(
83-
StringParser.getInstance()
82+
PlaceholderUtils.replacePlaceHolder(
83+
PlaceholderUtils
8484
.replacePlaceHolder(plugin.getGui()
8585
.getChestVoteURLURLText(),
8686
"voteurl", site.getVoteURL()),

‎VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteNext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
1616
import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
1717
import com.bencodez.advancedcore.api.item.ItemBuilder;
18-
import com.bencodez.advancedcore.api.messages.StringParser;
18+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
1919
import com.bencodez.advancedcore.api.rewards.RewardBuilder;
2020
import com.bencodez.simpleapi.messages.MessageAPI;
2121
import com.bencodez.votingplugin.VotingPluginMain;
@@ -94,7 +94,7 @@ public void onChest(Player player) {
9494
}
9595
inv.addButton(inv.getNextSlot(),
9696
new UpdatingBInventoryButton(plugin, site.getItem().setName(siteNameDisplay)
97-
.setLore(StringParser.getInstance().replacePlaceHolder(
97+
.setLore(PlaceholderUtils.replacePlaceHolder(
9898
plugin.getGui().getChestVoteNextLine(), "time", user.voteCommandNextInfo(site)))
9999
.setAmountNone(1), 1000, 1000) {
100100

‎VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShop.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
1313
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
1414
import com.bencodez.advancedcore.api.item.ItemBuilder;
15-
import com.bencodez.advancedcore.api.messages.StringParser;
15+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
1616
import com.bencodez.advancedcore.api.rewards.RewardBuilder;
1717
import com.bencodez.advancedcore.api.rewards.RewardOptions;
1818
import com.bencodez.simpleapi.messages.MessageAPI;
@@ -136,15 +136,15 @@ public void onClick(ClickEvent event) {
136136
plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
137137
new RewardOptions().setPlaceholders(placeholders));
138138

139-
user.sendMessage(StringParser.getInstance().replacePlaceHolder(
139+
user.sendMessage(PlaceholderUtils.replacePlaceHolder(
140140
plugin.getGui().getCHESTVoteShopPurchase(identifier),
141141
placeholders));
142142
if (limit > 0) {
143143
user.setVoteShopIdentifierLimit(identifier,
144144
user.getVoteShopIdentifierLimit(identifier) + 1);
145145
}
146146
} else {
147-
user.sendMessage(StringParser.getInstance().replacePlaceHolder(
147+
user.sendMessage(PlaceholderUtils.replacePlaceHolder(
148148
plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
149149
}
150150
} else {

‎VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShopConfirm.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
1313
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
1414
import com.bencodez.advancedcore.api.item.ItemBuilder;
15-
import com.bencodez.advancedcore.api.messages.StringParser;
15+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
1616
import com.bencodez.advancedcore.api.rewards.RewardOptions;
1717
import com.bencodez.simpleapi.player.PlayerUtils;
1818
import com.bencodez.votingplugin.VotingPluginMain;
@@ -71,13 +71,13 @@ public void onClick(ClickEvent event) {
7171
plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
7272
new RewardOptions().setPlaceholders(placeholders));
7373

74-
user.sendMessage(StringParser.getInstance()
74+
user.sendMessage(PlaceholderUtils
7575
.replacePlaceHolder(plugin.getGui().getCHESTVoteShopPurchase(identifier), placeholders));
7676
if (limit > 0) {
7777
user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
7878
}
7979
} else {
80-
user.sendMessage(StringParser.getInstance()
80+
user.sendMessage(PlaceholderUtils
8181
.replacePlaceHolder(plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
8282
}
8383
if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {

‎VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteStreak.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
1313
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
1414
import com.bencodez.advancedcore.api.item.ItemBuilder;
15-
import com.bencodez.advancedcore.api.misc.ArrayUtils1;
15+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
1616
import com.bencodez.advancedcore.api.rewards.RewardBuilder;
1717
import com.bencodez.simpleapi.array.ArrayUtils;
1818
import com.bencodez.votingplugin.VotingPluginMain;
@@ -47,7 +47,7 @@ public ArrayList<String> getChat(CommandSender sender) {
4747

4848
placeholders.put("player", user.getPlayerName());
4949

50-
msg = ArrayUtils1.getInstance().replacePlaceHolder(msg, placeholders);
50+
msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
5151

5252
return ArrayUtils.colorize(msg);
5353
}

‎VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteToday.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
1717
import com.bencodez.advancedcore.api.inventory.BInventoryButton;
1818
import com.bencodez.advancedcore.api.item.ItemBuilder;
19-
import com.bencodez.advancedcore.api.messages.StringParser;
20-
import com.bencodez.advancedcore.api.misc.ArrayUtils1;
19+
import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
2120
import com.bencodez.advancedcore.api.rewards.RewardBuilder;
2221
import com.bencodez.simpleapi.array.ArrayUtils;
2322
import com.bencodez.simpleapi.nms.NMSManager;
@@ -67,7 +66,7 @@ public ArrayList<String> getChat(CommandSender arg0) {
6766
msg.add(voteToday[i]);
6867
}
6968

70-
return ArrayUtils.colorize(ArrayUtils1.getInstance().replacePlaceHolder(msg, placeholders));
69+
return ArrayUtils.colorize(PlaceholderUtils.replacePlaceHolder(msg, placeholders));
7170
}
7271

7372
@Override
@@ -95,14 +94,14 @@ public void onChest(Player player) {
9594
HashMap<String, String> placeholders = new HashMap<String, String>();
9695
placeholders.put("VoteSite", voteSite.getDisplayName());
9796
placeholders.put("Time", timeString);
98-
msg = StringParser.getInstance().replacePlaceHolder(msg, placeholders);
97+
msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
9998
ItemBuilder item = null;
10099
if (plugin.getGui().isChestVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
101100
item = new ItemBuilder(user.getPlayerHead());
102101
} else {
103102
item = new ItemBuilder(plugin.getGui().getChestVoteTodayPlayerItem());
104103
}
105-
item.setName(StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(),
104+
item.setName(PlaceholderUtils.replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(),
106105
"player", user.getPlayerName()));
107106
item.setLore(msg);
108107
final UUID uuid = user.getUuid();
@@ -151,7 +150,7 @@ public String[] voteToday() {
151150
placeholders.put("player", user.getPlayerName());
152151
placeholders.put("votesite", voteSite.getKey());
153152
placeholders.put("time", timeString);
154-
msg.add(StringParser.getInstance()
153+
msg.add(PlaceholderUtils
155154
.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
156155
// msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " +
157156
// timeString);
@@ -180,7 +179,7 @@ public String[] voteTodayGUI() {
180179
placeholders.put("player", user.getPlayerName());
181180
placeholders.put("votesite", mostRecentSite.getKey());
182181
placeholders.put("time", timeString);
183-
msg.add(StringParser.getInstance()
182+
msg.add(PlaceholderUtils
184183
.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
185184
}
186185
}

0 commit comments

Comments
 (0)