ChromaGaming/Chroma-Discord
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 8 Wiki Activity

Merge pull request #11 from TBMCPlugins/Ali

Browse source 
Adjusted things
This commit is contained in:
alisolarflare 2016-11-23 11:08:04 -05:00 committed by GitHub
parent d3691222b8 81f531fa6c
commit 4cac17c2df
3 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
View file

@ -74,8 +74,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
public static IChannel botchannel; public static IChannel botchannel;
public static IChannel annchannel; public static IChannel annchannel;
public static IChannel genchannel; public static IChannel genchannel;
public static IChannel issuechannel;
public static IChannel debugchannel;
public static IChannel chatchannel; public static IChannel chatchannel;
public static boolean Test = true; public static boolean Test = true;
@ -94,16 +92,12 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
botchannel = mainServer.getChannelByID("209720707188260864"); // bot botchannel = mainServer.getChannelByID("209720707188260864"); // bot
annchannel = mainServer.getChannelByID("126795071927353344"); // announcements annchannel = mainServer.getChannelByID("126795071927353344"); // announcements
genchannel = mainServer.getChannelByID("125813020357165056"); // general genchannel = mainServer.getChannelByID("125813020357165056"); // general
issuechannel = devServer.getChannelByID("219643416496046081"); // server-issues
debugchannel = devServer.getChannelByID("250332016199860224"); // debug-channel
chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat
dc.changeStatus(Status.game("on TBMC")); dc.changeStatus(Status.game("on TBMC"));
} else { } else {
botchannel = devServer.getChannelByID("239519012529111040"); // bottest botchannel = devServer.getChannelByID("239519012529111040"); // bottest
annchannel = devServer.getChannelByID("239519012529111040"); // bottest annchannel = devServer.getChannelByID("239519012529111040"); // bottest
genchannel = devServer.getChannelByID("239519012529111040"); // bottest genchannel = devServer.getChannelByID("239519012529111040"); // bottest
issuechannel = devServer.getChannelByID("239519012529111040"); // bottest
debugchannel = devServer.getChannelByID("239519012529111040"); //bottest
chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test
dc.changeStatus(Status.game("testing")); dc.changeStatus(Status.game("testing"));
} }

57
src/main/java/buttondevteam/discordplugin/DebugMessageListener.java → src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java
View file

@ -1,28 +1,29 @@
package buttondevteam.discordplugin; package buttondevteam.discordplugin.listeners;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import buttondevteam.lib.TBMCDebugMessageEvent; import buttondevteam.discordplugin.DiscordPlugin;
import buttondevteam.lib.TBMCDebugMessageEvent;
public class DebugMessageListener implements Listener{
@EventHandler public class DebugMessageListener implements Listener{
public void onException(TBMCDebugMessageEvent e) { @EventHandler
SendMessage(e.getDebugMessage()); public void onException(TBMCDebugMessageEvent e) {
e.setSent(); SendMessage(e.getDebugMessage());
} e.setSent();
}
private static void SendMessage(String message) {
try { private static void SendMessage(String message) {
StringBuilder sb = new StringBuilder(); try {
sb.append("```").append("\n"); StringBuilder sb = new StringBuilder();
if (message.length() > 2000) sb.append("```").append("\n");
message = message.substring(0, 2000); if (message.length() > 2000)
sb.append(message).append("\n"); message = message.substring(0, 2000);
sb.append("```"); sb.append(message).append("\n");
DiscordPlugin.sendMessageToChannel(DiscordPlugin.debugchannel, sb.toString()); sb.append("```");
} catch (Exception ex) { DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, sb.toString());
ex.printStackTrace(); } catch (Exception ex) {
} ex.printStackTrace();
} }
}
}
}

2
src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java
View file

@ -24,7 +24,7 @@ public class ExceptionListener implements Listener {
stackTrace = stackTrace.substring(0, 2000); stackTrace = stackTrace.substring(0, 2000);
sb.append(stackTrace).append("\n"); sb.append(stackTrace).append("\n");
sb.append("```"); sb.append("```");
DiscordPlugin.sendMessageToChannel(DiscordPlugin.issuechannel, sb.toString()); DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, sb.toString());
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
} }