Added BungeeToggle Command

MineverseChat/bungee.yml

@@ -1,4 +1,4 @@
 name: VentureChat
 main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
-version: 2.12.0
+version: 2.12.3
 author: Aust1n46

MineverseChat/config.yml

@@ -193,7 +193,7 @@ venturegui:
     durability: 0
     text: '&cRemove Message'
     permission: 'removemessage'
-    command: '/removemessage {hash} true'
+    command: '/removemessage {channel} {hash} true'
     slot: 7
     
 guiicon: '&c [✓]'

MineverseChat/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java

@@ -0,0 +1,42 @@
+package mineverse.Aust1n46.chat.command.chat;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import mineverse.Aust1n46.chat.MineverseChat;
+import mineverse.Aust1n46.chat.api.MineverseChatAPI;
+import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
+import mineverse.Aust1n46.chat.command.MineverseCommand;
+
+public class BungeeToggle extends MineverseCommand {
+	private MineverseChat plugin;
+
+	public BungeeToggle(String name) {
+		super(name);
+		this.plugin = MineverseChat.getInstance();
+	}
+
+	@Override
+	public void execute(CommandSender sender, String command, String[] args) {
+		if(!(sender instanceof Player)) {
+			plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
+			return;
+		}
+		MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
+		if(mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) {
+			if(!mcp.getBungeeToggle()) {				
+				mcp.setBungeeToggle(true);
+				mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now receiving BungeeCord chat.");
+				MineverseChat.getInstance().synchronize(mcp, true);
+				return;
+			}			
+			mcp.setBungeeToggle(false);
+			mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now blocking BungeeCord chat.");
+			MineverseChat.getInstance().synchronize(mcp, true);
+			return;
+		}
+		mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command.");
+		return;
+	}
+}

MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java

@@ -66,7 +66,7 @@ public class VentureChatGui extends MineverseCommand {
 				Set<String> blockedCommands = new HashSet<String>();
 				List<String> mail = new ArrayList<String>();
 				String jsonFormat = "Default";
-				target = new MineverseChatPlayer(uuid, name, current, ignores, listening, mutes, blockedCommands, mail, false, null, true, true, name, jsonFormat, false, false, false, true, true);
+				target = new MineverseChatPlayer(uuid, name, current, ignores, listening, mutes, blockedCommands, mail, false, null, true, true, name, jsonFormat, false, false, false, true, true, true);
 				MineverseChat.players.add(target);
 			}
 			if(MineverseChat.ccInfo.isChannel(args[1])) {

MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java

@@ -712,8 +712,8 @@ public class ChatListener implements Listener {
 				message = String.format(Channelformat + event.getMessage(), new Object[] { event.getPlayer().getDisplayName(), event.getMessage() }).replaceAll("(§([a-z0-9]))", "");
 				format = String.format(Channelformat, new Object[] { event.getPlayer().getDisplayName() });
 				chat = event.getMessage();
-				MineverseChat.lastChatMessage = new ChatMessage(mcp.getPlayer().getName(), message, message.hashCode(), format, chat, eventChannel.getName());
+				//MineverseChat.lastChatMessage = new ChatMessage(mcp.getPlayer().getName(), message, message.hashCode(), format, chat, eventChannel.getName());
-				MineverseChat.lastJson = Format.convertToJson(MineverseChat.lastChatMessage);
+				//MineverseChat.lastJson = Format.convertToJson(MineverseChat.lastChatMessage);
 				event.setCancelled(true);
 				ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
 				DataOutputStream out = new DataOutputStream(byteOutStream);
@@ -725,7 +725,13 @@ public class ChatListener implements Listener {
 					out.writeUTF(message);
 					out.writeUTF(format);
 					out.writeUTF(chat);
+					if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
+						System.out.println(out.size() + " size bytes without json");
+					}
 					out.writeUTF(MineverseChat.lastJson);
+					if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
+						System.out.println(out.size() + " bytes size with json");
+					}
 					mcp.getPlayer().sendPluginMessage(plugin, "VentureChat", byteOutStream.toByteArray());
 					out.close();
 				}

MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java

@@ -113,6 +113,11 @@ public class Format {
 		json += "]";
 		if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
 			System.out.println(json);
+			System.out.println("END OF JSON");
+			System.out.println("END OF JSON");
+			System.out.println("END OF JSON");
+			System.out.println("END OF JSON");
+			System.out.println("END OF JSON");
 		}
 		return json;
 	}