Skip to content

Commit 3d46425

Browse files
author
DiamondIceNS
committed
Standardize bot playing message across all versions
1 parent bc5e27c commit 3d46425

File tree

5 files changed

+6
-21
lines changed

5 files changed

+6
-21
lines changed

discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ class DbBukkitServer(val plugin: BukkitDiscordBridge, val bukkitServer: Server)
2828
return DbBukkitScheduler(plugin, bukkitServer.scheduler)
2929
}
3030

31-
override fun getVersion(): String {
32-
return bukkitServer.bukkitVersion.split("-")[0]
33-
}
34-
35-
override fun getMinecraftShortVersion(): String {
31+
override fun getMinecraftVersion(): String {
3632
return bukkitServer.bukkitVersion.split("-")[0]
3733
}
3834

discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ object Connection: Runnable {
113113
JDA = builder.buildBlocking()
114114
listener = Listener()
115115
JDA.addEventListener(listener)
116-
JDA.presence.game = Game.of("Minecraft ${DiscordBridge.getServer().getMinecraftShortVersion()}")
116+
JDA.presence.game = Game.of("Minecraft ${DiscordBridge.getServer().getMinecraftVersion()}")
117117
if (serverReady) send(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.server-start", "Server started!"), getRelayChannel())
118118
jdaReady = true
119119
}

discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ interface IDbServer {
88

99
fun getScheduler(): IDbScheduler
1010

11-
fun getVersion(): String
12-
13-
fun getMinecraftShortVersion(): String
11+
fun getMinecraftVersion(): String
1412

1513
fun getPlayer(uuid: UUID): IDbPlayer?
1614

discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,8 @@ class DbForgeServer(private val mod: ForgeDiscordBridge) : IDbServer {
2727
return DbForgeScheduler()
2828
}
2929

30-
// TODO
31-
override fun getVersion(): String {
32-
return "Minecraft Forge " + ForgeVersion.mcVersion
33-
}
34-
35-
override fun getMinecraftShortVersion(): String {
36-
return "Minecraft Forge " + ForgeVersion.mcVersion
30+
override fun getMinecraftVersion(): String {
31+
return ForgeVersion.mcVersion
3732
}
3833

3934
override fun getPlayer(uuid: UUID): IDbPlayer? {

discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ class DbSpongeServer(private val plugin: SpongeDiscordBridge, private val game:
2929
return DbSpongeScheduler(plugin, game)
3030
}
3131

32-
override fun getVersion(): String {
33-
return game.platform.minecraftVersion.name
34-
}
35-
36-
override fun getMinecraftShortVersion(): String {
32+
override fun getMinecraftVersion(): String {
3733
return game.platform.minecraftVersion.name
3834
}
3935

0 commit comments

Comments
 (0)