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

Merge branch 'master' of https://github.com/TBMCPlugins/DiscordPlugin.git

Browse source
This commit is contained in:
Norbi Peti 2016-11-05 18:55:37 +01:00
commit 19dd0f5ef5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
} else { } else {
lastannouncementtime = getConfig().getLong("lastannouncementtime"); lastannouncementtime = getConfig().getLong("lastannouncementtime");
lastseentime = getConfig().getLong("lastseentime"); lastseentime = getConfig().getLong("lastseentime");
Test = getConfig().getBoolean("test", true);
} }
ClientBuilder cb = new ClientBuilder(); ClientBuilder cb = new ClientBuilder();
cb.withToken(Files.readFirstLine(new File("TBMC", "Token.txt"), StandardCharsets.UTF_8)); cb.withToken(Files.readFirstLine(new File("TBMC", "Token.txt"), StandardCharsets.UTF_8));
@ -69,7 +70,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
public static IChannel genchannel; public static IChannel genchannel;
public static IChannel issuechannel; public static IChannel issuechannel;
public static final boolean Test = true; public static boolean Test = true;
@Override @Override
public void handle(ReadyEvent event) { public void handle(ReadyEvent event) {
@ -94,7 +95,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
issuechannel = devServer.getChannelByID("239519012529111040"); // bottest issuechannel = devServer.getChannelByID("239519012529111040"); // bottest
dc.changeStatus(Status.game("testing")); dc.changeStatus(Status.game("testing"));
} }
sendMessageToChannel(botchannel, "Minecraft server started up"); //sendMessageToChannel(botchannel, "Minecraft server started up");
Runnable r = new Runnable() { Runnable r = new Runnable() {
public void run() { public void run() {
AnnouncementGetterThreadMethod(); AnnouncementGetterThreadMethod();

7
src/main/java/buttondevteam/discordplugin/MCListener.java
View file

@ -20,8 +20,11 @@ public class MCListener implements Listener {
try { try {
if (e.getCommand().equalsIgnoreCase("stop")) if (e.getCommand().equalsIgnoreCase("stop"))
DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, "Minecraft server shutting down!"); DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, "Minecraft server shutting down!");
else if (e.getCommand().equalsIgnoreCase("restart")) /*
DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, "Minecraft server restarting"); * else if (e.getCommand().equalsIgnoreCase("restart"))
* DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel,
* "Minecraft server restarting");
*/
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
} }