Added BungeeToggle Command

This commit is contained in:
Aust1n46 2018-01-19 20:39:02 -05:00
parent 40ba992e2b
commit d79bb350c3
10 changed files with 661 additions and 608 deletions

View File

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

View File

@ -193,7 +193,7 @@ venturegui:
durability: 0 durability: 0
text: '&cRemove Message' text: '&cRemove Message'
permission: 'removemessage' permission: 'removemessage'
command: '/removemessage {hash} true' command: '/removemessage {channel} {hash} true'
slot: 7 slot: 7
guiicon: '&c [✓]' guiicon: '&c [✓]'

View File

@ -0,0 +1,42 @@
package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand;
public class BungeeToggle extends MineverseCommand {
private MineverseChat plugin;
public BungeeToggle(String name) {
super(name);
this.plugin = MineverseChat.getInstance();
}
@Override
public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) {
if(!mcp.getBungeeToggle()) {
mcp.setBungeeToggle(true);
mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now receiving BungeeCord chat.");
MineverseChat.getInstance().synchronize(mcp, true);
return;
}
mcp.setBungeeToggle(false);
mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now blocking BungeeCord chat.");
MineverseChat.getInstance().synchronize(mcp, true);
return;
}
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command.");
return;
}
}

View File

@ -66,7 +66,7 @@ public class VentureChatGui extends MineverseCommand {
Set<String> blockedCommands = new HashSet<String>(); Set<String> blockedCommands = new HashSet<String>();
List<String> mail = new ArrayList<String>(); List<String> mail = new ArrayList<String>();
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); 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])) {

View File

@ -1,38 +1,38 @@
package mineverse.Aust1n46.chat.command.chat; package mineverse.Aust1n46.chat.command.chat;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class Venturechat extends MineverseCommand { public class Venturechat extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin;
public Venturechat(String name) { public Venturechat(String name) {
super(name); super(name);
this.plugin = MineverseChat.getInstance(); this.plugin = MineverseChat.getInstance();
} }
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
sender.sendMessage(ChatColor.GOLD + "VentureChat Version: " + plugin.getDescription().getVersion()); sender.sendMessage(ChatColor.GOLD + "VentureChat Version: " + plugin.getDescription().getVersion());
sender.sendMessage(ChatColor.GOLD + "Written by Aust1n46"); sender.sendMessage(ChatColor.GOLD + "Written by Aust1n46");
if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) { if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) {
Player player = (Player) sender; Player player = (Player) sender;
String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "Click here to begin..." + ChatColor.RESET + ChatColor.GOLD + " | "; String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "Click here to begin..." + ChatColor.RESET + ChatColor.GOLD + " | ";
String spaces = " "; String spaces = " ";
TextComponent tcSpaces = new TextComponent(spaces); TextComponent tcSpaces = new TextComponent(spaces);
TextComponent message = new TextComponent(title); TextComponent message = new TextComponent(title);
message.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click here to rank up!").create())); message.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click here to rank up!").create()));
message.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rules 1")); message.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rules 1"));
tcSpaces.addExtra(message); tcSpaces.addExtra(message);
player.spigot().sendMessage(tcSpaces); player.spigot().sendMessage(tcSpaces);
} }
} }
} }

View File

@ -1,206 +1,206 @@
package mineverse.Aust1n46.chat.listeners; package mineverse.Aust1n46.chat.listeners;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.versions.VersionHandler; import mineverse.Aust1n46.chat.versions.VersionHandler;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.Pattern;
import org.bukkit.block.banner.PatternType; import org.bukkit.block.banner.PatternType;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.ArmorStand; import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BannerMeta; import org.bukkit.inventory.meta.BannerMeta;
import org.bukkit.util.EulerAngle; import org.bukkit.util.EulerAngle;
public class CapeListener implements Listener { public class CapeListener implements Listener {
@EventHandler @EventHandler
public void onLeave(PlayerQuitEvent event) { public void onLeave(PlayerQuitEvent event) {
Player p = event.getPlayer(); Player p = event.getPlayer();
if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) { if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) {
return; return;
} }
MineverseChat.cape.remove(); MineverseChat.cape.remove();
} }
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
Player p = event.getPlayer(); Player p = event.getPlayer();
if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) { if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) {
return; return;
} }
MineverseChat.cape = (ArmorStand) p.getWorld().spawnEntity(p.getLocation(), EntityType.ARMOR_STAND); MineverseChat.cape = (ArmorStand) p.getWorld().spawnEntity(p.getLocation(), EntityType.ARMOR_STAND);
MineverseChat.banner = this.getBanner(); MineverseChat.banner = this.getBanner();
this.equipCape(p, MineverseChat.banner); this.equipCape(p, MineverseChat.banner);
} }
@EventHandler @EventHandler
public void onMove(PlayerMoveEvent event) { public void onMove(PlayerMoveEvent event) {
Player p = event.getPlayer(); Player p = event.getPlayer();
if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) { if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) {
return; return;
} }
Location loc = new Location(event.getTo().getWorld(), event.getTo().getX(), event.getTo().getY() + 1.05D, event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch()); Location loc = new Location(event.getTo().getWorld(), event.getTo().getX(), event.getTo().getY() + 1.05D, event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
if(p.isSneaking()) { if(p.isSneaking()) {
loc.setY(event.getTo().getY() + 0.85D); loc.setY(event.getTo().getY() + 0.85D);
} }
ArmorStand cape = MineverseChat.cape; ArmorStand cape = MineverseChat.cape;
cape.teleport(loc); cape.teleport(loc);
Double add = Double.valueOf(Math.abs(p.getVelocity().getX()) * 3.0D + Math.abs(p.getVelocity().getZ()) * 3.0D); Double add = Double.valueOf(Math.abs(p.getVelocity().getX()) * 3.0D + Math.abs(p.getVelocity().getZ()) * 3.0D);
cape.setHeadPose(cape.getHeadPose().setZ(cape.getHeadPose().getZ()).setX(-2.45D + add.doubleValue())); cape.setHeadPose(cape.getHeadPose().setZ(cape.getHeadPose().getZ()).setX(-2.45D + add.doubleValue()));
} }
@EventHandler @EventHandler
public void onTeleport(PlayerTeleportEvent event) { public void onTeleport(PlayerTeleportEvent event) {
Player p = event.getPlayer(); Player p = event.getPlayer();
if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) { if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) {
return; return;
} }
Location loc = new Location(event.getTo().getWorld(), event.getTo().getX(), event.getTo().getY() + 1.05D, event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch()); Location loc = new Location(event.getTo().getWorld(), event.getTo().getX(), event.getTo().getY() + 1.05D, event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
ArmorStand cape = MineverseChat.cape; ArmorStand cape = MineverseChat.cape;
cape.teleport(loc); cape.teleport(loc);
} }
@EventHandler @EventHandler
public void onRespawn(PlayerRespawnEvent event) { public void onRespawn(PlayerRespawnEvent event) {
Player p = event.getPlayer(); Player p = event.getPlayer();
if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) { if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) {
return; return;
} }
Location loc = new Location(event.getRespawnLocation().getWorld(), event.getRespawnLocation().getX(), event.getRespawnLocation().getY() + 1.05D, event.getRespawnLocation().getZ(), event.getRespawnLocation().getYaw(), event.getRespawnLocation().getPitch()); Location loc = new Location(event.getRespawnLocation().getWorld(), event.getRespawnLocation().getX(), event.getRespawnLocation().getY() + 1.05D, event.getRespawnLocation().getZ(), event.getRespawnLocation().getYaw(), event.getRespawnLocation().getPitch());
ArmorStand cape = MineverseChat.cape; ArmorStand cape = MineverseChat.cape;
cape.teleport(loc); cape.teleport(loc);
} }
@EventHandler @EventHandler
public void onDeath(PlayerDeathEvent event) { public void onDeath(PlayerDeathEvent event) {
Player p = event.getEntity(); Player p = event.getEntity();
if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) { if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) {
return; return;
} }
Location loc = new Location(event.getEntity().getWorld(), event.getEntity().getLocation().getX(), -1.0D, event.getEntity().getLocation().getZ()); Location loc = new Location(event.getEntity().getWorld(), event.getEntity().getLocation().getX(), -1.0D, event.getEntity().getLocation().getZ());
ArmorStand cape = MineverseChat.cape; ArmorStand cape = MineverseChat.cape;
cape.teleport(loc); cape.teleport(loc);
} }
public void equipCape(Player p, ItemStack i) { public void equipCape(Player p, ItemStack i) {
Location loc = new Location(p.getLocation().getWorld(), p.getLocation().getX(), p.getLocation().getY() + 1.05D, p.getLocation().getZ(), p.getLocation().getYaw(), p.getLocation().getPitch()); Location loc = new Location(p.getLocation().getWorld(), p.getLocation().getX(), p.getLocation().getY() + 1.05D, p.getLocation().getZ(), p.getLocation().getYaw(), p.getLocation().getPitch());
ArmorStand cape = MineverseChat.cape; ArmorStand cape = MineverseChat.cape;
cape.setHelmet(i); cape.setHelmet(i);
cape.setHeadPose(cape.getHeadPose().setX(cape.getHeadPose().getX() - 2.4D)); cape.setHeadPose(cape.getHeadPose().setX(cape.getHeadPose().getX() - 2.4D));
cape.setSmall(true); cape.setSmall(true);
cape.setNoDamageTicks(Integer.MAX_VALUE); cape.setNoDamageTicks(Integer.MAX_VALUE);
cape.setVisible(false); cape.setVisible(false);
cape.setGravity(false); cape.setGravity(false);
cape.setArms(false); cape.setArms(false);
cape.setBasePlate(false); cape.setBasePlate(false);
cape.teleport(loc); cape.teleport(loc);
cape.setVisible(false); cape.setVisible(false);
} }
public EulerAngle getAngle(Double d) { public EulerAngle getAngle(Double d) {
return new EulerAngle(0.0D, d.doubleValue(), 0.0D); return new EulerAngle(0.0D, d.doubleValue(), 0.0D);
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public void capeInHand(Player p) { public void capeInHand(Player p) {
if(p.getName().equals("Aust1n46")) { if(p.getName().equals("Aust1n46")) {
if(p.getInventory().getItemInHand().getType().equals(Material.BANNER)) { if(p.getInventory().getItemInHand().getType().equals(Material.BANNER)) {
equipCape(p, p.getInventory().getItemInHand()); equipCape(p, p.getInventory().getItemInHand());
BannerMeta b = (BannerMeta) p.getInventory().getItemInHand().getItemMeta(); BannerMeta b = (BannerMeta) p.getInventory().getItemInHand().getItemMeta();
this.addBanner("cape", b); this.addBanner("cape", b);
p.setItemInHand(null); p.setItemInHand(null);
} }
} }
} }
@EventHandler @EventHandler
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) { public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
final Player p = event.getPlayer(); final Player p = event.getPlayer();
if(event.getMessage().startsWith("/cape")) { if(event.getMessage().startsWith("/cape")) {
if(p.getName().equals("Aust1n46") && !VersionHandler.is1_7_10() && !VersionHandler.is1_7_9() && !VersionHandler.is1_7_2()) { if(p.getName().equals("Aust1n46") && !VersionHandler.is1_7_10() && !VersionHandler.is1_7_9() && !VersionHandler.is1_7_2()) {
//capeInHand(p); //capeInHand(p);
if(MineverseChat.capeToggle) { if(MineverseChat.capeToggle) {
MineverseChat.cape.remove(); MineverseChat.cape.remove();
MineverseChat.capeToggle = false; MineverseChat.capeToggle = false;
p.sendMessage(ChatColor.GOLD + "Cape hidden!"); p.sendMessage(ChatColor.GOLD + "Cape hidden!");
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
MineverseChat.cape = (ArmorStand) p.getWorld().spawnEntity(p.getLocation(), EntityType.ARMOR_STAND); MineverseChat.cape = (ArmorStand) p.getWorld().spawnEntity(p.getLocation(), EntityType.ARMOR_STAND);
this.equipCape(p, MineverseChat.banner); this.equipCape(p, MineverseChat.banner);
p.sendMessage(ChatColor.GOLD + "Cape shown!"); p.sendMessage(ChatColor.GOLD + "Cape shown!");
MineverseChat.capeToggle = true; MineverseChat.capeToggle = true;
MineverseChat.banner = this.getBanner(); MineverseChat.banner = this.getBanner();
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} }
} }
public List<String> getSerializedPatterns(BannerMeta b) { public List<String> getSerializedPatterns(BannerMeta b) {
List<String> patterns = new ArrayList<String>(); List<String> patterns = new ArrayList<String>();
for(Pattern p : b.getPatterns()) { for(Pattern p : b.getPatterns()) {
String s = p.getPattern().toString() + ";" + p.getColor().toString(); String s = p.getPattern().toString() + ";" + p.getColor().toString();
patterns.add(s); patterns.add(s);
} }
return patterns; return patterns;
} }
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);
s = s.toUpperCase(); s = s.toUpperCase();
f.set(s + ".base_color", b.getBaseColor().toString()); f.set(s + ".base_color", b.getBaseColor().toString());
f.set(s + ".patterns", getSerializedPatterns(b)); f.set(s + ".patterns", getSerializedPatterns(b));
MineverseChat.getInstance().saveConfig(); MineverseChat.getInstance().saveConfig();
} }
public ItemStack getBanner() { public ItemStack getBanner() {
ItemStack i = new ItemStack(Material.BANNER, 1); ItemStack i = new ItemStack(Material.BANNER, 1);
BannerMeta bMeta = (BannerMeta) i.getItemMeta(); BannerMeta bMeta = (BannerMeta) i.getItemMeta();
bMeta.setBaseColor(DyeColor.valueOf("BLACK")); bMeta.setBaseColor(DyeColor.valueOf("BLACK"));
List<String> patterns = new ArrayList<String>(); List<String> patterns = new ArrayList<String>();
patterns.add("STRIPE_BOTTOM;MAGENTA"); patterns.add("STRIPE_BOTTOM;MAGENTA");
patterns.add("STRIPE_TOP;MAGENTA"); patterns.add("STRIPE_TOP;MAGENTA");
patterns.add("STRAIGHT_CROSS;MAGENTA"); patterns.add("STRAIGHT_CROSS;MAGENTA");
patterns.add("BORDER;SILVER"); patterns.add("BORDER;SILVER");
patterns.add("CREEPER;SILVER"); patterns.add("CREEPER;SILVER");
patterns.add("CROSS;BLACK"); patterns.add("CROSS;BLACK");
patterns.add("CURLY_BORDER;GRAY"); patterns.add("CURLY_BORDER;GRAY");
patterns.add("RHOMBUS_MIDDLE;BLACK"); patterns.add("RHOMBUS_MIDDLE;BLACK");
patterns.add("SKULL;MAGENTA"); patterns.add("SKULL;MAGENTA");
patterns.add("STRIPE_SMALL;BLACK"); patterns.add("STRIPE_SMALL;BLACK");
patterns.add("CURLY_BORDER;BLACK"); patterns.add("CURLY_BORDER;BLACK");
for(String pat : patterns) { for(String pat : patterns) {
String[] parts = pat.split(";"); String[] parts = pat.split(";");
DyeColor d = DyeColor.valueOf(parts[1]); DyeColor d = DyeColor.valueOf(parts[1]);
PatternType pt = PatternType.valueOf(parts[0]); PatternType pt = PatternType.valueOf(parts[0]);
bMeta.addPattern(new Pattern(d, pt)); bMeta.addPattern(new Pattern(d, pt));
} }
String display = Format.FormatStringAll("Cape"); String display = Format.FormatStringAll("Cape");
bMeta.setDisplayName(display); bMeta.setDisplayName(display);
List<String> lore = new ArrayList<String>(); List<String> lore = new ArrayList<String>();
bMeta.setLore(lore); bMeta.setLore(lore);
i.setItemMeta(bMeta); i.setItemMeta(bMeta);
return i; return i;
} }
} }

View File

@ -712,8 +712,8 @@ public class ChatListener implements Listener {
message = String.format(Channelformat + event.getMessage(), new Object[] { event.getPlayer().getDisplayName(), event.getMessage() }).replaceAll("(§([a-z0-9]))", ""); message = String.format(Channelformat + event.getMessage(), new Object[] { event.getPlayer().getDisplayName(), event.getMessage() }).replaceAll("(§([a-z0-9]))", "");
format = String.format(Channelformat, new Object[] { event.getPlayer().getDisplayName() }); format = String.format(Channelformat, new Object[] { event.getPlayer().getDisplayName() });
chat = event.getMessage(); chat = event.getMessage();
MineverseChat.lastChatMessage = new ChatMessage(mcp.getPlayer().getName(), message, message.hashCode(), format, chat, eventChannel.getName()); //MineverseChat.lastChatMessage = new ChatMessage(mcp.getPlayer().getName(), message, message.hashCode(), format, chat, eventChannel.getName());
MineverseChat.lastJson = Format.convertToJson(MineverseChat.lastChatMessage); //MineverseChat.lastJson = Format.convertToJson(MineverseChat.lastChatMessage);
event.setCancelled(true); event.setCancelled(true);
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteOutStream); DataOutputStream out = new DataOutputStream(byteOutStream);
@ -725,7 +725,13 @@ public class ChatListener implements Listener {
out.writeUTF(message); out.writeUTF(message);
out.writeUTF(format); out.writeUTF(format);
out.writeUTF(chat); out.writeUTF(chat);
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
System.out.println(out.size() + " size bytes without json");
}
out.writeUTF(MineverseChat.lastJson); out.writeUTF(MineverseChat.lastJson);
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
System.out.println(out.size() + " bytes size with json");
}
mcp.getPlayer().sendPluginMessage(plugin, "VentureChat", byteOutStream.toByteArray()); mcp.getPlayer().sendPluginMessage(plugin, "VentureChat", byteOutStream.toByteArray());
out.close(); out.close();
} }

View File

@ -1,290 +1,290 @@
package mineverse.Aust1n46.chat.listeners; package mineverse.Aust1n46.chat.listeners;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.alias.Alias; import mineverse.Aust1n46.chat.alias.Alias;
import mineverse.Aust1n46.chat.alias.AliasInfo; import mineverse.Aust1n46.chat.alias.AliasInfo;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; 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.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.utilities.FormatTags;
//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.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; 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.plugin.Plugin; //import org.bukkit.plugin.Plugin;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.inventory.meta.SkullMeta;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
//This class listens for commands (Any chat that begins with a /) to use in the command spy and //This class listens for commands (Any chat that begins with a /) to use in the command spy and
//in the custom commands such as aliases. //in the custom commands such as aliases.
public class CommandListener implements CommandExecutor, Listener { public class CommandListener implements CommandExecutor, Listener {
private MineverseChat plugin; private MineverseChat plugin;
private ChatChannelInfo cc; private ChatChannelInfo cc;
private AliasInfo aa; private AliasInfo aa;
private Bot bot; private Bot bot;
public CommandListener(MineverseChat plugin, ChatChannelInfo cc, AliasInfo aa, Bot bot) { public CommandListener(MineverseChat plugin, ChatChannelInfo cc, AliasInfo aa, Bot bot) {
this.plugin = plugin; this.plugin = plugin;
this.cc = cc; this.cc = cc;
this.aa = aa; this.aa = aa;
this.bot = bot; this.bot = bot;
} }
@EventHandler @EventHandler
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) throws FileNotFoundException { public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) throws FileNotFoundException {
ConfigurationSection cs = plugin.getConfig().getConfigurationSection("commandspy"); ConfigurationSection cs = plugin.getConfig().getConfigurationSection("commandspy");
Boolean wec = cs.getBoolean("worldeditcommands", true); Boolean wec = cs.getBoolean("worldeditcommands", true);
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer()); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer());
for(MineverseChatPlayer p : MineverseChat.players) { for(MineverseChatPlayer p : MineverseChat.players) {
if(p.hasCommandSpy() && p.isOnline()) { if(p.hasCommandSpy() && p.isOnline()) {
if(wec) { if(wec) {
p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage()); p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage());
} }
else { else {
if(!(event.getMessage().toLowerCase().startsWith("//"))) { if(!(event.getMessage().toLowerCase().startsWith("//"))) {
p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage()); p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage());
} }
} }
} }
} }
if(!event.getMessage().startsWith("/afk")) { if(!event.getMessage().startsWith("/afk")) {
if(mcp.isAFK()) { if(mcp.isAFK()) {
mcp.setAFK(false); mcp.setAFK(false);
mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer AFK."); mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer AFK.");
if(plugin.getConfig().getBoolean("broadcastafk")) { if(plugin.getConfig().getBoolean("broadcastafk")) {
for(MineverseChatPlayer p : MineverseChat.players) { for(MineverseChatPlayer p : MineverseChat.players) {
if(p.isOnline() && mcp.getName() != p.getName()) { if(p.isOnline() && mcp.getName() != p.getName()) {
p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + " is no longer AFK."); p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + " is no longer AFK.");
} }
} }
} }
} }
} }
String[] blocked = event.getMessage().split(" "); String[] blocked = event.getMessage().split(" ");
if(mcp.getBlockedCommands().contains(blocked[0])) { if(mcp.getBlockedCommands().contains(blocked[0])) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You are blocked from entering this command: " + event.getMessage()); mcp.getPlayer().sendMessage(ChatColor.RED + "You are blocked from entering this command: " + event.getMessage());
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
String message = event.getMessage(); String message = event.getMessage();
/* /*
* boolean cus = false; if((message.startsWith("/pl") || * boolean cus = false; if((message.startsWith("/pl") ||
* message.startsWith("/plugins")) && * message.startsWith("/plugins")) &&
* plugin.getConfig().getBoolean("modifypluginlist", true)) { * plugin.getConfig().getBoolean("modifypluginlist", true)) {
* if(message.contains(" ")) { if(message.split(" ")[0].equals("/pl") || * if(message.contains(" ")) { if(message.split(" ")[0].equals("/pl") ||
* message.split(" ")[0].equals("/plugins")) { cus = true; } } * message.split(" ")[0].equals("/plugins")) { cus = true; } }
* if(message.equals("/pl") || message.equals("/plugins")) { cus = true; * if(message.equals("/pl") || message.equals("/plugins")) { cus = true;
* } if(cus && mcp.getPlayer().hasPermission("bukkit.command.plugins")) * } if(cus && mcp.getPlayer().hasPermission("bukkit.command.plugins"))
* { String pluginlist = ""; for(Plugin p : * { String pluginlist = ""; for(Plugin p :
* Bukkit.getPluginManager().getPlugins()) { pluginlist += * Bukkit.getPluginManager().getPlugins()) { pluginlist +=
* ChatColor.GREEN + p.getName().replace("VentureChat", * ChatColor.GREEN + p.getName().replace("VentureChat",
* plugin.getConfig().getString("pluginname", "VentureChat")) + * plugin.getConfig().getString("pluginname", "VentureChat")) +
* ChatColor.WHITE + ", "; } if(pluginlist.length() > 2) { pluginlist = * ChatColor.WHITE + ", "; } if(pluginlist.length() > 2) { pluginlist =
* pluginlist.substring(0, pluginlist.length() - 2); } * pluginlist.substring(0, pluginlist.length() - 2); }
* mcp.getPlayer().sendMessage("Plugins (" + * mcp.getPlayer().sendMessage("Plugins (" +
* Bukkit.getPluginManager().getPlugins().length + "): " + pluginlist); * Bukkit.getPluginManager().getPlugins().length + "): " + pluginlist);
* event.setCancelled(true); return; } } * event.setCancelled(true); return; } }
*/ */
if(plugin.mysql) { if(plugin.mysql) {
Statement statement; Statement statement;
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime()); String date = formatter.format(currentDate.getTime());
try { try {
statement = plugin.c.createStatement(); statement = plugin.c.createStatement();
statement.executeUpdate("INSERT INTO `VentureChat` (`ChatTime`, `UUID`, `Name`, `Server`, `Channel`, `Text`, `Type`) VALUES ('" + date + "', '" + mcp.getUUID().toString() + "', '" + mcp.getName() + "', '" + plugin.getServer().getServerName() + "', 'Command_Component', '" + event.getMessage().replace("'", "''") + "', 'Command');"); statement.executeUpdate("INSERT INTO `VentureChat` (`ChatTime`, `UUID`, `Name`, `Server`, `Channel`, `Text`, `Type`) VALUES ('" + date + "', '" + mcp.getUUID().toString() + "', '" + mcp.getName() + "', '" + plugin.getServer().getServerName() + "', 'Command_Component', '" + event.getMessage().replace("'", "''") + "', 'Command');");
} }
catch(SQLException error) { catch(SQLException error) {
error.printStackTrace(); error.printStackTrace();
} }
} }
for(Alias a : aa.getAliases()) { for(Alias a : aa.getAliases()) {
if(message.toLowerCase().substring(1).split(" ")[0].equals(a.getName().toLowerCase())) { if(message.toLowerCase().substring(1).split(" ")[0].equals(a.getName().toLowerCase())) {
for(String s : a.getComponents()) { for(String s : a.getComponents()) {
if(!mcp.getPlayer().hasPermission(a.getPermission()) && a.hasPermission()) { if(!mcp.getPlayer().hasPermission(a.getPermission()) && a.hasPermission()) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this alias."); mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this alias.");
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
int num = 1; int num = 1;
if(message.length() < a.getName().length() + 2 || a.getArguments() == 0) num = 0; if(message.length() < a.getName().length() + 2 || a.getArguments() == 0) num = 0;
int arg = 0; int arg = 0;
if(message.substring(a.getName().length() + 1 + num).length() == 0) arg = 1; if(message.substring(a.getName().length() + 1 + num).length() == 0) arg = 1;
String[] args = message.substring(a.getName().length() + 1 + num).split(" "); String[] args = message.substring(a.getName().length() + 1 + num).split(" ");
String send = ""; String send = "";
if(args.length - arg < a.getArguments()) { if(args.length - arg < a.getArguments()) {
String keyword = "arguments."; String keyword = "arguments.";
if(a.getArguments() == 1) keyword = "argument."; if(a.getArguments() == 1) keyword = "argument.";
mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments for this alias, enter at least " + a.getArguments() + " " + keyword); mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid arguments for this alias, enter at least " + a.getArguments() + " " + keyword);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
for(int b = 0; b < args.length; b++) { for(int b = 0; b < args.length; b++) {
send += " " + args[b]; send += " " + args[b];
} }
if(send.length() > 0) send = send.substring(1); if(send.length() > 0) send = send.substring(1);
s = Format.FormatStringAll(s); s = Format.FormatStringAll(s);
if(mcp.getPlayer().hasPermission("venturechat.color")) send = Format.FormatStringColor(send); if(mcp.getPlayer().hasPermission("venturechat.color")) send = Format.FormatStringColor(send);
if(mcp.getPlayer().hasPermission("venturechat.format")) send = Format.FormatString(send); if(mcp.getPlayer().hasPermission("venturechat.format")) send = Format.FormatString(send);
if(s.startsWith("Command:")) { if(s.startsWith("Command:")) {
mcp.getPlayer().chat(s.substring(9).replace("$", send)); mcp.getPlayer().chat(s.substring(9).replace("$", send));
event.setCancelled(true); event.setCancelled(true);
} }
if(s.startsWith("Message:")) { if(s.startsWith("Message:")) {
mcp.getPlayer().sendMessage(s.substring(9).replace("$", send)); mcp.getPlayer().sendMessage(s.substring(9).replace("$", send));
event.setCancelled(true); event.setCancelled(true);
} }
if(s.startsWith("Broadcast:")) { if(s.startsWith("Broadcast:")) {
plugin.getServer().broadcastMessage(s.substring(11).replace("$", send)); plugin.getServer().broadcastMessage(s.substring(11).replace("$", send));
event.setCancelled(true); event.setCancelled(true);
} }
} }
} }
} }
if(!plugin.quickchat) { if(!plugin.quickchat) {
for(ChatChannel channel : cc.getChannelsInfo()) { for(ChatChannel channel : cc.getChannelsInfo()) {
if(!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) { if(!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) {
if(message.equals("/" + channel.getAlias())) { if(message.equals("/" + channel.getAlias())) {
mcp.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]"); mcp.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]");
if(mcp.hasConversation()) { if(mcp.hasConversation()) {
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
if(p.isSpy()) { if(p.isSpy()) {
p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + ".");
} }
} }
mcp.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); mcp.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + ".");
mcp.setConversation(null); mcp.setConversation(null);
} }
mcp.addListening(channel.getName()); mcp.addListening(channel.getName());
mcp.setCurrentChannel(channel); mcp.setCurrentChannel(channel);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if(message.toLowerCase().startsWith("/" + channel.getAlias() + " ")) { if(message.toLowerCase().startsWith("/" + channel.getAlias() + " ")) {
message = message.substring(channel.getAlias().length() + 1); message = message.substring(channel.getAlias().length() + 1);
mcp.addListening(channel.getName()); mcp.addListening(channel.getName());
mcp.setQuickChannel(channel); mcp.setQuickChannel(channel);
String format = ""; String format = "";
if(plugin.getConfig().getConfigurationSection("channels." + channel.getName()).getString("format").equalsIgnoreCase("Default")) { if(plugin.getConfig().getConfigurationSection("channels." + channel.getName()).getString("format").equalsIgnoreCase("Default")) {
format = FormatTags.ChatFormat(ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "] {prefix}{name}" + ChatColor.valueOf(channel.getColor().toUpperCase()) + ":" + ChatColor.valueOf(channel.getChatColor().toUpperCase()), mcp.getPlayer(), plugin, cc, channel, plugin.getConfig().getBoolean("jsonFormat")); format = FormatTags.ChatFormat(ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "] {prefix}{name}" + ChatColor.valueOf(channel.getColor().toUpperCase()) + ":" + ChatColor.valueOf(channel.getChatColor().toUpperCase()), mcp.getPlayer(), plugin, cc, channel, plugin.getConfig().getBoolean("jsonFormat"));
} }
else { else {
format = FormatTags.ChatFormat(plugin.getConfig().getConfigurationSection("channels." + channel.getName()).getString("format"), mcp.getPlayer(), plugin, cc, channel, plugin.getConfig().getBoolean("jsonFormat")); format = FormatTags.ChatFormat(plugin.getConfig().getConfigurationSection("channels." + channel.getName()).getString("format"), mcp.getPlayer(), plugin, cc, channel, plugin.getConfig().getBoolean("jsonFormat"));
if(plugin.getConfig().getBoolean("formatcleaner", false)) { if(plugin.getConfig().getBoolean("formatcleaner", false)) {
format = format.replace("[]", " "); format = format.replace("[]", " ");
format = format.replace(" ", " ").replace(" ", " ").replace(" ", " "); format = format.replace(" ", " ").replace(" ", " ").replace(" ", " ");
} }
} }
mcp.setQuickChat(true); mcp.setQuickChat(true);
mcp.getPlayer().chat(message); mcp.getPlayer().chat(message);
event.setCancelled(true); event.setCancelled(true);
} }
} }
} }
} }
} }
//old 1.8 command map //old 1.8 command map
@EventHandler @EventHandler
public void onServerCommand(ServerCommandEvent event) { public void onServerCommand(ServerCommandEvent event) {
if(plugin.irc && bot.bot.isConnected() && !event.getCommand().equalsIgnoreCase("say ") && event.getCommand().toLowerCase().startsWith("say ")) { if(plugin.irc && bot.bot.isConnected() && !event.getCommand().equalsIgnoreCase("say ") && event.getCommand().toLowerCase().startsWith("say ")) {
bot.bot.getUserChannelDao().getChannel(bot.channel).send().message("[Server] " + event.getCommand().substring(4)); bot.bot.getUserChannelDao().getChannel(bot.channel).send().message("[Server] " + event.getCommand().substring(4));
} }
if(plugin.mysql) { if(plugin.mysql) {
Statement statement; Statement statement;
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime()); String date = formatter.format(currentDate.getTime());
try { try {
statement = plugin.c.createStatement(); statement = plugin.c.createStatement();
statement.executeUpdate("INSERT INTO `VentureChat` (`ChatTime`, `UUID`, `Name`, `Server`, `Channel`, `Text`, `Type`) VALUES ('" + date + "', 'N/A', 'Console', '" + plugin.getServer().getServerName() + "', 'Command_Component', '" + event.getCommand().replace("'", "''") + "', 'Command');"); statement.executeUpdate("INSERT INTO `VentureChat` (`ChatTime`, `UUID`, `Name`, `Server`, `Channel`, `Text`, `Type`) VALUES ('" + date + "', 'N/A', 'Console', '" + plugin.getServer().getServerName() + "', 'Command_Component', '" + event.getCommand().replace("'", "''") + "', 'Command');");
} }
catch(SQLException error) { catch(SQLException error) {
error.printStackTrace(); error.printStackTrace();
} }
} }
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if(!(sender instanceof Player)) { if(!(sender instanceof Player)) {
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
return true; return true;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
for(ChatChannel channel : cc.getChannelsInfo()) { for(ChatChannel channel : cc.getChannelsInfo()) {
if(command.getName().toLowerCase().equals(channel.getAlias())) { if(command.getName().toLowerCase().equals(channel.getAlias())) {
if(args.length == 0) { if(args.length == 0) {
mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /" + channel.getAlias() + " message"); mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /" + channel.getAlias() + " message");
return true; return true;
} }
mcp.setQuickChat(true); mcp.setQuickChat(true);
mcp.setQuickChannel(channel); mcp.setQuickChannel(channel);
mcp.addListening(channel.getName()); mcp.addListening(channel.getName());
String msg = ""; String msg = "";
for(int x = 0; x < args.length; x++) { for(int x = 0; x < args.length; x++) {
if(args[x].length() > 0) msg += " " + args[x]; if(args[x].length() > 0) msg += " " + args[x];
} }
mcp.getPlayer().chat(msg); mcp.getPlayer().chat(msg);
return true; return true;
} }
} }
return false; return false;
} }
@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();
if(item == null || !e.getInventory().getTitle().contains("VentureChat")) { if(item == null || !e.getInventory().getTitle().contains("VentureChat")) {
return; return;
} }
e.setCancelled(true); e.setCancelled(true);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) e.getWhoClicked()); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) e.getWhoClicked());
MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(e.getInventory().getTitle().replace(" GUI", "").replace("VentureChat: ", "")); MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(e.getInventory().getTitle().replace(" GUI", "").replace("VentureChat: ", ""));
ItemStack skull = e.getInventory().getItem(0); ItemStack skull = e.getInventory().getItem(0);
SkullMeta skullMeta = (SkullMeta) skull.getItemMeta(); SkullMeta skullMeta = (SkullMeta) skull.getItemMeta();
ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(ChatColor.stripColor(skullMeta.getLore().get(0)).replace("Channel: ", "")); ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(ChatColor.stripColor(skullMeta.getLore().get(0)).replace("Channel: ", ""));
int hash = Integer.parseInt(ChatColor.stripColor(skullMeta.getLore().get(1).replace("Hash: ", ""))); int hash = Integer.parseInt(ChatColor.stripColor(skullMeta.getLore().get(1).replace("Hash: ", "")));
if(item.getType() == Material.BARRIER) { if(item.getType() == Material.BARRIER) {
mcp.getPlayer().closeInventory(); mcp.getPlayer().closeInventory();
} }
for(GuiSlot g : MineverseChat.gsInfo.getGuiSlots()) { for(GuiSlot g : MineverseChat.gsInfo.getGuiSlots()) {
if(g.getIcon() == item.getType() && g.getDurability() == item.getDurability() && g.getSlot() == e.getSlot()) { if(g.getIcon() == item.getType() && g.getDurability() == item.getDurability() && g.getSlot() == e.getSlot()) {
String command = g.getCommand().replace("{channel}", channel.getName()).replace("{hash}", hash + "").replace("{player_name}", target.getName()); String command = g.getCommand().replace("{channel}", channel.getName()).replace("{hash}", hash + "").replace("{player_name}", target.getName());
if(target.isOnline()) { if(target.isOnline()) {
command = PlaceholderAPI.setBracketPlaceholders(target.getPlayer(), command); command = PlaceholderAPI.setBracketPlaceholders(target.getPlayer(), command);
} }
mcp.getPlayer().chat(command); mcp.getPlayer().chat(command);
} }
} }
} }
} }

View File

@ -113,6 +113,11 @@ public class Format {
json += "]"; json += "]";
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) { if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
System.out.println(json); System.out.println(json);
System.out.println("END OF JSON");
System.out.println("END OF JSON");
System.out.println("END OF JSON");
System.out.println("END OF JSON");
System.out.println("END OF JSON");
} }
return json; return json;
} }

View File

@ -1,71 +1,71 @@
package mineverse.Aust1n46.chat.versions; package mineverse.Aust1n46.chat.versions;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
//This class contains methods for determining what version of Minecraft the server is running. //This class contains methods for determining what version of Minecraft the server is running.
public class VersionHandler { public class VersionHandler {
public static boolean is1_2_5() { public static boolean is1_2_5() {
return Bukkit.getVersion().contains("1.2.5"); return Bukkit.getVersion().contains("1.2.5");
} }
public static boolean is1_3_2() { public static boolean is1_3_2() {
return Bukkit.getVersion().contains("1.3.2"); return Bukkit.getVersion().contains("1.3.2");
} }
public static boolean is1_4_7() { public static boolean is1_4_7() {
return Bukkit.getVersion().contains("1.4.7"); return Bukkit.getVersion().contains("1.4.7");
} }
public static boolean is1_5_2() { public static boolean is1_5_2() {
return Bukkit.getVersion().contains("1.5.2"); return Bukkit.getVersion().contains("1.5.2");
} }
public static boolean is1_6_2() { public static boolean is1_6_2() {
return Bukkit.getVersion().contains("1.6.2"); return Bukkit.getVersion().contains("1.6.2");
} }
public static boolean is1_6_4() { public static boolean is1_6_4() {
return Bukkit.getVersion().contains("1.6.4"); return Bukkit.getVersion().contains("1.6.4");
} }
public static boolean is1_7_2() { public static boolean is1_7_2() {
return Bukkit.getVersion().contains("1.7") && Bukkit.getServer().getClass().getPackage().getName().contains("R1"); return Bukkit.getVersion().contains("1.7") && Bukkit.getServer().getClass().getPackage().getName().contains("R1");
} }
public static boolean is1_7_9() { public static boolean is1_7_9() {
return Bukkit.getVersion().contains("1.7") && Bukkit.getServer().getClass().getPackage().getName().contains("R3"); return Bukkit.getVersion().contains("1.7") && Bukkit.getServer().getClass().getPackage().getName().contains("R3");
} }
public static boolean is1_7_10() { public static boolean is1_7_10() {
return Bukkit.getVersion().contains("1.7") && Bukkit.getServer().getClass().getPackage().getName().contains("R4"); return Bukkit.getVersion().contains("1.7") && Bukkit.getServer().getClass().getPackage().getName().contains("R4");
} }
public static boolean is1_8() { public static boolean is1_8() {
return Bukkit.getVersion().contains("1.8"); return Bukkit.getVersion().contains("1.8");
} }
public static boolean is1_9() { public static boolean is1_9() {
return Bukkit.getVersion().contains("1.9"); return Bukkit.getVersion().contains("1.9");
} }
public static boolean is1_10() { public static boolean is1_10() {
return Bukkit.getVersion().contains("1.10"); return Bukkit.getVersion().contains("1.10");
} }
public static boolean is1_11() { public static boolean is1_11() {
return Bukkit.getVersion().contains("1.11"); return Bukkit.getVersion().contains("1.11");
} }
public static boolean is1_12() { public static boolean is1_12() {
return Bukkit.getVersion().contains("1.12"); return Bukkit.getVersion().contains("1.12");
} }
public static boolean isCauldron() { public static boolean isCauldron() {
return false; return false;
} }
public static boolean matchesVersion(String s) { public static boolean matchesVersion(String s) {
return Bukkit.getVersion().contains(s) || Bukkit.getServer().getClass().getPackage().getName().contains(s); return Bukkit.getVersion().contains(s) || Bukkit.getServer().getClass().getPackage().getName().contains(s);
} }
} }