mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-05-23 02:19:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor MineverseChatBungee.

Browse Source
This commit is contained in:
Aust1n46 2021-04-16 18:10:47 -05:00
parent 86246ba132
commit 7566733018
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
View File

@ -30,7 +30,7 @@ import net.md_5.bungee.event.EventHandler;
//This is the main class for the BungeeCord version of the plugin. //This is the main class for the BungeeCord version of the plugin.
public class MineverseChatBungee extends Plugin implements Listener { public class MineverseChatBungee extends Plugin implements Listener {
private static MineverseChatBungee instance; private static MineverseChatBungee instance;
private Configuration bungeeConfig; private static Configuration bungeeConfig;
public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data";
@Override @Override
@ -54,7 +54,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
BungeePlayerData.loadLegacyBungeePlayerData(); BungeePlayerData.loadLegacyBungeePlayerData();
BungeePlayerData.loadBungeePlayerData(); BungeePlayerData.loadBungeePlayerData();
this.getProxy().registerChannel(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL); this.getProxy().registerChannel(PLUGIN_MESSAGING_CHANNEL);
this.getProxy().getPluginManager().registerListener(this, this); this.getProxy().getPluginManager().registerListener(this, this);
} }
@ -67,7 +67,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
return instance; return instance;
} }
public Configuration getBungeeConfig() { public static Configuration getBungeeConfig() {
return bungeeConfig; return bungeeConfig;
} }
@ -91,14 +91,14 @@ public class MineverseChatBungee extends Plugin implements Listener {
ByteArrayOutputStream outstream = new ByteArrayOutputStream(); ByteArrayOutputStream outstream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(outstream); DataOutputStream out = new DataOutputStream(outstream);
out.writeUTF("PlayerNames"); out.writeUTF("PlayerNames");
out.writeInt(this.getProxy().getPlayers().size()); out.writeInt(getProxy().getPlayers().size());
for(ProxiedPlayer pp : this.getProxy().getPlayers()) { for(ProxiedPlayer pp : getProxy().getPlayers()) {
out.writeUTF(pp.getName()); out.writeUTF(pp.getName());
} }
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -110,7 +110,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
@EventHandler @EventHandler
public void onPluginMessage(PluginMessageEvent ev) { public void onPluginMessage(PluginMessageEvent ev) {
//System.out.println(ev.getTag() + "," + ev.getSender().toString() + "," + (ev.getSender() instanceof Server)); //System.out.println(ev.getTag() + "," + ev.getSender().toString() + "," + (ev.getSender() instanceof Server));
if(!ev.getTag().equals(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL) && !ev.getTag().contains("viaversion:")) { if(!ev.getTag().equals(PLUGIN_MESSAGING_CHANNEL) && !ev.getTag().contains("viaversion:")) {
return; return;
} }
if(!(ev.getSender() instanceof Server)) { if(!(ev.getSender() instanceof Server)) {
@ -151,7 +151,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
if(!bungeeToggle && !getProxy().getServers().get(send).getName().equalsIgnoreCase(ser.getInfo().getName())) { if(!bungeeToggle && !getProxy().getServers().get(send).getName().equalsIgnoreCase(ser.getInfo().getName())) {
continue; continue;
} }
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -163,7 +163,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(message); out.writeUTF(message);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -183,7 +183,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(channel); out.writeUTF(channel);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -215,7 +215,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
} }
smcp.clearMessageData(); smcp.clearMessageData();
Server server = getProxy().getPlayer(name).getServer(); Server server = getProxy().getPlayer(name).getServer();
server.sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); server.sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -225,7 +225,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(hash); out.writeUTF(hash);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -244,7 +244,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(sender); out.writeUTF(sender);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -267,7 +267,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -282,7 +282,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(receiverName); out.writeUTF(receiverName);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -307,7 +307,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(reason); out.writeUTF(reason);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -326,7 +326,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeLong(time); out.writeLong(time);
out.writeUTF(reason); out.writeUTF(reason);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
if(identifier.equals("Offline")) { if(identifier.equals("Offline")) {
@ -349,7 +349,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(senderIdentifier); out.writeUTF(senderIdentifier);
out.writeUTF(playerToMute); out.writeUTF(playerToMute);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -364,7 +364,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(playerToMute); out.writeUTF(playerToMute);
out.writeUTF(channelName); out.writeUTF(channelName);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -385,7 +385,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(channelName); out.writeUTF(channelName);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -400,7 +400,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(playerToUnmute); out.writeUTF(playerToUnmute);
out.writeUTF(channelName); out.writeUTF(channelName);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
if(identifier.equals("Offline")) { if(identifier.equals("Offline")) {
@ -423,7 +423,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(senderIdentifier); out.writeUTF(senderIdentifier);
out.writeUTF(playerToUnmute); out.writeUTF(playerToUnmute);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -438,7 +438,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(playerToUnmute); out.writeUTF(playerToUnmute);
out.writeUTF(channelName); out.writeUTF(channelName);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -467,7 +467,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(msg); out.writeUTF(msg);
for(String serv : getProxy().getServers().keySet()) { for(String serv : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(serv).getPlayers().size() > 0) { if(getProxy().getServers().get(serv).getPlayers().size() > 0) {
getProxy().getServers().get(serv).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(serv).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -490,7 +490,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -503,7 +503,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
if(identifier.equals("Blocked")) { if(identifier.equals("Blocked")) {
@ -515,7 +515,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
if(identifier.equals("Echo")) { if(identifier.equals("Echo")) {
@ -533,7 +533,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(sender); out.writeUTF(sender);
out.writeUTF(echo); out.writeUTF(echo);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
outstream = new ByteArrayOutputStream(); outstream = new ByteArrayOutputStream();
out = new DataOutputStream(outstream); out = new DataOutputStream(outstream);
@ -544,7 +544,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(spy); out.writeUTF(spy);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(send).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
} }
} }
@ -589,7 +589,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(ignore.toString()); out.writeUTF(ignore.toString());
} }
if(getProxy().getServers().get(server).getPlayers().size() > 0) if(getProxy().getServers().get(server).getPlayers().size() > 0)
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
} }
if(identifier.equals("Update")) { if(identifier.equals("Update")) {
UUID uuid = UUID.fromString(in.readUTF()); UUID uuid = UUID.fromString(in.readUTF());
@ -629,4 +629,4 @@ public class MineverseChatBungee extends Plugin implements Listener {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }

2
src/mineverse/Aust1n46/chat/utilities/UUIDFetcher.java
View File

@ -120,7 +120,7 @@ public class UUIDFetcher implements Callable<Map<String, UUID>> { //unimplemente
} }
public static boolean shouldSkipOfflineUUIDBungee(UUID uuid) { public static boolean shouldSkipOfflineUUIDBungee(UUID uuid) {
return (uuidIsOffline(uuid) && !MineverseChatBungee.getInstance().getBungeeConfig().getBoolean("offline_server_acknowledgement", false)); return (uuidIsOffline(uuid) && !MineverseChatBungee.getBungeeConfig().getBoolean("offline_server_acknowledgement", false));
} }
public static void checkOfflineUUIDWarning(UUID uuid) { public static void checkOfflineUUIDWarning(UUID uuid) {