Use newer classes

BenCodez · May 20, 2024 · 60ac9fc · 60ac9fc
1 parent a0d334c
commit 60ac9fc
Show file tree

Hide file tree

Showing 31 changed files with 156 additions and 149 deletions.
diff --git a/VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMetrics.java b/VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMetrics.java
@@ -2,7 +2,7 @@
 
 import java.util.concurrent.Callable;
 
-import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
+import com.bencodez.simpleapi.metrics.BStatsMetrics;
 
 public class VotingPluginMetrics {
 

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java b/VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java
@@ -12,6 +12,7 @@
 
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class BroadcastHandler {
@@ -30,8 +31,7 @@ public void check() {
 			for (int i = 0; i < size; i++) {
 				votedPlayers.poll();
 			}
-			String bc = StringParser.getInstance()
-					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			String bc = MessageAPI.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
 			String playersText = "";
 			while (!votedPlayers.isEmpty()) {
 				playersText += votedPlayers.remove();

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java
@@ -34,7 +34,6 @@
 
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
-import com.bencodez.advancedcore.api.misc.jsonparser.JsonParser;
 import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
@@ -51,6 +50,7 @@
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.bencodez.advancedcore.bungeeapi.time.BungeeTimeChecker;
+import com.bencodez.simpleapi.json.JsonParser;
 import com.bencodez.votingplugin.bungee.global.multiproxy.MultiProxyHandler;
 import com.bencodez.votingplugin.bungee.global.multiproxy.MultiProxyMethod;
 import com.bencodez.votingplugin.bungee.global.multiproxy.MultiProxyServerSocketConfiguration;
@@ -547,7 +547,7 @@ public void onDisable() {
 				num++;
 			}
 		}
-		
+
 		voteCacheFile.save();
 		nonVotedPlayersCache.save();
 		if (mysql != null) {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java
@@ -44,7 +44,6 @@
 
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
-import com.bencodez.advancedcore.api.misc.jsonparser.JsonParser;
 import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
@@ -62,6 +61,7 @@
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.bencodez.advancedcore.bungeeapi.time.BungeeTimeChecker;
 import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.simpleapi.json.JsonParser;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.bungee.BungeeVersion;

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java
diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandAdminVote.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandAdminVote.java
@@ -5,7 +5,7 @@
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -36,7 +36,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 		}
 
 		// invalid command
-		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 
 		return true;
 	}

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandAliases.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandAliases.java
@@ -7,8 +7,8 @@
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -92,10 +92,10 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 		// invalid command
 		if (adminCommand) {
 			sender.sendMessage(
-					StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
+					MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 		} else {
 			sender.sendMessage(
-					StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
+					MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		}
 		return true;
 	}

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandVote.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandVote.java
@@ -5,7 +5,7 @@
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -61,7 +61,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 		}
 
 		// invalid command
-		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		return true;
 	}
 

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/AdminGUI.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/AdminGUI.java
@@ -20,13 +20,13 @@
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
 import com.bencodez.advancedcore.api.yml.editor.ConfigEditor;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.player.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
 import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
@@ -289,7 +289,7 @@ public void onClick(ClickEvent event) {
 
 					@Override
 					public void onInput(Player player, String value) {
-						Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "VoteSite");
+						Object ob = PlayerUtils.getPlayerMeta(plugin, player, "VoteSite");
 						if (ob != null) {
 							VoteSite site = (VoteSite) ob;
 							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, value, site.getServiceSite(), false);

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteHelp.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteHelp.java
@@ -10,7 +10,7 @@
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 import net.md_5.bungee.api.chat.TextComponent;
@@ -43,9 +43,9 @@ public ArrayList<TextComponent> adminHelp(CommandSender sender, int page) {
 			maxPage++;
 		}
 
-		msg.add(StringParser.getInstance().stringToComp("&6&lVotingPlugin Admin Help " + (page) + "/" + maxPage));
-		msg.add(StringParser.getInstance().stringToComp("&6&l() = Needed"));
-		msg.add(StringParser.getInstance().stringToComp("&6&lAliases: adminvote, av"));
+		msg.add(MessageAPI.stringToComp("&6&lVotingPlugin Admin Help " + (page) + "/" + maxPage));
+		msg.add(MessageAPI.stringToComp("&6&l() = Needed"));
+		msg.add(MessageAPI.stringToComp("&6&lAliases: adminvote, av"));
 
 		for (int i = pagesize * (page - 1); (i < text.size()) && (i < ((page) * pagesize)); i++) {
 			msg.add(text.get(i));

diff --git a/...ugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulative.java b/...ugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulative.java
@@ -12,12 +12,12 @@
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class AdminVoteCumulative extends GUIHandler {
@@ -54,7 +54,7 @@ public void onChest(Player player) {
 					public void onClick(ClickEvent clickEvent) {
 						ArrayList<Integer> nums = new ArrayList<Integer>();
 						for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}

diff --git a/...ugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestones.java b/...ugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestones.java
@@ -12,12 +12,12 @@
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class AdminVoteMilestones extends GUIHandler {
@@ -54,7 +54,7 @@ public void onChest(Player player) {
 					public void onClick(ClickEvent clickEvent) {
 						ArrayList<Integer> nums = new ArrayList<Integer>();
 						for (String num : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteGUI.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteGUI.java
@@ -12,10 +12,10 @@
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -43,15 +43,15 @@ private ItemBuilder getItemSlot(String slot, Player player) {
 
 		String str = plugin.getConfigFile().getVoteTopDefault();
 		if (lore.length == 0) {
-			if (StringParser.getInstance().startsWithIgnoreCase(slot, "url")) {
+			if (MessageAPI.startsWithIgnoreCase(slot, "url")) {
 				lore = new String[] { "&aClick me" };
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "next")) {
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "next")) {
 				lore = ArrayUtils.getInstance().convert(new VoteNext(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "last")) {
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "last")) {
 				lore = ArrayUtils.getInstance().convert(new VoteLast(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "total")) {
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "total")) {
 				lore = ArrayUtils.getInstance().convert(new VoteTotal(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "top")) {
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "top")) {
 
 				if (str.equalsIgnoreCase("monthly")) {
 					lore = plugin.getTopVoterHandler().topVoterMonthly(1);

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteHelp.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteHelp.java
@@ -10,7 +10,7 @@
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 
@@ -121,7 +121,7 @@ public ArrayList<TextComponent> voteHelpText(CommandSender sender) {
 			maxPage++;
 		}
 
-		msg.add(StringParser.getInstance()
+		msg.add(MessageAPI
 				.stringToComp(plugin.getConfigFile().getFormatCommandsVoteHelpTitle() + " " + page + "/" + maxPage));
 
 		for (int i = pagesize * (page - 1); (i < text.size()) && (i < ((page) * pagesize)); i++) {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteNext.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteNext.java
@@ -11,12 +11,13 @@
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -40,7 +41,7 @@ public ArrayList<String> getChat(CommandSender sender) {
 
 		String playerName = user.getPlayerName();
 
-		msg.add(StringParser.getInstance().colorize(StringParser.getInstance()
+		msg.add(MessageAPI.colorize(StringParser.getInstance()
 				.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteNextTitle(), "%player%", playerName)));
 
 		for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
@@ -52,7 +53,7 @@ public ArrayList<String> getChat(CommandSender sender) {
 
 				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%",
 						voteSite.getDisplayName());
-				msg.add(StringParser.getInstance().colorize(msgLine));
+				msg.add(MessageAPI.colorize(msgLine));
 			}
 		}
 		return msg;

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShop.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShop.java
@@ -15,6 +15,7 @@
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -46,7 +47,7 @@ public void onChat(CommandSender sender) {
 	@Override
 	public void onChest(Player player) {
 		if (!plugin.getGui().isChestVoteShopEnabled()) {
-			player.sendMessage(StringParser.getInstance().colorize(plugin.getGui().getChestVoteShopDisabled()));
+			player.sendMessage(MessageAPI.colorize(plugin.getGui().getChestVoteShopDisabled()));
 			return;
 		}
 

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShopConfirm.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShopConfirm.java
@@ -13,8 +13,8 @@
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.player.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -46,7 +46,7 @@ public void onChat(CommandSender sender) {
 
 	@Override
 	public void onChest(Player player) {
-		PlayerUtils.getInstance().setPlayerMeta(player, "ident", identifier);
+		PlayerUtils.setPlayerMeta(plugin, player, "ident", identifier);
 		BInventory inv = new BInventory(plugin.getGui().getChestShopConfirmPurchaseTitle());
 		inv.dontClose();
 		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopConfirmPurchaseYesItem())) {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/tabcompleter/AdminVoteTabCompleter.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/tabcompleter/AdminVoteTabCompleter.java
@@ -11,7 +11,7 @@
 import org.bukkit.command.TabCompleter;
 
 import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 /**
@@ -40,7 +40,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String alia
 				args.length - 1));
 
 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/tabcompleter/AliasesTabCompleter.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/tabcompleter/AliasesTabCompleter.java
@@ -13,8 +13,8 @@
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 /**
@@ -88,7 +88,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String alia
 		}
 
 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/tabcompleter/VoteTabCompleter.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/tabcompleter/VoteTabCompleter.java
@@ -11,7 +11,7 @@
 import org.bukkit.command.TabCompleter;
 
 import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -41,7 +41,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String alia
 				args.length - 1));
 
 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}