MultiChat v1.10

multichat/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>xyz.olivermartin.multichat</groupId>
   <artifactId>multichat</artifactId>
-  <version>1.9.5</version>
+  <version>1.10</version>
   <build>
     <plugins>
       <plugin>
@@ -261,8 +261,14 @@
     <dependency>
       <groupId>me.clip</groupId>
       <artifactId>placeholderapi</artifactId>
-      <version>2.9.2</version>
+      <version>2.10.9</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>org.jetbrains</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.github.rojo8399</groupId>
@@ -293,5 +299,9 @@
       </exclusions>
     </dependency>
   </dependencies>
+  <properties>
+    <java.version>1.8</java.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 </project>
 

multichat/pom.xml

@@ -5,7 +5,12 @@
 
 	<groupId>xyz.olivermartin.multichat</groupId>
 	<artifactId>multichat</artifactId>
-	<version>1.9.5</version>
+	<version>1.10</version>
+
+	<properties>
+		<java.version>1.8</java.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 
 	<repositories>
 
@@ -147,7 +152,7 @@
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.9.2</version>
+			<version>2.10.9</version>
 			<scope>provided</scope>
 		</dependency>
 

multichat/src/main/java/com/olivermartin410/plugins/TGroupChatInfo.java

@@ -1,8 +1,8 @@
 package com.olivermartin410.plugins;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 
 /**
@@ -16,22 +16,22 @@ public class TGroupChatInfo extends TChatInfo implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	private List<UUID> Members = new ArrayList<UUID>();
-	private List<UUID> Viewers = new ArrayList<UUID>();
-	private List<UUID> Admins = new ArrayList<UUID>();
-	private List<UUID> BannedPlayers = new ArrayList<UUID>();
+	private final Set<UUID> members = new HashSet<>();
+	private final Set<UUID> viewers = new HashSet<>();
+	private final Set<UUID> admins = new HashSet<>();
+	private final Set<UUID> bannedPlayers = new HashSet<>();
 
 	private String PartyName;
 	private boolean secret;
 	private String password;
 	private boolean formal;
 
-	public void setPassword(String newpassword) {
-		this.password = newpassword;
+	public void setPassword(String password) {
+		this.password = password;
 	}
 
-	public void setFormal(boolean trueorfalse) {
-		this.formal = trueorfalse;
+	public void setFormal(boolean formal) {
+		this.formal = formal;
 	}
 
 	public boolean getFormal() {
@@ -42,8 +42,8 @@ public String getPassword() {
 		return this.password;
 	}
 
-	public void setSecret(boolean trueorfalse) {
-		this.secret = trueorfalse;
+	public void setSecret(boolean secret) {
+		this.secret = secret;
 	}
 
 	public boolean getSecret() {
@@ -58,91 +58,67 @@ public void setName(String Name) {
 		this.PartyName = Name;
 	}
 
-	public List<UUID> getMembers() {
-		return this.Members;
+	public Set<UUID> getMembers() {
+		return this.members;
 	}
 
-	public void addMember(UUID memberuuid) {
-		this.Members.add(memberuuid);
+	public void addMember(UUID playerUID) {
+		this.members.add(playerUID);
 	}
 
-	public void delMember(UUID memberuuid) {
-		this.Members.remove(memberuuid);
+	public void delMember(UUID playerUID) {
+		this.members.remove(playerUID);
 	}
 
-	public List<UUID> getAdmins() {
-		return this.Admins;
+	public Set<UUID> getAdmins() {
+		return this.admins;
 	}
 
-	public void addAdmin(UUID adminuuid) {
-		this.Admins.add(adminuuid);
+	public void addAdmin(UUID playerUID) {
+		this.admins.add(playerUID);
 	}
 
-	public void delAdmin(UUID adminuuid) {
-		this.Admins.remove(adminuuid);
+	public void delAdmin(UUID playerUID) {
+		this.admins.remove(playerUID);
 	}
 
-	public boolean existsAdmin(UUID adminuuid) {
-
-		if (this.Admins.contains(adminuuid)) {
-			return true;
-		}
-
-		return false;
-
+	public boolean isAdmin(UUID playerUID) {
+		return this.admins.contains(playerUID);
 	}
 
-	public List<UUID> getBanned() {
-		return this.BannedPlayers;
+	public Set<UUID> getBanned() {
+		return this.bannedPlayers;
 	}
 
-	public void addBanned(UUID banuuid) {
-		this.BannedPlayers.add(banuuid);
+	public void addBanned(UUID playerUID) {
+		this.bannedPlayers.add(playerUID);
 	}
 
-	public void delBanned(UUID banuuid) {
-		this.BannedPlayers.remove(banuuid);
+	public void delBanned(UUID playerUID) {
+		this.bannedPlayers.remove(playerUID);
 	}
 
-	public boolean existsBanned(UUID banuuid) {
-
-		if (this.BannedPlayers.contains(banuuid)) {
-			return true;
-		}
-
-		return false;
-
+	public boolean isBanned(UUID playerUID) {
+		return this.bannedPlayers.contains(playerUID);
 	}
 
-	public boolean existsMember(UUID memberuuid) {
-
-		if (this.Members.contains(memberuuid)) {
-			return true;
-		}
-
-		return false;
-
+	public boolean isMember(UUID playerUID) {
+		return this.members.contains(playerUID);
 	}
 
-	public List<UUID> getViewers() {
-		return this.Viewers;
+	public Set<UUID> getViewers() {
+		return this.viewers;
 	}
 
-	public void addViewer(UUID memberuuid) {
-		this.Viewers.add(memberuuid);
+	public void addViewer(UUID playerUID) {
+		this.viewers.add(playerUID);
 	}
 
-	public void delViewer(UUID memberuuid) {
-		this.Viewers.remove(memberuuid);
+	public void delViewer(UUID playerUID) {
+		this.viewers.remove(playerUID);
 	}
 
-	public boolean existsViewer(UUID memberuuid) {
-
-		if (this.Viewers.contains(memberuuid)) {
-			return true;
-		}
-
-		return false;
-
+	public boolean isViewer(UUID playerUID) {
+		return this.viewers.contains(playerUID);
 	}
 }

multichat/src/main/java/xyz/olivermartin/multichat/bungee/Announcements.java

@@ -1,15 +1,18 @@
 package xyz.olivermartin.multichat.bungee;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 import xyz.olivermartin.multichat.bungee.events.PostBroadcastEvent;
+import xyz.olivermartin.multichat.common.MessageType;
+import xyz.olivermartin.multichat.common.MultiChatUtil;
+import xyz.olivermartin.multichat.proxy.common.MultiChatProxy;
+import xyz.olivermartin.multichat.proxy.common.ProxyJsonUtils;
+import xyz.olivermartin.multichat.proxy.common.config.ProxyConfigs;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Announcements Management
@@ -29,19 +32,21 @@ public static boolean startAnnouncement(final String name, Integer minutes) {
 
 			Integer ID;
 
-			ScheduledTask task = ProxyServer.getInstance().getScheduler().schedule(MultiChat.getInstance(), new Runnable() {
+			ScheduledTask task = ProxyServer.getInstance().getScheduler().schedule(MultiChatProxy.getInstance().getPlugin(), new Runnable() {
 
 				@Override
 				public void run() {
 					String message = announcements.get(name.toLowerCase());
 
-					message = ChatControl.applyChatRules(message, "announcements", "").get();
+					message = ChatControl.applyChatRules(null, message, MessageType.ANNOUNCEMENTS).get();
+
+					message = MultiChatUtil.translateColorCodes(message);
 
 					for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
-						if (MultiChat.legacyServers.contains(onlineplayer.getServer().getInfo().getName())) {
-							onlineplayer.sendMessage(TextComponent.fromLegacyText(MultiChatUtil.approximateHexCodes(ChatColor.translateAlternateColorCodes('&',message))));
+						if (ProxyConfigs.CONFIG.isLegacyServer(onlineplayer.getServer().getInfo().getName())) {
+							onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(MultiChatUtil.approximateRGBColorCodes(message)));
 						} else {
-							onlineplayer.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',message)));
+							onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(message));
 						}
 					}
 
@@ -92,7 +97,7 @@ public static boolean addAnnouncement(String name, String message) {
 
 		if (!announcements.containsKey(name.toLowerCase())) {
 
-			announcements.put(name.toLowerCase(), MultiChatUtil.reformatRGB(message));
+			announcements.put(name.toLowerCase(), message);
 			return true;
 
 		} else {
@@ -133,13 +138,15 @@ public static void playAnnouncement(String name) {
 
 			String message = announcements.get(name.toLowerCase());
 
-			message = ChatControl.applyChatRules(message, "announcements", "").get();
+			message = ChatControl.applyChatRules(null, message, MessageType.ANNOUNCEMENTS).get();
+
+			message = MultiChatUtil.translateColorCodes(message);
 
 			for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
-				if (MultiChat.legacyServers.contains(onlineplayer.getServer().getInfo().getName())) {
-					onlineplayer.sendMessage(TextComponent.fromLegacyText(MultiChatUtil.approximateHexCodes(ChatColor.translateAlternateColorCodes('&',message))));
+				if (ProxyConfigs.CONFIG.isLegacyServer(onlineplayer.getServer().getInfo().getName())) {
+					onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(MultiChatUtil.approximateRGBColorCodes(message)));
 				} else {
-					onlineplayer.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',message)));
+					onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(message));
 				}
 			}
 

multichat/src/main/java/xyz/olivermartin/multichat/bungee/Bulletins.java

@@ -1,15 +1,18 @@
 package xyz.olivermartin.multichat.bungee;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
-
-import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 import xyz.olivermartin.multichat.bungee.events.PostBroadcastEvent;
+import xyz.olivermartin.multichat.common.MessageType;
+import xyz.olivermartin.multichat.common.MultiChatUtil;
+import xyz.olivermartin.multichat.proxy.common.MultiChatProxy;
+import xyz.olivermartin.multichat.proxy.common.ProxyJsonUtils;
+import xyz.olivermartin.multichat.proxy.common.config.ProxyConfigs;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Bulletins Management
@@ -72,7 +75,7 @@ public static void stopBulletins() {
 
 	public static void addBulletin(String message) {
 		synchronized (bulletin) {
-			bulletin.add(MultiChatUtil.reformatRGB(message));
+			bulletin.add(message);
 		}
 	}
 
@@ -95,7 +98,7 @@ public static void removeBulletin(int index) {
 	}
 
 	private static void scheduleNextBulletin(final int minutes) {
-		ScheduledTask task = ProxyServer.getInstance().getScheduler().schedule(MultiChat.getInstance(), new Runnable() {
+		ScheduledTask task = ProxyServer.getInstance().getScheduler().schedule(MultiChatProxy.getInstance().getPlugin(), new Runnable() {
 
 			@Override
 			public void run() {
@@ -108,16 +111,18 @@ public void run() {
 
 					message = bulletin.get(nextBulletin);
 
-					message = ChatControl.applyChatRules(message, "bulletins", "").get();
+					message = ChatControl.applyChatRules(null, message, MessageType.BULLETINS).get();
+
+					message = MultiChatUtil.translateColorCodes(message);
 
 					for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
-						if (MultiChat.legacyServers.contains(onlineplayer.getServer().getInfo().getName())) {
-							onlineplayer.sendMessage(TextComponent.fromLegacyText(MultiChatUtil.approximateHexCodes(ChatColor.translateAlternateColorCodes('&',message))));
+						if (ProxyConfigs.CONFIG.isLegacyServer(onlineplayer.getServer().getInfo().getName())) {
+							onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(MultiChatUtil.approximateRGBColorCodes(message)));
 						} else {
-							onlineplayer.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',message)));
+							onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(message));
 						}
 					}
-					
+
 					// Trigger PostBroadcastEvent
 					ProxyServer.getInstance().getPluginManager().callEvent(new PostBroadcastEvent("bulletin", message));