diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
new file mode 100644
index 0000000..25da574
--- /dev/null
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000..0b97b85
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/BungeeCord.jar b/lib/BungeeCord.jar
index f5c311f..0396a5e 100644
Binary files a/lib/BungeeCord.jar and b/lib/BungeeCord.jar differ
diff --git a/plugin.yml b/plugin.yml
index b15670d..3a2282e 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,4 +1,4 @@
name: SimpleChat
-version: 0.4.1
+version: 0.4.2
main: com.github.calenria.scbungee.SimpleChat
author: Calenria
\ No newline at end of file
diff --git a/src/com/github/calenria/scbungee/SimpleChat.java b/src/com/github/calenria/scbungee/SimpleChat.java
index c28d56b..0cdf03d 100644
--- a/src/com/github/calenria/scbungee/SimpleChat.java
+++ b/src/com/github/calenria/scbungee/SimpleChat.java
@@ -1,5 +1,8 @@
package com.github.calenria.scbungee;
+import net.md_5.bungee.BungeeCord;
+import net.md_5.bungee.api.plugin.Plugin;
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
@@ -10,27 +13,24 @@
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
-import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.api.plugin.Plugin;
-
public class SimpleChat extends Plugin {
- public static ResourceBundle messages = null;
- public static String pluginPath = "./plugins/SimpleChat-Bungee/";
- public File messagesFile = new File(pluginPath + "messages.properties");
- public static Boolean hideStream = true;
- public static Boolean debug = false;
+ public static ResourceBundle messages = null;
+ public static String pluginPath = "./plugins/SimpleChat-Bungee/";
+ public File messagesFile = new File(pluginPath + "messages.properties");
+ public static Boolean hideStream = true;
+ public static Boolean debug = false;
@Override
public void onEnable() {
BungeeCord.getInstance().registerChannel("SimpleChat");
- BungeeCord.getInstance().getPluginManager().registerListener(new SimpleChatListener());
+ BungeeCord.getInstance().getPluginManager().registerListener(this, new SimpleChatListener());
messages = readProperties();
hideStream = Boolean.parseBoolean(messages.getString("hideStream"));
try {
debug = Boolean.parseBoolean(messages.getString("debug"));
} catch (MissingResourceException e) {
try {
- BufferedWriter out = new BufferedWriter(new FileWriter(messagesFile, true));
+ BufferedWriter out = new BufferedWriter(new FileWriter(this.messagesFile, true));
out.write("debug=false");
out.newLine();
out.close();
@@ -45,12 +45,12 @@ private PropertyResourceBundle readProperties() {
PropertyResourceBundle bundle = null;
File pluginDir = new File(pluginPath);
- if (!messagesFile.exists()) {
+ if (!this.messagesFile.exists()) {
try {
if (!pluginDir.exists()) {
pluginDir.mkdirs();
}
- BufferedWriter out = new BufferedWriter(new FileWriter(messagesFile));
+ BufferedWriter out = new BufferedWriter(new FileWriter(this.messagesFile));
out.write("hideStream=true");
out.newLine();
out.write("login=&6%s hat das Spiel betreten");
@@ -65,7 +65,7 @@ private PropertyResourceBundle readProperties() {
}
}
try {
- bundle = new PropertyResourceBundle(new FileInputStream(messagesFile));
+ bundle = new PropertyResourceBundle(new FileInputStream(this.messagesFile));
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
diff --git a/src/com/github/calenria/scbungee/SimpleChatListener.java b/src/com/github/calenria/scbungee/SimpleChatListener.java
index 0801832..df890e7 100644
--- a/src/com/github/calenria/scbungee/SimpleChatListener.java
+++ b/src/com/github/calenria/scbungee/SimpleChatListener.java
@@ -1,11 +1,5 @@
package com.github.calenria.scbungee;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.StringTokenizer;
-
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.config.ServerInfo;
@@ -15,12 +9,17 @@
import net.md_5.bungee.api.event.PlayerDisconnectEvent;
import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
-import com.google.common.eventbus.Subscribe;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.StringTokenizer;
public class SimpleChatListener implements Listener {
- @Subscribe
+ @EventHandler
public void onLogin(LoginEvent event) {
if (SimpleChat.hideStream) {
return;
@@ -29,7 +28,7 @@ public void onLogin(LoginEvent event) {
sendAll(ChatColor.translateAlternateColorCodes('&', String.format(SimpleChat.messages.getString("login"), event.getConnection().getName())));
}
- @Subscribe
+ @EventHandler
public void onDisconnect(PlayerDisconnectEvent event) {
if (SimpleChat.hideStream) {
return;
@@ -38,14 +37,15 @@ public void onDisconnect(PlayerDisconnectEvent event) {
sendAll(ChatColor.translateAlternateColorCodes('&', String.format(SimpleChat.messages.getString("logout"), event.getPlayer().getName())));
}
- @Subscribe
+ @EventHandler
public void onPluginMessage(PluginMessageEvent event) {
String pluginMessage = new String(event.getData());
if (SimpleChat.debug) {
- BungeeCord.getInstance().getLogger().info("Recived plugin message: " + pluginMessage);
+ BungeeCord.getInstance().getLogger().info("Recived plugin message: " + pluginMessage);
}
- if (!event.getTag().equals("SimpleChat"))
+ if (!event.getTag().equals("SimpleChat")) {
return;
+ }
StringTokenizer st = new StringTokenizer(pluginMessage, "@#@");
String type = st.nextToken();
@@ -90,7 +90,8 @@ public void onPluginMessage(PluginMessageEvent event) {
}
} else {
if (fromPlayer != null) {
- fromPlayer.sendMessage(ChatColor.translateAlternateColorCodes('&', "&4Fehler beim Ermitteln des Chat Partners. Offline oder Verschrieben? (" + to + ")"));
+ fromPlayer.sendMessage(ChatColor.translateAlternateColorCodes('&',
+ "&4Fehler beim Ermitteln des Chat Partners. Offline oder Verschrieben? (" + to + ")"));
}
}
@@ -110,20 +111,20 @@ public void onPluginMessage(PluginMessageEvent event) {
private void sendPluginMessage(String pluginMessage, Entry server) {
if (SimpleChat.debug) {
- BungeeCord.getInstance().getLogger().info("[perUser] Sending Message to: " + server.getKey());
+ BungeeCord.getInstance().getLogger().info("[perUser] Sending Message to: " + server.getKey());
}
List pPlayers = new ArrayList(server.getValue().getPlayers());
if (!pPlayers.isEmpty()) {
ProxiedPlayer pPlayer = pPlayers.get(0);
pPlayer.sendData("SimpleChat", pluginMessage.getBytes());
} else {
- BungeeCord.getInstance().getLogger().info("No Player found on Server: " + server.getKey());
+ BungeeCord.getInstance().getLogger().info("No Player found on Server: " + server.getKey());
}
}
private void sendPluginMessage(String pluginMessage, Server server) {
if (SimpleChat.debug) {
- BungeeCord.getInstance().getLogger().info("[perServer] Sending Message to: " + server.getInfo().getName());
+ BungeeCord.getInstance().getLogger().info("[perServer] Sending Message to: " + server.getInfo().getName());
}
server.sendData("SimpleChat", pluginMessage.getBytes());
}
@@ -133,7 +134,7 @@ private void sendAll(String msg) {
if (!pPlayers.isEmpty()) {
for (ProxiedPlayer proxiedPlayer : pPlayers) {
if (SimpleChat.debug) {
- BungeeCord.getInstance().getLogger().info("Sending Message to: " + proxiedPlayer.getName());
+ BungeeCord.getInstance().getLogger().info("Sending Message to: " + proxiedPlayer.getName());
}
proxiedPlayer.sendMessage(msg);
}