Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 oskar3123
|
5cf024472d
|
||
 oskar3123andGitHub
|
74337911b3 | ||
|
oskar3123
|
90e0084fca
|
||
|
oskar3123
|
b5e3086577
|
||
|
oskar3123
|
5e03e64c43
|
||
|
oskar3123andGitHub
|
0515a154ec | ||
|
oskar3123
|
311fa2b551
|
||
|
oskar3123
|
bcfd6c512e
|
||
|
oskar3123andGitHub
|
39c1941388 | ||
|
oskar3123
|
ab6ffcce7d | ||
|
oskar3123
|
d0cc86103a | ||
|
oskar3123
|
c57fb7223a | ||
|
oskar3123
|
9e8278d439
|
||
|
oskar3123
|
9abaf55532
|
||
|
oskar3123
|
1136b7e33f
|
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
language: java
|
language: java
|
||||||
jdk:
|
jdk:
|
||||||
- oraclejdk8
|
- openjdk8
|
||||||
deploy:
|
deploy:
|
||||||
provider: releases
|
provider: releases
|
||||||
api_key: $GITHUB_KEY
|
api_key: $GITHUB_KEY
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
[](https://travis-ci.org/oskar3123/StaffChat)
|
[](https://app.travis-ci.com/github/oskar3123/StaffChat)
|
||||||
[](https://github.com/oskar3123/StaffChat/releases/latest)
|
[](https://github.com/oskar3123/StaffChat/releases/latest)
|
||||||
[](https://github.com/oskar3123/StaffChat/releases/latest)
|
[](https://github.com/oskar3123/StaffChat/releases/latest)
|
||||||
[](https://github.com/oskar3123/StaffChat/commits/master)
|
[](https://github.com/oskar3123/StaffChat/commits/master)
|
||||||
[](https://coveralls.io/github/oskar3123/StaffChat?branch=master)
|
|
||||||
|
|
||||||
# [StaffChat](https://oskar3123.github.io/StaffChat)
|
# [StaffChat](https://oskar3123.github.io/StaffChat)
|
||||||
|
|
||||||
@@ -15,6 +14,8 @@ You can download the plugin from the [Spigot resource page](https://www.spigotmc
|
|||||||
|
|
||||||
### Bukkit/Spigot
|
### Bukkit/Spigot
|
||||||
|
|
||||||
|
Because the event API in 1.14+ is now strict between sync and async events you should check whether this was called synchronously or asynchronously by using `event.isAsynchronous()`
|
||||||
|
|
||||||
```java
|
```java
|
||||||
public class StaffChatListener implements Listener
|
public class StaffChatListener implements Listener
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,77 +1,91 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>me.oskar3123</groupId>
|
<name>StaffChat</name>
|
||||||
<artifactId>staffchat</artifactId>
|
<groupId>me.oskar3123</groupId>
|
||||||
<version>1.1.4-SNAPSHOT</version>
|
<artifactId>staffchat</artifactId>
|
||||||
|
<version>1.4.0</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>spigot-repo</id>
|
<id>spigot-repo</id>
|
||||||
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>bungeecord-repo</id>
|
<id>bungeecord-repo</id>
|
||||||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
|
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
<repository>
|
||||||
|
<id>placeholderapi</id>
|
||||||
|
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>dv8tion</id>
|
||||||
|
<name>m2-dv8tion</name>
|
||||||
|
<url>https://m2.dv8tion.net/releases</url>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>Scarsz-Nexus</id>
|
||||||
|
<url>https://nexus.scarsz.me/content/groups/public/</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot-api</artifactId>
|
<artifactId>spigot-api</artifactId>
|
||||||
<version>1.13-R0.1-SNAPSHOT</version>
|
<version>1.18-R0.1-SNAPSHOT</version>
|
||||||
</dependency>
|
<scope>provided</scope>
|
||||||
<dependency>
|
</dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<dependency>
|
||||||
<artifactId>bukkit</artifactId>
|
<groupId>net.md-5</groupId>
|
||||||
<version>1.13-R0.1-SNAPSHOT</version>
|
<artifactId>bungeecord-api</artifactId>
|
||||||
</dependency>
|
<version>1.18-R0.1-SNAPSHOT</version>
|
||||||
<dependency>
|
<type>jar</type>
|
||||||
<groupId>net.md-5</groupId>
|
<scope>provided</scope>
|
||||||
<artifactId>bungeecord-api</artifactId>
|
</dependency>
|
||||||
<version>1.13-SNAPSHOT</version>
|
<dependency>
|
||||||
</dependency>
|
<groupId>net.md-5</groupId>
|
||||||
</dependencies>
|
<artifactId>bungeecord-api</artifactId>
|
||||||
|
<version>1.18-R0.1-SNAPSHOT</version>
|
||||||
|
<type>javadoc</type>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>me.clip</groupId>
|
||||||
|
<artifactId>placeholderapi</artifactId>
|
||||||
|
<version>2.11.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.discordsrv</groupId>
|
||||||
|
<artifactId>discordsrv</artifactId>
|
||||||
|
<version>1.25.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<finalName>${project.name}-${project.version}</finalName>
|
||||||
<plugin>
|
<plugins>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<plugin>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<version>3.1</version>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<configuration>
|
<version>3.1</version>
|
||||||
<source>1.8</source>
|
<configuration>
|
||||||
<target>1.8</target>
|
<source>1.8</source>
|
||||||
</configuration>
|
<target>1.8</target>
|
||||||
</plugin>
|
</configuration>
|
||||||
<plugin>
|
</plugin>
|
||||||
<groupId>org.eluder.coveralls</groupId>
|
</plugins>
|
||||||
<artifactId>coveralls-maven-plugin</artifactId>
|
</build>
|
||||||
<version>4.3.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.jacoco</groupId>
|
|
||||||
<artifactId>jacoco-maven-plugin</artifactId>
|
|
||||||
<version>0.7.9</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>prepare-agent</id>
|
|
||||||
<goals>
|
|
||||||
<goal>prepare-agent</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
package me.oskar3123.staffchat.bungee;
|
package me.oskar3123.staffchat.bungee;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
import me.oskar3123.staffchat.bungee.command.BungeeStaffChatCommand;
|
import me.oskar3123.staffchat.bungee.command.BungeeStaffChatCommand;
|
||||||
import me.oskar3123.staffchat.bungee.listener.BungeeChatListener;
|
import me.oskar3123.staffchat.bungee.listener.BungeeChatListener;
|
||||||
import net.md_5.bungee.api.plugin.Plugin;
|
import net.md_5.bungee.api.plugin.Plugin;
|
||||||
@@ -7,82 +11,102 @@ import net.md_5.bungee.config.Configuration;
|
|||||||
import net.md_5.bungee.config.ConfigurationProvider;
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
import net.md_5.bungee.config.YamlConfiguration;
|
import net.md_5.bungee.config.YamlConfiguration;
|
||||||
|
|
||||||
import java.io.File;
|
public class BungeeMain extends Plugin {
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
|
|
||||||
public class BungeeMain extends Plugin
|
public final String usePerm = "staffchat.use";
|
||||||
{
|
public final String seePerm = "staffchat.see";
|
||||||
|
public final String commandPerm = "staffchat.command";
|
||||||
|
public final String reloadPerm = "staffchat.reload";
|
||||||
|
public final BungeeChatListener chatListener = new BungeeChatListener(this);
|
||||||
|
private Configuration config;
|
||||||
|
|
||||||
public final String usePerm = "staffchat.use";
|
public void onEnable() {
|
||||||
public final String seePerm = "staffchat.see";
|
new MetricsLite(this);
|
||||||
public final String commandPerm = "staffchat.command";
|
saveDefaultConfig();
|
||||||
public final String reloadPerm = "staffchat.reload";
|
if (!reloadConfig()) {
|
||||||
private Configuration config;
|
getLogger().severe("Could not load config file, using defaults.");
|
||||||
|
}
|
||||||
|
registerCommands();
|
||||||
|
registerEvents();
|
||||||
|
}
|
||||||
|
|
||||||
public void onEnable()
|
private void registerCommands() {
|
||||||
{
|
getProxy().getPluginManager().registerCommand(this, new BungeeStaffChatCommand(this));
|
||||||
new MetricsLite(this);
|
}
|
||||||
saveDefaultConfig();
|
|
||||||
if (!reloadConfig())
|
private void registerEvents() {
|
||||||
{
|
getProxy().getPluginManager().registerListener(this, chatListener);
|
||||||
getLogger().severe("Could not load config file, using defaults.");
|
}
|
||||||
}
|
|
||||||
registerCommands();
|
public boolean reloadConfig() {
|
||||||
registerEvents();
|
try {
|
||||||
|
config =
|
||||||
|
ConfigurationProvider.getProvider(YamlConfiguration.class)
|
||||||
|
.load(new File(getDataFolder(), "config.yml"));
|
||||||
|
loadDefaultValues();
|
||||||
|
return true;
|
||||||
|
} catch (IOException e) {
|
||||||
|
config =
|
||||||
|
ConfigurationProvider.getProvider(YamlConfiguration.class)
|
||||||
|
.load(getResourceAsStream("config.yml"));
|
||||||
|
loadDefaultValues();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadDefaultValues() {
|
||||||
|
String[] keys =
|
||||||
|
new String[] {
|
||||||
|
"settings.character",
|
||||||
|
"settings.format",
|
||||||
|
"messages.prefix",
|
||||||
|
"messages.nopermission",
|
||||||
|
"messages.playeronly",
|
||||||
|
"messages.reloaded",
|
||||||
|
"messages.toggled",
|
||||||
|
"messages.onstring",
|
||||||
|
"messages.offstring",
|
||||||
|
};
|
||||||
|
Configuration def =
|
||||||
|
ConfigurationProvider.getProvider(YamlConfiguration.class)
|
||||||
|
.load(getResourceAsStream("config.yml"));
|
||||||
|
for (String key : keys) {
|
||||||
|
String v = config.getString(key);
|
||||||
|
if (v == null || v.isEmpty()) {
|
||||||
|
config.set(key, def.getString(key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
saveConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Configuration getConfig() {
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void saveDefaultConfig() {
|
||||||
|
if (!getDataFolder().exists()) {
|
||||||
|
//noinspection ResultOfMethodCallIgnored
|
||||||
|
getDataFolder().mkdir();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void registerCommands()
|
File file = new File(getDataFolder(), "config.yml");
|
||||||
{
|
|
||||||
getProxy().getPluginManager().registerCommand(this, new BungeeStaffChatCommand(this));
|
if (!file.exists()) {
|
||||||
|
try (InputStream in = getResourceAsStream("config.yml")) {
|
||||||
|
Files.copy(in, file.toPath());
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void registerEvents()
|
public void saveConfig() {
|
||||||
{
|
try {
|
||||||
getProxy().getPluginManager().registerListener(this, new BungeeChatListener(this));
|
ConfigurationProvider.getProvider(YamlConfiguration.class)
|
||||||
|
.save(config, new File(getDataFolder(), "config.yml"));
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
getLogger().severe("Failed to save config");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public boolean reloadConfig()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml"));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(getResourceAsStream("config.yml"));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Configuration getConfig()
|
|
||||||
{
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveDefaultConfig()
|
|
||||||
{
|
|
||||||
if (!getDataFolder().exists())
|
|
||||||
{
|
|
||||||
//noinspection ResultOfMethodCallIgnored
|
|
||||||
getDataFolder().mkdir();
|
|
||||||
}
|
|
||||||
|
|
||||||
File file = new File(getDataFolder(), "config.yml");
|
|
||||||
|
|
||||||
if (!file.exists())
|
|
||||||
{
|
|
||||||
try (InputStream in = getResourceAsStream("config.yml"))
|
|
||||||
{
|
|
||||||
Files.copy(in, file.toPath());
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,428 +2,394 @@ package me.oskar3123.staffchat.bungee;
|
|||||||
|
|
||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.BufferedWriter;
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.DataOutputStream;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileReader;
|
||||||
|
import java.io.FileWriter;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Timer;
|
||||||
|
import java.util.TimerTask;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.zip.GZIPOutputStream;
|
||||||
|
import javax.net.ssl.HttpsURLConnection;
|
||||||
import net.md_5.bungee.api.plugin.Plugin;
|
import net.md_5.bungee.api.plugin.Plugin;
|
||||||
import net.md_5.bungee.api.scheduler.TaskScheduler;
|
import net.md_5.bungee.api.scheduler.TaskScheduler;
|
||||||
import net.md_5.bungee.config.Configuration;
|
import net.md_5.bungee.config.Configuration;
|
||||||
import net.md_5.bungee.config.ConfigurationProvider;
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
import net.md_5.bungee.config.YamlConfiguration;
|
import net.md_5.bungee.config.YamlConfiguration;
|
||||||
|
|
||||||
import javax.net.ssl.HttpsURLConnection;
|
|
||||||
import java.io.*;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.zip.GZIPOutputStream;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* bStats collects some data for plugin authors.
|
* bStats collects some data for plugin authors.
|
||||||
* <p>
|
*
|
||||||
* Check out https://bStats.org/ to learn more about bStats!
|
* <p>Check out https://bStats.org/ to learn more about bStats!
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("all")
|
@SuppressWarnings("all")
|
||||||
public class MetricsLite
|
public class MetricsLite {
|
||||||
{
|
|
||||||
|
|
||||||
// The version of this bStats class
|
// The version of this bStats class
|
||||||
public static final int B_STATS_VERSION = 1;
|
public static final int B_STATS_VERSION = 1;
|
||||||
// The url to which the data is sent
|
// The url to which the data is sent
|
||||||
private static final String URL = "https://bStats.org/submitData/bungeecord";
|
private static final String URL = "https://bStats.org/submitData/bungeecord";
|
||||||
// A list with all known metrics class objects including this one
|
// A list with all known metrics class objects including this one
|
||||||
private static final List<Object> knownMetricsInstances = new ArrayList<>();
|
private static final List<Object> knownMetricsInstances = new ArrayList<>();
|
||||||
|
|
||||||
static
|
static {
|
||||||
{
|
// Maven's Relocate is clever and changes strings, too. So we have to use this little "trick"
|
||||||
// Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
|
// ... :D
|
||||||
final String defaultPackage = new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
|
final String defaultPackage =
|
||||||
final String examplePackage = new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
|
new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
|
||||||
// We want to make sure nobody just copy & pastes the example and use the wrong package names
|
final String examplePackage =
|
||||||
if (MetricsLite.class.getPackage().getName().equals(defaultPackage) || MetricsLite.class.getPackage().getName().equals(examplePackage))
|
new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
|
||||||
{
|
// We want to make sure nobody just copy & pastes the example and use the wrong package names
|
||||||
throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
|
if (MetricsLite.class.getPackage().getName().equals(defaultPackage)
|
||||||
}
|
|| MetricsLite.class.getPackage().getName().equals(examplePackage)) {
|
||||||
|
throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The plugin
|
||||||
|
private final Plugin plugin;
|
||||||
|
// Is bStats enabled on this server?
|
||||||
|
private boolean enabled;
|
||||||
|
// The uuid of the server
|
||||||
|
private String serverUUID;
|
||||||
|
// Should failed requests be logged?
|
||||||
|
private boolean logFailedRequests = false;
|
||||||
|
|
||||||
|
public MetricsLite(Plugin plugin) {
|
||||||
|
this.plugin = plugin;
|
||||||
|
|
||||||
|
try {
|
||||||
|
loadConfig();
|
||||||
|
} catch (IOException e) {
|
||||||
|
// Failed to load configuration
|
||||||
|
plugin.getLogger().log(Level.WARNING, "Failed to load bStats config!", e);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The plugin
|
// We are not allowed to send data about this server :(
|
||||||
private final Plugin plugin;
|
if (!enabled) {
|
||||||
// Is bStats enabled on this server?
|
return;
|
||||||
private boolean enabled;
|
}
|
||||||
// The uuid of the server
|
|
||||||
private String serverUUID;
|
|
||||||
// Should failed requests be logged?
|
|
||||||
private boolean logFailedRequests = false;
|
|
||||||
|
|
||||||
public MetricsLite(Plugin plugin)
|
Class<?> usedMetricsClass = getFirstBStatsClass();
|
||||||
{
|
if (usedMetricsClass == null) {
|
||||||
this.plugin = plugin;
|
// Failed to get first metrics class
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (usedMetricsClass == getClass()) {
|
||||||
|
// We are the first! :)
|
||||||
|
linkMetrics(this);
|
||||||
|
startSubmitting();
|
||||||
|
} else {
|
||||||
|
// We aren't the first so we link to the first metrics class
|
||||||
|
try {
|
||||||
|
usedMetricsClass.getMethod("linkMetrics", Object.class).invoke(null, this);
|
||||||
|
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
|
||||||
|
if (logFailedRequests) {
|
||||||
|
plugin
|
||||||
|
.getLogger()
|
||||||
|
.log(
|
||||||
|
Level.WARNING,
|
||||||
|
"Failed to link to first metrics class " + usedMetricsClass.getName() + "!",
|
||||||
|
e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try
|
/**
|
||||||
{
|
* Links an other metrics class with this class. This method is called using Reflection.
|
||||||
loadConfig();
|
*
|
||||||
}
|
* @param metrics An object of the metrics class to link.
|
||||||
catch (IOException e)
|
*/
|
||||||
{
|
public static void linkMetrics(Object metrics) {
|
||||||
// Failed to load configuration
|
knownMetricsInstances.add(metrics);
|
||||||
plugin.getLogger().log(Level.WARNING, "Failed to load bStats config!", e);
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We are not allowed to send data about this server :(
|
/**
|
||||||
if (!enabled)
|
* Sends the data to the bStats server.
|
||||||
{
|
*
|
||||||
return;
|
* @param data The data to send.
|
||||||
}
|
* @throws Exception If the request failed.
|
||||||
|
*/
|
||||||
|
private static void sendData(JsonObject data) throws Exception {
|
||||||
|
if (data == null) {
|
||||||
|
throw new IllegalArgumentException("Data cannot be null");
|
||||||
|
}
|
||||||
|
|
||||||
Class<?> usedMetricsClass = getFirstBStatsClass();
|
HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
|
||||||
if (usedMetricsClass == null)
|
|
||||||
{
|
// Compress the data to save bandwidth
|
||||||
// Failed to get first metrics class
|
byte[] compressedData = compress(data.toString());
|
||||||
return;
|
|
||||||
|
// Add headers
|
||||||
|
connection.setRequestMethod("POST");
|
||||||
|
connection.addRequestProperty("Accept", "application/json");
|
||||||
|
connection.addRequestProperty("Connection", "close");
|
||||||
|
connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
|
||||||
|
connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
|
||||||
|
connection.setRequestProperty(
|
||||||
|
"Content-Type", "application/json"); // We send our data in JSON format
|
||||||
|
connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
|
||||||
|
|
||||||
|
// Send data
|
||||||
|
connection.setDoOutput(true);
|
||||||
|
DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
|
||||||
|
outputStream.write(compressedData);
|
||||||
|
outputStream.flush();
|
||||||
|
outputStream.close();
|
||||||
|
|
||||||
|
connection.getInputStream().close(); // We don't care about the response - Just send our data :)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gzips the given String.
|
||||||
|
*
|
||||||
|
* @param str The string to gzip.
|
||||||
|
* @return The gzipped String.
|
||||||
|
* @throws IOException If the compression failed.
|
||||||
|
*/
|
||||||
|
private static byte[] compress(final String str) throws IOException {
|
||||||
|
if (str == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
||||||
|
GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
|
||||||
|
gzip.write(str.getBytes("UTF-8"));
|
||||||
|
gzip.close();
|
||||||
|
return outputStream.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the plugin specific data. This method is called using Reflection.
|
||||||
|
*
|
||||||
|
* @return The plugin specific data.
|
||||||
|
*/
|
||||||
|
public JsonObject getPluginData() {
|
||||||
|
JsonObject data = new JsonObject();
|
||||||
|
|
||||||
|
String pluginName = plugin.getDescription().getName();
|
||||||
|
String pluginVersion = plugin.getDescription().getVersion();
|
||||||
|
|
||||||
|
data.addProperty("pluginName", pluginName);
|
||||||
|
data.addProperty("pluginVersion", pluginVersion);
|
||||||
|
|
||||||
|
JsonArray customCharts = new JsonArray();
|
||||||
|
data.add("customCharts", customCharts);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startSubmitting() {
|
||||||
|
// We use a timer cause want to be independent from the server tps
|
||||||
|
final Timer timer = new Timer(true);
|
||||||
|
timer.scheduleAtFixedRate(
|
||||||
|
new TimerTask() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
// The data collection (e.g. for custom graphs) is done sync
|
||||||
|
// Don't be afraid! The connection to the bStats server is still async, only the stats
|
||||||
|
// collection is sync ;)
|
||||||
|
TaskScheduler scheduler = plugin.getProxy().getScheduler();
|
||||||
|
scheduler.schedule(
|
||||||
|
plugin,
|
||||||
|
new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
submitData();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
0L,
|
||||||
|
TimeUnit.SECONDS);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
1000 * 60 * 2,
|
||||||
|
1000 * 60 * 30);
|
||||||
|
// Submit the data every 30 minutes, first time after 2 minutes to give other plugins enough
|
||||||
|
// time to start
|
||||||
|
// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
|
||||||
|
// WARNING: Just don't do it!
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the server specific data.
|
||||||
|
*
|
||||||
|
* @return The server specific data.
|
||||||
|
*/
|
||||||
|
private JsonObject getServerData() {
|
||||||
|
// Minecraft specific data
|
||||||
|
int playerAmount = plugin.getProxy().getOnlineCount();
|
||||||
|
playerAmount = playerAmount > 500 ? 500 : playerAmount;
|
||||||
|
int onlineMode = plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0;
|
||||||
|
String bungeecordVersion = plugin.getProxy().getVersion();
|
||||||
|
int managedServers = plugin.getProxy().getServers().size();
|
||||||
|
|
||||||
|
// OS/Java specific data
|
||||||
|
String javaVersion = System.getProperty("java.version");
|
||||||
|
String osName = System.getProperty("os.name");
|
||||||
|
String osArch = System.getProperty("os.arch");
|
||||||
|
String osVersion = System.getProperty("os.version");
|
||||||
|
int coreCount = Runtime.getRuntime().availableProcessors();
|
||||||
|
|
||||||
|
JsonObject data = new JsonObject();
|
||||||
|
|
||||||
|
data.addProperty("serverUUID", serverUUID);
|
||||||
|
|
||||||
|
data.addProperty("playerAmount", playerAmount);
|
||||||
|
data.addProperty("managedServers", managedServers);
|
||||||
|
data.addProperty("onlineMode", onlineMode);
|
||||||
|
data.addProperty("bungeecordVersion", bungeecordVersion);
|
||||||
|
|
||||||
|
data.addProperty("javaVersion", javaVersion);
|
||||||
|
data.addProperty("osName", osName);
|
||||||
|
data.addProperty("osArch", osArch);
|
||||||
|
data.addProperty("osVersion", osVersion);
|
||||||
|
data.addProperty("coreCount", coreCount);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Collects the data and sends it afterwards. */
|
||||||
|
private void submitData() {
|
||||||
|
final JsonObject data = getServerData();
|
||||||
|
|
||||||
|
final JsonArray pluginData = new JsonArray();
|
||||||
|
// Search for all other bStats Metrics classes to get their plugin data
|
||||||
|
for (Object metrics : knownMetricsInstances) {
|
||||||
|
try {
|
||||||
|
Object plugin = metrics.getClass().getMethod("getPluginData").invoke(metrics);
|
||||||
|
if (plugin instanceof JsonObject) {
|
||||||
|
pluginData.add((JsonObject) plugin);
|
||||||
}
|
}
|
||||||
if (usedMetricsClass == getClass())
|
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
|
||||||
{
|
}
|
||||||
// We are the first! :)
|
}
|
||||||
linkMetrics(this);
|
|
||||||
startSubmitting();
|
data.add("plugins", pluginData);
|
||||||
}
|
|
||||||
else
|
// Create a new thread for the connection to the bStats server
|
||||||
{
|
new Thread(
|
||||||
// We aren't the first so we link to the first metrics class
|
new Runnable() {
|
||||||
try
|
@Override
|
||||||
{
|
public void run() {
|
||||||
usedMetricsClass.getMethod("linkMetrics", Object.class).invoke(null, this);
|
try {
|
||||||
}
|
// Send the data
|
||||||
catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e)
|
sendData(data);
|
||||||
{
|
} catch (Exception e) {
|
||||||
if (logFailedRequests)
|
// Something went wrong! :(
|
||||||
{
|
if (logFailedRequests) {
|
||||||
plugin.getLogger().log(Level.WARNING, "Failed to link to first metrics class " + usedMetricsClass.getName() + "!", e);
|
plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats!", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads the bStats configuration.
|
||||||
|
*
|
||||||
|
* @throws IOException If something did not work :(
|
||||||
|
*/
|
||||||
|
private void loadConfig() throws IOException {
|
||||||
|
Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
|
||||||
|
configPath.toFile().mkdirs();
|
||||||
|
File configFile = new File(configPath.toFile(), "config.yml");
|
||||||
|
if (!configFile.exists()) {
|
||||||
|
writeFile(
|
||||||
|
configFile,
|
||||||
|
"#bStats collects some data for plugin authors like how many servers are using their plugins.",
|
||||||
|
"#To honor their work, you should not disable it.",
|
||||||
|
"#This has nearly no effect on the server performance!",
|
||||||
|
"#Check out https://bStats.org/ to learn more :)",
|
||||||
|
"enabled: true",
|
||||||
|
"serverUuid: \"" + UUID.randomUUID().toString() + "\"",
|
||||||
|
"logFailedRequests: false");
|
||||||
|
}
|
||||||
|
|
||||||
|
Configuration configuration =
|
||||||
|
ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile);
|
||||||
|
|
||||||
|
// Load configuration
|
||||||
|
enabled = configuration.getBoolean("enabled", true);
|
||||||
|
serverUUID = configuration.getString("serverUuid");
|
||||||
|
logFailedRequests = configuration.getBoolean("logFailedRequests", false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the first bStat Metrics class.
|
||||||
|
*
|
||||||
|
* @return The first bStats metrics class.
|
||||||
|
*/
|
||||||
|
private Class<?> getFirstBStatsClass() {
|
||||||
|
Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
|
||||||
|
configPath.toFile().mkdirs();
|
||||||
|
File tempFile = new File(configPath.toFile(), "temp.txt");
|
||||||
|
|
||||||
|
try {
|
||||||
|
String className = readFile(tempFile);
|
||||||
|
if (className != null) {
|
||||||
|
try {
|
||||||
|
// Let's check if a class with the given name exists.
|
||||||
|
return Class.forName(className);
|
||||||
|
} catch (ClassNotFoundException ignored) {
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
writeFile(tempFile, getClass().getName());
|
||||||
|
return getClass();
|
||||||
|
} catch (IOException e) {
|
||||||
|
if (logFailedRequests) {
|
||||||
|
plugin.getLogger().log(Level.WARNING, "Failed to get first bStats class!", e);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Links an other metrics class with this class.
|
* Reads the first line of the file.
|
||||||
* This method is called using Reflection.
|
*
|
||||||
*
|
* @param file The file to read. Cannot be null.
|
||||||
* @param metrics An object of the metrics class to link.
|
* @return The first line of the file or <code>null</code> if the file does not exist or is empty.
|
||||||
*/
|
* @throws IOException If something did not work :(
|
||||||
public static void linkMetrics(Object metrics)
|
*/
|
||||||
{
|
private String readFile(File file) throws IOException {
|
||||||
knownMetricsInstances.add(metrics);
|
if (!file.exists()) {
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
try (FileReader fileReader = new FileReader(file);
|
||||||
/**
|
BufferedReader bufferedReader = new BufferedReader(fileReader); ) {
|
||||||
* Sends the data to the bStats server.
|
return bufferedReader.readLine();
|
||||||
*
|
|
||||||
* @param data The data to send.
|
|
||||||
* @throws Exception If the request failed.
|
|
||||||
*/
|
|
||||||
private static void sendData(JsonObject data) throws Exception
|
|
||||||
{
|
|
||||||
if (data == null)
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException("Data cannot be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
|
|
||||||
|
|
||||||
// Compress the data to save bandwidth
|
|
||||||
byte[] compressedData = compress(data.toString());
|
|
||||||
|
|
||||||
// Add headers
|
|
||||||
connection.setRequestMethod("POST");
|
|
||||||
connection.addRequestProperty("Accept", "application/json");
|
|
||||||
connection.addRequestProperty("Connection", "close");
|
|
||||||
connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
|
|
||||||
connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
|
|
||||||
connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
|
|
||||||
connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
|
|
||||||
|
|
||||||
// Send data
|
|
||||||
connection.setDoOutput(true);
|
|
||||||
DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
|
|
||||||
outputStream.write(compressedData);
|
|
||||||
outputStream.flush();
|
|
||||||
outputStream.close();
|
|
||||||
|
|
||||||
connection.getInputStream().close(); // We don't care about the response - Just send our data :)
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gzips the given String.
|
* Writes a String to a file. It also adds a note for the user,
|
||||||
*
|
*
|
||||||
* @param str The string to gzip.
|
* @param file The file to write to. Cannot be null.
|
||||||
* @return The gzipped String.
|
* @param lines The lines to write.
|
||||||
* @throws IOException If the compression failed.
|
* @throws IOException If something did not work :(
|
||||||
*/
|
*/
|
||||||
private static byte[] compress(final String str) throws IOException
|
private void writeFile(File file, String... lines) throws IOException {
|
||||||
{
|
if (!file.exists()) {
|
||||||
if (str == null)
|
file.createNewFile();
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
|
||||||
GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
|
|
||||||
gzip.write(str.getBytes("UTF-8"));
|
|
||||||
gzip.close();
|
|
||||||
return outputStream.toByteArray();
|
|
||||||
}
|
}
|
||||||
|
try (FileWriter fileWriter = new FileWriter(file);
|
||||||
/**
|
BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)) {
|
||||||
* Gets the plugin specific data.
|
for (String line : lines) {
|
||||||
* This method is called using Reflection.
|
bufferedWriter.write(line);
|
||||||
*
|
bufferedWriter.newLine();
|
||||||
* @return The plugin specific data.
|
}
|
||||||
*/
|
|
||||||
public JsonObject getPluginData()
|
|
||||||
{
|
|
||||||
JsonObject data = new JsonObject();
|
|
||||||
|
|
||||||
String pluginName = plugin.getDescription().getName();
|
|
||||||
String pluginVersion = plugin.getDescription().getVersion();
|
|
||||||
|
|
||||||
data.addProperty("pluginName", pluginName);
|
|
||||||
data.addProperty("pluginVersion", pluginVersion);
|
|
||||||
|
|
||||||
JsonArray customCharts = new JsonArray();
|
|
||||||
data.add("customCharts", customCharts);
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private void startSubmitting()
|
}
|
||||||
{
|
|
||||||
// We use a timer cause want to be independent from the server tps
|
|
||||||
final Timer timer = new Timer(true);
|
|
||||||
timer.scheduleAtFixedRate(new TimerTask()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void run()
|
|
||||||
{
|
|
||||||
// The data collection (e.g. for custom graphs) is done sync
|
|
||||||
// Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
|
|
||||||
TaskScheduler scheduler = plugin.getProxy().getScheduler();
|
|
||||||
scheduler.schedule(plugin, new Runnable()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void run()
|
|
||||||
{
|
|
||||||
submitData();
|
|
||||||
}
|
|
||||||
}, 0L, TimeUnit.SECONDS);
|
|
||||||
}
|
|
||||||
}, 1000 * 60 * 2, 1000 * 60 * 30);
|
|
||||||
// Submit the data every 30 minutes, first time after 2 minutes to give other plugins enough time to start
|
|
||||||
// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
|
|
||||||
// WARNING: Just don't do it!
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the server specific data.
|
|
||||||
*
|
|
||||||
* @return The server specific data.
|
|
||||||
*/
|
|
||||||
private JsonObject getServerData()
|
|
||||||
{
|
|
||||||
// Minecraft specific data
|
|
||||||
int playerAmount = plugin.getProxy().getOnlineCount();
|
|
||||||
playerAmount = playerAmount > 500 ? 500 : playerAmount;
|
|
||||||
int onlineMode = plugin.getProxy().getConfig().isOnlineMode() ? 1 : 0;
|
|
||||||
String bungeecordVersion = plugin.getProxy().getVersion();
|
|
||||||
int managedServers = plugin.getProxy().getServers().size();
|
|
||||||
|
|
||||||
// OS/Java specific data
|
|
||||||
String javaVersion = System.getProperty("java.version");
|
|
||||||
String osName = System.getProperty("os.name");
|
|
||||||
String osArch = System.getProperty("os.arch");
|
|
||||||
String osVersion = System.getProperty("os.version");
|
|
||||||
int coreCount = Runtime.getRuntime().availableProcessors();
|
|
||||||
|
|
||||||
JsonObject data = new JsonObject();
|
|
||||||
|
|
||||||
data.addProperty("serverUUID", serverUUID);
|
|
||||||
|
|
||||||
data.addProperty("playerAmount", playerAmount);
|
|
||||||
data.addProperty("managedServers", managedServers);
|
|
||||||
data.addProperty("onlineMode", onlineMode);
|
|
||||||
data.addProperty("bungeecordVersion", bungeecordVersion);
|
|
||||||
|
|
||||||
data.addProperty("javaVersion", javaVersion);
|
|
||||||
data.addProperty("osName", osName);
|
|
||||||
data.addProperty("osArch", osArch);
|
|
||||||
data.addProperty("osVersion", osVersion);
|
|
||||||
data.addProperty("coreCount", coreCount);
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Collects the data and sends it afterwards.
|
|
||||||
*/
|
|
||||||
private void submitData()
|
|
||||||
{
|
|
||||||
final JsonObject data = getServerData();
|
|
||||||
|
|
||||||
final JsonArray pluginData = new JsonArray();
|
|
||||||
// Search for all other bStats Metrics classes to get their plugin data
|
|
||||||
for (Object metrics : knownMetricsInstances)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Object plugin = metrics.getClass().getMethod("getPluginData").invoke(metrics);
|
|
||||||
if (plugin instanceof JsonObject)
|
|
||||||
{
|
|
||||||
pluginData.add((JsonObject) plugin);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data.add("plugins", pluginData);
|
|
||||||
|
|
||||||
// Create a new thread for the connection to the bStats server
|
|
||||||
new Thread(new Runnable()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void run()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Send the data
|
|
||||||
sendData(data);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
// Something went wrong! :(
|
|
||||||
if (logFailedRequests)
|
|
||||||
{
|
|
||||||
plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats!", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads the bStats configuration.
|
|
||||||
*
|
|
||||||
* @throws IOException If something did not work :(
|
|
||||||
*/
|
|
||||||
private void loadConfig() throws IOException
|
|
||||||
{
|
|
||||||
Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
|
|
||||||
configPath.toFile().mkdirs();
|
|
||||||
File configFile = new File(configPath.toFile(), "config.yml");
|
|
||||||
if (!configFile.exists())
|
|
||||||
{
|
|
||||||
writeFile(configFile,
|
|
||||||
"#bStats collects some data for plugin authors like how many servers are using their plugins.",
|
|
||||||
"#To honor their work, you should not disable it.",
|
|
||||||
"#This has nearly no effect on the server performance!",
|
|
||||||
"#Check out https://bStats.org/ to learn more :)",
|
|
||||||
"enabled: true",
|
|
||||||
"serverUuid: \"" + UUID.randomUUID().toString() + "\"",
|
|
||||||
"logFailedRequests: false");
|
|
||||||
}
|
|
||||||
|
|
||||||
Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile);
|
|
||||||
|
|
||||||
// Load configuration
|
|
||||||
enabled = configuration.getBoolean("enabled", true);
|
|
||||||
serverUUID = configuration.getString("serverUuid");
|
|
||||||
logFailedRequests = configuration.getBoolean("logFailedRequests", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the first bStat Metrics class.
|
|
||||||
*
|
|
||||||
* @return The first bStats metrics class.
|
|
||||||
*/
|
|
||||||
private Class<?> getFirstBStatsClass()
|
|
||||||
{
|
|
||||||
Path configPath = plugin.getDataFolder().toPath().getParent().resolve("bStats");
|
|
||||||
configPath.toFile().mkdirs();
|
|
||||||
File tempFile = new File(configPath.toFile(), "temp.txt");
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
String className = readFile(tempFile);
|
|
||||||
if (className != null)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Let's check if a class with the given name exists.
|
|
||||||
return Class.forName(className);
|
|
||||||
}
|
|
||||||
catch (ClassNotFoundException ignored)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
writeFile(tempFile, getClass().getName());
|
|
||||||
return getClass();
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
if (logFailedRequests)
|
|
||||||
{
|
|
||||||
plugin.getLogger().log(Level.WARNING, "Failed to get first bStats class!", e);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reads the first line of the file.
|
|
||||||
*
|
|
||||||
* @param file The file to read. Cannot be null.
|
|
||||||
* @return The first line of the file or <code>null</code> if the file does not exist or is empty.
|
|
||||||
* @throws IOException If something did not work :(
|
|
||||||
*/
|
|
||||||
private String readFile(File file) throws IOException
|
|
||||||
{
|
|
||||||
if (!file.exists())
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
try (
|
|
||||||
FileReader fileReader = new FileReader(file);
|
|
||||||
BufferedReader bufferedReader = new BufferedReader(fileReader);
|
|
||||||
)
|
|
||||||
{
|
|
||||||
return bufferedReader.readLine();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Writes a String to a file. It also adds a note for the user,
|
|
||||||
*
|
|
||||||
* @param file The file to write to. Cannot be null.
|
|
||||||
* @param lines The lines to write.
|
|
||||||
* @throws IOException If something did not work :(
|
|
||||||
*/
|
|
||||||
private void writeFile(File file, String... lines) throws IOException
|
|
||||||
{
|
|
||||||
if (!file.exists())
|
|
||||||
{
|
|
||||||
file.createNewFile();
|
|
||||||
}
|
|
||||||
try (
|
|
||||||
FileWriter fileWriter = new FileWriter(file);
|
|
||||||
BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)
|
|
||||||
)
|
|
||||||
{
|
|
||||||
for (String line : lines)
|
|
||||||
{
|
|
||||||
bufferedWriter.write(line);
|
|
||||||
bufferedWriter.newLine();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -5,75 +5,98 @@ import net.md_5.bungee.api.ChatColor;
|
|||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import net.md_5.bungee.api.chat.BaseComponent;
|
import net.md_5.bungee.api.chat.BaseComponent;
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
import net.md_5.bungee.api.chat.TextComponent;
|
||||||
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
import net.md_5.bungee.api.plugin.Command;
|
import net.md_5.bungee.api.plugin.Command;
|
||||||
import net.md_5.bungee.config.Configuration;
|
import net.md_5.bungee.config.Configuration;
|
||||||
|
import org.jetbrains.annotations.Contract;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class BungeeStaffChatCommand extends Command
|
public class BungeeStaffChatCommand extends Command {
|
||||||
{
|
|
||||||
|
|
||||||
private BungeeMain plugin;
|
private final BungeeMain plugin;
|
||||||
private Configuration config;
|
private Configuration config;
|
||||||
|
|
||||||
public BungeeStaffChatCommand(BungeeMain plugin)
|
public BungeeStaffChatCommand(@NotNull BungeeMain plugin) {
|
||||||
{
|
super("staffchat");
|
||||||
super("staffchat");
|
this.plugin = plugin;
|
||||||
this.plugin = plugin;
|
config = plugin.getConfig();
|
||||||
config = plugin.getConfig();
|
}
|
||||||
|
|
||||||
|
public void execute(@NotNull CommandSender sender, @NotNull String[] args) {
|
||||||
|
BaseComponent[] noPerm =
|
||||||
|
txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
||||||
|
if (!sender.hasPermission(plugin.commandPerm)) {
|
||||||
|
sender.sendMessage(noPerm);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
if (args.length < 1) {
|
||||||
public void execute(CommandSender sender, String[] args)
|
help(sender, getName());
|
||||||
{
|
return;
|
||||||
BaseComponent[] noPerm = txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
|
||||||
if (!sender.hasPermission(plugin.commandPerm))
|
|
||||||
{
|
|
||||||
sender.sendMessage(noPerm);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (args.length < 1)
|
|
||||||
{
|
|
||||||
help(sender, getName());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (args[0].equalsIgnoreCase("reload"))
|
|
||||||
{
|
|
||||||
if (sender.hasPermission(plugin.reloadPerm))
|
|
||||||
{
|
|
||||||
reload(sender);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sender.sendMessage(noPerm);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
help(sender, getName());
|
|
||||||
}
|
}
|
||||||
|
if (args[0].equalsIgnoreCase("reload")) {
|
||||||
private void help(CommandSender sender, String label)
|
if (sender.hasPermission(plugin.reloadPerm)) {
|
||||||
{
|
reload(sender);
|
||||||
String prefix = config.getString("messages.prefix");
|
} else {
|
||||||
sender.sendMessage(txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"));
|
sender.sendMessage(noPerm);
|
||||||
if (sender.hasPermission(plugin.reloadPerm))
|
}
|
||||||
{
|
return;
|
||||||
sender.sendMessage(txt(prefix + "/" + label + " reload - Reloads the config file"));
|
} else if (args[0].equalsIgnoreCase("toggle")) {
|
||||||
}
|
if (sender.hasPermission(plugin.usePerm)) {
|
||||||
|
toggle(sender);
|
||||||
|
} else {
|
||||||
|
sender.sendMessage(noPerm);
|
||||||
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
help(sender, getName());
|
||||||
|
}
|
||||||
|
|
||||||
private void reload(CommandSender sender)
|
private void playerOnly(@NotNull CommandSender sender) {
|
||||||
{
|
sender.sendMessage(
|
||||||
plugin.reloadConfig();
|
txt(config.getString("messages.prefix") + config.getString("messages.playeronly")));
|
||||||
config = plugin.getConfig();
|
}
|
||||||
sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
|
||||||
|
private void help(@NotNull CommandSender sender, String label) {
|
||||||
|
String prefix = config.getString("messages.prefix");
|
||||||
|
sender.sendMessage(
|
||||||
|
txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"));
|
||||||
|
if (sender.hasPermission(plugin.usePerm)) {
|
||||||
|
sender.sendMessage(txt(prefix + "Message prefix: " + config.getString("settings.character")));
|
||||||
|
sender.sendMessage(txt(prefix + "/" + label + " toggle - Toggles auto staffchat"));
|
||||||
}
|
}
|
||||||
|
if (sender.hasPermission(plugin.reloadPerm)) {
|
||||||
private String clr(String string)
|
sender.sendMessage(txt(prefix + "/" + label + " reload - Reloads the config file"));
|
||||||
{
|
|
||||||
return ChatColor.translateAlternateColorCodes('&', string);
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private BaseComponent[] txt(String text)
|
private void reload(@NotNull CommandSender sender) {
|
||||||
{
|
plugin.reloadConfig();
|
||||||
return TextComponent.fromLegacyText(clr(text));
|
config = plugin.getConfig();
|
||||||
|
sender.sendMessage(
|
||||||
|
txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void toggle(@NotNull CommandSender sender) {
|
||||||
|
if (!(sender instanceof ProxiedPlayer)) {
|
||||||
|
playerOnly(sender);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
boolean toggled = plugin.chatListener.togglePlayer(((ProxiedPlayer) sender).getUniqueId());
|
||||||
|
String state =
|
||||||
|
toggled ? config.getString("messages.onstring") : config.getString("messages.offstring");
|
||||||
|
sender.sendMessage(
|
||||||
|
txt(
|
||||||
|
config.getString("messages.prefix")
|
||||||
|
+ String.format(config.getString("messages.toggled", ""), state)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Contract("_ -> new")
|
||||||
|
private @NotNull String clr(@NotNull String string) {
|
||||||
|
return ChatColor.translateAlternateColorCodes('&', string);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Contract("_ -> new")
|
||||||
|
private @NotNull BaseComponent[] txt(@NotNull String text) {
|
||||||
|
return TextComponent.fromLegacyText(clr(text));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,54 +1,53 @@
|
|||||||
package me.oskar3123.staffchat.bungee.event;
|
package me.oskar3123.staffchat.bungee.event;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
import net.md_5.bungee.api.plugin.Cancellable;
|
import net.md_5.bungee.api.plugin.Cancellable;
|
||||||
import net.md_5.bungee.api.plugin.Event;
|
import net.md_5.bungee.api.plugin.Event;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class BungeeStaffChatEvent extends Event implements Cancellable
|
public class BungeeStaffChatEvent extends Event implements Cancellable {
|
||||||
{
|
|
||||||
|
|
||||||
private final String message;
|
private final ProxiedPlayer player;
|
||||||
private final ProxiedPlayer player;
|
|
||||||
private boolean cancelled = false;
|
|
||||||
private String format;
|
|
||||||
|
|
||||||
public BungeeStaffChatEvent(ProxiedPlayer player, String format, String message)
|
private boolean cancelled = false;
|
||||||
{
|
private String format;
|
||||||
this.player = player;
|
private String message;
|
||||||
this.format = format;
|
|
||||||
this.message = message;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getFormat()
|
public BungeeStaffChatEvent(
|
||||||
{
|
@NotNull ProxiedPlayer player, @NotNull String format, @NotNull String message) {
|
||||||
return format;
|
this.player = player;
|
||||||
}
|
this.format = format;
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
public void setFormat(String format)
|
public @NotNull String getFormat() {
|
||||||
{
|
return format;
|
||||||
this.format = format;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public String getMessage()
|
public void setFormat(@NotNull String format) {
|
||||||
{
|
this.format = Objects.requireNonNull(format);
|
||||||
return message;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public ProxiedPlayer getPlayer()
|
public @NotNull String getMessage() {
|
||||||
{
|
return message;
|
||||||
return player;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
public void setMessage(@NotNull String message) {
|
||||||
public boolean isCancelled()
|
this.message = Objects.requireNonNull(message);
|
||||||
{
|
}
|
||||||
return cancelled;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
public @NotNull ProxiedPlayer getPlayer() {
|
||||||
public void setCancelled(boolean cancelled)
|
return player;
|
||||||
{
|
}
|
||||||
this.cancelled = cancelled;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isCancelled() {
|
||||||
|
return cancelled;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCancelled(boolean cancelled) {
|
||||||
|
this.cancelled = cancelled;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
package me.oskar3123.staffchat.bungee.listener;
|
package me.oskar3123.staffchat.bungee.listener;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
import me.oskar3123.staffchat.bungee.BungeeMain;
|
import me.oskar3123.staffchat.bungee.BungeeMain;
|
||||||
import me.oskar3123.staffchat.bungee.event.BungeeStaffChatEvent;
|
import me.oskar3123.staffchat.bungee.event.BungeeStaffChatEvent;
|
||||||
import me.oskar3123.staffchat.util.StringUtils;
|
import me.oskar3123.staffchat.util.StringUtils;
|
||||||
@@ -11,69 +15,78 @@ import net.md_5.bungee.api.event.ChatEvent;
|
|||||||
import net.md_5.bungee.api.plugin.Listener;
|
import net.md_5.bungee.api.plugin.Listener;
|
||||||
import net.md_5.bungee.config.Configuration;
|
import net.md_5.bungee.config.Configuration;
|
||||||
import net.md_5.bungee.event.EventHandler;
|
import net.md_5.bungee.event.EventHandler;
|
||||||
|
import org.jetbrains.annotations.Contract;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class BungeeChatListener implements Listener
|
public class BungeeChatListener implements Listener {
|
||||||
{
|
|
||||||
|
|
||||||
private BungeeMain plugin;
|
private final BungeeMain plugin;
|
||||||
|
private final Set<UUID> toggledPlayers = new HashSet<>();
|
||||||
|
|
||||||
public BungeeChatListener(BungeeMain plugin)
|
public BungeeChatListener(@NotNull BungeeMain plugin) {
|
||||||
{
|
this.plugin = plugin;
|
||||||
this.plugin = plugin;
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void chat(@NotNull ChatEvent event) {
|
||||||
|
if (event.getMessage().startsWith("/")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!(event.getSender() instanceof ProxiedPlayer)) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
ProxiedPlayer player = (ProxiedPlayer) event.getSender();
|
||||||
public void chat(ChatEvent event)
|
if (!player.hasPermission(plugin.usePerm)) {
|
||||||
{
|
return;
|
||||||
if (!(event.getSender() instanceof ProxiedPlayer))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ProxiedPlayer player = (ProxiedPlayer) event.getSender();
|
|
||||||
if (!player.hasPermission(plugin.usePerm))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Configuration config = plugin.getConfig();
|
|
||||||
String character = config.getString("settings.character");
|
|
||||||
if (!event.getMessage().startsWith(character))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String format = config.getString("settings.format");
|
|
||||||
String message = event.getMessage().substring(character.length()).trim();
|
|
||||||
|
|
||||||
BungeeStaffChatEvent chatEvent = new BungeeStaffChatEvent(player, format, message);
|
|
||||||
plugin.getProxy().getPluginManager().callEvent(chatEvent);
|
|
||||||
if (chatEvent.isCancelled())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
format = chatEvent.getFormat();
|
|
||||||
|
|
||||||
format = format.replaceAll("\\{NAME\\}", StringUtils.sanitize(player.getName()));
|
|
||||||
format = format.replaceAll("\\{MESSAGE\\}", StringUtils.sanitize(message));
|
|
||||||
final BaseComponent[] messageComponents = txt(format);
|
|
||||||
|
|
||||||
plugin.getProxy().getPlayers().stream()
|
|
||||||
.filter(p -> p.hasPermission(plugin.seePerm))
|
|
||||||
.forEach(p -> p.sendMessage(messageComponents));
|
|
||||||
plugin.getLogger().info(ChatColor.stripColor(clr(format)));
|
|
||||||
|
|
||||||
event.setCancelled(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String clr(String string)
|
Configuration config = plugin.getConfig();
|
||||||
{
|
String character = Objects.requireNonNull(config.getString("settings.character", "@"));
|
||||||
return ChatColor.translateAlternateColorCodes('&', string);
|
boolean isToggled = toggledPlayers.contains(player.getUniqueId());
|
||||||
|
if (!event.getMessage().startsWith(character) && !isToggled) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
private BaseComponent[] txt(String text)
|
String format = Objects.requireNonNull(config.getString("settings.format", ""));
|
||||||
{
|
String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim();
|
||||||
return TextComponent.fromLegacyText(clr(text));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
BungeeStaffChatEvent chatEvent = new BungeeStaffChatEvent(player, format, message);
|
||||||
|
plugin.getProxy().getPluginManager().callEvent(chatEvent);
|
||||||
|
if (chatEvent.isCancelled()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
format = chatEvent.getFormat();
|
||||||
|
message = chatEvent.getMessage();
|
||||||
|
|
||||||
|
format = format.replaceAll("\\{NAME}", StringUtils.sanitize(player.getName()));
|
||||||
|
format = format.replaceAll("\\{MESSAGE}", StringUtils.sanitize(message));
|
||||||
|
final BaseComponent[] messageComponents = txt(format);
|
||||||
|
|
||||||
|
plugin.getProxy().getPlayers().stream()
|
||||||
|
.filter(p -> p.hasPermission(plugin.seePerm))
|
||||||
|
.forEach(p -> p.sendMessage(messageComponents));
|
||||||
|
plugin.getLogger().info(ChatColor.stripColor(clr(format)));
|
||||||
|
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Contract("_ -> new")
|
||||||
|
private @NotNull String clr(@NotNull String string) {
|
||||||
|
return ChatColor.translateAlternateColorCodes('&', string);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Contract("_ -> new")
|
||||||
|
private @NotNull BaseComponent[] txt(@NotNull String text) {
|
||||||
|
return TextComponent.fromLegacyText(clr(text));
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean togglePlayer(@NotNull UUID player) {
|
||||||
|
if (toggledPlayers.contains(player)) {
|
||||||
|
toggledPlayers.remove(player);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
toggledPlayers.add(player);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,34 +1,54 @@
|
|||||||
package me.oskar3123.staffchat.spigot;
|
package me.oskar3123.staffchat.spigot;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
import me.clip.placeholderapi.PlaceholderAPI;
|
||||||
import me.oskar3123.staffchat.spigot.command.StaffChatCommand;
|
import me.oskar3123.staffchat.spigot.command.StaffChatCommand;
|
||||||
import me.oskar3123.staffchat.spigot.listener.ChatListener;
|
import me.oskar3123.staffchat.spigot.listener.ChatListener;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
public class Main extends JavaPlugin
|
public class Main extends JavaPlugin {
|
||||||
{
|
|
||||||
|
|
||||||
public final String usePerm = "staffchat.use";
|
public final String usePerm = "staffchat.use";
|
||||||
public final String seePerm = "staffchat.see";
|
public final String seePerm = "staffchat.see";
|
||||||
public final String commandPerm = "staffchat.command";
|
public final String commandPerm = "staffchat.command";
|
||||||
public final String reloadPerm = "staffchat.reload";
|
public final String reloadPerm = "staffchat.reload";
|
||||||
|
public final ChatListener chatListener = new ChatListener(this);
|
||||||
|
|
||||||
public void onEnable()
|
public void onEnable() {
|
||||||
{
|
getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
|
||||||
new MetricsLite(this);
|
getServer().getMessenger().registerIncomingPluginChannel(this, "BungeeCord", chatListener);
|
||||||
saveDefaultConfig();
|
new MetricsLite(this);
|
||||||
registerCommands();
|
saveDefaultConfig();
|
||||||
registerEvents();
|
registerCommands();
|
||||||
|
registerEvents();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void saveDefaultConfig() {
|
||||||
|
super.saveDefaultConfig();
|
||||||
|
getConfig().options().copyDefaults(true);
|
||||||
|
saveConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void registerCommands() {
|
||||||
|
Optional.ofNullable(getCommand("staffchat"))
|
||||||
|
.ifPresent(command -> command.setExecutor(new StaffChatCommand(this)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void registerEvents() {
|
||||||
|
Bukkit.getPluginManager().registerEvents(this.chatListener, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isPlaceholderApiEnabled() {
|
||||||
|
return Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
|
||||||
|
}
|
||||||
|
|
||||||
|
public String replacePlaceholders(Player player, String string) {
|
||||||
|
if (!isPlaceholderApiEnabled()) {
|
||||||
|
return string;
|
||||||
}
|
}
|
||||||
|
return PlaceholderAPI.setPlaceholders(player, string);
|
||||||
private void registerCommands()
|
}
|
||||||
{
|
|
||||||
getCommand("staffchat").setExecutor(new StaffChatCommand(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void registerEvents()
|
|
||||||
{
|
|
||||||
Bukkit.getPluginManager().registerEvents(new ChatListener(this), this);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
package me.oskar3123.staffchat.spigot;
|
package me.oskar3123.staffchat.spigot;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import com.google.gson.JsonArray;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import com.google.gson.JsonObject;
|
||||||
import org.bukkit.plugin.ServicePriority;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
|
||||||
import org.json.simple.JSONArray;
|
|
||||||
import org.json.simple.JSONObject;
|
|
||||||
|
|
||||||
import javax.net.ssl.HttpsURLConnection;
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -19,317 +13,304 @@ import java.util.TimerTask;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.zip.GZIPOutputStream;
|
import java.util.zip.GZIPOutputStream;
|
||||||
|
import javax.net.ssl.HttpsURLConnection;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
|
import org.bukkit.plugin.ServicePriority;
|
||||||
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* bStats collects some data for plugin authors.
|
* bStats collects some data for plugin authors.
|
||||||
* <p>
|
*
|
||||||
* Check out https://bStats.org/ to learn more about bStats!
|
* <p>Check out https://bStats.org/ to learn more about bStats!
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("all")
|
@SuppressWarnings("all")
|
||||||
public class MetricsLite
|
public class MetricsLite {
|
||||||
{
|
|
||||||
|
|
||||||
// The version of this bStats class
|
// The version of this bStats class
|
||||||
public static final int B_STATS_VERSION = 1;
|
public static final int B_STATS_VERSION = 1;
|
||||||
// The url to which the data is sent
|
// The url to which the data is sent
|
||||||
private static final String URL = "https://bStats.org/submitData/bukkit";
|
private static final String URL = "https://bStats.org/submitData/bukkit";
|
||||||
// Should failed requests be logged?
|
// Should failed requests be logged?
|
||||||
private static boolean logFailedRequests;
|
private static boolean logFailedRequests;
|
||||||
// The uuid of the server
|
// The uuid of the server
|
||||||
private static String serverUUID;
|
private static String serverUUID;
|
||||||
|
|
||||||
static
|
static {
|
||||||
{
|
// Maven's Relocate is clever and changes strings, too. So we have to use this little "trick"
|
||||||
// Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
|
// ... :D
|
||||||
final String defaultPackage = new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
|
final String defaultPackage =
|
||||||
final String examplePackage = new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
|
new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
|
||||||
// We want to make sure nobody just copy & pastes the example and use the wrong package names
|
final String examplePackage =
|
||||||
if (MetricsLite.class.getPackage().getName().equals(defaultPackage) || MetricsLite.class.getPackage().getName().equals(examplePackage))
|
new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
|
||||||
{
|
// We want to make sure nobody just copy & pastes the example and use the wrong package names
|
||||||
throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
|
if (MetricsLite.class.getPackage().getName().equals(defaultPackage)
|
||||||
}
|
|| MetricsLite.class.getPackage().getName().equals(examplePackage)) {
|
||||||
|
throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The plugin
|
||||||
|
private final JavaPlugin plugin;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class constructor.
|
||||||
|
*
|
||||||
|
* @param plugin The plugin which stats should be submitted.
|
||||||
|
*/
|
||||||
|
public MetricsLite(JavaPlugin plugin) {
|
||||||
|
if (plugin == null) {
|
||||||
|
throw new IllegalArgumentException("Plugin cannot be null!");
|
||||||
|
}
|
||||||
|
this.plugin = plugin;
|
||||||
|
|
||||||
|
// Get the config file
|
||||||
|
File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
|
||||||
|
File configFile = new File(bStatsFolder, "config.yml");
|
||||||
|
YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
|
||||||
|
|
||||||
|
// Check if the config file exists
|
||||||
|
if (!config.isSet("serverUuid")) {
|
||||||
|
|
||||||
|
// Add default values
|
||||||
|
config.addDefault("enabled", true);
|
||||||
|
// Every server gets it's unique random id.
|
||||||
|
config.addDefault("serverUuid", UUID.randomUUID().toString());
|
||||||
|
// Should failed request be logged?
|
||||||
|
config.addDefault("logFailedRequests", false);
|
||||||
|
|
||||||
|
// Inform the server owners about bStats
|
||||||
|
config
|
||||||
|
.options()
|
||||||
|
.header(
|
||||||
|
"bStats collects some data for plugin authors like how many servers are using their plugins.\n"
|
||||||
|
+ "To honor their work, you should not disable it.\n"
|
||||||
|
+ "This has nearly no effect on the server performance!\n"
|
||||||
|
+ "Check out https://bStats.org/ to learn more :)")
|
||||||
|
.copyDefaults(true);
|
||||||
|
try {
|
||||||
|
config.save(configFile);
|
||||||
|
} catch (IOException ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The plugin
|
// Load the data
|
||||||
private final JavaPlugin plugin;
|
serverUUID = config.getString("serverUuid");
|
||||||
|
logFailedRequests = config.getBoolean("logFailedRequests", false);
|
||||||
/**
|
if (config.getBoolean("enabled", true)) {
|
||||||
* Class constructor.
|
boolean found = false;
|
||||||
*
|
// Search for all other bStats Metrics classes to see if we are the first one
|
||||||
* @param plugin The plugin which stats should be submitted.
|
for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
|
||||||
*/
|
try {
|
||||||
public MetricsLite(JavaPlugin plugin)
|
service.getField("B_STATS_VERSION"); // Our identifier :)
|
||||||
{
|
found = true; // We aren't the first
|
||||||
if (plugin == null)
|
break;
|
||||||
{
|
} catch (NoSuchFieldException ignored) {
|
||||||
throw new IllegalArgumentException("Plugin cannot be null!");
|
|
||||||
}
|
|
||||||
this.plugin = plugin;
|
|
||||||
|
|
||||||
// Get the config file
|
|
||||||
File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
|
|
||||||
File configFile = new File(bStatsFolder, "config.yml");
|
|
||||||
YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
|
|
||||||
|
|
||||||
// Check if the config file exists
|
|
||||||
if (!config.isSet("serverUuid"))
|
|
||||||
{
|
|
||||||
|
|
||||||
// Add default values
|
|
||||||
config.addDefault("enabled", true);
|
|
||||||
// Every server gets it's unique random id.
|
|
||||||
config.addDefault("serverUuid", UUID.randomUUID().toString());
|
|
||||||
// Should failed request be logged?
|
|
||||||
config.addDefault("logFailedRequests", false);
|
|
||||||
|
|
||||||
// Inform the server owners about bStats
|
|
||||||
config.options().header(
|
|
||||||
"bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
|
|
||||||
"To honor their work, you should not disable it.\n" +
|
|
||||||
"This has nearly no effect on the server performance!\n" +
|
|
||||||
"Check out https://bStats.org/ to learn more :)"
|
|
||||||
).copyDefaults(true);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
config.save(configFile);
|
|
||||||
}
|
|
||||||
catch (IOException ignored)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load the data
|
|
||||||
serverUUID = config.getString("serverUuid");
|
|
||||||
logFailedRequests = config.getBoolean("logFailedRequests", false);
|
|
||||||
if (config.getBoolean("enabled", true))
|
|
||||||
{
|
|
||||||
boolean found = false;
|
|
||||||
// Search for all other bStats Metrics classes to see if we are the first one
|
|
||||||
for (Class<?> service : Bukkit.getServicesManager().getKnownServices())
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
service.getField("B_STATS_VERSION"); // Our identifier :)
|
|
||||||
found = true; // We aren't the first
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
catch (NoSuchFieldException ignored)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Register our service
|
|
||||||
Bukkit.getServicesManager().register(MetricsLite.class, this, plugin, ServicePriority.Normal);
|
|
||||||
if (!found)
|
|
||||||
{
|
|
||||||
// We are the first!
|
|
||||||
startSubmitting();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
// Register our service
|
||||||
|
Bukkit.getServicesManager().register(MetricsLite.class, this, plugin, ServicePriority.Normal);
|
||||||
|
if (!found) {
|
||||||
|
// We are the first!
|
||||||
|
startSubmitting();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sends the data to the bStats server.
|
* Sends the data to the bStats server.
|
||||||
*
|
*
|
||||||
* @param data The data to send.
|
* @param data The data to send.
|
||||||
* @throws Exception If the request failed.
|
* @throws Exception If the request failed.
|
||||||
*/
|
*/
|
||||||
private static void sendData(JSONObject data) throws Exception
|
private static void sendData(JsonObject data) throws Exception {
|
||||||
{
|
if (data == null) {
|
||||||
if (data == null)
|
throw new IllegalArgumentException("Data cannot be null!");
|
||||||
{
|
|
||||||
throw new IllegalArgumentException("Data cannot be null!");
|
|
||||||
}
|
|
||||||
if (Bukkit.isPrimaryThread())
|
|
||||||
{
|
|
||||||
throw new IllegalAccessException("This method must not be called from the main thread!");
|
|
||||||
}
|
|
||||||
HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
|
|
||||||
|
|
||||||
// Compress the data to save bandwidth
|
|
||||||
byte[] compressedData = compress(data.toString());
|
|
||||||
|
|
||||||
// Add headers
|
|
||||||
connection.setRequestMethod("POST");
|
|
||||||
connection.addRequestProperty("Accept", "application/json");
|
|
||||||
connection.addRequestProperty("Connection", "close");
|
|
||||||
connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
|
|
||||||
connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
|
|
||||||
connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
|
|
||||||
connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
|
|
||||||
|
|
||||||
// Send data
|
|
||||||
connection.setDoOutput(true);
|
|
||||||
DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
|
|
||||||
outputStream.write(compressedData);
|
|
||||||
outputStream.flush();
|
|
||||||
outputStream.close();
|
|
||||||
|
|
||||||
connection.getInputStream().close(); // We don't care about the response - Just send our data :)
|
|
||||||
}
|
}
|
||||||
|
if (Bukkit.isPrimaryThread()) {
|
||||||
/**
|
throw new IllegalAccessException("This method must not be called from the main thread!");
|
||||||
* Gzips the given String.
|
|
||||||
*
|
|
||||||
* @param str The string to gzip.
|
|
||||||
* @return The gzipped String.
|
|
||||||
* @throws IOException If the compression failed.
|
|
||||||
*/
|
|
||||||
private static byte[] compress(final String str) throws IOException
|
|
||||||
{
|
|
||||||
if (str == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
|
||||||
GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
|
|
||||||
gzip.write(str.getBytes("UTF-8"));
|
|
||||||
gzip.close();
|
|
||||||
return outputStream.toByteArray();
|
|
||||||
}
|
}
|
||||||
|
HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
|
||||||
|
|
||||||
/**
|
// Compress the data to save bandwidth
|
||||||
* Starts the Scheduler which submits our data every 30 minutes.
|
byte[] compressedData = compress(data.toString());
|
||||||
*/
|
|
||||||
private void startSubmitting()
|
// Add headers
|
||||||
{
|
connection.setRequestMethod("POST");
|
||||||
final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
|
connection.addRequestProperty("Accept", "application/json");
|
||||||
timer.scheduleAtFixedRate(new TimerTask()
|
connection.addRequestProperty("Connection", "close");
|
||||||
{
|
connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
|
||||||
@Override
|
connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
|
||||||
public void run()
|
connection.setRequestProperty(
|
||||||
{
|
"Content-Type", "application/json"); // We send our data in JSON format
|
||||||
if (!plugin.isEnabled())
|
connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
|
||||||
{ // Plugin was disabled
|
|
||||||
timer.cancel();
|
// Send data
|
||||||
return;
|
connection.setDoOutput(true);
|
||||||
}
|
DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
|
||||||
// Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
|
outputStream.write(compressedData);
|
||||||
// Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
|
outputStream.flush();
|
||||||
Bukkit.getScheduler().runTask(plugin, new Runnable()
|
outputStream.close();
|
||||||
{
|
|
||||||
@Override
|
connection.getInputStream().close(); // We don't care about the response - Just send our data :)
|
||||||
public void run()
|
}
|
||||||
{
|
|
||||||
|
/**
|
||||||
|
* Gzips the given String.
|
||||||
|
*
|
||||||
|
* @param str The string to gzip.
|
||||||
|
* @return The gzipped String.
|
||||||
|
* @throws IOException If the compression failed.
|
||||||
|
*/
|
||||||
|
private static byte[] compress(final String str) throws IOException {
|
||||||
|
if (str == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
||||||
|
GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
|
||||||
|
gzip.write(str.getBytes("UTF-8"));
|
||||||
|
gzip.close();
|
||||||
|
return outputStream.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Starts the Scheduler which submits our data every 30 minutes. */
|
||||||
|
private void startSubmitting() {
|
||||||
|
final Timer timer =
|
||||||
|
new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
|
||||||
|
timer.scheduleAtFixedRate(
|
||||||
|
new TimerTask() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
if (!plugin.isEnabled()) { // Plugin was disabled
|
||||||
|
timer.cancel();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Nevertheless we want our code to run in the Bukkit main thread, so we have to use the
|
||||||
|
// Bukkit scheduler
|
||||||
|
// Don't be afraid! The connection to the bStats server is still async, only the stats
|
||||||
|
// collection is sync ;)
|
||||||
|
Bukkit.getScheduler()
|
||||||
|
.runTask(
|
||||||
|
plugin,
|
||||||
|
new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
submitData();
|
submitData();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, 1000 * 60 * 5, 1000 * 60 * 30);
|
},
|
||||||
// Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
|
1000 * 60 * 5,
|
||||||
// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
|
1000 * 60 * 30);
|
||||||
// WARNING: Just don't do it!
|
// Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough
|
||||||
|
// time to start
|
||||||
|
// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
|
||||||
|
// WARNING: Just don't do it!
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the plugin specific data. This method is called using Reflection.
|
||||||
|
*
|
||||||
|
* @return The plugin specific data.
|
||||||
|
*/
|
||||||
|
public JsonObject getPluginData() {
|
||||||
|
JsonObject data = new JsonObject();
|
||||||
|
|
||||||
|
String pluginName = plugin.getDescription().getName();
|
||||||
|
String pluginVersion = plugin.getDescription().getVersion();
|
||||||
|
|
||||||
|
data.addProperty("pluginName", pluginName); // Append the name of the plugin
|
||||||
|
data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
|
||||||
|
|
||||||
|
JsonArray customCharts = new JsonArray();
|
||||||
|
data.add("customCharts", customCharts);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the server specific data.
|
||||||
|
*
|
||||||
|
* @return The server specific data.
|
||||||
|
*/
|
||||||
|
private JsonObject getServerData() {
|
||||||
|
// Minecraft specific data
|
||||||
|
int playerAmount = Bukkit.getOnlinePlayers().size();
|
||||||
|
int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
|
||||||
|
String bukkitVersion = Bukkit.getVersion();
|
||||||
|
bukkitVersion =
|
||||||
|
bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
|
||||||
|
|
||||||
|
// OS/Java specific data
|
||||||
|
String javaVersion = System.getProperty("java.version");
|
||||||
|
String osName = System.getProperty("os.name");
|
||||||
|
String osArch = System.getProperty("os.arch");
|
||||||
|
String osVersion = System.getProperty("os.version");
|
||||||
|
int coreCount = Runtime.getRuntime().availableProcessors();
|
||||||
|
|
||||||
|
JsonObject data = new JsonObject();
|
||||||
|
|
||||||
|
data.addProperty("serverUUID", serverUUID);
|
||||||
|
|
||||||
|
data.addProperty("playerAmount", playerAmount);
|
||||||
|
data.addProperty("onlineMode", onlineMode);
|
||||||
|
data.addProperty("bukkitVersion", bukkitVersion);
|
||||||
|
|
||||||
|
data.addProperty("javaVersion", javaVersion);
|
||||||
|
data.addProperty("osName", osName);
|
||||||
|
data.addProperty("osArch", osArch);
|
||||||
|
data.addProperty("osVersion", osVersion);
|
||||||
|
data.addProperty("coreCount", coreCount);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Collects the data and sends it afterwards. */
|
||||||
|
private void submitData() {
|
||||||
|
final JsonObject data = getServerData();
|
||||||
|
|
||||||
|
JsonArray pluginData = new JsonArray();
|
||||||
|
// Search for all other bStats Metrics classes to get their plugin data
|
||||||
|
for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
|
||||||
|
try {
|
||||||
|
service.getField("B_STATS_VERSION"); // Our identifier :)
|
||||||
|
} catch (NoSuchFieldException ignored) {
|
||||||
|
continue; // Continue "searching"
|
||||||
|
}
|
||||||
|
// Found one!
|
||||||
|
try {
|
||||||
|
pluginData.add(
|
||||||
|
(JsonObject)
|
||||||
|
service
|
||||||
|
.getMethod("getPluginData")
|
||||||
|
.invoke(Bukkit.getServicesManager().load(service)));
|
||||||
|
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
data.add("plugins", pluginData);
|
||||||
* Gets the plugin specific data.
|
|
||||||
* This method is called using Reflection.
|
|
||||||
*
|
|
||||||
* @return The plugin specific data.
|
|
||||||
*/
|
|
||||||
public JSONObject getPluginData()
|
|
||||||
{
|
|
||||||
JSONObject data = new JSONObject();
|
|
||||||
|
|
||||||
String pluginName = plugin.getDescription().getName();
|
// Create a new thread for the connection to the bStats server
|
||||||
String pluginVersion = plugin.getDescription().getVersion();
|
new Thread(
|
||||||
|
new Runnable() {
|
||||||
data.put("pluginName", pluginName); // Append the name of the plugin
|
@Override
|
||||||
data.put("pluginVersion", pluginVersion); // Append the version of the plugin
|
public void run() {
|
||||||
JSONArray customCharts = new JSONArray();
|
try {
|
||||||
data.put("customCharts", customCharts);
|
// Send the data
|
||||||
|
sendData(data);
|
||||||
return data;
|
} catch (Exception e) {
|
||||||
}
|
// Something went wrong! :(
|
||||||
|
if (logFailedRequests) {
|
||||||
/**
|
plugin
|
||||||
* Gets the server specific data.
|
.getLogger()
|
||||||
*
|
.log(
|
||||||
* @return The server specific data.
|
Level.WARNING,
|
||||||
*/
|
"Could not submit plugin stats of " + plugin.getName(),
|
||||||
private JSONObject getServerData()
|
e);
|
||||||
{
|
}
|
||||||
// Minecraft specific data
|
|
||||||
int playerAmount = Bukkit.getOnlinePlayers().size();
|
|
||||||
int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
|
|
||||||
String bukkitVersion = Bukkit.getVersion();
|
|
||||||
bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
|
|
||||||
|
|
||||||
// OS/Java specific data
|
|
||||||
String javaVersion = System.getProperty("java.version");
|
|
||||||
String osName = System.getProperty("os.name");
|
|
||||||
String osArch = System.getProperty("os.arch");
|
|
||||||
String osVersion = System.getProperty("os.version");
|
|
||||||
int coreCount = Runtime.getRuntime().availableProcessors();
|
|
||||||
|
|
||||||
JSONObject data = new JSONObject();
|
|
||||||
|
|
||||||
data.put("serverUUID", serverUUID);
|
|
||||||
|
|
||||||
data.put("playerAmount", playerAmount);
|
|
||||||
data.put("onlineMode", onlineMode);
|
|
||||||
data.put("bukkitVersion", bukkitVersion);
|
|
||||||
|
|
||||||
data.put("javaVersion", javaVersion);
|
|
||||||
data.put("osName", osName);
|
|
||||||
data.put("osArch", osArch);
|
|
||||||
data.put("osVersion", osVersion);
|
|
||||||
data.put("coreCount", coreCount);
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Collects the data and sends it afterwards.
|
|
||||||
*/
|
|
||||||
private void submitData()
|
|
||||||
{
|
|
||||||
final JSONObject data = getServerData();
|
|
||||||
|
|
||||||
JSONArray pluginData = new JSONArray();
|
|
||||||
// Search for all other bStats Metrics classes to get their plugin data
|
|
||||||
for (Class<?> service : Bukkit.getServicesManager().getKnownServices())
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
service.getField("B_STATS_VERSION"); // Our identifier :)
|
|
||||||
}
|
|
||||||
catch (NoSuchFieldException ignored)
|
|
||||||
{
|
|
||||||
continue; // Continue "searching"
|
|
||||||
}
|
|
||||||
// Found one!
|
|
||||||
try
|
|
||||||
{
|
|
||||||
pluginData.add(service.getMethod("getPluginData").invoke(Bukkit.getServicesManager().load(service)));
|
|
||||||
}
|
|
||||||
catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data.put("plugins", pluginData);
|
|
||||||
|
|
||||||
// Create a new thread for the connection to the bStats server
|
|
||||||
new Thread(new Runnable()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void run()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Send the data
|
|
||||||
sendData(data);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
}
|
||||||
{
|
})
|
||||||
// Something went wrong! :(
|
.start();
|
||||||
if (logFailedRequests)
|
}
|
||||||
{
|
}
|
||||||
plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,74 +1,103 @@
|
|||||||
package me.oskar3123.staffchat.spigot.command;
|
package me.oskar3123.staffchat.spigot.command;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
import me.oskar3123.staffchat.spigot.Main;
|
import me.oskar3123.staffchat.spigot.Main;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
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.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.jetbrains.annotations.Contract;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class StaffChatCommand implements CommandExecutor
|
public class StaffChatCommand implements CommandExecutor {
|
||||||
{
|
|
||||||
|
|
||||||
private Main plugin;
|
private final Main plugin;
|
||||||
private FileConfiguration config;
|
private FileConfiguration config;
|
||||||
|
|
||||||
public StaffChatCommand(Main plugin)
|
public StaffChatCommand(@NotNull Main plugin) {
|
||||||
{
|
this.plugin = plugin;
|
||||||
this.plugin = plugin;
|
config = plugin.getConfig();
|
||||||
config = plugin.getConfig();
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCommand(
|
||||||
|
@NotNull CommandSender sender,
|
||||||
|
@NotNull Command command,
|
||||||
|
@NotNull String label,
|
||||||
|
@NotNull String[] args) {
|
||||||
|
String noPerm =
|
||||||
|
clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
||||||
|
if (!sender.hasPermission(plugin.commandPerm)) {
|
||||||
|
sender.sendMessage(noPerm);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
if (args.length < 1) {
|
||||||
@Override
|
help(sender, label);
|
||||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
|
return true;
|
||||||
{
|
|
||||||
String noPerm = clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
|
|
||||||
if (!sender.hasPermission(plugin.commandPerm))
|
|
||||||
{
|
|
||||||
sender.sendMessage(noPerm);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (args.length < 1)
|
|
||||||
{
|
|
||||||
help(sender, label);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (args[0].equalsIgnoreCase("reload"))
|
|
||||||
{
|
|
||||||
if (sender.hasPermission(plugin.reloadPerm))
|
|
||||||
{
|
|
||||||
reload(sender);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sender.sendMessage(noPerm);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
help(sender, label);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
if (args[0].equalsIgnoreCase("reload")) {
|
||||||
private void help(CommandSender sender, String label)
|
if (sender.hasPermission(plugin.reloadPerm)) {
|
||||||
{
|
reload(sender);
|
||||||
String prefix = clr(config.getString("messages.prefix"));
|
} else {
|
||||||
sender.sendMessage(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123");
|
sender.sendMessage(noPerm);
|
||||||
if (sender.hasPermission(plugin.reloadPerm))
|
}
|
||||||
{
|
return true;
|
||||||
sender.sendMessage(prefix + "/" + label + " reload - Reloads the config file");
|
} else if (args[0].equalsIgnoreCase("toggle")) {
|
||||||
}
|
if (sender.hasPermission(plugin.usePerm)) {
|
||||||
|
toggle(sender);
|
||||||
|
} else {
|
||||||
|
sender.sendMessage(noPerm);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
help(sender, label);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private void reload(CommandSender sender)
|
private void playerOnly(@NotNull CommandSender sender) {
|
||||||
{
|
sender.sendMessage(
|
||||||
plugin.reloadConfig();
|
clr(config.getString("messages.prefix") + config.getString("messages.playeronly")));
|
||||||
config = plugin.getConfig();
|
}
|
||||||
sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
|
||||||
|
private void help(@NotNull CommandSender sender, String label) {
|
||||||
|
String prefix = clr(Objects.requireNonNull(config.getString("messages.prefix", "")));
|
||||||
|
sender.sendMessage(
|
||||||
|
prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123");
|
||||||
|
if (sender.hasPermission(plugin.usePerm)) {
|
||||||
|
sender.sendMessage(prefix + "Message prefix: " + config.getString("settings.character"));
|
||||||
|
sender.sendMessage(prefix + "/" + label + " toggle - Toggles auto staffchat");
|
||||||
}
|
}
|
||||||
|
if (sender.hasPermission(plugin.reloadPerm)) {
|
||||||
private String clr(String string)
|
sender.sendMessage(prefix + "/" + label + " reload - Reloads the config file");
|
||||||
{
|
|
||||||
return ChatColor.translateAlternateColorCodes('&', string);
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void reload(@NotNull CommandSender sender) {
|
||||||
|
plugin.reloadConfig();
|
||||||
|
config = plugin.getConfig();
|
||||||
|
sender.sendMessage(
|
||||||
|
clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void toggle(@NotNull CommandSender sender) {
|
||||||
|
if (!(sender instanceof Player)) {
|
||||||
|
playerOnly(sender);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
boolean toggled = plugin.chatListener.togglePlayer(((Player) sender).getUniqueId());
|
||||||
|
String state =
|
||||||
|
toggled ? config.getString("messages.onstring") : config.getString("messages.offstring");
|
||||||
|
sender.sendMessage(
|
||||||
|
clr(
|
||||||
|
config.getString("messages.prefix")
|
||||||
|
+ String.format(
|
||||||
|
Objects.requireNonNull(config.getString("messages.toggled", "")), state)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Contract("_ -> new")
|
||||||
|
private @NotNull String clr(@NotNull String string) {
|
||||||
|
return ChatColor.translateAlternateColorCodes('&', string);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,67 +1,72 @@
|
|||||||
package me.oskar3123.staffchat.spigot.event;
|
package me.oskar3123.staffchat.spigot.event;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.Cancellable;
|
import org.bukkit.event.Cancellable;
|
||||||
import org.bukkit.event.Event;
|
import org.bukkit.event.Event;
|
||||||
import org.bukkit.event.HandlerList;
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class StaffChatEvent extends Event implements Cancellable
|
public class StaffChatEvent extends Event implements Cancellable {
|
||||||
{
|
|
||||||
|
|
||||||
private static HandlerList handlerList = new HandlerList();
|
private static final HandlerList HANDLER_LIST = new HandlerList();
|
||||||
private final Player player;
|
|
||||||
private final String message;
|
|
||||||
private boolean cancelled = false;
|
|
||||||
private String format;
|
|
||||||
|
|
||||||
public StaffChatEvent(Player player, String format, String message)
|
private final Player player;
|
||||||
{
|
|
||||||
this.player = player;
|
|
||||||
this.format = format;
|
|
||||||
this.message = message;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static HandlerList getHandlerList()
|
private boolean cancelled = false;
|
||||||
{
|
private String format;
|
||||||
return handlerList;
|
private String message;
|
||||||
}
|
|
||||||
|
|
||||||
public String getFormat()
|
public StaffChatEvent(
|
||||||
{
|
boolean async, @NotNull Player player, @NotNull String format, @NotNull String message) {
|
||||||
return format;
|
super(async);
|
||||||
}
|
this.player = player;
|
||||||
|
this.format = format;
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
public void setFormat(String format)
|
/**
|
||||||
{
|
* Required by BungeeCord
|
||||||
this.format = format;
|
*
|
||||||
}
|
* @return the handler list
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
public static @NotNull HandlerList getHandlerList() {
|
||||||
|
return HANDLER_LIST;
|
||||||
|
}
|
||||||
|
|
||||||
public Player getPlayer()
|
public @NotNull String getFormat() {
|
||||||
{
|
return format;
|
||||||
return player;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public String getMessage()
|
public void setFormat(String format) {
|
||||||
{
|
this.format = Objects.requireNonNull(format);
|
||||||
return message;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
public @NotNull String getMessage() {
|
||||||
public HandlerList getHandlers()
|
return message;
|
||||||
{
|
}
|
||||||
return handlerList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
public void setMessage(String message) {
|
||||||
public boolean isCancelled()
|
this.message = Objects.requireNonNull(message);
|
||||||
{
|
}
|
||||||
return cancelled;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
public @NotNull Player getPlayer() {
|
||||||
public void setCancelled(boolean cancelled)
|
return player;
|
||||||
{
|
}
|
||||||
this.cancelled = cancelled;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull HandlerList getHandlers() {
|
||||||
|
return HANDLER_LIST;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isCancelled() {
|
||||||
|
return cancelled;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCancelled(boolean cancelled) {
|
||||||
|
this.cancelled = cancelled;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,62 +1,161 @@
|
|||||||
package me.oskar3123.staffchat.spigot.listener;
|
package me.oskar3123.staffchat.spigot.listener;
|
||||||
|
|
||||||
|
import com.google.common.io.ByteArrayDataInput;
|
||||||
|
import com.google.common.io.ByteArrayDataOutput;
|
||||||
|
import com.google.common.io.ByteStreams;
|
||||||
|
import github.scarsz.discordsrv.DiscordSRV;
|
||||||
|
import github.scarsz.discordsrv.util.DiscordUtil;
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.DataInputStream;
|
||||||
|
import java.io.DataOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
import me.oskar3123.staffchat.spigot.Main;
|
import me.oskar3123.staffchat.spigot.Main;
|
||||||
import me.oskar3123.staffchat.spigot.event.StaffChatEvent;
|
import me.oskar3123.staffchat.spigot.event.StaffChatEvent;
|
||||||
import me.oskar3123.staffchat.util.StringUtils;
|
import me.oskar3123.staffchat.util.StringUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||||
|
import org.bukkit.plugin.messaging.PluginMessageListener;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class ChatListener implements Listener
|
public class ChatListener implements Listener, PluginMessageListener {
|
||||||
{
|
|
||||||
|
|
||||||
private Main plugin;
|
private final Main plugin;
|
||||||
|
private final Set<UUID> toggledPlayers = new HashSet<>();
|
||||||
|
|
||||||
public ChatListener(Main plugin)
|
public ChatListener(@NotNull Main plugin) {
|
||||||
{
|
this.plugin = plugin;
|
||||||
this.plugin = plugin;
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void chat(@NotNull AsyncPlayerChatEvent event) {
|
||||||
|
if (!event.getPlayer().hasPermission(plugin.usePerm)) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
FileConfiguration config = plugin.getConfig();
|
||||||
public void chat(AsyncPlayerChatEvent event)
|
String character = Objects.requireNonNull(config.getString("settings.character", "@"));
|
||||||
{
|
boolean isToggled = toggledPlayers.contains(event.getPlayer().getUniqueId());
|
||||||
if (!event.getPlayer().hasPermission(plugin.usePerm))
|
if (!event.getMessage().startsWith(character) && !isToggled) {
|
||||||
{
|
return;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
FileConfiguration config = plugin.getConfig();
|
|
||||||
String character = config.getString("settings.character");
|
|
||||||
if (!event.getMessage().startsWith(character))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String format = config.getString("settings.format");
|
|
||||||
String message = event.getMessage().substring(character.length()).trim();
|
|
||||||
|
|
||||||
StaffChatEvent chatEvent = new StaffChatEvent(event.getPlayer(), format, message);
|
|
||||||
Bukkit.getServer().getPluginManager().callEvent(chatEvent);
|
|
||||||
if (chatEvent.isCancelled())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
format = chatEvent.getFormat();
|
|
||||||
|
|
||||||
format = format.replaceAll("\\{NAME\\}", StringUtils.sanitize(event.getPlayer().getName()));
|
|
||||||
format = format.replaceAll("\\{MESSAGE\\}", StringUtils.sanitize(message));
|
|
||||||
format = ChatColor.translateAlternateColorCodes('&', format);
|
|
||||||
final String finalMessage = format;
|
|
||||||
|
|
||||||
Bukkit.getOnlinePlayers().stream()
|
|
||||||
.filter(p -> p.hasPermission(plugin.seePerm))
|
|
||||||
.forEach(p -> p.sendMessage(finalMessage));
|
|
||||||
plugin.getLogger().info(ChatColor.stripColor(finalMessage));
|
|
||||||
|
|
||||||
event.setCancelled(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String format = Objects.requireNonNull(config.getString("settings.format", ""));
|
||||||
|
String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim();
|
||||||
|
if (config.getBoolean("settings.replaceplaceholdersinmessage")) {
|
||||||
|
message = plugin.replacePlaceholders(event.getPlayer(), message);
|
||||||
|
}
|
||||||
|
|
||||||
|
StaffChatEvent chatEvent =
|
||||||
|
new StaffChatEvent(event.isAsynchronous(), event.getPlayer(), format, message);
|
||||||
|
Bukkit.getServer().getPluginManager().callEvent(chatEvent);
|
||||||
|
if (chatEvent.isCancelled()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
format = chatEvent.getFormat();
|
||||||
|
message = chatEvent.getMessage();
|
||||||
|
|
||||||
|
format = plugin.replacePlaceholders(event.getPlayer(), format);
|
||||||
|
format = format.replaceAll("\\{NAME}", StringUtils.sanitize(event.getPlayer().getName()));
|
||||||
|
format = ChatColor.translateAlternateColorCodes('&', format);
|
||||||
|
format = format.replaceAll("\\{MESSAGE}", StringUtils.sanitize(message));
|
||||||
|
final String finalMessage = format;
|
||||||
|
|
||||||
|
if (plugin.getConfig().getBoolean("discordsrv.enable")) {
|
||||||
|
sendDiscordMessage(event.getPlayer(), message);
|
||||||
|
}
|
||||||
|
if (plugin.getConfig().getBoolean("settings.sendmessagestoallservers")) {
|
||||||
|
sendForwardPluginMessage(event.getPlayer(), finalMessage);
|
||||||
|
}
|
||||||
|
sendStaffChatMessage(finalMessage);
|
||||||
|
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPluginMessageReceived(
|
||||||
|
@NotNull String channel, @NotNull Player player, byte[] message) {
|
||||||
|
if (!channel.equals("BungeeCord")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ByteArrayDataInput in = ByteStreams.newDataInput(message);
|
||||||
|
String subChannel = in.readUTF();
|
||||||
|
if (!subChannel.equals("StaffChat")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
short len = in.readShort();
|
||||||
|
byte[] msgbytes = new byte[len];
|
||||||
|
in.readFully(msgbytes);
|
||||||
|
|
||||||
|
DataInputStream msgin = new DataInputStream(new ByteArrayInputStream(msgbytes));
|
||||||
|
String actualMessage;
|
||||||
|
try {
|
||||||
|
actualMessage = msgin.readUTF();
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
plugin.getLogger().severe("Failed to read plugin message from bungeecord");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sendStaffChatMessage(actualMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void sendStaffChatMessage(@NotNull String message) {
|
||||||
|
Bukkit.getOnlinePlayers().stream()
|
||||||
|
.filter(p -> p.hasPermission(plugin.seePerm))
|
||||||
|
.forEach(p -> p.sendMessage(message));
|
||||||
|
plugin.getLogger().info(ChatColor.stripColor(message));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void sendForwardPluginMessage(@NotNull Player player, @NotNull String message) {
|
||||||
|
ByteArrayDataOutput out = ByteStreams.newDataOutput();
|
||||||
|
out.writeUTF("Forward");
|
||||||
|
out.writeUTF("ONLINE");
|
||||||
|
out.writeUTF("StaffChat");
|
||||||
|
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
|
||||||
|
DataOutputStream dataStream = new DataOutputStream(byteStream);
|
||||||
|
try {
|
||||||
|
dataStream.writeUTF(message);
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
plugin.getLogger().severe("Failed to send plugin message to bungeecord");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
byte[] data = byteStream.toByteArray();
|
||||||
|
out.writeShort(data.length);
|
||||||
|
out.write(data);
|
||||||
|
player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void sendDiscordMessage(Player player, String message) {
|
||||||
|
if (Bukkit.getPluginManager().isPluginEnabled("DiscordSRV")) {
|
||||||
|
String format =
|
||||||
|
plugin
|
||||||
|
.replacePlaceholders(player, plugin.getConfig().getString("discordsrv.format", ""))
|
||||||
|
.replaceAll("\\{NAME}", StringUtils.sanitize(player.getName()))
|
||||||
|
.replaceAll("\\{MESSAGE}", StringUtils.sanitize(message));
|
||||||
|
DiscordUtil.sendMessage(
|
||||||
|
DiscordSRV.getPlugin()
|
||||||
|
.getOptionalTextChannel(
|
||||||
|
plugin.getConfig().getString("discordsrv.channel", "staffchat")),
|
||||||
|
format);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean togglePlayer(@NotNull UUID player) {
|
||||||
|
if (toggledPlayers.contains(player)) {
|
||||||
|
toggledPlayers.remove(player);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
toggledPlayers.add(player);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
package me.oskar3123.staffchat.util;
|
package me.oskar3123.staffchat.util;
|
||||||
|
|
||||||
public class StringUtils
|
public class StringUtils {
|
||||||
{
|
|
||||||
|
|
||||||
public static String sanitize(String string)
|
|
||||||
{
|
|
||||||
string = string.replaceAll("\\\\", "\\\\\\\\");
|
|
||||||
string = string.replaceAll("\\$", "\\\\\\$");
|
|
||||||
return string;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public static String sanitize(String string) {
|
||||||
|
string = string.replaceAll("\\\\", "\\\\\\\\");
|
||||||
|
string = string.replaceAll("\\$", "\\\\\\$");
|
||||||
|
return string;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: StaffChat
|
name: StaffChat
|
||||||
authors: [oskar3123]
|
author: oskar3123
|
||||||
main: me.oskar3123.staffchat.bungee.BungeeMain
|
main: me.oskar3123.staffchat.bungee.BungeeMain
|
||||||
version: 1.1.3
|
version: 1.4.0
|
||||||
|
|||||||
@@ -1,7 +1,17 @@
|
|||||||
settings:
|
settings:
|
||||||
character: '@'
|
character: '@'
|
||||||
format: '&b{NAME}: {MESSAGE}'
|
format: '&b{NAME}: {MESSAGE}'
|
||||||
|
replaceplaceholdersinmessage: true
|
||||||
|
sendmessagestoallservers: true
|
||||||
messages:
|
messages:
|
||||||
prefix: '&7StaffChat&8> &7'
|
prefix: '&7StaffChat&8> &7'
|
||||||
nopermission: '&cYou don''t have permission to do that'
|
nopermission: '&cYou don''t have permission to do that'
|
||||||
reloaded: 'Reloaded the config file'
|
playeronly: '&cPlayer only command'
|
||||||
|
reloaded: 'Reloaded the config file'
|
||||||
|
toggled: 'You toggled auto staffchat %s'
|
||||||
|
onstring: 'on'
|
||||||
|
offstring: 'off'
|
||||||
|
discordsrv:
|
||||||
|
enable: false
|
||||||
|
channel: 'staffchat'
|
||||||
|
format: '{NAME} » {MESSAGE}'
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
name: StaffChat
|
name: StaffChat
|
||||||
authors: [oskar3123]
|
authors: [ oskar3123 ]
|
||||||
main: me.oskar3123.staffchat.spigot.Main
|
main: me.oskar3123.staffchat.spigot.Main
|
||||||
version: 1.1.3
|
api-version: 1.13
|
||||||
|
version: 1.4.0
|
||||||
|
softdepend: [ PlaceholderAPI, DiscordSRV ]
|
||||||
commands:
|
commands:
|
||||||
staffchat:
|
staffchat:
|
||||||
usage: /<command>
|
usage: /<command>
|
||||||
description: Used to reload the config file.
|
description: Used to reload the config file.
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
staffchat.*:
|
staffchat.*:
|
||||||
description: Gives you permission to everything in the plugin.
|
description: Gives you permission to everything in the plugin.
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,308 +0,0 @@
|
|||||||
package me.oskar3123.staffchat;
|
|
||||||
|
|
||||||
import net.md_5.bungee.api.*;
|
|
||||||
import net.md_5.bungee.api.chat.BaseComponent;
|
|
||||||
import net.md_5.bungee.api.config.ServerInfo;
|
|
||||||
import net.md_5.bungee.api.connection.PendingConnection;
|
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
|
||||||
import net.md_5.bungee.api.connection.Server;
|
|
||||||
import net.md_5.bungee.api.event.ServerConnectEvent;
|
|
||||||
import net.md_5.bungee.api.score.Scoreboard;
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class TestProxiedPlayer implements ProxiedPlayer
|
|
||||||
{
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayName()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setDisplayName(String s)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(ChatMessageType chatMessageType, BaseComponent... baseComponents)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(ChatMessageType chatMessageType, BaseComponent baseComponent)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void connect(ServerInfo serverInfo)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void connect(ServerInfo serverInfo, ServerConnectEvent.Reason reason)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void connect(ServerInfo serverInfo, Callback<Boolean> callback)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void connect(ServerInfo serverInfo, Callback<Boolean> callback, ServerConnectEvent.Reason reason)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void connect(ServerConnectRequest serverConnectRequest)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Server getServer()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getPing()
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendData(String s, byte[] bytes)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public PendingConnection getPendingConnection()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void chat(String s)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ServerInfo getReconnectServer()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setReconnectServer(ServerInfo serverInfo)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getUUID()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UUID getUniqueId()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Locale getLocale()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public byte getViewDistance()
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ChatMode getChatMode()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasChatColors()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public SkinConfiguration getSkinParts()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MainHand getMainHand()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTabHeader(BaseComponent baseComponent, BaseComponent baseComponent1)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTabHeader(BaseComponent[] baseComponents, BaseComponent[] baseComponents1)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void resetTabHeader()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendTitle(Title title)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isForgeUser()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Map<String, String> getModList()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Scoreboard getScoreboard()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(String s)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessages(String... strings)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(BaseComponent... baseComponents)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(BaseComponent baseComponent)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<String> getGroups()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addGroups(String... strings)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void removeGroups(String... strings)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasPermission(String s)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPermission(String s, boolean b)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<String> getPermissions()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InetSocketAddress getAddress()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void disconnect(String s)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void disconnect(BaseComponent... baseComponents)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void disconnect(BaseComponent baseComponent)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isConnected()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Unsafe unsafe()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
package me.oskar3123.staffchat.bungee.event;
|
|
||||||
|
|
||||||
import me.oskar3123.staffchat.TestProxiedPlayer;
|
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
|
||||||
|
|
||||||
public class BungeeStaffChatEventTest
|
|
||||||
{
|
|
||||||
|
|
||||||
private ProxiedPlayer player;
|
|
||||||
private String format;
|
|
||||||
private String message;
|
|
||||||
private BungeeStaffChatEvent event;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void before()
|
|
||||||
{
|
|
||||||
this.player = new TestProxiedPlayer();
|
|
||||||
this.format = "Format";
|
|
||||||
this.message = "Message";
|
|
||||||
this.event = new BungeeStaffChatEvent(player, format, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testFormat()
|
|
||||||
{
|
|
||||||
assertEquals(format, event.getFormat());
|
|
||||||
String newFormat = "New Format";
|
|
||||||
event.setFormat(newFormat);
|
|
||||||
assertEquals(newFormat, event.getFormat());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getMessage()
|
|
||||||
{
|
|
||||||
assertEquals(message, event.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getPlayer()
|
|
||||||
{
|
|
||||||
assertEquals(player, event.getPlayer());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCancelled()
|
|
||||||
{
|
|
||||||
event.setCancelled(true);
|
|
||||||
assertTrue(event.isCancelled());
|
|
||||||
event.setCancelled(false);
|
|
||||||
assertFalse(event.isCancelled());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
package me.oskar3123.staffchat.spigot.event;
|
|
||||||
|
|
||||||
import me.oskar3123.staffchat.TestPlayer;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
|
||||||
|
|
||||||
public class StaffChatEventTest
|
|
||||||
{
|
|
||||||
|
|
||||||
private Player player;
|
|
||||||
private String format;
|
|
||||||
private String message;
|
|
||||||
private StaffChatEvent event;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void before()
|
|
||||||
{
|
|
||||||
this.player = new TestPlayer();
|
|
||||||
this.format = "Format";
|
|
||||||
this.message = "Message";
|
|
||||||
this.event = new StaffChatEvent(player, format, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testFormat()
|
|
||||||
{
|
|
||||||
assertEquals(format, event.getFormat());
|
|
||||||
String newFormat = "New Format";
|
|
||||||
event.setFormat(newFormat);
|
|
||||||
assertEquals(newFormat, event.getFormat());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getPlayer()
|
|
||||||
{
|
|
||||||
assertEquals(player, event.getPlayer());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getMessage()
|
|
||||||
{
|
|
||||||
assertEquals(message, event.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCancelled()
|
|
||||||
{
|
|
||||||
event.setCancelled(true);
|
|
||||||
assertTrue(event.isCancelled());
|
|
||||||
event.setCancelled(false);
|
|
||||||
assertFalse(event.isCancelled());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package me.oskar3123.staffchat.util;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
|
||||||
|
|
||||||
public class StringUtilsTest
|
|
||||||
{
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void sanitize()
|
|
||||||
{
|
|
||||||
assertEquals("message", "hejsan \\$ \\\\ xd", StringUtils.sanitize("hejsan $ \\ xd"));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user