mirror of
				https://github.com/Aust1n46/VentureChat.git
				synced 2025-10-30 21:52:23 +00:00 
			
		
		
		
	Added PlaceholderAPI support for single server messaging.
This commit is contained in:
		
							parent
							
								
									0f5981087c
								
							
						
					
					
						commit
						7e2b6cb83e
					
				| @ -71,12 +71,12 @@ public class Message extends MineverseCommand { | |||||||
| 					.replace("{player}", player.getName())); | 					.replace("{player}", player.getName())); | ||||||
| 			return; | 			return; | ||||||
| 		} | 		} | ||||||
|  | 		 | ||||||
| 		if(args.length >= 2) { | 		if(args.length >= 2) { | ||||||
| 			String msg = ""; | 			String msg = ""; | ||||||
| 			String echo = ""; | 			String echo = ""; | ||||||
| 			String send = ""; | 			String send = ""; | ||||||
| 			String spy = ""; | 			String spy = ""; | ||||||
| 			String tellColor = plugin.getConfig().getString("tellcolor", "gray"); |  | ||||||
| 			if(args[1].length() > 0) { | 			if(args[1].length() > 0) { | ||||||
| 				for(int r = 1; r < args.length; r++) { | 				for(int r = 1; r < args.length; r++) { | ||||||
| 					msg += " " + args[r]; | 					msg += " " + args[r]; | ||||||
| @ -93,24 +93,18 @@ public class Message extends MineverseCommand { | |||||||
| 				if(mcp.getPlayer().hasPermission("venturechat.format")) { | 				if(mcp.getPlayer().hasPermission("venturechat.format")) { | ||||||
| 					msg = Format.FormatString(msg); | 					msg = Format.FormatString(msg); | ||||||
| 				} | 				} | ||||||
| 				if(plugin.getConfig().getString("tellformatto").equalsIgnoreCase("Default")) { | 				send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom")) + msg; | ||||||
| 					echo = "You message " + player.getNickname() + ":" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; | 				echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto")) + msg; | ||||||
| 				} | 				spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy")) + msg; | ||||||
| 				else { | 				 | ||||||
| 					echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto").replace("{playerto}", player.getNickname()).replace("{playerfrom}", mcp.getNickname())) + msg; | 				send = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), send.replaceAll("sender_", "")); | ||||||
| 				} | 				echo = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), echo.replaceAll("sender_", "")); | ||||||
| 				if(plugin.getConfig().getString("tellformatfrom").equalsIgnoreCase("Default")) { | 				spy = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), spy.replaceAll("sender_", "")); | ||||||
| 					send = mcp.getNickname() + " messages you:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; | 				 | ||||||
| 				} | 				send = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", "")); | ||||||
| 				else { | 				echo = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", "")); | ||||||
| 					send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom").replace("{playerto}", player.getNickname()).replace("{playerfrom}", mcp.getNickname())) + msg; | 				spy = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", "")); | ||||||
| 				} | 				 | ||||||
| 				if(plugin.getConfig().getString("tellformatspy").equalsIgnoreCase("Default")) { |  | ||||||
| 					spy = mcp.getName() + " messages " + player.getName() + ":" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; |  | ||||||
| 				} |  | ||||||
| 				else { |  | ||||||
| 					spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy").replace("{playerto}", player.getName()).replace("{playerfrom}", mcp.getName())) + msg; |  | ||||||
| 				} |  | ||||||
| 				player.setReplyPlayer(mcp.getUUID()); | 				player.setReplyPlayer(mcp.getUUID()); | ||||||
| 				mcp.setReplyPlayer(player.getUUID()); | 				mcp.setReplyPlayer(player.getUUID()); | ||||||
| 				player.getPlayer().sendMessage(send); | 				player.getPlayer().sendMessage(send); | ||||||
| @ -125,6 +119,9 @@ public class Message extends MineverseCommand { | |||||||
| 				} | 				} | ||||||
| 				if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { | 				if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { | ||||||
| 					for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { | 					for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { | ||||||
|  | 						if(sp.getName().equals(mcp.getName()) || sp.getName().equals(player.getName())) { | ||||||
|  | 							continue; | ||||||
|  | 						} | ||||||
| 						if(sp.isSpy()) { | 						if(sp.isSpy()) { | ||||||
| 							sp.getPlayer().sendMessage(spy); | 							sp.getPlayer().sendMessage(spy); | ||||||
| 						} | 						} | ||||||
|  | |||||||
| @ -3,7 +3,6 @@ package mineverse.Aust1n46.chat.command.message; | |||||||
| import java.io.ByteArrayOutputStream; | import java.io.ByteArrayOutputStream; | ||||||
| import java.io.DataOutputStream; | import java.io.DataOutputStream; | ||||||
| 
 | 
 | ||||||
| import org.bukkit.ChatColor; |  | ||||||
| import org.bukkit.Sound; | import org.bukkit.Sound; | ||||||
| import org.bukkit.command.CommandSender; | import org.bukkit.command.CommandSender; | ||||||
| import org.bukkit.entity.Player; | import org.bukkit.entity.Player; | ||||||
| @ -62,7 +61,6 @@ public class Reply extends MineverseCommand { | |||||||
| 				String echo = ""; | 				String echo = ""; | ||||||
| 				String send = ""; | 				String send = ""; | ||||||
| 				String spy = ""; | 				String spy = ""; | ||||||
| 				String tellColor = plugin.getConfig().getString("tellcolor", "gray"); |  | ||||||
| 				if(args.length > 0) { | 				if(args.length > 0) { | ||||||
| 					for(int r = 0; r < args.length; r++) | 					for(int r = 0; r < args.length; r++) | ||||||
| 						msg += " " + args[r]; | 						msg += " " + args[r]; | ||||||
| @ -78,27 +76,25 @@ public class Reply extends MineverseCommand { | |||||||
| 					if(mcp.getPlayer().hasPermission("venturechat.format")) { | 					if(mcp.getPlayer().hasPermission("venturechat.format")) { | ||||||
| 						msg = Format.FormatString(msg); | 						msg = Format.FormatString(msg); | ||||||
| 					} | 					} | ||||||
| 					if(plugin.getConfig().getString("replyformatto").equalsIgnoreCase("Default")) { | 
 | ||||||
| 						echo = "You reply to " + player.getNickname() + ":" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; | 					echo = Format.FormatStringAll(plugin.getConfig().getString("replyformatto")) + msg; | ||||||
| 					} | 					send = Format.FormatStringAll(plugin.getConfig().getString("replyformatfrom")) + msg; | ||||||
| 					else { | 					spy = Format.FormatStringAll(plugin.getConfig().getString("replyformatspy")) + msg; | ||||||
| 						echo = Format.FormatStringAll(plugin.getConfig().getString("replyformatto").replace("{playerto}", player.getNickname()).replace("{playerfrom}", mcp.getNickname())) + msg; | 					 | ||||||
| 					} | 					send = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), send.replaceAll("sender_", "")); | ||||||
| 					if(plugin.getConfig().getString("replyformatfrom").equalsIgnoreCase("Default")) { | 					echo = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), echo.replaceAll("sender_", "")); | ||||||
| 						send = mcp.getNickname() + " replies to you:" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; | 					spy = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), spy.replaceAll("sender_", "")); | ||||||
| 					} | 					 | ||||||
| 					else { | 					send = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", "")); | ||||||
| 						send = Format.FormatStringAll(plugin.getConfig().getString("replyformatfrom").replace("{playerto}", player.getNickname()).replace("{playerfrom}", mcp.getNickname())) + msg; | 					echo = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", "")); | ||||||
| 					} | 					spy = PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", "")); | ||||||
| 					if(plugin.getConfig().getString("replyformatspy").equalsIgnoreCase("Default")) { | 					 | ||||||
| 						spy = mcp.getName() + " replied to " + player.getName() + ":" + ChatColor.valueOf(tellColor.toUpperCase()) + msg; |  | ||||||
| 					} |  | ||||||
| 					else { |  | ||||||
| 						spy = Format.FormatStringAll(plugin.getConfig().getString("replyformatspy").replace("{playerto}", player.getName()).replace("{playerfrom}", mcp.getName())) + msg; |  | ||||||
| 					} |  | ||||||
| 					if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { | 					if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { | ||||||
| 						for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { | 						for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { | ||||||
| 							if(p.isOnline() && p.isSpy()) { | 							if(p.getName().equals(mcp.getName()) || p.getName().equals(player.getName())) { | ||||||
|  | 								continue; | ||||||
|  | 							} | ||||||
|  | 							if(p.isSpy()) { | ||||||
| 								p.getPlayer().sendMessage(spy); | 								p.getPlayer().sendMessage(spy); | ||||||
| 							} | 							} | ||||||
| 						} | 						} | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Aust1n46
						Aust1n46