Skip to content

Commit 4dee8ab

Browse files
committed
Minor cleanup and addition of properties file.
1 parent 5a79b74 commit 4dee8ab

File tree

3 files changed

+32
-10
lines changed

3 files changed

+32
-10
lines changed

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
1313

1414
group = 'org.nyxcode.wurm'
1515

16-
version = '0.2'
16+
version = '1.0'
1717

1818
description = "A mod that acts as a discord relay between Wurm kingdom chat and a discord server"
1919

@@ -33,7 +33,7 @@ dependencies {
3333

3434
shadowJar {
3535
dependencies {
36-
exclude(dependency('org.gotti.wurmunlimited:server-modlauncher:0.29.2'))
36+
exclude(dependency('org.gotti.wurmunlimited:server-modlauncher:0.33-beta1'))
3737
exclude(dependency('org.gotti.wurmunlimited:common:2182584'))
3838
exclude(dependency('org.gotti.wurmunlimited:server:2182584'))
3939
}
@@ -44,6 +44,9 @@ task dist(type: Zip) {
4444
into(project.name, {
4545
from jar
4646
})
47+
into(project.name+"/libs", {
48+
from fileTree(dir: 'libs', include: '*')
49+
})
4750
from fileTree(dir: 'mods', include: '*')
4851
})
4952

mods/DiscordRelay.properties

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
classname=org.nyxcode.wurm.discordrelay.DiscordRelay
2+
classpath=*.jar,libs/*.jar
3+
sharedClassLoader=true
4+
5+
# Required
6+
# Discord bot token
7+
botToken=
8+
9+
# Required
10+
# Discord server to connect to
11+
discordServerName=ServerName
12+
13+
# Required
14+
# In game relay identification
15+
# Player name in Wurm that will prefix all discord messages
16+
wurmBotName=ServerBot
17+
18+
# Optional
19+
# true: Kingdom names that contain space will have matching discord
20+
# channels with spaces replaced by underscores (Freedom Isles -> freedom_isles)
21+
#
22+
# false: Kingdom names that contain space will have matching discord
23+
# channels without them (Freedom Isles -> freedomisles)
24+
useUnderscore=true

src/main/java/org/nyxcode/wurm/discordrelay/DiscordRelay.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@
2424
import java.util.Date;
2525
import java.util.List;
2626
import java.util.Properties;
27-
import java.util.logging.Logger;
2827

2928

3029
/**
3130
* Created by whisper2shade on 22.04.2017.
3231
*/
3332
public class DiscordRelay extends ListenerAdapter implements WurmServerMod, PreInitable, Configurable, ChannelMessageListener, PlayerMessageListener {
34-
public static final Logger logger = Logger.getLogger(DiscordRelay.class.getName());
33+
//public static final Logger logger = Logger.getLogger(DiscordRelay.class.getName());
3534

3635
private static JDA jda;
3736
private static String botToken;
@@ -43,11 +42,7 @@ public class DiscordRelay extends ListenerAdapter implements WurmServerMod, PreI
4342
public void preInit() {
4443
try {
4544
jda = new JDABuilder(AccountType.BOT).setToken(botToken).addEventListener(this).buildBlocking();
46-
} catch (LoginException e) {
47-
e.printStackTrace();
48-
} catch (InterruptedException e) {
49-
e.printStackTrace();
50-
} catch (RateLimitedException e) {
45+
} catch (LoginException | RateLimitedException | InterruptedException e) {
5146
e.printStackTrace();
5247
}
5348
}
@@ -86,7 +81,7 @@ public MessagePolicy onKingdomMessage(Message message) {
8681
}
8782

8883
public void sendToGlobalKingdomChat(final String channel, final String message) {
89-
List<Kingdom> kingdoms = Arrays.asList(Kingdoms.getAllKingdoms());
84+
Kingdom[] kingdoms = Kingdoms.getAllKingdoms();
9085

9186
byte kingdomId = -1;
9287

0 commit comments

Comments
 (0)