Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
59878fd976 | ||
|
|
a436526aea | ||
|
|
548cfbc58a | ||
|
|
de514eea3f | ||
|
|
49a5b409b1 | ||
|
|
904fffea1d | ||
|
|
c68e146a64 | ||
|
|
96768d983c | ||
|
|
20170202c6 | ||
|
|
e4eae96c64 | ||
|
|
0673f6082b | ||
|
|
c892b74dba | ||
|
|
9029dd3659 | ||
|
|
dc7b42823b | ||
|
|
de72e6671c | ||
|
|
8ce435717d | ||
|
|
4c47baa3eb | ||
|
|
cd016b967e | ||
|
|
4a51251ec8 | ||
|
|
bc82cc0bb6 | ||
|
|
5c20c41c21 | ||
|
|
2d8cac9ac2 | ||
|
|
c8676637ed | ||
|
|
9b5f568675 |
+11
@@ -0,0 +1,11 @@
|
|||||||
|
language: java
|
||||||
|
jdk:
|
||||||
|
- oraclejdk8
|
||||||
|
deploy:
|
||||||
|
provider: releases
|
||||||
|
api_key: $GITHUB_KEY
|
||||||
|
file_glob: true
|
||||||
|
file: "*/staffchat*.jar"
|
||||||
|
skip_cleanup: true
|
||||||
|
on:
|
||||||
|
tags: true
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
# StaffChat
|
# [StaffChat](https://oskar3123.github.io/StaffChat)
|
||||||
|

|
||||||
|
|
||||||
Simple and highly configurable staffchat
|
Simple and highly configurable staffchat
|
||||||
|
|
||||||
## Download
|
## Download
|
||||||
You can download the binary from the [Spigot resource page](https://www.spigotmc.org/resources/37804/)
|
You can download the plugin from the [Spigot resource page](https://www.spigotmc.org/resources/37804/) or via the [GitHub releases](https://github.com/oskar3123/StaffChat/releases)
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
theme: jekyll-theme-cayman
|
||||||
|
show_downloads: true
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<groupId>me.oskar3123</groupId>
|
<groupId>me.oskar3123</groupId>
|
||||||
<artifactId>staffchat</artifactId>
|
<artifactId>staffchat</artifactId>
|
||||||
<version>1.1.1-SNAPSHOT</version>
|
<version>1.1.2-SNAPSHOT</version>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ public class BungeeMain extends Plugin
|
|||||||
if (!reloadConfig())
|
if (!reloadConfig())
|
||||||
{
|
{
|
||||||
getLogger().severe("Could not load config file, using defaults.");
|
getLogger().severe("Could not load config file, using defaults.");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
registerCommands();
|
registerCommands();
|
||||||
registerEvents();
|
registerEvents();
|
||||||
|
|||||||
@@ -11,20 +11,20 @@ import net.md_5.bungee.config.Configuration;
|
|||||||
public class BungeeStaffChatCommand extends Command
|
public class BungeeStaffChatCommand extends Command
|
||||||
{
|
{
|
||||||
|
|
||||||
private BungeeMain main;
|
private BungeeMain plugin;
|
||||||
private Configuration config;
|
private Configuration config;
|
||||||
|
|
||||||
public BungeeStaffChatCommand(BungeeMain main)
|
public BungeeStaffChatCommand(BungeeMain plugin)
|
||||||
{
|
{
|
||||||
super("staffchat");
|
super("staffchat");
|
||||||
this.main = main;
|
this.plugin = plugin;
|
||||||
config = main.getConfig();
|
config = plugin.getConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void execute(CommandSender sender, String[] args)
|
public void execute(CommandSender sender, String[] args)
|
||||||
{
|
{
|
||||||
BaseComponent[] noPerm = txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
BaseComponent[] noPerm = txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
||||||
if (!sender.hasPermission(main.commandPerm))
|
if (!sender.hasPermission(plugin.commandPerm))
|
||||||
{
|
{
|
||||||
sender.sendMessage(noPerm);
|
sender.sendMessage(noPerm);
|
||||||
return;
|
return;
|
||||||
@@ -36,7 +36,7 @@ public class BungeeStaffChatCommand extends Command
|
|||||||
}
|
}
|
||||||
if (args[0].equalsIgnoreCase("reload"))
|
if (args[0].equalsIgnoreCase("reload"))
|
||||||
{
|
{
|
||||||
if (sender.hasPermission(main.reloadPerm))
|
if (sender.hasPermission(plugin.reloadPerm))
|
||||||
{
|
{
|
||||||
reload(sender);
|
reload(sender);
|
||||||
}
|
}
|
||||||
@@ -52,8 +52,8 @@ public class BungeeStaffChatCommand extends Command
|
|||||||
private void help(CommandSender sender, String label)
|
private void help(CommandSender sender, String label)
|
||||||
{
|
{
|
||||||
String prefix = config.getString("messages.prefix");
|
String prefix = config.getString("messages.prefix");
|
||||||
sender.sendMessage(txt(prefix + "Version " + main.getDescription().getVersion() + ", made by oskar3123"));
|
sender.sendMessage(txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"));
|
||||||
if (sender.hasPermission(main.reloadPerm))
|
if (sender.hasPermission(plugin.reloadPerm))
|
||||||
{
|
{
|
||||||
sender.sendMessage(txt(prefix + "/" + label + " reload - Reloads the config file"));
|
sender.sendMessage(txt(prefix + "/" + label + " reload - Reloads the config file"));
|
||||||
}
|
}
|
||||||
@@ -61,8 +61,8 @@ public class BungeeStaffChatCommand extends Command
|
|||||||
|
|
||||||
private void reload(CommandSender sender)
|
private void reload(CommandSender sender)
|
||||||
{
|
{
|
||||||
main.reloadConfig();
|
plugin.reloadConfig();
|
||||||
config = main.getConfig();
|
config = plugin.getConfig();
|
||||||
sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,11 +13,11 @@ import net.md_5.bungee.event.EventHandler;
|
|||||||
public class BungeeChatListener implements Listener
|
public class BungeeChatListener implements Listener
|
||||||
{
|
{
|
||||||
|
|
||||||
private BungeeMain main;
|
private BungeeMain plugin;
|
||||||
|
|
||||||
public BungeeChatListener(BungeeMain main)
|
public BungeeChatListener(BungeeMain plugin)
|
||||||
{
|
{
|
||||||
this.main = main;
|
this.plugin = plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
@@ -29,12 +29,12 @@ public class BungeeChatListener implements Listener
|
|||||||
}
|
}
|
||||||
|
|
||||||
ProxiedPlayer player = (ProxiedPlayer) event.getSender();
|
ProxiedPlayer player = (ProxiedPlayer) event.getSender();
|
||||||
if (!player.hasPermission(main.usePerm))
|
if (!player.hasPermission(plugin.usePerm))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Configuration config = main.getConfig();
|
Configuration config = plugin.getConfig();
|
||||||
String character = config.getString("settings.character");
|
String character = config.getString("settings.character");
|
||||||
if (!event.getMessage().startsWith(character))
|
if (!event.getMessage().startsWith(character))
|
||||||
{
|
{
|
||||||
@@ -46,10 +46,10 @@ public class BungeeChatListener implements Listener
|
|||||||
format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
|
format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
|
||||||
final BaseComponent[] message = txt(format);
|
final BaseComponent[] message = txt(format);
|
||||||
|
|
||||||
main.getProxy().getPlayers().stream()
|
plugin.getProxy().getPlayers().stream()
|
||||||
.filter(p -> p.hasPermission(main.seePerm))
|
.filter(p -> p.hasPermission(plugin.seePerm))
|
||||||
.forEach(p -> p.sendMessage(message));
|
.forEach(p -> p.sendMessage(message));
|
||||||
main.getLogger().info(ChatColor.stripColor(clr(format)));
|
plugin.getLogger().info(ChatColor.stripColor(clr(format)));
|
||||||
|
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,20 +10,20 @@ import org.bukkit.configuration.file.FileConfiguration;
|
|||||||
public class StaffChatCommand implements CommandExecutor
|
public class StaffChatCommand implements CommandExecutor
|
||||||
{
|
{
|
||||||
|
|
||||||
private Main main;
|
private Main plugin;
|
||||||
private FileConfiguration config;
|
private FileConfiguration config;
|
||||||
|
|
||||||
public StaffChatCommand(Main main)
|
public StaffChatCommand(Main plugin)
|
||||||
{
|
{
|
||||||
this.main = main;
|
this.plugin = plugin;
|
||||||
config = main.getConfig();
|
config = plugin.getConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
|
public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
|
||||||
{
|
{
|
||||||
String noPerm = clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
String noPerm = clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
||||||
if (!sender.hasPermission(main.commandPerm))
|
if (!sender.hasPermission(plugin.commandPerm))
|
||||||
{
|
{
|
||||||
sender.sendMessage(noPerm);
|
sender.sendMessage(noPerm);
|
||||||
return true;
|
return true;
|
||||||
@@ -35,7 +35,7 @@ public class StaffChatCommand implements CommandExecutor
|
|||||||
}
|
}
|
||||||
if (args[0].equalsIgnoreCase("reload"))
|
if (args[0].equalsIgnoreCase("reload"))
|
||||||
{
|
{
|
||||||
if (sender.hasPermission(main.reloadPerm))
|
if (sender.hasPermission(plugin.reloadPerm))
|
||||||
{
|
{
|
||||||
reload(sender);
|
reload(sender);
|
||||||
}
|
}
|
||||||
@@ -52,8 +52,8 @@ public class StaffChatCommand implements CommandExecutor
|
|||||||
private void help(CommandSender sender, String label)
|
private void help(CommandSender sender, String label)
|
||||||
{
|
{
|
||||||
String prefix = clr(config.getString("messages.prefix"));
|
String prefix = clr(config.getString("messages.prefix"));
|
||||||
sender.sendMessage(prefix + "Version " + main.getDescription().getVersion() + ", made by oskar3123");
|
sender.sendMessage(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123");
|
||||||
if (sender.hasPermission(main.reloadPerm))
|
if (sender.hasPermission(plugin.reloadPerm))
|
||||||
{
|
{
|
||||||
sender.sendMessage(prefix + "/" + label + " reload - Reloads the config file");
|
sender.sendMessage(prefix + "/" + label + " reload - Reloads the config file");
|
||||||
}
|
}
|
||||||
@@ -61,8 +61,8 @@ public class StaffChatCommand implements CommandExecutor
|
|||||||
|
|
||||||
private void reload(CommandSender sender)
|
private void reload(CommandSender sender)
|
||||||
{
|
{
|
||||||
main.reloadConfig();
|
plugin.reloadConfig();
|
||||||
config = main.getConfig();
|
config = plugin.getConfig();
|
||||||
sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,22 +12,22 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
|
|||||||
public class ChatListener implements Listener
|
public class ChatListener implements Listener
|
||||||
{
|
{
|
||||||
|
|
||||||
private Main main;
|
private Main plugin;
|
||||||
|
|
||||||
public ChatListener(Main main)
|
public ChatListener(Main plugin)
|
||||||
{
|
{
|
||||||
this.main = main;
|
this.plugin = plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||||
public void chat(AsyncPlayerChatEvent event)
|
public void chat(AsyncPlayerChatEvent event)
|
||||||
{
|
{
|
||||||
if (!event.getPlayer().hasPermission(main.usePerm))
|
if (!event.getPlayer().hasPermission(plugin.usePerm))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
FileConfiguration config = main.getConfig();
|
FileConfiguration config = plugin.getConfig();
|
||||||
String character = config.getString("settings.character");
|
String character = config.getString("settings.character");
|
||||||
if (!event.getMessage().startsWith(character))
|
if (!event.getMessage().startsWith(character))
|
||||||
{
|
{
|
||||||
@@ -37,20 +37,15 @@ public class ChatListener implements Listener
|
|||||||
String format = config.getString("settings.format");
|
String format = config.getString("settings.format");
|
||||||
format = format.replaceAll("\\{NAME\\}", event.getPlayer().getName());
|
format = format.replaceAll("\\{NAME\\}", event.getPlayer().getName());
|
||||||
format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
|
format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
|
||||||
format = clr(format);
|
format = ChatColor.translateAlternateColorCodes('&', format);
|
||||||
final String message = format;
|
final String message = format;
|
||||||
|
|
||||||
Bukkit.getOnlinePlayers().stream()
|
Bukkit.getOnlinePlayers().stream()
|
||||||
.filter(p -> p.hasPermission(main.seePerm))
|
.filter(p -> p.hasPermission(plugin.seePerm))
|
||||||
.forEach(p -> p.sendMessage(message));
|
.forEach(p -> p.sendMessage(message));
|
||||||
main.getLogger().info(ChatColor.stripColor(message));
|
plugin.getLogger().info(ChatColor.stripColor(message));
|
||||||
|
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String clr(String string)
|
|
||||||
{
|
|
||||||
return ChatColor.translateAlternateColorCodes('&', string);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: StaffChat
|
name: StaffChat
|
||||||
authors: [oskar3123]
|
authors: [oskar3123]
|
||||||
main: me.oskar3123.staffchat.bungee.BungeeMain
|
main: me.oskar3123.staffchat.bungee.BungeeMain
|
||||||
version: 1.1.1
|
version: 1.1.2
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
name: StaffChat
|
name: StaffChat
|
||||||
authors: [oskar3123]
|
authors: [oskar3123]
|
||||||
main: me.oskar3123.staffchat.spigot.Main
|
main: me.oskar3123.staffchat.spigot.Main
|
||||||
version: 1.1.1
|
version: 1.1.2
|
||||||
|
|
||||||
commands:
|
commands:
|
||||||
staffchat:
|
staffchat:
|
||||||
|
|||||||
Reference in New Issue
Block a user