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

Updated VentureChat to support Minecraft 1.14

Browse Source
This commit is contained in:
Aust1n46 2019-05-17 18:11:30 -04:00
parent 55186b4cae
commit 2d1b45b542
14 changed files with 114 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.classpath
View File

@ -7,12 +7,17 @@
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/MassiveCore.jar"/> <classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/MassiveCore.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/pircbotx-2.0.1.jar"/> <classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/pircbotx-2.0.1.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/PlaceholderAPI-2.8.2.jar"/> <classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/PlaceholderAPI-2.8.2.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/spigot-1.12.2-R0.1-SNAPSHOT-b1581.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Towny.jar"/> <classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Towny.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Vault.jar"/> <classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/Vault.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/BungeeCord.jar"/> <classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/BungeeCord.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/workspace/VentureChat Dependencies/spigot-1.8.8-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.13-R0.1-SNAPSHOT-b1726.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/plugins_1.13/ProtocolLib.jar"/> <classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/plugins_1.13/ProtocolLib.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.14.1.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.7.10-SNAPSHOT-b1657.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.8.8-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.9.4-R0.1-SNAPSHOT-latest.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.10-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.11.2-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.12.2.jar"/>
<classpathentry kind="lib" path="C:/Users/Austin/Desktop/Mineverse Network/Servers/Hub/spigot-1.13.2.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

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.14.3 version: 2.15
author: Aust1n46 author: Aust1n46

25
MineverseChat/config.yml
View File

@ -305,6 +305,17 @@ irc:
components: components:
- 'kick' - 'kick'
# Enables the creation of special Towny channels: Town and Nation
# To create these channels, simply name two channels below "Town" and "Nation"
# Bungeecord must be set to false for these channels!
enable_towny_channel: false
# Enables the creation of a special faction only channel using the Factions plugin
# To create this channel, simply name a channel below "Faction"
# Bungeecord must be set to false for this channel!
# WARNING: May not work for all versions of Factions!
enable_factions_channel: false
# color = [channel] color # color = [channel] color
# chatcolor = text color # chatcolor = text color
# cooldown is in seconds # cooldown is in seconds
@ -315,22 +326,14 @@ irc:
# Example: permissions: staff equals venturechat.staff # Example: permissions: staff equals venturechat.staff
# Use None for no permissions # Use None for no permissions
# Use PlaceholderAPI placeholders please!!!
# Use PlaceholderAPI placeholders please!!!
# Use PlaceholderAPI placeholders please!!!
# Legacy Placeholders: # Legacy Placeholders:
# Use PlaceholderAPI
# {name} : player name # {name} : player name
# {nickname} : player nickname or name if they have no nickname # {nickname} : player nickname or name if they have no nickname
# {prefix} : player prefix and color # {prefix} : player prefix and color
# {suffix} : player suffix and color # {suffix} : player suffix and color
# {servername} : name of the server in server.properties
# {herolevel} : heroes hero level
# {heroclass} : heroes hero class
# {heroxp} : heroes hero xp
# {herosecondclass} : heroes second class
# {party} : heroes party
# {herosecondmaster} : heroes second class master
# {heromaster} : heroes class master
# {herosecondlevel} : heroes second class level
# {herosecondxp} : heroes second class xp
# Use '' or "" around format, example: '[&2global&f] {prefix}{name}&2:' # Use '' or "" around format, example: '[&2global&f] {prefix}{name}&2:'
# You must have prefixes and suffixes set in a Vault compatible permissions plugin to avoid errors # You must have prefixes and suffixes set in a Vault compatible permissions plugin to avoid errors
# Use "" as the prefix or suffix to have none # Use "" as the prefix or suffix to have none

27
MineverseChat/defaultconfig.yml
View File

@ -135,7 +135,7 @@ messageremoverpermissions: '&cYou need additional permissions to view this messa
messageremovertext: '&c&o<message removed>' messageremovertext: '&c&o<message removed>'
# The name of the group is the permissions node for the format # The name of the group is the permissions node for the format
# Example: mineversechat.json.Owner is the node for the group Owner # Example: venturechat.json.Owner is the node for the group Owner
# A lower priority overrides a higher priority if a player has more than 1 group # A lower priority overrides a higher priority if a player has more than 1 group
# Possible options for click_name and click_prefix are suggest_command, run_command, and open_url # Possible options for click_name and click_prefix are suggest_command, run_command, and open_url
jsonformatting: jsonformatting:
@ -305,6 +305,17 @@ irc:
components: components:
- 'kick' - 'kick'
# Enables the creation of special Towny channels: Town and Nation
# To create these channels, simply name two channels below "Town" and "Nation"
# Bungeecord must be set to false for these channels!
enable_towny_channel: false
# Enables the creation of a special faction only channel using the Factions plugin
# To create this channel, simply name a channel below "Faction"
# Bungeecord must be set to false for this channel!
# WARNING: May not work for all versions of Factions!
enable_factions_channel: false
# color = [channel] color # color = [channel] color
# chatcolor = text color # chatcolor = text color
# cooldown is in seconds # cooldown is in seconds
@ -315,22 +326,14 @@ irc:
# Example: permissions: staff equals venturechat.staff # Example: permissions: staff equals venturechat.staff
# Use None for no permissions # Use None for no permissions
# Use PlaceholderAPI placeholders please!!!
# Use PlaceholderAPI placeholders please!!!
# Use PlaceholderAPI placeholders please!!!
# Legacy Placeholders: # Legacy Placeholders:
# Use PlaceholderAPI
# {name} : player name # {name} : player name
# {nickname} : player nickname or name if they have no nickname # {nickname} : player nickname or name if they have no nickname
# {prefix} : player prefix and color # {prefix} : player prefix and color
# {suffix} : player suffix and color # {suffix} : player suffix and color
# {servername} : name of the server in server.properties
# {herolevel} : heroes hero level
# {heroclass} : heroes hero class
# {heroxp} : heroes hero xp
# {herosecondclass} : heroes second class
# {party} : heroes party
# {herosecondmaster} : heroes second class master
# {heromaster} : heroes class master
# {herosecondlevel} : heroes second class level
# {herosecondxp} : heroes second class xp
# Use '' or "" around format, example: '[&2global&f] {prefix}{name}&2:' # Use '' or "" around format, example: '[&2global&f] {prefix}{name}&2:'
# You must have prefixes and suffixes set in a Vault compatible permissions plugin to avoid errors # You must have prefixes and suffixes set in a Vault compatible permissions plugin to avoid errors
# Use "" as the prefix or suffix to have none # Use "" as the prefix or suffix to have none

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

@ -756,7 +756,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
if(request) { if(request) {
out.writeUTF("PlayersReceive"); out.writeUTF("PlayersReceive");
// System.out.println(mcp.getPlayer().getServer().getServerName()); // System.out.println(mcp.getPlayer().getServer().getServerName());
out.writeUTF(this.getServer().getServerName()); out.writeUTF(this.getServer().getName());
} }
else { else {
out.writeUTF("PlayersUpdate"); out.writeUTF("PlayersUpdate");

2
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;
} }

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

@ -12,6 +12,7 @@ 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;
@ -86,17 +87,25 @@ public class VentureChatGui extends MineverseCommand {
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;
ItemStack skull = null;
if(VersionHandler.is1_7_10()) { if(VersionHandler.is1_7_10()) {
close = new ItemStack(Material.BEDROCK); close = new ItemStack(Material.BEDROCK);
} }
else { else {
close = new ItemStack(Material.BARRIER); close = new ItemStack(Material.BARRIER);
} }
if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) {
skull = new ItemStack(Material.getMaterial("SKULL_ITEM"));
}
else {
skull = new ItemStack(Material.PLAYER_HEAD);
}
ItemMeta closeMeta = close.getItemMeta(); ItemMeta closeMeta = close.getItemMeta();
closeMeta.setDisplayName("§oClose GUI"); closeMeta.setDisplayName("§oClose GUI");
close.setItemMeta(closeMeta); close.setItemMeta(closeMeta);
ItemStack skull = new ItemStack(Material.SKULL_ITEM);
SkullMeta skullMeta = (SkullMeta) skull.getItemMeta(); SkullMeta skullMeta = (SkullMeta) skull.getItemMeta();
skullMeta.setOwner(target.getName()); skullMeta.setOwner(target.getName());
skullMeta.setDisplayName("§b" + target.getName()); skullMeta.setDisplayName("§b" + target.getName());

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

@ -122,11 +122,21 @@ public class CapeListener implements Listener {
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(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) {
equipCape(p, p.getInventory().getItemInHand()); if(p.getInventory().getItemInHand().getType().equals(Material.getMaterial("BANNER"))) {
BannerMeta b = (BannerMeta) p.getInventory().getItemInHand().getItemMeta(); equipCape(p, p.getInventory().getItemInHand());
this.addBanner("cape", b); BannerMeta b = (BannerMeta) p.getInventory().getItemInHand().getItemMeta();
p.setItemInHand(null); this.addBanner("cape", b);
p.setItemInHand(null);
}
}
else {
if(p.getInventory().getItemInHand().getType().equals(Material.BLACK_BANNER)) {
equipCape(p, p.getInventory().getItemInHand());
BannerMeta b = (BannerMeta) p.getInventory().getItemInHand().getItemMeta();
this.addBanner("cape", b);
p.setItemInHand(null);
}
} }
} }
} }
@ -174,9 +184,17 @@ public class CapeListener implements Listener {
} }
public ItemStack getBanner() { public ItemStack getBanner() {
ItemStack i = new ItemStack(Material.BANNER, 1); ItemStack i = null;
if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) {
i = new ItemStack(Material.getMaterial("BANNER"), 1);
}
else {
i = new ItemStack(Material.BLACK_BANNER, 1);
}
BannerMeta bMeta = (BannerMeta) i.getItemMeta(); BannerMeta bMeta = (BannerMeta) i.getItemMeta();
bMeta.setBaseColor(DyeColor.valueOf("BLACK")); if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12()) {
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");

16
MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
View File

@ -192,7 +192,7 @@ public class ChatListener implements Listener {
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());
DatabaseSender.writeToMySQL("ChatTime", "UUID", "Name", "Server", "Channel", "Text", "Type", date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getServerName(), "Messaging_Component", event.getMessage().replace("'", "''"), "Chat"); DatabaseSender.writeToMySQL("ChatTime", "UUID", "Name", "Server", "Channel", "Text", "Type", date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), "Messaging_Component", event.getMessage().replace("'", "''"), "Chat");
} }
} }
event.setCancelled(true); event.setCancelled(true);
@ -232,7 +232,7 @@ public class ChatListener implements Listener {
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() + "', 'Party_Component', '" + event.getMessage().replace("'", "''") + "', 'Chat');"); statement.executeUpdate("INSERT INTO `VentureChat` (`ChatTime`, `UUID`, `Name`, `Server`, `Channel`, `Text`, `Type`) VALUES ('" + date + "', '" + mcp.getUUID().toString() + "', '" + mcp.getName() + "', '" + plugin.getServer().getName() + "', 'Party_Component', '" + event.getMessage().replace("'", "''") + "', 'Chat');");
} }
catch(SQLException e) { catch(SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -565,7 +565,7 @@ public class ChatListener implements Listener {
recipientSize--; recipientSize--;
continue; continue;
} }
if(pluginManager.isPluginEnabled("Towny")) { if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny")) {
try { try {
Resident r = TownyUniverse.getDataSource().getResident(p.getName()); Resident r = TownyUniverse.getDataSource().getResident(p.getName());
Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName()); Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName());
@ -609,7 +609,7 @@ public class ChatListener implements Listener {
} }
} }
if(pluginManager.isPluginEnabled("Factions")) { if(plugin.getConfig().getBoolean("enable_factions_channel") && pluginManager.isPluginEnabled("Factions")) {
try { try {
MPlayer mplayer = MPlayer.get(mcp.getPlayer()); MPlayer mplayer = MPlayer.get(mcp.getPlayer());
MPlayer mplayerp = MPlayer.get(p.getPlayer()); MPlayer mplayerp = MPlayer.get(p.getPlayer());
@ -689,8 +689,12 @@ public class ChatListener implements Listener {
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);
ChatMessageEvent chatMessageEvent = new ChatMessageEvent(mcp, eventChannel, bungee, MineverseChat.lastChatMessage, MineverseChat.lastJson);
/* Temp disabled for 1.14
* ChatMessageEvent chatMessageEvent = new ChatMessageEvent(mcp, eventChannel, bungee, MineverseChat.lastChatMessage, MineverseChat.lastJson);
Bukkit.getServer().getPluginManager().callEvent(chatMessageEvent); Bukkit.getServer().getPluginManager().callEvent(chatMessageEvent);
*/
if(irc && plugin.irc) { if(irc && plugin.irc) {
if(bot.bot.isConnected()) { if(bot.bot.isConnected()) {
@ -704,7 +708,7 @@ public class ChatListener implements Listener {
date = formatter.format(currentDate.getTime()); 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() + "', '" + eventChannel.getName() + "', '" + event.getMessage().replace("'", "''") + "', 'Chat');"); statement.executeUpdate("INSERT INTO `VentureChat` (`ChatTime`, `UUID`, `Name`, `Server`, `Channel`, `Text`, `Type`) VALUES ('" + date + "', '" + mcp.getUUID().toString() + "', '" + mcp.getName() + "', '" + plugin.getServer().getName() + "', '" + eventChannel.getName() + "', '" + event.getMessage().replace("'", "''") + "', 'Chat');");
} }
catch(SQLException e) { catch(SQLException e) {
e.printStackTrace(); e.printStackTrace();

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

@ -16,7 +16,7 @@ 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 mineverse.Aust1n46.chat.versions.VersionHandler; import mineverse.Aust1n46.chat.versions.VersionHandler;
//import org.bukkit.Bukkit; //import org.bukkit.Bukkit;
@ -33,8 +33,10 @@ 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.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;
@ -120,7 +122,7 @@ public class CommandListener implements CommandExecutor, Listener {
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().getName() + "', 'Command_Component', '" + event.getMessage().replace("'", "''") + "', 'Command');");
} }
catch(SQLException error) { catch(SQLException error) {
error.printStackTrace(); error.printStackTrace();
@ -194,7 +196,7 @@ public class CommandListener implements CommandExecutor, Listener {
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"));
} }
@ -204,7 +206,7 @@ public class CommandListener implements CommandExecutor, Listener {
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);
@ -227,7 +229,7 @@ public class CommandListener implements CommandExecutor, Listener {
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().getName() + "', 'Command_Component', '" + event.getCommand().replace("'", "''") + "', 'Command');");
} }
catch(SQLException error) { catch(SQLException error) {
error.printStackTrace(); error.printStackTrace();
@ -265,12 +267,12 @@ public class CommandListener implements CommandExecutor, Listener {
@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.getView().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.getView().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: ", ""));

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

@ -176,7 +176,7 @@ public class LoginListener implements Listener {
String mutes = ""; String mutes = "";
for(String channel : mcp.getMutes().keySet()) { for(String channel : mcp.getMutes().keySet()) {
ChatChannel c = MineverseChat.ccInfo.getChannelInfo(channel); ChatChannel c = MineverseChat.ccInfo.getChannelInfo(channel);
mutes += c.getName() + ":" + mcp.getMutes().get(c) + ","; mutes += c.getName() + ":" + mcp.getMutes().get(c.getName()) + ",";
} }
String blockedCommands = ""; String blockedCommands = "";
for(String s : mcp.getBlockedCommands()) { for(String s : mcp.getBlockedCommands()) {

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

@ -4,6 +4,7 @@ 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;
@ -48,6 +49,8 @@ public class FormatTags {
String herosecondmaster = ""; String herosecondmaster = "";
String health = p.getHealthScale() + ""; String health = p.getHealthScale() + "";
String world = p.getWorld().getName(); String world = p.getWorld().getName();
String servername = p.getServer().getName();
String xp = p.getExpToLevel() + ""; String xp = p.getExpToLevel() + "";
if(channel.getBungee()) { if(channel.getBungee()) {
nickname = p.getDisplayName(); nickname = p.getDisplayName();
@ -134,7 +137,7 @@ public class FormatTags {
ex.printStackTrace(); ex.printStackTrace();
} }
}*/ }*/
String end = Format.FormatStringAll(format.replace("{town}", town).replace("{nickname}", nickname).replace("{nation}", nation).replace("{name}", name).replace("{townytitle}", ttitle).replace("{suffix}", suffix).replace("{faction}", faction).replace("{factionstitle}", ftitle).replace("{servername}", p.getServer().getServerName()).replace("{pretown}", ptown).replace("{prenation}", pnation).replace("{group}", group).replace("{groupprefix}", groupprefix).replace("{groupsuffix}", groupsuffix).replace("{role}", role).replace("{world}", world).replace("{xp}", xp).replace("{mana}", mana).replace("{herolevel}", herolevel).replace("{heroclass}", heroclass).replace("{heroxp}", heroxp).replace("{health}", health).replace("{herosecondclass}", herosecondclass).replace("{party}", party).replace("{herosecondmaster}", herosecondmaster).replace("{heromaster}", heromaster).replace("{herosecondlevel}", herosecondlevel).replace("{herosecondxp}", herosecondxp).replace("{surname}", surname)); String end = Format.FormatStringAll(format.replace("{town}", town).replace("{nickname}", nickname).replace("{nation}", nation).replace("{name}", name).replace("{townytitle}", ttitle).replace("{suffix}", suffix).replace("{faction}", faction).replace("{factionstitle}", ftitle).replace("{servername}", servername).replace("{pretown}", ptown).replace("{prenation}", pnation).replace("{group}", group).replace("{groupprefix}", groupprefix).replace("{groupsuffix}", groupsuffix).replace("{role}", role).replace("{world}", world).replace("{xp}", xp).replace("{mana}", mana).replace("{herolevel}", herolevel).replace("{heroclass}", heroclass).replace("{heroxp}", heroxp).replace("{health}", health).replace("{herosecondclass}", herosecondclass).replace("{party}", party).replace("{herosecondmaster}", herosecondmaster).replace("{heromaster}", heromaster).replace("{herosecondlevel}", herosecondlevel).replace("{herosecondxp}", herosecondxp).replace("{surname}", surname));
if(!json) { if(!json) {
end = end.replace("{prefix}", prefix); end = end.replace("{prefix}", prefix);
} }
@ -147,6 +150,9 @@ public class FormatTags {
return end; return end;
} }
/**
* Unused
* **/
public static String TabFormat(String format, Player p, MineverseChat plugin, ChatChannelInfo cc) { public static String TabFormat(String format, Player p, MineverseChat plugin, ChatChannelInfo cc) {
PluginManager pluginManager = plugin.getServer().getPluginManager(); PluginManager pluginManager = plugin.getServer().getPluginManager();
String town = ""; String town = "";
@ -178,6 +184,7 @@ public class FormatTags {
String health = p.getHealthScale() + ""; String health = p.getHealthScale() + "";
String world = p.getWorld().getName(); String world = p.getWorld().getName();
String xp = p.getExpToLevel() + ""; String xp = p.getExpToLevel() + "";
String servername = p.getServer().getName();
try { try {
prefix = Format.FormatStringAll(MineverseChat.chat.getPlayerPrefix(p)); prefix = Format.FormatStringAll(MineverseChat.chat.getPlayerPrefix(p));
suffix = Format.FormatStringAll(MineverseChat.chat.getPlayerSuffix(p)); suffix = Format.FormatStringAll(MineverseChat.chat.getPlayerSuffix(p));
@ -260,6 +267,6 @@ public class FormatTags {
ex.printStackTrace(); ex.printStackTrace();
} }
}*/ }*/
return Format.FormatStringAll(format.replace("{town}", town).replace("{nation}", nation).replace("{name}", name).replace("{townytitle}", ttitle).replace("{prefix}", prefix).replace("{suffix}", suffix).replace("{faction}", faction).replace("{factionstitle}", ftitle).replace("{servername}", p.getServer().getServerName()).replace("{pretown}", ptown).replace("{prenation}", pnation).replace("{group}", group).replace("{groupprefix}", groupprefix).replace("{groupsuffix}", groupsuffix).replace("{role}", role).replace("{world}", world).replace("{xp}", xp).replace("{mana}", mana).replace("{herolevel}", herolevel).replace("{heroclass}", heroclass).replace("{heroxp}", heroxp).replace("{health}", health).replace("{herosecondclass}", herosecondclass).replace("{party}", party).replace("{herosecondmaster}", herosecondmaster).replace("{heromaster}", heromaster).replace("{herosecondlevel}", herosecondlevel).replace("{herosecondxp}", herosecondxp).replace("{surname}", surname).replace("{displayname}", displayname)); return Format.FormatStringAll(format.replace("{town}", town).replace("{nation}", nation).replace("{name}", name).replace("{townytitle}", ttitle).replace("{prefix}", prefix).replace("{suffix}", suffix).replace("{faction}", faction).replace("{factionstitle}", ftitle).replace("{servername}", servername).replace("{pretown}", ptown).replace("{prenation}", pnation).replace("{group}", group).replace("{groupprefix}", groupprefix).replace("{groupsuffix}", groupsuffix).replace("{role}", role).replace("{world}", world).replace("{xp}", xp).replace("{mana}", mana).replace("{herolevel}", herolevel).replace("{heroclass}", heroclass).replace("{heroxp}", heroxp).replace("{health}", health).replace("{herosecondclass}", herosecondclass).replace("{party}", party).replace("{herosecondmaster}", herosecondmaster).replace("{heromaster}", heromaster).replace("{herosecondlevel}", herosecondlevel).replace("{herosecondxp}", herosecondxp).replace("{surname}", surname).replace("{displayname}", displayname));
} }
} }

8
MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java
View File

@ -29,6 +29,10 @@ public class VersionHandler {
return Bukkit.getVersion().contains("1.6.4"); return Bukkit.getVersion().contains("1.6.4");
} }
public static boolean is1_7() {
return Bukkit.getVersion().contains("1.7");
}
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");
} }
@ -65,6 +69,10 @@ public class VersionHandler {
return Bukkit.getVersion().contains("1.13"); return Bukkit.getVersion().contains("1.13");
} }
public static boolean is1_14() {
return Bukkit.getVersion().contains("1.14");
}
public static boolean isCauldron() { public static boolean isCauldron() {
return false; return false;
} }

3
MineverseChat/plugin.yml
View File

@ -1,5 +1,6 @@
name: VentureChat name: VentureChat
version: 2.14.3 version: 2.15
api-version: 1.13
main: mineverse.Aust1n46.chat.MineverseChat main: mineverse.Aust1n46.chat.MineverseChat
depend: [Vault, ProtocolLib, PlaceholderAPI] depend: [Vault, ProtocolLib, PlaceholderAPI]
softdepend: [Towny, Factions, Heroes] softdepend: [Towny, Factions, Heroes]