format all the things
This commit is contained in:
parent
6c5a381903
commit
41c8776993
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.2.21'
|
ext.kotlin_version = '1.2.21'
|
||||||
repositories {
|
repositories {
|
||||||
|
|
|
@ -14,7 +14,7 @@ abstract class IMatterLink {
|
||||||
abstract val mcVersion: String
|
abstract val mcVersion: String
|
||||||
abstract val modVersion: String
|
abstract val modVersion: String
|
||||||
|
|
||||||
abstract fun commandSenderFor(user: String, userid: String, server: String): IMinecraftCommandSender
|
abstract fun commandSenderFor(user: String, userId: String, server: String): IMinecraftCommandSender
|
||||||
|
|
||||||
abstract fun wrappedSendToPlayers(msg: String)
|
abstract fun wrappedSendToPlayers(msg: String)
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import com.google.gson.Gson
|
||||||
import com.google.gson.GsonBuilder
|
import com.google.gson.GsonBuilder
|
||||||
import com.google.gson.JsonSyntaxException
|
import com.google.gson.JsonSyntaxException
|
||||||
import com.google.gson.reflect.TypeToken
|
import com.google.gson.reflect.TypeToken
|
||||||
import com.google.gson.stream.MalformedJsonException
|
|
||||||
import matterlink.instance
|
import matterlink.instance
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,8 @@ object DeathHandler {
|
||||||
if (cfg.death.showDeath) {
|
if (cfg.death.showDeath) {
|
||||||
var msg = deathMessage.replace(player, player.antiping)
|
var msg = deathMessage.replace(player, player.antiping)
|
||||||
if (cfg.death.showDamageType) {
|
if (cfg.death.showDamageType) {
|
||||||
val emojis = cfg.death.damageTypeMapping[damageType]?.split(' ') ?: listOf("\uD83D\uDC7B unknown type '$damageType'")
|
val emojis = cfg.death.damageTypeMapping[damageType]?.split(' ')
|
||||||
|
?: listOf("\uD83D\uDC7B unknown type '$damageType'")
|
||||||
val damageEmoji = emojis[random.nextInt(emojis.size)]
|
val damageEmoji = emojis[random.nextInt(emojis.size)]
|
||||||
msg += " " + damageEmoji
|
msg += " " + damageEmoji
|
||||||
}
|
}
|
||||||
|
|
|
@ -254,11 +254,11 @@ enable=true
|
||||||
# key="yourkey"
|
# key="yourkey"
|
||||||
|
|
||||||
|
|
||||||
#[[gateway.inout]] can be used when then channel will be used to receive from
|
# #[[gateway.inout]] can be used when then channel will be used to receive from
|
||||||
#and send messages to
|
# #and send messages to
|
||||||
[[gateway.inout]]
|
# [[gateway.inout]]
|
||||||
account="irc.freenode"
|
# account="irc.freenode"
|
||||||
channel="#matterlink-testing"
|
# channel="#matterlink-testing"
|
||||||
|
|
||||||
# #OPTIONAL - only used for IRC protocol at the moment
|
# #OPTIONAL - only used for IRC protocol at the moment
|
||||||
# [gateway.out.options]
|
# [gateway.out.options]
|
||||||
|
|
Loading…
Reference in New Issue