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

Reverted UUIDFetcher changes to support "Cracked" servers again

Browse Source
This commit is contained in:
Aust1n46 2019-05-19 16:37:59 -04:00
parent 2d1b45b542
commit 12999289b3
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MineverseChat/bungee.yml
View File

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

2
MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
View File

@ -829,6 +829,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
String identifier = msgin.readUTF(); String identifier = msgin.readUTF();
if(identifier.equals("Get")) { if(identifier.equals("Get")) {
String sender = msgin.readUTF(); String sender = msgin.readUTF();
String name = msgin.readUTF();
String chatchannel = msgin.readUTF(); String chatchannel = msgin.readUTF();
List<String> listening = new ArrayList<String>(); List<String> listening = new ArrayList<String>();
if(ccInfo.isChannel(chatchannel)) { if(ccInfo.isChannel(chatchannel)) {
@ -845,6 +846,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Chwho"); out.writeUTF("Chwho");
out.writeUTF("Receive"); out.writeUTF("Receive");
out.writeUTF(sender); out.writeUTF(sender);
out.writeUTF(name);
out.writeUTF(chatchannel); out.writeUTF(chatchannel);
out.writeInt(listening.size()); out.writeInt(listening.size());
for(String s : listening) { for(String s : listening) {

7
MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
View File

@ -135,7 +135,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("venturechat:") && !ev.getTag().contains("viaversion:")) { if(!ev.getTag().equals("venturechat:") && !ev.getTag().contains("viaversion:")) {
return; return;
} }
@ -180,6 +180,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
String identifier = in.readUTF(); String identifier = in.readUTF();
if(identifier.equals("Get")) { if(identifier.equals("Get")) {
String sender = in.readUTF(); String sender = in.readUTF();
String name = in.readUTF();
String channel = in.readUTF(); String channel = in.readUTF();
SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender)); SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender));
smcp.clearMessagePackets(); smcp.clearMessagePackets();
@ -187,6 +188,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF("Chwho"); out.writeUTF("Chwho");
out.writeUTF("Get"); out.writeUTF("Get");
out.writeUTF(sender); out.writeUTF(sender);
out.writeUTF(name);
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) {
@ -196,6 +198,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
} }
if(identifier.equals("Receive")) { if(identifier.equals("Receive")) {
String sender = in.readUTF(); String sender = in.readUTF();
String name = in.readUTF();
String channel = in.readUTF(); String channel = in.readUTF();
SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender)); SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender));
smcp.incrementMessagePackets(); smcp.incrementMessagePackets();
@ -220,7 +223,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(s); out.writeUTF(s);
} }
smcp.clearMessageData(); smcp.clearMessageData();
Server server = getProxy().getPlayer(UUID.fromString(sender)).getServer(); Server server = getProxy().getPlayer(name).getServer();
server.sendData("venturechat:", outstream.toByteArray()); server.sendData("venturechat:", outstream.toByteArray());
} }
} }

4
MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java
View File

@ -7,7 +7,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import com.massivecraft.factions.entity.MPlayer; 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.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.utilities.UUIDFetcher;
@SuppressWarnings("unused")
public class Chwho extends MineverseCommand { public class Chwho extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin;
private ChatChannelInfo cc = MineverseChat.ccInfo; private ChatChannelInfo cc = MineverseChat.ccInfo;
@ -56,6 +53,7 @@ public class Chwho extends MineverseCommand {
out.writeUTF("Chwho"); out.writeUTF("Chwho");
out.writeUTF("Get"); out.writeUTF("Get");
out.writeUTF(mcp.getUUID().toString()); out.writeUTF(mcp.getUUID().toString());
out.writeUTF(mcp.getName());
out.writeUTF(channel.getName()); out.writeUTF(channel.getName());
mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray());
out.close(); out.close();

12
MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java
View File

@ -1,18 +1,13 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; 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.command.MineverseCommand;
import mineverse.Aust1n46.chat.gui.GuiSlot; import mineverse.Aust1n46.chat.gui.GuiSlot;
import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.utilities.UUIDFetcher;
import mineverse.Aust1n46.chat.versions.VersionHandler; import mineverse.Aust1n46.chat.versions.VersionHandler;
public class VentureChatGui extends MineverseCommand { public class VentureChatGui extends MineverseCommand {
@ -51,7 +45,9 @@ public class VentureChatGui extends MineverseCommand {
if(mcp.getPlayer().hasPermission("venturechat.gui")) { if(mcp.getPlayer().hasPermission("venturechat.gui")) {
MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]); MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(target == null) { 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; UUID uuid = null;
try { try {
uuid = UUIDFetcher.getUUIDOf(args[0]); uuid = UUIDFetcher.getUUIDOf(args[0]);
@ -70,6 +66,7 @@ public class VentureChatGui extends MineverseCommand {
String jsonFormat = "Default"; 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); 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); MineverseChat.players.add(target);
*/
} }
if(MineverseChat.ccInfo.isChannel(args[1])) { if(MineverseChat.ccInfo.isChannel(args[1])) {
ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(args[1]); ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(args[1]);
@ -84,6 +81,7 @@ public class VentureChatGui extends MineverseCommand {
return; return;
} }
@SuppressWarnings("deprecation")
private void openInventory(MineverseChatPlayer mcp, MineverseChatPlayer target, ChatChannel channel, int hash) { private void openInventory(MineverseChatPlayer mcp, MineverseChatPlayer target, ChatChannel channel, int hash) {
Inventory inv = Bukkit.createInventory(null, this.getSlots(), "VentureChat: " + target.getName() + " GUI"); Inventory inv = Bukkit.createInventory(null, this.getSlots(), "VentureChat: " + target.getName() + " GUI");
ItemStack close = null; ItemStack close = null;

2
MineverseChat/mineverse/Aust1n46/chat/irc/listeners/MessageListener.java
View File

@ -59,7 +59,7 @@ public class MessageListener extends ListenerAdapter {
for(ChatChannel ci : cc.getChannelsInfo()) { for(ChatChannel ci : cc.getChannelsInfo()) {
if(ci.isIRC()) { if(ci.isIRC()) {
for(MineverseChatPlayer p : MineverseChat.players) { for(MineverseChatPlayer p : MineverseChat.players) {
if(p.isOnline() && p.getListening().contains(ci)) { if(p.isOnline() && p.getListening().contains(ci.getName())) {
players.add(p); players.add(p);
} }
} }

3
MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java
View File

@ -120,6 +120,7 @@ public class CapeListener implements Listener {
return new EulerAngle(0.0D, d.doubleValue(), 0.0D); return new EulerAngle(0.0D, d.doubleValue(), 0.0D);
} }
@SuppressWarnings("deprecation")
public void capeInHand(Player p) { public void capeInHand(Player p) {
if(p.getName().equals("Aust1n46")) { if(p.getName().equals("Aust1n46")) {
if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) { 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; return patterns;
} }
@SuppressWarnings("deprecation")
public void addBanner(String s, BannerMeta b) { public void addBanner(String s, BannerMeta b) {
FileConfiguration f = MineverseChat.getInstance().getConfig(); FileConfiguration f = MineverseChat.getInstance().getConfig();
f.set(s.toUpperCase() + ".display_name", s); f.set(s.toUpperCase() + ".display_name", s);
@ -183,6 +185,7 @@ public class CapeListener implements Listener {
MineverseChat.getInstance().saveConfig(); MineverseChat.getInstance().saveConfig();
} }
@SuppressWarnings("deprecation")
public ItemStack getBanner() { public ItemStack getBanner() {
ItemStack i = null; ItemStack i = null;
if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) { if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) {

6
MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java
View File

@ -16,10 +16,8 @@ import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.gui.GuiSlot; import mineverse.Aust1n46.chat.gui.GuiSlot;
import mineverse.Aust1n46.chat.irc.Bot; import mineverse.Aust1n46.chat.irc.Bot;
import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.utilities.Format;
//import mineverse.Aust1n46.chat.utilities.FormatTags;
import mineverse.Aust1n46.chat.versions.VersionHandler; import mineverse.Aust1n46.chat.versions.VersionHandler;
//import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -33,10 +31,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.server.ServerCommandEvent; 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.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.inventory.meta.SkullMeta;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
@ -264,6 +259,7 @@ public class CommandListener implements CommandExecutor, Listener {
return false; return false;
} }
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void InventoryClick(InventoryClickEvent e) { public void InventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem(); ItemStack item = e.getCurrentItem();

5
MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java
View File

@ -17,7 +17,6 @@ import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.database.PlayerData; import mineverse.Aust1n46.chat.database.PlayerData;
import mineverse.Aust1n46.chat.json.JsonFormat; import mineverse.Aust1n46.chat.json.JsonFormat;
import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.utilities.UUIDFetcher;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
@ -69,7 +68,9 @@ public class LoginListener implements Listener {
if(mcp == null) { if(mcp == null) {
Player player = event.getPlayer(); Player player = event.getPlayer();
String name = player.getName(); 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(); ChatChannel current = cc.getDefaultChannel();
Set<UUID> ignores = new HashSet<UUID>(); Set<UUID> ignores = new HashSet<UUID>();
Set<String> listening = new HashSet<String>(); Set<String> listening = new HashSet<String>();

1
MineverseChat/mineverse/Aust1n46/chat/utilities/FormatTags.java
View File

@ -4,7 +4,6 @@ import me.clip.placeholderapi.PlaceholderAPI;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.versions.VersionHandler;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

2
MineverseChat/plugin.yml
View File

@ -1,5 +1,5 @@
name: VentureChat name: VentureChat
version: 2.15 version: 2.15.1
api-version: 1.13 api-version: 1.13
main: mineverse.Aust1n46.chat.MineverseChat main: mineverse.Aust1n46.chat.MineverseChat
depend: [Vault, ProtocolLib, PlaceholderAPI] depend: [Vault, ProtocolLib, PlaceholderAPI]