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

Pushing 2.12.2 changes

Browse Source
This commit is contained in:
Aust1n46 2018-01-19 20:55:00 -05:00
parent d79bb350c3
commit db901ffd6f
8 changed files with 1985 additions and 1975 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MineverseChat/.classpath
View File

@ -8,11 +8,12 @@
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/Heroes.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/MassiveCore.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/PlaceholderAPI.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/ProtocolLib-3.5.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/spigot-1.8.8.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/spigot-1.9.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/spigot-1.9-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/Towny.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/workspace/VentureChat Dependencies/Vault.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/Desktop/SSD Backup 12_28_17/Desktop/Mineverse Network/Servers/Hub/plugins/ProtocolLib.jar"/>
<classpathentry kind="lib" path="C:/Users/aust1/Desktop/SSD Backup 12_28_17/Desktop/Mineverse Network/Servers/Hub/spigot-1.12.2.jar"/>
<classpathentry kind="output" path=""/>
</classpath>

2
MineverseChat/bungee.yml
View File

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

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

@ -431,18 +431,18 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
// getDescription().getName())));
}
else {
/*Don't run this code right now
for(ChatChannel c : ccInfo.getChannelsInfo()) {
CCommand cmd = new CCommand(c.getAlias());
cmap.register("", cmd);
cmd.setExecutor(commandListener);
}
for(Alias a : aaInfo.getAliases()) {
CCommand cmd = new CCommand(a.getName());
cmap.register("", cmd);
}
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Registering Alias commands"));
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Registering Quickchat commands"));
/*
* Don't run this code right now for(ChatChannel c :
* ccInfo.getChannelsInfo()) { CCommand cmd = new
* CCommand(c.getAlias()); cmap.register("", cmd);
* cmd.setExecutor(commandListener); } for(Alias a :
* aaInfo.getAliases()) { CCommand cmd = new CCommand(a.getName());
* cmap.register("", cmd); }
* Bukkit.getConsoleSender().sendMessage(Format.
* FormatStringAll("&8[&eVentureChat&8]&e - Registering Alias commands"
* )); Bukkit.getConsoleSender().sendMessage(Format.
* FormatStringAll("&8[&eVentureChat&8]&e - Registering Quickchat commands"
* ));
*/
}
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord"));
@ -487,10 +487,13 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
public void run() {
for(MineverseChatPlayer p : MineverseChat.players) {
// Calendar currentDate = Calendar.getInstance();
//SimpleDateFormat formatter = new SimpleDateFormat("dd:HH:mm:ss");
// SimpleDateFormat formatter = new
// SimpleDateFormat("dd:HH:mm:ss");
// String date = formatter.format(currentDate.getTime());
// String[] datearray = date.split(":");
//int time = (Integer.parseInt(datearray[0]) * 1440) + (Integer.parseInt(datearray[1]) * 60) + (Integer.parseInt(datearray[2]));
// int time = (Integer.parseInt(datearray[0]) * 1440) +
// (Integer.parseInt(datearray[1]) * 60) +
// (Integer.parseInt(datearray[2]));
int time = (int) (System.currentTimeMillis() / 60000);
@ -553,23 +556,20 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
}
private void loadNMS() throws ClassNotFoundException {
/*if(VersionHandler.is1_7_10()) {
try {
MineverseChat.posField = MinecraftReflection.getMinecraftClass("PacketPlayOutChat").getDeclaredField("b");
MineverseChat.posField.setAccessible(true);
}
catch(NoSuchFieldException | SecurityException localNoSuchFieldException) {
localNoSuchFieldException.printStackTrace();
}
try {
MineverseChat.messageMethod = MinecraftReflection.getMinecraftClass("IChatBaseComponent").getDeclaredMethod("c", new Class[0]);
MineverseChat.messageMethod.setAccessible(true);
}
catch(SecurityException | NoSuchMethodException e) {
e.printStackTrace();
}
return;
}*/
/*
* if(VersionHandler.is1_7_10()) { try { MineverseChat.posField =
* MinecraftReflection.getMinecraftClass("PacketPlayOutChat").
* getDeclaredField("b"); MineverseChat.posField.setAccessible(true); }
* catch(NoSuchFieldException | SecurityException
* localNoSuchFieldException) {
* localNoSuchFieldException.printStackTrace(); } try {
* MineverseChat.messageMethod =
* MinecraftReflection.getMinecraftClass("IChatBaseComponent").
* getDeclaredMethod("c", new Class[0]);
* MineverseChat.messageMethod.setAccessible(true); }
* catch(SecurityException | NoSuchMethodException e) {
* e.printStackTrace(); } return; }
*/
if(VersionHandler.is1_8() || VersionHandler.is1_7_10()) {
try {
MineverseChat.posField = MinecraftReflection.getMinecraftClass("PacketPlayOutChat").getDeclaredField("b");
@ -601,6 +601,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
catch(SecurityException | NoSuchMethodException e) {
e.printStackTrace();
}
if(!VersionHandler.is1_9() && !VersionHandler.is1_10() && !VersionHandler.is1_11()) {
try {
MineverseChat.chatMessageType = getNMSClass("ChatMessageType");
}
@ -609,11 +610,13 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
}
}
}
}
private Class<?> getNMSClass(String name) {
try {
return Class.forName("net.minecraft.server." + getVersion() + "." + name);
} catch (ClassNotFoundException e) {
}
catch(ClassNotFoundException e) {
e.printStackTrace();
return null;
}
@ -775,7 +778,9 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
}
try {
DataInputStream msgin = new DataInputStream(new ByteArrayInputStream(message));
// System.out.println(msgin.available() + " size");
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
System.out.println(msgin.available() + " size on receiving end");
}
String subchannel = msgin.readUTF();
if(subchannel.equals("Chat")) {
String chatchannel = msgin.readUTF();
@ -790,7 +795,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
Bukkit.getConsoleSender().sendMessage(chat);
MineverseChatPlayer sender = MineverseChatAPI.getMineverseChatPlayer(playerName);
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
// System.out.println(p.getName());
//System.out.println(p.getName() + " received chat message");
if(p.isOnline() && p.getListening().contains(ccInfo.getChannelInfo(chatchannel).getName())) {
if(plugin.getConfig().getBoolean("ignorechat", false)) {
// System.out.println(p.getIgnores());
@ -913,7 +918,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Ignore");
out.writeUTF("Echo");
out.writeUTF(server);
out.writeUTF(p.getNickname());
out.writeUTF(p.getUUID().toString());
out.writeUTF(sender.toString());
player.sendPluginMessage(this, "VentureChat", stream.toByteArray());
return;
@ -925,16 +930,16 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
p.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + receiver + ChatColor.RED + " is not online.");
}
if(identifier.equals("Echo")) {
String receiver = msgin.readUTF();
UUID receiver = UUID.fromString(msgin.readUTF());
UUID sender = UUID.fromString(msgin.readUTF());
MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender);
MineverseChatPlayer r = MineverseChatAPI.getMineverseChatPlayer(receiver);
String rName = Format.FormatStringAll(receiver);
String rName = receiver.toString();
if(r != null) {
rName = Format.FormatStringAll(r.getNickname());
}
p.addIgnore(receiver);
p.getPlayer().sendMessage(ChatColor.GOLD + "You are now ignoring player: " + ChatColor.RED + rName);
p.addIgnore(r.getUUID());
this.synchronize(p, true);
}
}

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

@ -158,7 +158,6 @@ public class MineverseChatBungee extends Plugin implements Listener {
String f = in.readUTF();
String c = in.readUTF();
String json = in.readUTF();
for(String send : getProxy().getServers().keySet()) {
out.writeUTF("Chat");
out.writeUTF(chatchannel);
out.writeUTF(message);
@ -167,6 +166,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF(f);
out.writeUTF(c);
out.writeUTF(json);
for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData("VentureChat", outstream.toByteArray());
}
@ -174,9 +174,9 @@ public class MineverseChatBungee extends Plugin implements Listener {
}
if(subchannel.equals("RemoveMessage")) {
String hash = in.readUTF();
for(String send : getProxy().getServers().keySet()) {
out.writeUTF("RemoveMessage");
out.writeUTF(hash);
for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) {
getProxy().getServers().get(send).sendData("VentureChat", outstream.toByteArray());
}

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

@ -13,6 +13,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand;
//import mineverse.Aust1n46.chat.json.JsonButton;
import mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.versions.VersionHandler;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
@ -61,6 +62,7 @@ public class Removemessage extends MineverseCommand {
catch(Exception e) {
e.printStackTrace();
}
return;
}
new BukkitRunnable() {
public void run() {
@ -160,7 +162,9 @@ public class Removemessage extends MineverseCommand {
private PacketContainer createPacketPlayOutChat(WrappedChatComponent component) {
PacketContainer container = new PacketContainer(PacketType.Play.Server.CHAT);
container.getChatComponents().write(0, component);
if(!VersionHandler.is1_7_10() && !VersionHandler.is1_8() && !VersionHandler.is1_9() && !VersionHandler.is1_10() && !VersionHandler.is1_11()) {
container.getChatTypes().write(0, ChatType.CHAT);
}
return container;
}

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

@ -66,7 +66,7 @@ public class VentureChatGui extends MineverseCommand {
Set<String> blockedCommands = new HashSet<String>();
List<String> mail = new ArrayList<String>();
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);
MineverseChat.players.add(target);
}
if(MineverseChat.ccInfo.isChannel(args[1])) {

2
MineverseChat/plugin.yml
View File

@ -1,5 +1,5 @@
name: VentureChat
version: 2.12.0
version: 2.12.2
main: mineverse.Aust1n46.chat.MineverseChat
depend: [Vault, ProtocolLib, PlaceholderAPI]
softdepend: [Towny, Factions, Heroes]