From 12999289b3d4aced3018f6c1d1665b4b7596b51a Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sun, 19 May 2019 16:37:59 -0400 Subject: [PATCH] Reverted UUIDFetcher changes to support "Cracked" servers again --- MineverseChat/bungee.yml | 2 +- .../mineverse/Aust1n46/chat/MineverseChat.java | 2 ++ .../Aust1n46/chat/bungee/MineverseChatBungee.java | 7 +++++-- .../mineverse/Aust1n46/chat/command/chat/Chwho.java | 4 +--- .../Aust1n46/chat/command/chat/VentureChatGui.java | 12 +++++------- .../Aust1n46/chat/irc/listeners/MessageListener.java | 2 +- .../Aust1n46/chat/listeners/CapeListener.java | 3 +++ .../Aust1n46/chat/listeners/CommandListener.java | 6 +----- .../Aust1n46/chat/listeners/LoginListener.java | 5 +++-- .../Aust1n46/chat/utilities/FormatTags.java | 1 - MineverseChat/plugin.yml | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/MineverseChat/bungee.yml b/MineverseChat/bungee.yml index 23844c4..8ed64f0 100644 --- a/MineverseChat/bungee.yml +++ b/MineverseChat/bungee.yml @@ -1,4 +1,4 @@ name: VentureChat main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee -version: 2.15 +version: 2.15.1 author: Aust1n46 \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index d5d16a7..328fbea 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -829,6 +829,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { String identifier = msgin.readUTF(); if(identifier.equals("Get")) { String sender = msgin.readUTF(); + String name = msgin.readUTF(); String chatchannel = msgin.readUTF(); List listening = new ArrayList(); if(ccInfo.isChannel(chatchannel)) { @@ -845,6 +846,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF("Chwho"); out.writeUTF("Receive"); out.writeUTF(sender); + out.writeUTF(name); out.writeUTF(chatchannel); out.writeInt(listening.size()); for(String s : listening) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java index 0d43cb2..adf0146 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java @@ -135,7 +135,7 @@ public class MineverseChatBungee extends Plugin implements Listener { @EventHandler 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("venturechat:") && !ev.getTag().contains("viaversion:")) { return; } @@ -180,6 +180,7 @@ public class MineverseChatBungee extends Plugin implements Listener { String identifier = in.readUTF(); if(identifier.equals("Get")) { String sender = in.readUTF(); + String name = in.readUTF(); String channel = in.readUTF(); SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender)); smcp.clearMessagePackets(); @@ -187,6 +188,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF("Chwho"); out.writeUTF("Get"); out.writeUTF(sender); + out.writeUTF(name); out.writeUTF(channel); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { @@ -196,6 +198,7 @@ public class MineverseChatBungee extends Plugin implements Listener { } if(identifier.equals("Receive")) { String sender = in.readUTF(); + String name = in.readUTF(); String channel = in.readUTF(); SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender)); smcp.incrementMessagePackets(); @@ -220,7 +223,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(s); } smcp.clearMessageData(); - Server server = getProxy().getPlayer(UUID.fromString(sender)).getServer(); + Server server = getProxy().getPlayer(name).getServer(); server.sendData("venturechat:", outstream.toByteArray()); } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java index d3a127e..311c5a9 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -7,7 +7,6 @@ import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.plugin.PluginManager; import com.massivecraft.factions.entity.MPlayer; @@ -20,9 +19,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; -import mineverse.Aust1n46.chat.utilities.UUIDFetcher; -@SuppressWarnings("unused") public class Chwho extends MineverseCommand { private MineverseChat plugin; private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -56,6 +53,7 @@ public class Chwho extends MineverseCommand { out.writeUTF("Chwho"); out.writeUTF("Get"); out.writeUTF(mcp.getUUID().toString()); + out.writeUTF(mcp.getName()); out.writeUTF(channel.getName()); mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); out.close(); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index 00d3066..98cc852 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -1,18 +1,13 @@ package mineverse.Aust1n46.chat.command.chat; import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Set; -import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -26,7 +21,6 @@ import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.gui.GuiSlot; import mineverse.Aust1n46.chat.utilities.Format; -import mineverse.Aust1n46.chat.utilities.UUIDFetcher; import mineverse.Aust1n46.chat.versions.VersionHandler; public class VentureChatGui extends MineverseCommand { @@ -51,7 +45,9 @@ public class VentureChatGui extends MineverseCommand { if(mcp.getPlayer().hasPermission("venturechat.gui")) { MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(target == null) { - //mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + return; + /* UUID uuid = null; try { uuid = UUIDFetcher.getUUIDOf(args[0]); @@ -70,6 +66,7 @@ public class VentureChatGui extends MineverseCommand { 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, true); MineverseChat.players.add(target); + */ } if(MineverseChat.ccInfo.isChannel(args[1])) { ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(args[1]); @@ -84,6 +81,7 @@ public class VentureChatGui extends MineverseCommand { return; } + @SuppressWarnings("deprecation") private void openInventory(MineverseChatPlayer mcp, MineverseChatPlayer target, ChatChannel channel, int hash) { Inventory inv = Bukkit.createInventory(null, this.getSlots(), "VentureChat: " + target.getName() + " GUI"); ItemStack close = null; diff --git a/MineverseChat/mineverse/Aust1n46/chat/irc/listeners/MessageListener.java b/MineverseChat/mineverse/Aust1n46/chat/irc/listeners/MessageListener.java index 1ba43f2..6a1781d 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/irc/listeners/MessageListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/irc/listeners/MessageListener.java @@ -59,7 +59,7 @@ public class MessageListener extends ListenerAdapter { for(ChatChannel ci : cc.getChannelsInfo()) { if(ci.isIRC()) { for(MineverseChatPlayer p : MineverseChat.players) { - if(p.isOnline() && p.getListening().contains(ci)) { + if(p.isOnline() && p.getListening().contains(ci.getName())) { players.add(p); } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java index 4af2fbc..58d0f48 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java @@ -120,6 +120,7 @@ public class CapeListener implements Listener { return new EulerAngle(0.0D, d.doubleValue(), 0.0D); } + @SuppressWarnings("deprecation") public void capeInHand(Player p) { if(p.getName().equals("Aust1n46")) { if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) { @@ -174,6 +175,7 @@ public class CapeListener implements Listener { return patterns; } + @SuppressWarnings("deprecation") public void addBanner(String s, BannerMeta b) { FileConfiguration f = MineverseChat.getInstance().getConfig(); f.set(s.toUpperCase() + ".display_name", s); @@ -183,6 +185,7 @@ public class CapeListener implements Listener { MineverseChat.getInstance().saveConfig(); } + @SuppressWarnings("deprecation") public ItemStack getBanner() { ItemStack i = null; if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java index 02d86c7..959ff49 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java @@ -16,10 +16,8 @@ import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.gui.GuiSlot; import mineverse.Aust1n46.chat.irc.Bot; import mineverse.Aust1n46.chat.utilities.Format; -//import mineverse.Aust1n46.chat.utilities.FormatTags; import mineverse.Aust1n46.chat.versions.VersionHandler; -//import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.Command; @@ -33,10 +31,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.server.ServerCommandEvent; -import org.bukkit.inventory.Inventory; -//import org.bukkit.plugin.Plugin; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.SkullMeta; import me.clip.placeholderapi.PlaceholderAPI; @@ -264,6 +259,7 @@ public class CommandListener implements CommandExecutor, Listener { return false; } + @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.LOW) public void InventoryClick(InventoryClickEvent e) { ItemStack item = e.getCurrentItem(); diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java index 078e4d2..703eb15 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java @@ -17,7 +17,6 @@ import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.database.PlayerData; import mineverse.Aust1n46.chat.json.JsonFormat; import mineverse.Aust1n46.chat.utilities.Format; -import mineverse.Aust1n46.chat.utilities.UUIDFetcher; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; @@ -69,7 +68,9 @@ public class LoginListener implements Listener { if(mcp == null) { Player player = event.getPlayer(); String name = player.getName(); - UUID uuid = UUIDFetcher.getUUIDOf(name); + // Disabling Mojang UUID Query + //UUID uuid = UUIDFetcher.getUUIDOf(name); + UUID uuid = player.getUniqueId(); ChatChannel current = cc.getDefaultChannel(); Set ignores = new HashSet(); Set listening = new HashSet(); diff --git a/MineverseChat/mineverse/Aust1n46/chat/utilities/FormatTags.java b/MineverseChat/mineverse/Aust1n46/chat/utilities/FormatTags.java index c1d29ab..1d5d4b9 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/utilities/FormatTags.java +++ b/MineverseChat/mineverse/Aust1n46/chat/utilities/FormatTags.java @@ -4,7 +4,6 @@ import me.clip.placeholderapi.PlaceholderAPI; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; -import mineverse.Aust1n46.chat.versions.VersionHandler; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml index eaf7fe2..7141163 100644 --- a/MineverseChat/plugin.yml +++ b/MineverseChat/plugin.yml @@ -1,5 +1,5 @@ name: VentureChat -version: 2.15 +version: 2.15.1 api-version: 1.13 main: mineverse.Aust1n46.chat.MineverseChat depend: [Vault, ProtocolLib, PlaceholderAPI]