.gitignore

@@ -87,6 +87,10 @@ gradle-app.setting
 # Cache of project
 .gradletasknamecache
 
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+
 # End of https://www.gitignore.io/api/gradle,kotlin,intellij+iml
 
 ### MatterLink ###
@@ -98,5 +102,3 @@ run/
 
 \.floo
 \.flooignore
-
-bugreport/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "Jankson"]
+[submodule "api"]
-	path = Jankson
+	path = api
-	url = https://github.com/falkreon/Jankson.git
+	url = https://github.com/NikkyAI/MatterLinkApi.git

.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-    "java.configuration.updateBuildConfiguration": "automatic",
-    "java.home": "/usr/lib/jvm/java-8-openjdk/"
-}

1.10.2/build.gradle

@@ -0,0 +1,127 @@
+
+buildscript {
+    repositories {
+        jcenter()
+        maven { url = "http://files.minecraftforge.net/maven" }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
+    }
+}
+
+plugins {
+    id "com.github.johnrengelman.shadow" version "1.2.4"
+    id 'com.matthewprenger.cursegradle' version '1.0.10'
+}
+
+apply plugin: 'net.minecraftforge.gradle.forge'
+
+version = project.mc_version + "-" + project.mod_version
+
+archivesBaseName = project.mod_name
+
+sourceCompatibility = targetCompatibility = '1.8'
+
+dependencies {
+    compile project(':core')
+    compile group: "net.shadowfacts", name: "Forgelin", version:  project.forgelin_version
+}
+
+shadowJar {
+    classifier ''
+
+    dependencies {
+        include project(":core")
+        include project(":api")
+    }
+
+    exclude 'dummyThing'
+}
+
+
+minecraft {
+    version = project.mc_version + "-" + project.forge_version
+    runDir = "run"
+
+    mappings = project.mcp_mappings
+}
+
+compileKotlin.doFirst {
+    def target = "src/main/kotlin/matterlink/gen"
+    copy {
+        from("src/templates/kotlin/matterlink/Constants.kt")
+        into(target)
+    }
+    ant.replaceregexp(match:'@MODVERSION@', replace: project.mod_version, flags:'g', byline:true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+    ant.replaceregexp(match:'@MCVERSION@', replace: project.mc_version, flags:'g', byline:true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+    ant.replaceregexp(match:'@FORGELIN-VERSION@', replace: project.forgelin_version, flags:'g', byline:true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+    ant.replaceregexp(match:'@FORGE-VERSION@', replace: project.forge_version, flags:'g', byline:true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+}
+
+processResources {
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.mod_version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(project(":core").sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+
+        // replace version and mcversion
+        expand 'version': project.mod_version, 'mcversion': project.minecraft.version
+    }
+
+    // copy everything else except the mcmod.info
+    from(project(":core").sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+
+}
+
+sourceJar {
+    classifier 'sources'
+    // copy all the minecraftforge specific classes
+    from sourceSets.main.allSource
+
+    // copy everything else except the mcmod.info
+    from (project(":core").sourceSets.main.allSource) {
+        exclude 'mcmod.info'
+    }
+}
+
+
+reobf {
+    shadowJar { mappingType = 'SEARGE' }
+}
+
+tasks.shadowJar.finalizedBy reobfShadowJar
+
+curseforge {
+    if (project.hasProperty('CURSEFORGE_API_TOKEN') && project.hasProperty('release')) {
+        apiKey = CURSEFORGE_API_TOKEN
+    }
+    project {
+        id = project.curse_id
+        releaseType = project.curse_release_type
+        if (project.hasProperty('changelog_file')) {
+            println("changelog = $changelog_file")
+            changelogType = "markdown"
+            changelog = file(changelog_file)
+        }
+        relations {
+            requiredLibrary 'shadowfacts-forgelin'
+        }
+        mainArtifact(shadowJar) {
+            displayName = "MatterLink $version"
+        }
+    }
+}

1.10.2/gradle.properties

@@ -0,0 +1,3 @@
+mc_version = 1.10.2
+mcp_mappings = stable_29
+forge_version = 12.18.3.2185

1.10.2/src/main/kotlin/matterlink/EventHandler.kt

@@ -0,0 +1,106 @@
+package matterlink
+
+import matterlink.api.ApiMessage.Companion.USER_ACTION
+import matterlink.config.cfg
+import matterlink.handlers.*
+import net.minecraft.command.server.CommandBroadcast
+import net.minecraft.command.server.CommandEmote
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.entity.player.EntityPlayerMP
+import net.minecraft.server.dedicated.DedicatedServer
+import net.minecraftforge.event.CommandEvent
+import net.minecraftforge.event.ServerChatEvent
+import net.minecraftforge.event.entity.living.LivingDeathEvent
+import net.minecraftforge.event.entity.player.AchievementEvent
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.PlayerEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
+
+//FORGE-DEPENDENT
+@Mod.EventBusSubscriber
+object EventHandler {
+
+    //MC-VERSION & FORGE DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun progressEvent(e: AchievementEvent) {
+        val achievement = e.achievement
+        val entityPlayer = e.entityPlayer as? EntityPlayerMP ?: return
+        val statFile = entityPlayer.statFile
+
+        if (!statFile.canUnlockAchievement(achievement) || statFile.hasAchievementUnlocked(achievement)) {
+            return
+        }
+        ProgressHandler.handleProgress(
+                name = e.entityPlayer.displayName.unformattedText,
+                message = "has earned the achievement",
+                display = e.achievement.statName.unformattedText
+        )
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun chatEvent(e: ServerChatEvent) {
+        ChatProcessor.sendToBridge(
+                user = e.player.displayName.unformattedText,
+                msg = e.message,
+                event = ""
+        )
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun commandEvent(e: CommandEvent) {
+        val sender = when {
+            e.sender is DedicatedServer -> cfg.outgoing.systemUser
+            else -> e.sender.displayName.unformattedText
+        }
+        val args = e.parameters.joinToString(" ")
+        val type = when {
+            e.command is CommandEmote -> USER_ACTION
+            e.command.name == "me" -> USER_ACTION
+            e.command is CommandBroadcast -> ""
+            else -> return
+        }
+        ChatProcessor.sendToBridge(user = sender, msg = args, event = type)
+
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun deathEvent(e: LivingDeathEvent) {
+        if (e.entityLiving is EntityPlayer) {
+            DeathHandler.handleDeath(
+                    player = e.entityLiving.displayName.unformattedText,
+                    deathMessage = e.entityLiving.combatTracker.deathMessage.unformattedText,
+                    damageType = e.source.damageType
+            )
+        }
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun joinEvent(e: PlayerEvent.PlayerLoggedInEvent) {
+        JoinLeaveHandler.handleJoin(e.player.displayName.unformattedText)
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun leaveEvent(e: PlayerEvent.PlayerLoggedOutEvent) {
+        JoinLeaveHandler.handleLeave(e.player.displayName.unformattedText)
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun serverTickEvent(e: TickEvent.ServerTickEvent) {
+        if (e.phase == TickEvent.Phase.END)
+            TickHandler.handleTick()
+    }
+}

1.10.2/src/main/kotlin/matterlink/MatterLink.kt

@@ -0,0 +1,71 @@
+package matterlink
+
+import matterlink.command.CommandMatterlink
+import matterlink.command.MatterLinkCommandSender
+import matterlink.config.cfg
+import net.minecraft.util.text.TextComponentString
+import net.minecraftforge.common.ForgeVersion
+import net.minecraftforge.fml.common.FMLCommonHandler
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.Logger
+
+lateinit var logger: Logger
+
+@Mod(
+        modid = MODID,
+        name = NAME, version = MODVERSION,
+        serverSideOnly = true,
+        useMetadata = true,
+        acceptableRemoteVersions = "*",
+        modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter",
+        dependencies = DEPENDENCIES
+)
+object MatterLink : IMatterLink() {
+    init {
+        instance = this
+    }
+
+    @Mod.EventHandler
+    fun preInit(event: FMLPreInitializationEvent) {
+        logger = event.modLog
+        logger.info("Building bridge!")
+
+        cfg = MatterLinkConfig(event.modConfigurationDirectory)
+    }
+
+    @Mod.EventHandler
+    fun init(event: FMLInitializationEvent) {
+        this.registerBridgeCommands()
+    }
+
+    @Mod.EventHandler
+    fun serverStarting(event: FMLServerStartingEvent) {
+        logger.debug("Registering server commands")
+        event.registerServerCommand(CommandMatterlink())
+        start()
+    }
+
+    @Mod.EventHandler
+    fun serverStopping(event: FMLServerStoppingEvent) {
+        stop()
+    }
+
+    //FORGE-DEPENDENT
+    override fun wrappedSendToPlayers(msg: String) {
+        FMLCommonHandler.instance().minecraftServerInstance.playerList.sendChatMsg(TextComponentString(msg))
+    }
+
+    override fun log(level: String, formatString: String, vararg data: Any) =
+            logger.log(Level.toLevel(level, Level.INFO), formatString, *data)
+
+    override fun commandSenderFor(user: String, userId: String, server: String, op: Boolean) = MatterLinkCommandSender(user, userId, server, op)
+
+    override val mcVersion: String = MCVERSION
+    override val modVersion: String = MODVERSION
+    override val forgeVersion = ForgeVersion.getVersion()
+}

1.10.2/src/main/kotlin/matterlink/MatterLinkConfig.kt

@@ -0,0 +1,24 @@
+package matterlink
+
+import matterlink.config.BaseConfig
+import net.minecraftforge.common.config.Configuration
+import java.io.File
+
+class MatterLinkConfig(val baseCfgDir: File) : BaseConfig(baseCfgDir) {
+    init {
+        logger.info("Reading bridge blueprints... from {}", cfgDirectory)
+        val config = Configuration(mainCfgFile)
+
+        load(
+                getBoolean = config::getBoolean,
+                getString = config::getString,
+                getStringValidated = config::getString,
+                getStringValidValues = config::getString,
+                getStringList = config::getStringList,
+                addCustomCategoryComment = config::addCustomCategoryComment
+        )
+        if (config.hasChanged()) config.save()
+    }
+
+    override fun load() = MatterLinkConfig(baseCfgDir)
+}

1.10.2/src/main/kotlin/matterlink/command/CommandMatterlink.kt

@@ -1,34 +1,31 @@
 package matterlink.command
 
-import kotlinx.coroutines.runBlocking
 import net.minecraft.command.CommandBase
 import net.minecraft.command.ICommandSender
 import net.minecraft.command.WrongUsageException
-import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.text.TextComponentString
 
 
-object MatterLinkCommand : CommandBase() {
+class CommandMatterlink : CommandBase() {
     override fun getName(): String {
-        return CommandCoreML.name
+        return CommandCore.getName()
     }
 
     override fun getUsage(sender: ICommandSender): String {
-        return CommandCoreML.usage
+        return CommandCore.getUsage()
     }
 
     override fun getAliases(): List<String> {
-        return CommandCoreML.aliases
+        return CommandCore.getAliases()
     }
 
-    override fun execute(server: MinecraftServer, sender: ICommandSender, args: Array<String>) = runBlocking {
+    override fun execute(server: MinecraftServer, sender: ICommandSender, args: Array<String>) {
         if (args.isEmpty()) {
-            throw WrongUsageException("Invalid command! Valid uses: ${getUsage(sender)}")
+            throw WrongUsageException("Invalid command! Valid uses: ${this.getUsage(sender)}")
         }
 
-        val uuid = (sender as? EntityPlayer)?.uniqueID?.toString()
+        val reply = CommandCore.execute(args)
-        val reply = CommandCoreML.execute(args, sender.name, uuid)
 
         if (reply.isNotEmpty() && sender.sendCommandFeedback()) {
             sender.sendMessage(TextComponentString(reply))

1.10.2/src/main/kotlin/matterlink/command/MatterLinkCommandSender.kt

@@ -1,7 +1,5 @@
 package matterlink.command
 
-import kotlinx.coroutines.runBlocking
-import matterlink.bridge.command.IBridgeCommand
 import matterlink.bridge.command.IMinecraftCommandSender
 import net.minecraft.command.CommandResultStats
 import net.minecraft.command.ICommandSender
@@ -15,22 +13,18 @@ import net.minecraft.world.World
 import net.minecraftforge.fml.common.FMLCommonHandler
 import javax.annotation.Nonnull
 
-class MatterLinkCommandSender(
+class MatterLinkCommandSender(user: String, userId: String, server: String, op: Boolean) : IMinecraftCommandSender(user, userId, server, op), ICommandSender {
-    user: String,
+    private var level: Int = 0
-    env: IBridgeCommand.CommandEnvironment,
+
-    op: Boolean
+    override fun execute(cmdString: String): Boolean {
-) : IMinecraftCommandSender(user, env, op), ICommandSender {
+        return 0 < FMLCommonHandler.instance().minecraftServerInstance.commandManager.executeCommand(
-    override fun execute(cmdString: String): Boolean = runBlocking {
+                this,
-        return@runBlocking 0 < FMLCommonHandler.instance().minecraftServerInstance.commandManager.executeCommand(
-            this@MatterLinkCommandSender,
                 cmdString
-        ).apply {
+        )
-            sendReply(cmdString)
-        }
     }
 
     override fun getDisplayName(): ITextComponent {
-        return TextComponentString(displayName)
+        return TextComponentString(user)
     }
 
     override fun getName() = accountName
@@ -39,7 +33,7 @@ class MatterLinkCommandSender(
         return FMLCommonHandler.instance().minecraftServerInstance.worldServerForDimension(0)
     }
 
-    override fun canCommandSenderUseCommand(permLevel: Int, commandName: String): Boolean {
+    override fun canUseCommand(permLevel: Int, commandName: String): Boolean {
         //we check user on our end
         return canExecute(commandName)
     }
@@ -48,8 +42,9 @@ class MatterLinkCommandSender(
         return FMLCommonHandler.instance().minecraftServerInstance
     }
 
-    override fun addChatMessage(@Nonnull component: ITextComponent?) {
+    override fun sendMessage(@Nonnull component: ITextComponent?) {
-        appendReply(component!!.unformattedComponentText)
+        sendReply(component!!.unformattedComponentText)
+
     }
 
     override fun sendCommandFeedback(): Boolean {

1.10.2/src/templates/kotlin/matterlink/Constants.kt

@@ -5,4 +5,3 @@ const val NAME = "MatterLink"
 const val MODVERSION = "@MODVERSION@"
 const val MCVERSION = "@MCVERSION@"
 const val DEPENDENCIES = "required-after:forgelin@[@FORGELIN-VERSION@,);"
-const val BUILD_NUMBER = -1//@BUILD_NUMBER@

1.11.2/build.gradle

@@ -0,0 +1,125 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven { url = "http://files.minecraftforge.net/maven" }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
+    }
+}
+
+plugins {
+    id "com.github.johnrengelman.shadow" version "1.2.4"
+    id 'com.matthewprenger.cursegradle' version '1.0.10'
+}
+
+apply plugin: 'net.minecraftforge.gradle.forge'
+
+version = project.mc_version + "-" + project.mod_version
+
+archivesBaseName = project.mod_name
+
+sourceCompatibility = targetCompatibility = '1.8'
+
+dependencies {
+    compile project(':core')
+    compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version
+}
+
+shadowJar {
+    classifier ''
+
+    dependencies {
+        include project(":core")
+        include project(":api")
+    }
+
+    exclude 'dummyThing'
+}
+
+minecraft {
+    version = project.mc_version + "-" + project.forge_version
+    runDir = "run"
+
+    mappings = project.mcp_mappings
+}
+
+compileKotlin.doFirst {
+    def target = "src/main/kotlin/matterlink/gen"
+    copy {
+        from("src/templates/kotlin/matterlink/Constants.kt")
+        into(target)
+    }
+    ant.replaceregexp(match: '@MODVERSION@', replace: project.mod_version, flags: 'g', byline: true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+    ant.replaceregexp(match: '@MCVERSION@', replace: project.mc_version, flags: 'g', byline: true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+    ant.replaceregexp(match: '@FORGELIN-VERSION@', replace: project.forgelin_version, flags: 'g', byline: true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+    ant.replaceregexp(match: '@FORGE-VERSION@', replace: project.forge_version, flags: 'g', byline: true) {
+        fileset(dir: target, includes: 'Constants.kt')
+    }
+}
+
+processResources {
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.mod_version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(project(":core").sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+
+        // replace version and mcversion
+        expand 'version': project.mod_version, 'mcversion': project.minecraft.version
+    }
+
+    // copy everything else except the mcmod.info
+    from(project(":core").sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+
+}
+
+sourceJar {
+    classifier 'sources'
+    // copy all the minecraftforge specific classes
+    from sourceSets.main.allSource
+
+    // copy everything else except the mcmod.info
+    from(project(":core").sourceSets.main.allSource) {
+        exclude 'mcmod.info'
+    }
+}
+
+
+reobf {
+    shadowJar { mappingType = 'SEARGE' }
+}
+
+tasks.shadowJar.finalizedBy reobfShadowJar
+
+curseforge {
+    if (project.hasProperty('CURSEFORGE_API_TOKEN') && project.hasProperty('release')) {
+        apiKey = CURSEFORGE_API_TOKEN
+    }
+    project {
+        id = project.curse_id
+        releaseType = project.curse_release_type
+        if (project.hasProperty('changelog_file')) {
+            println("changelog = $changelog_file")
+            changelogType = "markdown"
+            changelog = file(changelog_file)
+        }
+        relations {
+            requiredLibrary 'shadowfacts-forgelin'
+        }
+        mainArtifact(shadowJar) {
+            displayName = "MatterLink $version"
+        }
+    }
+}

1.11.2/gradle.properties

@@ -0,0 +1,3 @@
+mc_version = 1.11.2
+mcp_mappings = stable_32
+forge_version = 13.20.1.2386

1.11.2/src/main/kotlin/matterlink/EventHandler.kt

@@ -0,0 +1,107 @@
+package matterlink
+
+import matterlink.api.ApiMessage.Companion.USER_ACTION
+import matterlink.config.cfg
+import matterlink.handlers.*
+import net.minecraft.command.server.CommandBroadcast
+import net.minecraft.command.server.CommandEmote
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.entity.player.EntityPlayerMP
+import net.minecraft.server.dedicated.DedicatedServer
+import net.minecraftforge.event.CommandEvent
+import net.minecraftforge.event.ServerChatEvent
+import net.minecraftforge.event.entity.living.LivingDeathEvent
+import net.minecraftforge.event.entity.player.AchievementEvent
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.PlayerEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
+
+//FORGE-DEPENDENT
+@Mod.EventBusSubscriber
+object EventHandler {
+
+    //MC-VERSION & FORGE DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun progressEvent(e: AchievementEvent) {
+        val achievement = e.achievement
+        val entityPlayer = e.entityPlayer as? EntityPlayerMP ?: return
+        val statFile = entityPlayer.statFile
+
+        if (!statFile.canUnlockAchievement(achievement) || statFile.hasAchievementUnlocked(achievement)) {
+            return
+        }
+
+        ProgressHandler.handleProgress(
+                name = e.entityPlayer.displayName.unformattedText,
+                message = "has earned the achievement",
+                display = e.achievement.statName.unformattedText
+        )
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun chatEvent(e: ServerChatEvent) {
+        ChatProcessor.sendToBridge(
+                user = e.player.displayName.unformattedText,
+                msg = e.message,
+                event = ""
+        )
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun commandEvent(e: CommandEvent) {
+        val sender = when {
+            e.sender is DedicatedServer -> cfg.outgoing.systemUser
+            else -> e.sender.displayName.unformattedText
+        }
+        val args = e.parameters.joinToString(" ")
+        val type = when {
+            e.command is CommandEmote -> USER_ACTION
+            e.command.name == "me" -> USER_ACTION
+            e.command is CommandBroadcast -> ""
+            else -> return
+        }
+        ChatProcessor.sendToBridge(user = sender, msg = args, event = type)
+
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun deathEvent(e: LivingDeathEvent) {
+        if (e.entityLiving is EntityPlayer) {
+            DeathHandler.handleDeath(
+                    player = e.entityLiving.displayName.unformattedText,
+                    deathMessage = e.entityLiving.combatTracker.deathMessage.unformattedText,
+                    damageType = e.source.damageType
+            )
+        }
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun joinEvent(e: PlayerEvent.PlayerLoggedInEvent) {
+        JoinLeaveHandler.handleJoin(e.player.displayName.unformattedText)
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun leaveEvent(e: PlayerEvent.PlayerLoggedOutEvent) {
+        JoinLeaveHandler.handleLeave(e.player.displayName.unformattedText)
+    }
+
+    //FORGE-DEPENDENT
+    @SubscribeEvent
+    @JvmStatic
+    fun serverTickEvent(e: TickEvent.ServerTickEvent) {
+        if (e.phase == TickEvent.Phase.END)
+            TickHandler.handleTick()
+    }
+}

1.11.2/src/main/kotlin/matterlink/MatterLink.kt

@@ -0,0 +1,71 @@
+package matterlink
+
+import matterlink.command.CommandMatterlink
+import matterlink.command.MatterLinkCommandSender
+import matterlink.config.cfg
+import net.minecraft.util.text.TextComponentString
+import net.minecraftforge.common.ForgeVersion
+import net.minecraftforge.fml.common.FMLCommonHandler
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.Logger
+
+lateinit var logger: Logger
+
+@Mod(
+        modid = MODID,
+        name = NAME, version = MODVERSION,
+        serverSideOnly = true,
+        useMetadata = true,
+        acceptableRemoteVersions = "*",
+        modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter",
+        dependencies = DEPENDENCIES
+)
+object MatterLink : IMatterLink() {
+    init {
+        instance = this
+    }
+
+    @Mod.EventHandler
+    fun preInit(event: FMLPreInitializationEvent) {
+        logger = event.modLog
+        logger.info("Building bridge!")
+
+        cfg = MatterLinkConfig(event.modConfigurationDirectory)
+    }
+
+    @Mod.EventHandler
+    fun init(event: FMLInitializationEvent) {
+        this.registerBridgeCommands()
+    }
+
+    @Mod.EventHandler
+    fun serverStarting(event: FMLServerStartingEvent) {
+        logger.debug("Registering server commands")
+        event.registerServerCommand(CommandMatterlink())
+        start()
+    }
+
+    @Mod.EventHandler
+    fun serverStopping(event: FMLServerStoppingEvent) {
+        stop()
+    }
+
+    //FORGE-DEPENDENT
+    override fun wrappedSendToPlayers(msg: String) {
+        FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(TextComponentString(msg))
+    }
+
+    override fun log(level: String, formatString: String, vararg data: Any) =
+            logger.log(Level.toLevel(level, Level.INFO), formatString, *data)
+
+    override fun commandSenderFor(user: String, userId: String, server: String, op: Boolean) = MatterLinkCommandSender(user, userId, server, op)
+
+    override val mcVersion: String = MCVERSION
+    override val modVersion: String = MODVERSION
+    override val forgeVersion = ForgeVersion.getVersion()
+}

1.11.2/src/main/kotlin/matterlink/MatterLinkConfig.kt

@@ -0,0 +1,24 @@
+package matterlink
+
+import matterlink.config.BaseConfig
+import net.minecraftforge.common.config.Configuration
+import java.io.File
+
+class MatterLinkConfig(val baseCfgDir: File) : BaseConfig(baseCfgDir) {
+    init {
+        logger.info("Reading bridge blueprints... from {}", cfgDirectory)
+        val config = Configuration(mainCfgFile)
+
+        load(
+                getBoolean = config::getBoolean,
+                getString = config::getString,
+                getStringValidated = config::getString,
+                getStringValidValues = config::getString,
+                getStringList = config::getStringList,
+                addCustomCategoryComment = config::addCustomCategoryComment
+        )
+        if (config.hasChanged()) config.save()
+    }
+
+    override fun load() = MatterLinkConfig(baseCfgDir)
+}

1.11.2/src/main/kotlin/matterlink/command/CommandMatterlink.kt

@@ -0,0 +1,34 @@
+package matterlink.command
+
+import net.minecraft.command.CommandBase
+import net.minecraft.command.ICommandSender
+import net.minecraft.command.WrongUsageException
+import net.minecraft.server.MinecraftServer
+import net.minecraft.util.text.TextComponentString
+
+
+class CommandMatterlink : CommandBase() {
+    override fun getName(): String {
+        return CommandCore.getName()
+    }
+
+    override fun getUsage(sender: ICommandSender): String {
+        return CommandCore.getUsage()
+    }
+
+    override fun getAliases(): List<String> {
+        return CommandCore.getAliases()
+    }
+
+    override fun execute(server: MinecraftServer, sender: ICommandSender, args: Array<String>) {
+        if (args.isEmpty()) {
+            throw WrongUsageException("Invalid command! Valid uses: ${this.getUsage(sender)}")
+        }
+
+        val reply = CommandCore.execute(args)
+
+        if (reply.isNotEmpty() && sender.sendCommandFeedback()) {
+            sender.sendMessage(TextComponentString(reply))
+        }
+    }
+}

1.11.2/src/main/kotlin/matterlink/command/MatterLinkCommandSender.kt

@@ -0,0 +1,60 @@
+package matterlink.command
+
+import matterlink.bridge.command.IMinecraftCommandSender
+import net.minecraft.command.CommandResultStats
+import net.minecraft.command.ICommandSender
+import net.minecraft.entity.Entity
+import net.minecraft.server.MinecraftServer
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Vec3d
+import net.minecraft.util.text.ITextComponent
+import net.minecraft.util.text.TextComponentString
+import net.minecraft.world.World
+import net.minecraftforge.fml.common.FMLCommonHandler
+import javax.annotation.Nonnull
+
+class MatterLinkCommandSender(user: String, userId: String, server: String, op: Boolean) : IMinecraftCommandSender(user, userId, server, op), ICommandSender {
+
+    override fun execute(cmdString: String): Boolean {
+        return 0 < FMLCommonHandler.instance().minecraftServerInstance.commandManager.executeCommand(
+                this,
+                cmdString
+        )
+    }
+
+    override fun getDisplayName(): ITextComponent {
+        return TextComponentString(user)
+    }
+
+    override fun getName() = accountName
+
+    override fun getEntityWorld(): World {
+        return FMLCommonHandler.instance().minecraftServerInstance.getWorld(0)
+    }
+
+    override fun canUseCommand(permLevel: Int, commandName: String): Boolean {
+        //we now do permissions checking on our end
+        return canExecute(commandName)
+    }
+
+    override fun getServer(): MinecraftServer? {
+        return FMLCommonHandler.instance().minecraftServerInstance
+    }
+
+    override fun sendMessage(@Nonnull component: ITextComponent?) {
+        sendReply(component!!.unformattedComponentText)
+    }
+
+    override fun sendCommandFeedback(): Boolean {
+        return true
+    }
+
+    //WtfMojangWhy
+    override fun getPosition(): BlockPos = BlockPos.ORIGIN
+
+    override fun setCommandStat(type: CommandResultStats.Type?, amount: Int) {}
+
+    override fun getPositionVector(): Vec3d = Vec3d.ZERO
+
+    override fun getCommandSenderEntity(): Entity? = null
+}

1.11.2/src/templates/kotlin/matterlink/Constants.kt

@@ -0,0 +1,8 @@
+package matterlink
+
+const val MODID = "matterlink"
+const val NAME = "MatterLink"
+const val MODVERSION = "@MODVERSION@"
+const val MCVERSION = "@MCVERSION@"
+const val DEPENDENCIES = "required-after:forgelin@[@FORGELIN-VERSION@,);required-after:forge@[@FORGE-VERSION@,);"
+

1.12.2/build.gradle

@@ -1,67 +1,59 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
+        maven { url = "http://files.minecraftforge.net/maven" }
-            url = 'http://files.minecraftforge.net/maven'
-        }
         mavenCentral()
-        maven {
-            url = 'https://oss.sonatype.org/content/groups/public'
-        }
-        maven {
-            url = 'https://plugins.gradle.org/m2/'
-        }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '2.3-SNAPSHOT'
+        classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
-        classpath group: 'com.github.jengelman.gradle.plugins', name: 'shadow', version: shadowVersion
-        classpath group: 'gradle.plugin.com.matthewprenger', name: 'CurseGradle', version: cursegradleVersion
-        classpath group: 'com.vanniktech', name: 'gradle-dependency-graph-generator-plugin', version: '0.5.0'
     }
 }
 
+plugins {
+    id "com.github.johnrengelman.shadow" version "1.2.4"
+    id 'com.matthewprenger.cursegradle' version '1.0.10'
+}
+
 apply plugin: 'net.minecraftforge.gradle.forge'
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'com.matthewprenger.cursegradle'
-apply plugin: "com.vanniktech.dependency.graph.generator"
 
-version = project.mc_version + '-' + project.modVersion
+version = project.mc_version + "-" + project.mod_version
 
-archivesBaseName = project.modName
+archivesBaseName = project.mod_name
 
 sourceCompatibility = targetCompatibility = '1.8'
 
 dependencies {
     compile project(':core')
-    shadow (project(path: ':core', configuration: 'shadow')) { transitive = false }
+    compile group: "net.shadowfacts", name: "Forgelin", version: project.forgelin_version
-
-    compile group: 'net.shadowfacts', name: 'Forgelin', version: project.forgelinVersion
 }
 
 shadowJar {
-    classifier = ''
+    classifier ''
+
+    dependencies {
+        include project(":core")
+        include project(":api")
+    }
 
     exclude 'dummyThing'
-    configurations = [project.configurations.shadow]
 }
 
 minecraft {
-    version = project.mc_version + '-' + project.forge_version
+    version = project.mc_version + "-" + project.forge_version
-    runDir = 'run'
+    runDir = "run"
 
     mappings = project.mcp_mappings
 
     replaceIn 'Constants.kt'
-    replace '@MODVERSION@', project.modVersion
+    replace '@MODVERSION@', project.mod_version
     replace '@MCVERSION@', project.mc_version
-    replace '@FORGELIN-VERSION@', project.forgelinVersion
+    replace '@FORGELIN-VERSION@', project.forgelin_version
     replace '@FORGE-VERSION@', project.forge_version
-    replace '-1//@BUILD_NUMBER@', System.env.BUILD_NUMBER ?: -1
 }
 
 processResources {
     // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.modVersion
+    inputs.property "version", project.mod_version
     inputs.property "mcversion", project.minecraft.version
 
     // replace stuff in mcmod.info, nothing else
@@ -69,7 +61,7 @@ processResources {
         include 'mcmod.info'
 
         // replace version and mcversion
-        expand 'version': project.modVersion, 'mcversion': project.minecraft.version
+        expand 'version': project.mod_version, 'mcversion': project.minecraft.version
     }
 
     // copy everything else except the mcmod.info
@@ -80,7 +72,7 @@ processResources {
 }
 
 sourceJar {
-    classifier = 'sources'
+    classifier 'sources'
     // copy all the minecraftforge specific classes
     from sourceSets.main.allSource
 
@@ -93,6 +85,7 @@ sourceJar {
 reobf {
     shadowJar { mappingType = 'SEARGE' }
 }
+
 tasks.shadowJar.finalizedBy reobfShadowJar
 
 curseforge {
@@ -100,11 +93,11 @@ curseforge {
         apiKey = CURSEFORGE_API_TOKEN
     }
     project {
-        id = project.curseId
+        id = project.curse_id
-        releaseType = project.curseReleaseType
+        releaseType = project.curse_release_type
         if (project.hasProperty('changelog_file')) {
             println("changelog = $changelog_file")
-            changelogType = 'markdown'
+            changelogType = "markdown"
             changelog = file(changelog_file)
         }
         relations {
@@ -115,7 +108,3 @@ curseforge {
         }
     }
 }
-
-runServer {
-    outputs.upToDateWhen { false }
-}

1.12.2/gradle.properties

@@ -1,3 +1,3 @@
 mc_version = 1.12.2
-mcp_mappings = stable_39
+mcp_mappings = snapshot_20171003
 forge_version = 14.23.1.2599

1.12.2/src/main/kotlin/matterlink/Constants.kt

@@ -5,4 +5,4 @@ const val NAME = "MatterLink"
 const val MODVERSION = "@MODVERSION@"
 const val MCVERSION = "@MCVERSION@"
 const val DEPENDENCIES = "required-after:forgelin@[@FORGELIN-VERSION@,);required-after:forge@[@FORGE-VERSION@,);"
-const val BUILD_NUMBER = -1//@BUILD_NUMBER@
+

1.12.2/src/main/kotlin/matterlink/EventHandler.kt

@@ -1,13 +1,8 @@
 package matterlink
 
-import kotlinx.coroutines.runBlocking
+import matterlink.api.ApiMessage.Companion.USER_ACTION
 import matterlink.config.cfg
-import matterlink.handlers.ChatEvent
+import matterlink.handlers.*
-import matterlink.handlers.ChatProcessor
-import matterlink.handlers.DeathHandler
-import matterlink.handlers.JoinLeaveHandler
-import matterlink.handlers.ProgressHandler
-import matterlink.handlers.TickHandler
 import net.minecraft.command.server.CommandBroadcast
 import net.minecraft.command.server.CommandEmote
 import net.minecraft.entity.player.EntityPlayer
@@ -28,80 +23,59 @@ object EventHandler {
     //MC-VERSION & FORGE DEPENDENT
     @SubscribeEvent
     @JvmStatic
-    fun progressEvent(e: AdvancementEvent) = runBlocking {
+    fun progressEvent(e: AdvancementEvent) {
-        if (e.advancement.display == null) return@runBlocking
+        if (e.advancement.display == null) return
         ProgressHandler.handleProgress(
                 name = e.entityPlayer.displayName.unformattedText,
                 message = "has made the advancement",
-            display = e.advancement.displayText.unformattedText,
+                display = e.advancement.displayText.unformattedText
-            x = e.entityPlayer.posX.toInt(),
-            y = e.entityPlayer.posY.toInt(),
-            z = e.entityPlayer.posZ.toInt(),
-            dimension = e.entityPlayer.dimension
         )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
     @JvmStatic
-    fun chatEvent(e: ServerChatEvent) = runBlocking {
+    fun chatEvent(e: ServerChatEvent) {
-        if (e.isCanceled) return@runBlocking
+        ChatProcessor.sendToBridge(
-        e.isCanceled = ChatProcessor.sendToBridge(
                 user = e.player.displayName.unformattedText,
                 msg = e.message,
-            x = e.player.posX.toInt(),
+                event = ""
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension,
-            event = ChatEvent.PLAIN,
-            uuid = e.player.gameProfile.id
         )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
     @JvmStatic
-    fun commandEvent(e: CommandEvent) = runBlocking {
+    fun commandEvent(e: CommandEvent) {
-
+        instance.log("DEBUG","commandEvent ${e.sender.javaClass.simpleName}")
+        instance.log("DEBUG","commandEvent ${e.sender.javaClass.typeName}")
+        instance.log("DEBUG","command ${e.command.aliases}")
+        instance.log("DEBUG","command ${e.command.name}")
         val sender = when {
             e.sender is DedicatedServer -> cfg.outgoing.systemUser
             else -> e.sender.displayName.unformattedText
         }
+        instance.log("DEBUG","sender $sender")
         val args = e.parameters.joinToString(" ")
-        val type = with(e.command) {
+        val type = when {
-            when {
+            e.command is CommandEmote -> USER_ACTION
-                this is CommandEmote || name.equals("me", true) -> ChatEvent.ACTION
+            e.command.name.equals("me", true) -> USER_ACTION
-                this is CommandBroadcast || name.equals("say", true) -> ChatEvent.BROADCAST
+            e.command is CommandBroadcast -> ""
-                else -> return@runBlocking
+            else -> return
         }
-        }
+        ChatProcessor.sendToBridge(user = sender, msg = args, event = type)
-        ChatProcessor.sendToBridge(
+
-            user = sender,
-            msg = args,
-            event = type,
-            x = e.sender.position.x,
-            y = e.sender.position.y,
-            z = e.sender.position.z,
-            dimension = when {
-                e.sender is DedicatedServer -> null
-                else -> e.sender.commandSenderEntity?.dimension ?: e.sender.entityWorld.provider.dimension
-            }
-        )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
     @JvmStatic
-    fun deathEvent(e: LivingDeathEvent) = runBlocking {
+    fun deathEvent(e: LivingDeathEvent) {
         if (e.entityLiving is EntityPlayer) {
             DeathHandler.handleDeath(
                     player = e.entityLiving.displayName.unformattedText,
                     deathMessage = e.entityLiving.combatTracker.deathMessage.unformattedText,
-                damageType = e.source.damageType,
+                    damageType = e.source.damageType
-                x = e.entityLiving.posX.toInt(),
-                y = e.entityLiving.posY.toInt(),
-                z = e.entityLiving.posZ.toInt(),
-                dimension = e.entityLiving.dimension
             )
         }
     }
@@ -109,35 +83,22 @@ object EventHandler {
     //FORGE-DEPENDENT
     @SubscribeEvent
     @JvmStatic
-    fun joinEvent(e: PlayerEvent.PlayerLoggedInEvent) = runBlocking {
+    fun joinEvent(e: PlayerEvent.PlayerLoggedInEvent) {
-        JoinLeaveHandler.handleJoin(
+        JoinLeaveHandler.handleJoin(e.player.displayName.unformattedText)
-            player = e.player.displayName.unformattedText,
-            x = e.player.posX.toInt(),
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension
-        )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
     @JvmStatic
-    fun leaveEvent(e: PlayerEvent.PlayerLoggedOutEvent) = runBlocking {
+    fun leaveEvent(e: PlayerEvent.PlayerLoggedOutEvent) {
-        JoinLeaveHandler.handleLeave(
+        JoinLeaveHandler.handleLeave(e.player.displayName.unformattedText)
-            player = e.player.displayName.unformattedText,
-            x = e.player.posX.toInt(),
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension
-        )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
     @JvmStatic
-    fun serverTickEvent(e: TickEvent.ServerTickEvent) = runBlocking {
+    fun serverTickEvent(e: TickEvent.ServerTickEvent) {
         if (e.phase == TickEvent.Phase.END)
             TickHandler.handleTick()
-
     }
 }

1.12.2/src/main/kotlin/matterlink/MatterLink.kt

@@ -1,26 +1,17 @@
 package matterlink
 
-import com.mojang.authlib.GameProfile
+import matterlink.command.CommandMatterlink
-import kotlinx.coroutines.runBlocking
-import matterlink.bridge.command.IBridgeCommand
-import matterlink.command.AuthCommand
-import matterlink.command.MatterLinkCommand
 import matterlink.command.MatterLinkCommandSender
-import matterlink.config.BaseConfig
 import matterlink.config.cfg
-import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.util.text.TextComponentString
 import net.minecraftforge.common.ForgeVersion
 import net.minecraftforge.fml.common.FMLCommonHandler
 import net.minecraftforge.fml.common.Mod
-import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.event.*
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent
-import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
 import org.apache.logging.log4j.Level
-import org.apache.logging.log4j.core.config.Configurator
+import org.apache.logging.log4j.Logger
-import java.util.UUID
 
+lateinit var logger: Logger
 
 @Mod(
         modid = MODID,
@@ -32,47 +23,37 @@ import java.util.UUID
         dependencies = DEPENDENCIES
 )
 object MatterLink : IMatterLink() {
-
     init {
-        Configurator.setLevel(MODID, Level.DEBUG)
         instance = this
     }
 
     @Mod.EventHandler
     fun preInit(event: FMLPreInitializationEvent) {
-        logger = with(event.modLog) {
+        logger = event.modLog
-            object : Logger {
-                override fun info(message: String) = this@with.info(message)
-                override fun debug(message: String) = this@with.debug(message)
-                override fun error(message: String) = this@with.error(message)
-                override fun warn(message: String) = this@with.warn(message)
-                override fun trace(message: String) = this@with.trace(message)
-            }
-        }
-
         logger.info("Building bridge!")
 
-        cfg = BaseConfig(event.modConfigurationDirectory).load()
+        cfg = MatterLinkConfig(event.modConfigurationDirectory)
     }
 
     @Mod.EventHandler
     fun init(event: FMLInitializationEvent) {
-        logger.debug("Registering bridge commands")
         this.registerBridgeCommands()
     }
 
     @Mod.EventHandler
-    fun serverStarting(event: FMLServerStartingEvent) {
+    fun serverAboutToStart(event: FMLServerAboutToStartEvent) {
-        logger.debug("Registering server commands")
+//        MessageHandlerInst.start(clear = true)
-        event.registerServerCommand(MatterLinkCommand)
-        event.registerServerCommand(AuthCommand)
-        runBlocking {
-            start()
-        }
     }
 
     @Mod.EventHandler
-    fun serverStopping(event: FMLServerStoppingEvent) = runBlocking {
+    fun serverStarting(event: FMLServerStartingEvent) {
+        log("DEBUG", "Registering server commands")
+        event.registerServerCommand(CommandMatterlink())
+        start()
+    }
+
+    @Mod.EventHandler
+    fun serverStopping(event: FMLServerStoppingEvent) {
         stop()
     }
 
@@ -81,70 +62,12 @@ object MatterLink : IMatterLink() {
         FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(TextComponentString(msg))
     }
 
-    override fun wrappedSendToPlayer(username: String, msg: String) {
+    override fun log(level: String, formatString: String, vararg data: Any) =
-        val profile = profileByName(username) ?: run {
+            logger.log(Level.toLevel(level, Level.INFO), formatString, *data)
-            logger.error("cannot find player by name $username")
-            return
-        }
-        val player = playerByProfile(profile) ?: run {
-            logger.error("${profile.name} is not online")
-            return
-        }
-        player.sendMessage(TextComponentString(msg))
-    }
 
-    override fun wrappedSendToPlayer(uuid: UUID, msg: String) {
+    override fun commandSenderFor(user: String, userId: String, server: String, op: Boolean) = MatterLinkCommandSender(user, userId, server, op)
-        val profile = profileByUUID(uuid) ?: run {
-            logger.error("cannot find player by uuid $uuid")
-            return
-        }
-        val player = playerByProfile(profile) ?: run {
-            logger.error("${profile.name} is not online")
-            return
-        }
-        player.sendMessage(TextComponentString(msg))
-    }
-
-    override fun isOnline(username: String) =
-        FMLCommonHandler.instance().minecraftServerInstance.onlinePlayerNames.contains(username)
-
-    private fun playerByProfile(gameProfile: GameProfile): EntityPlayerMP? =
-        FMLCommonHandler.instance().minecraftServerInstance.playerList.getPlayerByUUID(gameProfile.id)
-
-    private fun profileByUUID(uuid: UUID): GameProfile? = try {
-        FMLCommonHandler.instance().minecraftServerInstance.playerProfileCache.getProfileByUUID(uuid)
-    } catch (e: IllegalArgumentException) {
-        logger.warn("cannot find profile by uuid $uuid")
-        null
-    }
-
-    private fun profileByName(username: String): GameProfile? = try {
-        FMLCommonHandler.instance().minecraftServerInstance.playerProfileCache.getGameProfileForUsername(username)
-    } catch (e: IllegalArgumentException) {
-        logger.warn("cannot find profile by username $username")
-        null
-    }
-
-    override fun collectPlayers(area: Area): Set<UUID> {
-        val players = FMLCommonHandler.instance().minecraftServerInstance.playerList.players.filter {
-            (area.allDimensions || area.dimensions.contains(it.dimension))
-                    && area.testInBounds(it.posX.toInt(), it.posY.toInt(), it.posZ.toInt())
-        }
-        return players.map { it.uniqueID }.toSet()
-    }
-
-    override fun nameToUUID(username: String): UUID? = profileByName(username)?.id
-
-    override fun uuidToName(uuid: UUID): String? = profileByUUID(uuid)?.name
-
-    override fun commandSenderFor(
-        user: String,
-        env: IBridgeCommand.CommandEnvironment,
-        op: Boolean
-    ) = MatterLinkCommandSender(user, env, op)
 
     override val mcVersion: String = MCVERSION
     override val modVersion: String = MODVERSION
-    override val buildNumber = BUILD_NUMBER
     override val forgeVersion = ForgeVersion.getVersion()
 }

1.12.2/src/main/kotlin/matterlink/MatterLinkConfig.kt

@@ -0,0 +1,24 @@
+package matterlink
+
+import matterlink.config.BaseConfig
+import net.minecraftforge.common.config.Configuration
+import java.io.File
+
+class MatterLinkConfig(val baseCfgDir: File) : BaseConfig(baseCfgDir) {
+    init {
+        logger.info("Reading bridge blueprints... from {}", cfgDirectory)
+        val config = Configuration(mainCfgFile)
+
+        load(
+                getBoolean = config::getBoolean,
+                getString = config::getString,
+                getStringValidated = config::getString,
+                getStringValidValues = config::getString,
+                getStringList = config::getStringList,
+                addCustomCategoryComment = config::addCustomCategoryComment
+        )
+        if (config.hasChanged()) config.save()
+    }
+
+    override fun load() = MatterLinkConfig(baseCfgDir)
+}

1.12.2/src/main/kotlin/matterlink/command/CommandMatterlink.kt

@@ -3,26 +3,21 @@ package matterlink.command
 import net.minecraft.command.CommandBase
 import net.minecraft.command.ICommandSender
 import net.minecraft.command.WrongUsageException
-import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.text.TextComponentString
 
 
-object AuthCommand : CommandBase() {
+class CommandMatterlink : CommandBase() {
     override fun getName(): String {
-        return CommandCoreAuth.name
+        return CommandCore.getName()
     }
 
     override fun getUsage(sender: ICommandSender): String {
-        return CommandCoreAuth.usage
+        return CommandCore.getUsage()
     }
 
     override fun getAliases(): List<String> {
-        return CommandCoreAuth.aliases
+        return CommandCore.getAliases()
-    }
-
-    override fun getRequiredPermissionLevel(): Int {
-        return 0
     }
 
     override fun execute(server: MinecraftServer, sender: ICommandSender, args: Array<String>) {
@@ -30,8 +25,7 @@ object AuthCommand : CommandBase() {
             throw WrongUsageException("Invalid command! Valid uses: ${this.getUsage(sender)}")
         }
 
-        val uuid = (sender as? EntityPlayer)?.uniqueID?.toString()
+        val reply = CommandCore.execute(args)
-        val reply = CommandCoreAuth.execute(args, sender.name, uuid)
 
         if (reply.isNotEmpty() && sender.sendCommandFeedback()) {
             sender.sendMessage(TextComponentString(reply))

1.12.2/src/main/kotlin/matterlink/command/MatterLinkCommandSender.kt

@@ -1,7 +1,5 @@
 package matterlink.command
 
-import kotlinx.coroutines.runBlocking
-import matterlink.bridge.command.IBridgeCommand
 import matterlink.bridge.command.IMinecraftCommandSender
 import net.minecraft.command.ICommandSender
 import net.minecraft.server.MinecraftServer
@@ -11,23 +9,16 @@ import net.minecraft.world.World
 import net.minecraftforge.fml.common.FMLCommonHandler
 import javax.annotation.Nonnull
 
-class MatterLinkCommandSender(
+class MatterLinkCommandSender(user: String, userId: String, server: String, op: Boolean) : IMinecraftCommandSender(user, userId, server, op), ICommandSender {
-    user: String,
+    override fun execute(cmdString: String): Boolean {
-    env: IBridgeCommand.CommandEnvironment,
+        return 0 < FMLCommonHandler.instance().minecraftServerInstance.commandManager.executeCommand(
-    op: Boolean
+                this,
-) : IMinecraftCommandSender(user, env, op), ICommandSender {
-
-    override fun execute(cmdString: String): Boolean = runBlocking {
-        0 < FMLCommonHandler.instance().minecraftServerInstance.commandManager.executeCommand(
-            this@MatterLinkCommandSender,
                 cmdString
-        ).apply {
+        )
-            sendReply(cmdString)
-        }
     }
 
     override fun getDisplayName(): ITextComponent {
-        return TextComponentString(displayName)
+        return TextComponentString(user)
     }
 
     override fun getName() = accountName
@@ -46,7 +37,7 @@ class MatterLinkCommandSender(
     }
 
     override fun sendMessage(@Nonnull component: ITextComponent?) {
-        appendReply(component!!.unformattedComponentText)
+        sendReply(component!!.unformattedComponentText)
     }
 
     override fun sendCommandFeedback(): Boolean {

1.7.10/build.gradle

@@ -1,26 +1,23 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
+        maven { url = "http://files.minecraftforge.net/maven" }
-            url = 'http://files.minecraftforge.net/maven'
-        }
         mavenCentral()
-        maven {
-            url = 'https://plugins.gradle.org/m2/'
-        }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '1.2-SNAPSHOT'
+        classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT"
-        classpath group: 'gradle.plugin.com.matthewprenger', name: 'CurseGradle', version: cursegradleVersion
     }
 }
 
+plugins {
+    id 'com.matthewprenger.cursegradle' version '1.0.10'
+}
+
 apply plugin: 'forge'
-apply plugin: 'com.matthewprenger.cursegradle'
 
-version = project.mc_version + '-' + project.modVersion
+version = project.mc_version + "-" + project.mod_version
 
-archivesBaseName = project.modName
+archivesBaseName = project.mod_name
 
 sourceCompatibility = targetCompatibility = '1.8'
 
@@ -30,75 +27,58 @@ configurations {
 }
 
 dependencies {
-    shade (project(':core')) { transitive = true }
+    shade project(":core")
-    shade (project(':Jankson')) { transitive = false }
+    shade project(":api")
-
-    shade group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlinVersion
-
-    shade(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutinesVersion)
-    shade(group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-runtime", version: serializationVersion)
-
-    shade(group: "com.github.kittinunf.Fuel", name: "fuel", version: fuelVersion)
-    shade(group: "com.github.kittinunf.Fuel", name: "fuel-coroutines", version: fuelVersion)
-    shade(group: "com.github.kittinunf.Fuel", name: "fuel-kotlinx-serialization", version: fuelVersion)
-    shade(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion)
-
-//    shade group: 'com.github.kittinunf.fuel', name: 'fuel', version: fuelVersion
-//    shade group: 'com.github.kittinunf.result', name: 'result', version: resultVersion
 }
 
-
 minecraft {
-    version = project.mc_version + '-' + project.forge_version + '-' + project.mc_version
+    version = project.mc_version + "-" + project.forge_version + "-" + project.mc_version
-    runDir = 'run'
+    runDir = "run"
 
     mappings = project.mcp_mappings
 
-//    srgExtra 'PK: kotlin matterlink/repack/kotlin'
+    srgExtra "PK: kotlin matterlink/repack/kotlin"
-//    srgExtra 'PK: org/jetbrains/annotations matterlink/repack/org/jetbrains/annotations'
+    srgExtra "PK: org/jetbrains/annotations matterlink/repack/org/jetbrains/annotations"
-//    srgExtra 'PK: org/intellij matterlink/repack/org/intellij'
+//    srgExtra "PK: org/apache/http matterlink/repack/org/apache/http"
-//    srgExtra 'PK: blue/endless/ matterlink/repack/blue/endless/'
+    //srgExtra "PK: org/apache/commons matterlink/repack/org/apache/commons"
-
+    srgExtra "PK: org/intellij matterlink/repack/org/intellij"
 }
 
 compileKotlin.doFirst {
-    def target = 'src/main/kotlin/matterlink/gen'
+    def target = "src/main/kotlin/matterlink/gen"
     copy {
-        from('src/templates/kotlin/matterlink/Constants.kt')
+        from("src/templates/kotlin/matterlink/Constants.kt")
         into(target)
     }
-    ant.replaceregexp(match: '@MODVERSION@', replace: project.modVersion, flags: 'g', byline: true) {
+    ant.replaceregexp(match: '@MODVERSION@', replace: project.mod_version, flags: 'g', byline: true) {
         fileset(dir: target, includes: 'Constants.kt')
     }
     ant.replaceregexp(match: '@MCVERSION@', replace: project.mc_version, flags: 'g', byline: true) {
         fileset(dir: target, includes: 'Constants.kt')
     }
-    ant.replaceregexp(match: '@FORGELIN-VERSION@', replace: project.forgelinVersion, flags: 'g', byline: true) {
+    ant.replaceregexp(match: '@FORGELIN-VERSION@', replace: project.forgelin_version, flags: 'g', byline: true) {
         fileset(dir: target, includes: 'Constants.kt')
     }
     ant.replaceregexp(match: '@FORGE-VERSION@', replace: project.forge_version, flags: 'g', byline: true) {
         fileset(dir: target, includes: 'Constants.kt')
     }
-    ant.replaceregexp(match: '@BUILD_NUMBER@', replace: System.env.BUILD_NUMBER ?: -1, flags: 'g', byline: true) {
-        fileset(dir: target, includes: 'Constants.kt')
-    }
 }
 
 processResources {
     // this will ensure that this task is redone when the versions change.
-    inputs.property 'version', project.modVersion
+    inputs.property "version", project.mod_version
-    inputs.property 'mcversion', project.minecraft.version
+    inputs.property "mcversion", project.minecraft.version
 
     // replace stuff in mcmod.info, nothing else
-    from(project(':core').sourceSets.main.resources.srcDirs) {
+    from(project(":core").sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
 
         // replace version and mcversion
-        expand 'version': project.modVersion, 'mcversion': project.minecraft.version
+        expand 'version': project.mod_version, 'mcversion': project.minecraft.version
     }
 
     // copy everything else except the mcmod.info
-    from(project(':core').sourceSets.main.resources.srcDirs) {
+    from(project(":core").sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
     }
 }
@@ -106,7 +86,8 @@ processResources {
 jar {
     configurations.shade.each { dep ->
         from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
+            exclude "META-INF", "META-INF/**"
+            exclude "com/google/gson", "com/google/gson/**"
         }
     }
 }
@@ -116,11 +97,11 @@ curseforge {
         apiKey = CURSEFORGE_API_TOKEN
     }
     project {
-        id = project.curseId
+        id = project.curse_id
-        releaseType = project.curseReleaseType
+        releaseType = project.curse_release_type
         if (project.hasProperty('changelog_file')) {
             println("changelog = $changelog_file")
-            changelogType = 'markdown'
+            changelogType = "markdown"
             changelog = file(changelog_file)
         }
         mainArtifact(jar) {

1.7.10/src/main/kotlin/matterlink/EventHandler.kt

@@ -3,17 +3,11 @@ package matterlink
 import cpw.mods.fml.common.eventhandler.SubscribeEvent
 import cpw.mods.fml.common.gameevent.PlayerEvent
 import cpw.mods.fml.common.gameevent.TickEvent
-import kotlinx.coroutines.runBlocking
+import matterlink.api.ApiMessage.Companion.USER_ACTION
 import matterlink.config.cfg
-import matterlink.handlers.ChatEvent
+import matterlink.handlers.*
-import matterlink.handlers.ChatProcessor
-import matterlink.handlers.DeathHandler
-import matterlink.handlers.JoinLeaveHandler
-import matterlink.handlers.ProgressHandler
-import matterlink.handlers.TickHandler
 import net.minecraft.command.server.CommandBroadcast
 import net.minecraft.command.server.CommandEmote
-import net.minecraft.entity.Entity
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.server.dedicated.DedicatedServer
@@ -27,121 +21,78 @@ object EventHandler {
 
     //MC-VERSION & FORGE DEPENDENT
     @SubscribeEvent
-    fun progressEvent(e: AchievementEvent) = runBlocking {
+    fun progressEvent(e: AchievementEvent) {
         val achievement = e.achievement
-        val entityPlayer = e.entityPlayer as? EntityPlayerMP ?: return@runBlocking
+        val entityPlayer = e.entityPlayer as? EntityPlayerMP ?: return
         val statFile = entityPlayer.statFile
 
         if (!statFile.canUnlockAchievement(achievement) || statFile.hasAchievementUnlocked(achievement)) {
-            return@runBlocking
+            return
         }
 
         ProgressHandler.handleProgress(
                 name = e.entityPlayer.displayName,
                 message = "has earned the achievement",
-            display = e.achievement.statName.unformattedText,
+                display = e.achievement.statName.unformattedText
-            x = e.entityPlayer.posX.toInt(),
-            y = e.entityPlayer.posY.toInt(),
-            z = e.entityPlayer.posZ.toInt(),
-            dimension = e.entityPlayer.dimension
         )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
-    fun chatEvent(e: ServerChatEvent) = runBlocking {
+    fun chatEvent(e: ServerChatEvent) {
-        if (e.isCanceled) return@runBlocking
+        ChatProcessor.sendToBridge(
-        e.isCanceled = ChatProcessor.sendToBridge(
                 user = e.player.displayName,
                 msg = e.message,
-            x = e.player.posX.toInt(),
+                event = ""
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension,
-            event = ChatEvent.PLAIN,
-            uuid = e.player.gameProfile.id
         )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
-    fun commandEvent(e: CommandEvent) = runBlocking {
+    fun commandEvent(e: CommandEvent) {
         val sender = when {
             e.sender is DedicatedServer -> cfg.outgoing.systemUser
             else -> e.sender.commandSenderName
         }
         val args = e.parameters.joinToString(" ")
-        val type = with(e.command) {
+        val type = when {
-            when {
+            e.command is CommandEmote -> USER_ACTION
-                this is CommandEmote || commandName.equals("me", true) -> ChatEvent.ACTION
+            e.command.commandName == "me" -> USER_ACTION
-                this is CommandBroadcast || commandName.equals("say", true) -> ChatEvent.BROADCAST
+            e.command is CommandBroadcast -> ""
-                else -> return@runBlocking
+            else -> return
         }
-        }
+        ChatProcessor.sendToBridge(user = sender, msg = args, event = type)
-        val s = e.sender
-        val (x, y, z) = when (s) {
-            is Entity -> Triple(s.posX.toInt(), s.posY.toInt(), s.posZ.toInt())
-            else -> with(s.commandSenderPosition) { Triple(posX, posY, posZ) }
-        }
-        ChatProcessor.sendToBridge(
-            user = sender,
-            msg = args,
-            event = type,
-            x = x,
-            y = y,
-            z = z,
-            dimension = when {
-                e.sender is DedicatedServer -> null
-                else -> e.sender.entityWorld.provider.dimensionId
-            }
-        )
 
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
-    fun deathEvent(e: LivingDeathEvent) = runBlocking {
+    fun deathEvent(e: LivingDeathEvent) {
         if (e.entityLiving is EntityPlayer) {
             val player = e.entityLiving as EntityPlayer
             DeathHandler.handleDeath(
                     player = player.displayName,
                     deathMessage = e.entityLiving.combatTracker.func_151521_b().unformattedText,
-                damageType = e.source.damageType,
+                    damageType = e.source.damageType
-                x = e.entityLiving.posX.toInt(),
-                y = e.entityLiving.posY.toInt(),
-                z = e.entityLiving.posZ.toInt(),
-                dimension = e.entityLiving.dimension
             )
         }
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
-    fun joinEvent(e: PlayerEvent.PlayerLoggedInEvent) = runBlocking {
+    fun joinEvent(e: PlayerEvent.PlayerLoggedInEvent) {
-        JoinLeaveHandler.handleJoin(
+        JoinLeaveHandler.handleJoin(e.player.displayName)
-            player = e.player.displayName,
-            x = e.player.posX.toInt(),
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension
-        )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
-    fun leaveEvent(e: PlayerEvent.PlayerLoggedOutEvent) = runBlocking {
+    fun leaveEvent(e: PlayerEvent.PlayerLoggedOutEvent) {
-        JoinLeaveHandler.handleLeave(
+        JoinLeaveHandler.handleLeave(e.player.displayName)
-            player = e.player.displayName,
-            x = e.player.posX.toInt(),
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension
-        )
     }
 
     //FORGE-DEPENDENT
     @SubscribeEvent
-    fun serverTickEvent(e: TickEvent.ServerTickEvent) = runBlocking {
+    fun serverTickEvent(e: TickEvent.ServerTickEvent) {
         if (e.phase == TickEvent.Phase.END)
             TickHandler.handleTick()
     }

1.7.10/src/main/kotlin/matterlink/MatterLink.kt

@@ -1,25 +1,22 @@
 package matterlink
 
-import com.mojang.authlib.GameProfile
 import cpw.mods.fml.common.FMLCommonHandler
 import cpw.mods.fml.common.Mod
 import cpw.mods.fml.common.event.FMLInitializationEvent
 import cpw.mods.fml.common.event.FMLPreInitializationEvent
 import cpw.mods.fml.common.event.FMLServerStartingEvent
 import cpw.mods.fml.common.event.FMLServerStoppingEvent
-import kotlinx.coroutines.runBlocking
+import matterlink.command.CommandMatterlink
-import matterlink.bridge.command.IBridgeCommand
-import matterlink.command.AuthCommand
-import matterlink.command.MatterLinkCommand
 import matterlink.command.MatterLinkCommandSender
-import matterlink.config.BaseConfig
 import matterlink.config.cfg
-import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.ChatComponentText
 import net.minecraftforge.common.ForgeVersion
 import net.minecraftforge.common.MinecraftForge
-import java.util.UUID
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.Logger
+
+lateinit var logger: Logger
 
 @Mod(
         modid = MODID,
@@ -37,19 +34,10 @@ class MatterLink : IMatterLink() {
         MinecraftForge.EVENT_BUS.register(EventHandler)
         FMLCommonHandler.instance().bus().register(EventHandler)
 
-        logger = with(event.modLog) {
+        logger = event.modLog
-            object : Logger {
-                override fun info(message: String) = this@with.info(message)
-                override fun debug(message: String) = this@with.debug(message)
-                override fun error(message: String) = this@with.error(message)
-                override fun warn(message: String) = this@with.warn(message)
-                override fun trace(message: String) = this@with.trace(message)
-            }
-        }
-
         logger.info("Building bridge!")
 
-        cfg = BaseConfig(event.modConfigurationDirectory).load()
+        cfg = MatterLinkConfig(event.modConfigurationDirectory)
     }
 
     @Mod.EventHandler
@@ -58,15 +46,14 @@ class MatterLink : IMatterLink() {
     }
 
     @Mod.EventHandler
-    fun serverStarting(event: FMLServerStartingEvent) = runBlocking {
+    fun serverStarting(event: FMLServerStartingEvent) {
         logger.debug("Registering server commands")
-        event.registerServerCommand(MatterLinkCommand)
+        event.registerServerCommand(CommandMatterlink())
-        event.registerServerCommand(AuthCommand)
         start()
     }
 
     @Mod.EventHandler
-    fun serverStopping(event: FMLServerStoppingEvent) = runBlocking {
+    fun serverStopping(event: FMLServerStoppingEvent) {
         stop()
     }
 
@@ -75,74 +62,12 @@ class MatterLink : IMatterLink() {
         MinecraftServer.getServer().configurationManager.sendChatMsg(ChatComponentText(msg))
     }
 
-    override fun wrappedSendToPlayer(username: String, msg: String) {
+    override fun log(level: String, formatString: String, vararg data: Any) =
-        val profile = profileByName(username) ?: run {
+            logger.log(Level.toLevel(level, Level.INFO), formatString, *data)
-            logger.error("cannot find player by name $username")
-            return
-        }
-        val player = playerByProfile(profile) ?: run {
-            logger.error("${profile.name} is not online")
-            return
-        }
-        player.addChatMessage(ChatComponentText(msg))
-    }
 
-    override fun wrappedSendToPlayer(uuid: UUID, msg: String) {
+    override fun commandSenderFor(user: String, userId: String, server: String, op: Boolean) = MatterLinkCommandSender(user, userId, server, op)
-        val profile = profileByUUID(uuid) ?: run {
-            logger.error("cannot find player by uuid $uuid")
-            return
-        }
-        val player = playerByProfile(profile) ?: run {
-            logger.error("${profile.name} is not online")
-            return
-        }
-        player.addChatMessage(ChatComponentText(msg))
-    }
-
-    override fun isOnline(username: String) = (FMLCommonHandler.instance()
-        .minecraftServerInstance.configurationManager.getPlayerByUsername(username) ?: null) != null
-
-    private fun playerByProfile(gameProfile: GameProfile): EntityPlayerMP? {
-        return FMLCommonHandler.instance()
-            .minecraftServerInstance.configurationManager.getPlayerByUsername(gameProfile.name)
-    }
-
-    private fun profileByUUID(uuid: UUID): GameProfile? = try {
-        FMLCommonHandler.instance().minecraftServerInstance.playerProfileCache.func_152652_a(uuid)
-    } catch (e: IllegalArgumentException) {
-        logger.warn("cannot find profile by uuid $uuid")
-        null
-    }
-
-    private fun profileByName(username: String): GameProfile? = try {
-        FMLCommonHandler.instance().minecraftServerInstance.playerProfileCache.getGameProfileForUsername(username)
-    } catch (e: IllegalArgumentException) {
-        logger.warn("cannot find profile by username $username")
-        null
-    }
-
-    override fun collectPlayers(area: Area): Set<UUID> {
-        val players = MinecraftServer.getServer().configurationManager.playerEntityList
-            .map { it as EntityPlayerMP }
-            .filter {
-                (area.allDimensions || area.dimensions.contains(it.dimension))
-                        && area.testInBounds(it.posX.toInt(), it.posY.toInt(), it.posZ.toInt())
-            }
-        return players.map { it.uniqueID }.toSet()
-    }
-
-    override fun nameToUUID(username: String): UUID? = profileByName(username)?.id
-
-    override fun uuidToName(uuid: UUID): String? = profileByUUID(uuid)?.name
-
-    override fun commandSenderFor(
-        user: String,
-        env: IBridgeCommand.CommandEnvironment,
-        op: Boolean
-    ) = MatterLinkCommandSender(user, env, op)
 
     override val mcVersion: String = MCVERSION
     override val modVersion: String = MODVERSION
-    override val buildNumber = BUILD_NUMBER
     override val forgeVersion = ForgeVersion.getVersion()
 }

1.7.10/src/main/kotlin/matterlink/MatterLinkConfig.kt

@@ -0,0 +1,24 @@
+package matterlink
+
+import matterlink.config.BaseConfig
+import net.minecraftforge.common.config.Configuration
+import java.io.File
+
+class MatterLinkConfig(val baseCfgDir: File) : BaseConfig(baseCfgDir) {
+    init {
+        logger.info("Reading bridge blueprints... from {}", cfgDirectory)
+        val config = Configuration(mainCfgFile)
+
+        load(
+                getBoolean = config::getBoolean,
+                getString = config::getString,
+                getStringValidated = config::getString,
+                getStringValidValues = config::getString,
+                getStringList = config::getStringList,
+                addCustomCategoryComment = config::addCustomCategoryComment
+        )
+        if (config.hasChanged()) config.save()
+    }
+
+    override fun load() = MatterLinkConfig(baseCfgDir)
+}

1.7.10/src/main/kotlin/matterlink/command/CommandMatterlink.kt

@@ -3,33 +3,31 @@ package matterlink.command
 import net.minecraft.command.CommandBase
 import net.minecraft.command.ICommandSender
 import net.minecraft.command.WrongUsageException
-import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.util.ChatComponentText
 
 
-object AuthCommand : CommandBase() {
+class CommandMatterlink : CommandBase() {
-    override fun getCommandName(): String {
-        return CommandCoreAuth.name
-    }
-
-    override fun getCommandUsage(sender: ICommandSender): String {
-        return CommandCoreAuth.usage
-    }
-
-    override fun getCommandAliases(): List<String> {
-        return CommandCoreAuth.aliases
-    }
-
     override fun processCommand(sender: ICommandSender, args: Array<String>) {
         if (args.isEmpty()) {
             throw WrongUsageException("Invalid command! Valid uses: ${this.getCommandUsage(sender)}")
         }
 
-        val uuid = (sender as? EntityPlayer)?.uniqueID?.toString()
+        val reply = CommandCore.execute(args)
-        val reply = CommandCoreAuth.execute(args, sender.commandSenderName, uuid)
 
         if (reply.isNotEmpty()) {
             sender.addChatMessage(ChatComponentText(reply))
         }
     }
+
+    override fun getCommandName(): String {
+        return CommandCore.getName()
+    }
+
+    override fun getCommandUsage(sender: ICommandSender): String {
+        return CommandCore.getUsage()
+    }
+
+    override fun getCommandAliases(): List<String> {
+        return CommandCore.getAliases()
+    }
 }

1.7.10/src/main/kotlin/matterlink/command/MatterLinkCommand.kt

@@ -1,36 +0,0 @@
-package matterlink.command
-
-import kotlinx.coroutines.runBlocking
-import net.minecraft.command.CommandBase
-import net.minecraft.command.ICommandSender
-import net.minecraft.command.WrongUsageException
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.util.ChatComponentText
-
-
-object MatterLinkCommand : CommandBase() {
-    override fun getCommandName(): String {
-        return CommandCoreML.name
-    }
-
-    override fun getCommandUsage(sender: ICommandSender): String {
-        return CommandCoreML.usage
-    }
-
-    override fun getCommandAliases(): List<String> {
-        return CommandCoreML.aliases
-    }
-
-    override fun processCommand(sender: ICommandSender, args: Array<String>) = runBlocking {
-        if (args.isEmpty()) {
-            throw WrongUsageException("Invalid command! Valid uses: ${getCommandUsage(sender)}")
-        }
-
-        val uuid = (sender as? EntityPlayer)?.uniqueID?.toString()
-        val reply = CommandCoreML.execute(args, sender.commandSenderName, uuid)
-
-        if (reply.isNotEmpty()) {
-            sender.addChatMessage(ChatComponentText(reply))
-        }
-    }
-}

1.7.10/src/main/kotlin/matterlink/command/MatterLinkCommandSender.kt

@@ -1,7 +1,5 @@
 package matterlink.command
 
-import kotlinx.coroutines.runBlocking
-import matterlink.bridge.command.IBridgeCommand
 import matterlink.bridge.command.IMinecraftCommandSender
 import net.minecraft.command.ICommandSender
 import net.minecraft.server.MinecraftServer
@@ -10,23 +8,19 @@ import net.minecraft.util.ChunkCoordinates
 import net.minecraft.util.IChatComponent
 import net.minecraft.world.World
 
-class MatterLinkCommandSender(
+class MatterLinkCommandSender(user: String, userId: String, server: String, op: Boolean) : IMinecraftCommandSender(user, userId, server, op), ICommandSender {
-    user: String,
-    env: IBridgeCommand.CommandEnvironment,
-    op: Boolean
-) : IMinecraftCommandSender(user, env, op), ICommandSender {
 
-    override fun execute(cmdString: String): Boolean = runBlocking {
+    private var level: Int = 0
-        return@runBlocking 0 < MinecraftServer.getServer().commandManager.executeCommand(
+
-            this@MatterLinkCommandSender,
+    override fun execute(cmdString: String): Boolean {
+        return 0 < MinecraftServer.getServer().commandManager.executeCommand(
+                this,
                 cmdString
-        ).apply {
+        )
-            sendReply(cmdString)
-        }
     }
 
     override fun getFormattedCommandSenderName(): IChatComponent {
-        return ChatComponentText(displayName)
+        return ChatComponentText(user)
     }
 
     override fun getCommandSenderName() = accountName
@@ -41,7 +35,7 @@ class MatterLinkCommandSender(
     }
 
     override fun addChatMessage(component: IChatComponent) {
-        appendReply(component.unformattedText)
+        sendReply(component.unformattedText)
     }
 
     override fun getCommandSenderPosition(): ChunkCoordinates = ChunkCoordinates(0, 0, 0)

1.7.10/src/templates/kotlin/matterlink/Constants.kt

@@ -4,4 +4,4 @@ const val MODID = "matterlink"
 const val NAME = "MatterLink"
 const val MODVERSION = "@MODVERSION@"
 const val MCVERSION = "@MCVERSION@"
-const val BUILD_NUMBER = @BUILD_NUMBER@
+

1.9.4/build.gradle

@@ -1,135 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url = 'http://files.minecraftforge.net/maven'
-        }
-        mavenCentral()
-        maven {
-            url 'https://plugins.gradle.org/m2/'
-        }
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '2.2-SNAPSHOT'
-        classpath group: 'com.github.jengelman.gradle.plugins', name: 'shadow', version: shadowVersion
-        classpath group: 'gradle.plugin.com.matthewprenger', name: 'CurseGradle', version: cursegradleVersion
-    }
-}
-
-apply plugin: 'net.minecraftforge.gradle.forge'
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'com.matthewprenger.cursegradle'
-
-version = project.mc_version + '-' + project.modVersion
-
-archivesBaseName = project.modName
-
-sourceCompatibility = targetCompatibility = '1.8'
-
-dependencies {
-    compile project(':core')
-    shadow (project(path: ':core', configuration: 'shadow')) { transitive = false }
-
-    compile group: 'net.shadowfacts', name: 'Forgelin', version: project.forgelinVersion
-}
-
-shadowJar {
-    classifier = ''
-
-    exclude 'dummyThing'
-    configurations = [project.configurations.shadow]
-}
-
-import net.minecraftforge.gradle.user.TaskSourceCopy
-
-// Mad hacks to make source replacements work for Kotlin
-// source: https://github.com/PaleoCrafter/VanillaImmersion/blob/ee82ecafb76659cf7d7822a722c8f63f43f41d01/build.gradle#L119
-for (set in sourceSets) {
-    def taskName = "source${set.name.capitalize()}Kotlin"
-    def dir = new File(project.getBuildDir(), "sources/${set.name}/kotlin")
-    task(taskName, type: TaskSourceCopy) {
-        source = set.getKotlin()
-        output = dir
-    }
-    def compileTask = tasks[set.getCompileTaskName('kotlin')]
-    compileTask.source = dir
-    compileTask.dependsOn taskName
-    def dirPath = dir.toPath()
-    compileKotlin.include {
-        return it.file.toPath().startsWith(dirPath)
-    }
-}
-sourceJar.from sourceSets.main.kotlin
-
-minecraft {
-    version = project.mc_version + '-' + project.forge_version
-    runDir = 'run'
-
-    mappings = project.mcp_mappings
-
-    replaceIn 'Constants.kt'
-    replace '@MODVERSION@', project.modVersion
-    replace '@MCVERSION@', project.mc_version
-    replace '@FORGELIN-VERSION@', project.forgelinVersion
-    replace '@FORGE-VERSION@', project.forge_version
-    replace '-1//@BUILD_NUMBER@', System.env.BUILD_NUMBER ?: -1
-}
-
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property 'version', project.modVersion
-    inputs.property 'mcversion', project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(project(':core').sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'version': project.modVersion, 'mcversion': project.minecraft.version
-    }
-
-    // copy everything else except the mcmod.info
-    from(project(':core').sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-
-}
-
-sourceJar {
-    classifier 'sources'
-    // copy all the minecraftforge specific classes
-    from sourceSets.main.allSource
-
-    // copy everything else except the mcmod.info
-    from(project(':core').sourceSets.main.allSource) {
-        exclude 'mcmod.info'
-    }
-}
-
-
-reobf {
-    shadowJar { mappingType = 'SEARGE' }
-}
-tasks.shadowJar.finalizedBy reobfShadowJar
-
-curseforge {
-    if (project.hasProperty('CURSEFORGE_API_TOKEN') && project.hasProperty('release')) {
-        apiKey = CURSEFORGE_API_TOKEN
-    }
-    project {
-        id = project.curseId
-        releaseType = project.curseReleaseType
-        addGameVersion '1.10'
-        if (project.hasProperty('changelog_file')) {
-            println("changelog = $changelog_file")
-            changelogType = 'markdown'
-            changelog = file(changelog_file)
-        }
-        relations {
-            requiredLibrary 'shadowfacts-forgelin'
-        }
-        mainArtifact(shadowJar) {
-            displayName = "MatterLink $version"
-        }
-    }
-}

1.9.4/gradle.properties

@@ -1,3 +0,0 @@
-mc_version = 1.9.4
-mcp_mappings = stable_26
-forge_version = 12.17.0.2051

1.9.4/src/main/kotlin/matterlink/EventHandler.kt

@@ -1,139 +0,0 @@
-package matterlink
-
-import kotlinx.coroutines.runBlocking
-import matterlink.config.cfg
-import matterlink.handlers.ChatEvent
-import matterlink.handlers.ChatProcessor
-import matterlink.handlers.DeathHandler
-import matterlink.handlers.JoinLeaveHandler
-import matterlink.handlers.ProgressHandler
-import matterlink.handlers.TickHandler
-import net.minecraft.command.server.CommandBroadcast
-import net.minecraft.command.server.CommandEmote
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.entity.player.EntityPlayerMP
-import net.minecraft.server.dedicated.DedicatedServer
-import net.minecraftforge.event.CommandEvent
-import net.minecraftforge.event.ServerChatEvent
-import net.minecraftforge.event.entity.living.LivingDeathEvent
-import net.minecraftforge.event.entity.player.AchievementEvent
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import net.minecraftforge.fml.common.gameevent.PlayerEvent
-import net.minecraftforge.fml.common.gameevent.TickEvent
-
-//FORGE-DEPENDENT
-object EventHandler {
-
-    //MC-VERSION & FORGE DEPENDENT
-    @SubscribeEvent
-    fun progressEvent(e: AchievementEvent) = runBlocking {
-        val achievement = e.achievement
-        val entityPlayer = e.entityPlayer as? EntityPlayerMP ?: return@runBlocking
-        val statFile = entityPlayer.statFile
-
-        if (!statFile.canUnlockAchievement(achievement) || statFile.hasAchievementUnlocked(achievement)) {
-            return@runBlocking
-        }
-        ProgressHandler.handleProgress(
-            name = e.entityPlayer.displayName.unformattedText,
-            message = "has earned the achievement",
-            display = e.achievement.statName.unformattedText,
-            x = e.entityPlayer.posX.toInt(),
-            y = e.entityPlayer.posY.toInt(),
-            z = e.entityPlayer.posZ.toInt(),
-            dimension = e.entityPlayer.dimension
-        )
-    }
-
-    //FORGE-DEPENDENT
-    @SubscribeEvent
-    fun chatEvent(e: ServerChatEvent) = runBlocking {
-        if (e.isCanceled) return@runBlocking
-        e.isCanceled = ChatProcessor.sendToBridge(
-            user = e.player.displayName.unformattedText,
-            msg = e.message,
-            x = e.player.posX.toInt(),
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension,
-            event = ChatEvent.PLAIN,
-            uuid = e.player.gameProfile.id
-        )
-    }
-
-    //FORGE-DEPENDENT
-    @SubscribeEvent
-    fun commandEvent(e: CommandEvent) = runBlocking {
-        val sender = when {
-            e.sender is DedicatedServer -> cfg.outgoing.systemUser
-            else -> e.sender.displayName.unformattedText
-        }
-        val args = e.parameters.joinToString(" ")
-        val type = with(e.command) {
-            when {
-                this is CommandEmote || commandName.equals("me", true) -> ChatEvent.ACTION
-                this is CommandBroadcast || commandName.equals("say", true) -> ChatEvent.BROADCAST
-                else -> return@runBlocking
-            }
-        }
-        ChatProcessor.sendToBridge(
-            user = sender,
-            msg = args,
-            event = type,
-            x = e.sender.position.x,
-            y = e.sender.position.y,
-            z = e.sender.position.z,
-            dimension = when {
-                e.sender is DedicatedServer -> null
-                else -> e.sender.commandSenderEntity?.dimension ?: e.sender.entityWorld.provider.dimension
-            }
-        )
-    }
-
-    //FORGE-DEPENDENT
-    @SubscribeEvent
-    fun deathEvent(e: LivingDeathEvent) = runBlocking {
-        if (e.entityLiving is EntityPlayer) {
-            DeathHandler.handleDeath(
-                player = e.entityLiving.displayName.unformattedText,
-                deathMessage = e.entityLiving.combatTracker.deathMessage.unformattedText,
-                damageType = e.source.damageType,
-                x = e.entityLiving.posX.toInt(),
-                y = e.entityLiving.posY.toInt(),
-                z = e.entityLiving.posZ.toInt(),
-                dimension = e.entityLiving.dimension
-            )
-        }
-    }
-
-    //FORGE-DEPENDENT
-    @SubscribeEvent
-    fun joinEvent(e: PlayerEvent.PlayerLoggedInEvent) = runBlocking {
-        JoinLeaveHandler.handleJoin(
-            player = e.player.displayName.unformattedText,
-            x = e.player.posX.toInt(),
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension
-        )
-    }
-
-    //FORGE-DEPENDENT
-    @SubscribeEvent
-    fun leaveEvent(e: PlayerEvent.PlayerLoggedOutEvent) = runBlocking {
-        JoinLeaveHandler.handleLeave(
-            player = e.player.displayName.unformattedText,
-            x = e.player.posX.toInt(),
-            y = e.player.posY.toInt(),
-            z = e.player.posZ.toInt(),
-            dimension = e.player.dimension
-        )
-    }
-
-    //FORGE-DEPENDENT
-    @SubscribeEvent
-    fun serverTickEvent(e: TickEvent.ServerTickEvent) = runBlocking {
-        if (e.phase == TickEvent.Phase.END)
-            TickHandler.handleTick()
-    }
-}

1.9.4/src/main/kotlin/matterlink/MatterLink.kt

@@ -1,148 +0,0 @@
-package matterlink
-
-import com.mojang.authlib.GameProfile
-import kotlinx.coroutines.runBlocking
-import matterlink.bridge.command.IBridgeCommand
-import matterlink.command.AuthCommand
-import matterlink.command.MatterLinkCommand
-import matterlink.command.MatterLinkCommandSender
-import matterlink.config.BaseConfig
-import matterlink.config.cfg
-import net.minecraft.entity.player.EntityPlayerMP
-import net.minecraft.util.text.TextComponentString
-import net.minecraftforge.common.ForgeVersion
-import net.minecraftforge.common.MinecraftForge
-import net.minecraftforge.fml.common.FMLCommonHandler
-import net.minecraftforge.fml.common.Mod
-import net.minecraftforge.fml.common.event.FMLInitializationEvent
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent
-import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
-import java.util.UUID
-
-@Mod(
-    modid = MODID,
-    name = NAME, version = MODVERSION,
-    serverSideOnly = true,
-    useMetadata = true,
-    acceptableRemoteVersions = "*",
-    modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter",
-    dependencies = DEPENDENCIES
-)
-object MatterLink : IMatterLink() {
-    init {
-        instance = this
-    }
-
-    @Mod.EventHandler
-    fun preInit(event: FMLPreInitializationEvent) {
-        MinecraftForge.EVENT_BUS.register(EventHandler)
-        logger = with(event.modLog) {
-            object : Logger {
-                override fun info(message: String) = this@with.info(message)
-                override fun debug(message: String) = this@with.debug(message)
-                override fun error(message: String) = this@with.error(message)
-                override fun warn(message: String) = this@with.warn(message)
-                override fun trace(message: String) = this@with.trace(message)
-            }
-        }
-
-        logger.info("Building bridge!")
-
-        cfg = BaseConfig(event.modConfigurationDirectory).load()
-    }
-
-    @Mod.EventHandler
-    fun init(event: FMLInitializationEvent) {
-        this.registerBridgeCommands()
-    }
-
-    @Mod.EventHandler
-    fun serverStarting(event: FMLServerStartingEvent) = runBlocking {
-        logger.debug("Registering server commands")
-        event.registerServerCommand(MatterLinkCommand)
-        event.registerServerCommand(AuthCommand)
-        start()
-    }
-
-    @Mod.EventHandler
-    fun serverStopping(event: FMLServerStoppingEvent) = runBlocking {
-        stop()
-    }
-
-    //FORGE-DEPENDENT
-    override fun wrappedSendToPlayers(msg: String) {
-        FMLCommonHandler.instance().minecraftServerInstance.playerList.sendChatMsg(TextComponentString(msg))
-    }
-
-    override fun wrappedSendToPlayer(username: String, msg: String) {
-        val profile = profileByName(username) ?: run {
-            error("cannot find player by name $username")
-            return
-        }
-        val player = playerByProfile(profile) ?: run {
-            error("${profile.name} is not online")
-            return
-        }
-        player.addChatMessage(TextComponentString(msg))
-    }
-
-    override fun wrappedSendToPlayer(uuid: UUID, msg: String) {
-        val profile = profileByUUID(uuid) ?: run {
-            logger.error("cannot find player by uuid $uuid")
-            return
-        }
-        val player = playerByProfile(profile) ?: run {
-            logger.error("${profile.name} is not online")
-            return
-        }
-        player.addChatMessage(TextComponentString(msg))
-    }
-
-    override fun isOnline(username: String) =
-        FMLCommonHandler.instance().minecraftServerInstance.playerList.allUsernames.contains(username)
-
-    private fun playerByProfile(gameProfile: GameProfile): EntityPlayerMP? =
-        FMLCommonHandler.instance().minecraftServerInstance.playerList.getPlayerByUUID(gameProfile.id)
-
-
-    private fun profileByUUID(uuid: UUID): GameProfile? = try {
-        FMLCommonHandler.instance().minecraftServerInstance.playerProfileCache.getProfileByUUID(uuid)
-    } catch (e: IllegalArgumentException) {
-        logger.warn("cannot find profile by uuid $uuid")
-        null
-    }
-
-    private fun profileByName(username: String): GameProfile? = try {
-        FMLCommonHandler.instance().minecraftServerInstance.playerProfileCache.getGameProfileForUsername(username)
-    } catch (e: IllegalArgumentException) {
-        logger.warn("cannot find profile by username $username")
-        null
-    }
-
-    override fun collectPlayers(area: Area): Set<UUID> {
-        val playerList = FMLCommonHandler.instance().minecraftServerInstance.playerList
-        val players = playerList.allProfiles
-            .map { playerList.getPlayerByUUID(it.id) }
-            .filter {
-                (area.allDimensions || area.dimensions.contains(it.dimension))
-                        && area.testInBounds(it.posX.toInt(), it.posY.toInt(), it.posZ.toInt())
-            }
-        return players.map { it.uniqueID }.toSet()
-    }
-
-    override fun nameToUUID(username: String): UUID? = profileByName(username)?.id
-
-    override fun uuidToName(uuid: UUID): String? = profileByUUID(uuid)?.name
-
-    override fun commandSenderFor(
-        user: String,
-        env: IBridgeCommand.CommandEnvironment,
-        op: Boolean
-    ) = MatterLinkCommandSender(user, env, op)
-
-    override val mcVersion: String = MCVERSION
-    override val modVersion: String = MODVERSION
-    override val buildNumber = BUILD_NUMBER
-    override val forgeVersion = ForgeVersion.getVersion()
-}

1.9.4/src/main/kotlin/matterlink/command/AuthCommand.kt

@@ -1,41 +0,0 @@
-package matterlink.command
-
-import net.minecraft.command.CommandBase
-import net.minecraft.command.ICommandSender
-import net.minecraft.command.WrongUsageException
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.server.MinecraftServer
-import net.minecraft.util.text.TextComponentString
-
-
-object AuthCommand : CommandBase() {
-    override fun getCommandName(): String {
-        return CommandCoreAuth.name
-    }
-
-    override fun getCommandUsage(sender: ICommandSender): String {
-        return CommandCoreAuth.usage
-    }
-
-    override fun getCommandAliases(): List<String> {
-        return CommandCoreAuth.aliases
-    }
-
-    override fun getRequiredPermissionLevel(): Int {
-        return 0
-    }
-
-    override fun execute(server: MinecraftServer, sender: ICommandSender, args: Array<String>) {
-        if (args.isEmpty()) {
-            throw WrongUsageException("Invalid command! Valid uses: ${this.getCommandUsage(sender)}")
-        }
-
-        val uuid = (sender as? EntityPlayer)?.uniqueID?.toString()
-        val reply = CommandCoreAuth.execute(args, sender.name, uuid)
-
-        if (reply.isNotEmpty() && sender.sendCommandFeedback()) {
-            sender.addChatMessage(TextComponentString(reply))
-        }
-    }
-
-}

1.9.4/src/main/kotlin/matterlink/command/MatterLinkCommand.kt

@@ -1,37 +0,0 @@
-package matterlink.command
-
-import kotlinx.coroutines.runBlocking
-import net.minecraft.command.CommandBase
-import net.minecraft.command.ICommandSender
-import net.minecraft.command.WrongUsageException
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.server.MinecraftServer
-import net.minecraft.util.text.TextComponentString
-
-
-object MatterLinkCommand : CommandBase() {
-    override fun getCommandName(): String {
-        return CommandCoreML.name
-    }
-
-    override fun getCommandUsage(sender: ICommandSender): String {
-        return CommandCoreML.usage
-    }
-
-    override fun getCommandAliases(): List<String> {
-        return CommandCoreML.aliases
-    }
-
-    override fun execute(server: MinecraftServer, sender: ICommandSender, args: Array<String>) = runBlocking {
-        if (args.isEmpty()) {
-            throw WrongUsageException("Invalid command! Valid uses: ${getCommandUsage(sender)}")
-        }
-
-        val uuid = (sender as? EntityPlayer)?.uniqueID?.toString()
-        val reply = CommandCoreML.execute(args, sender.name, uuid)
-
-        if (reply.isNotEmpty() && sender.sendCommandFeedback()) {
-            sender.addChatMessage(TextComponentString(reply))
-        }
-    }
-}

Jankson

@@ -1 +0,0 @@
-Subproject commit 7d27c28784bacba17450faa9e723ca6b6eb39602

Jenkinsfile

@@ -11,15 +11,23 @@ pipeline {
 	            sh './gradlew :1.7.10:setupCiWorkspace'
 	            sh './gradlew :1.7.10:clean'
 	            sh './gradlew :1.7.10:build'
-	            archiveArtifacts artifacts: '1.7.10/build/libs/*jar'
+	            archive '1.7.10/build/libs/*jar'
 	        }
 	    }
-	    stage("1.9.4") {
+	    stage("1.10.2") {
 	        steps {
-	            sh './gradlew :1.9.4:setupCiWorkspace'
+	            sh './gradlew :1.10.2:setupCiWorkspace'
-	            sh './gradlew :1.9.4:clean'
+	            sh './gradlew :1.10.2:clean'
-	            sh './gradlew :1.9.4:build'
+	            sh './gradlew :1.10.2:build'
-	            archiveArtifacts artifacts: '1.9.4/build/libs/*jar'
+	            archive '1.10.2/build/libs/*jar'
+	        }
+	    }
+	    stage("1.11.2") {
+	        steps {
+	            sh './gradlew :1.11.2:setupCiWorkspace'
+	            sh './gradlew :1.11.2:clean'
+	            sh './gradlew :1.11.2:build'
+	            archive '1.11.2/build/libs/*jar'
 	        }
 	    }
 	    stage("1.12.2") {
@@ -27,7 +35,7 @@ pipeline {
 	            sh './gradlew :1.12.2:setupCiWorkspace'
 	            sh './gradlew :1.12.2:clean'
 	            sh './gradlew :1.12.2:build'
-	            archiveArtifacts artifacts: '1.12.2/build/libs/*jar'
+	            archive '1.12.2/build/libs/*jar'
 	        }
 	    }
 	}

README.md

@@ -1,9 +1,3 @@
-[![Discord](https://img.shields.io/discord/176780432371744769.svg?style=for-the-badge&label=%23ai-dev&logo=discord)](http://discord.gg/Fm5EST)
-[![Discord](https://img.shields.io/discord/342696338556977153.svg?style=for-the-badge&logo=discord)](https://discord.gg/hXqNgq5)
-[![Download 1.12.2](https://curse.nikky.moe/api/img/287323?logo&style=for-the-badge&version=1.12.2)](https://curse.nikky.moe/api/url/287323?version=1.12.2)
-[![Jenkins](https://img.shields.io/jenkins/s/https/ci.elytradev.com/job/elytra/job/MatterLink/job/master.svg?style=for-the-badge&label=Jenkins%20Build)](https://ci.elytradev.com/job/elytra/job/MatterLink/job/master/lastSuccessfulBuild/artifact/)
-[![Patreon](https://img.shields.io/badge/Patreon-Nikkyai-red.svg?style=for-the-badge)](https://www.patreon.com/NikkyAi)
-
 # MatterLink
 
 - [Downloads](#downloads)
@@ -28,7 +22,11 @@ Chat with us on IRC: [#matterlink @ irc.esper.net](irc://irc.esper.net/matterlin
 
 [![Download 1.12.2](https://curse.nikky.moe/api/img/287323?logo&style=for-the-badge&version=1.12.2)](https://curse.nikky.moe/api/url/287323?version=1.12.2)
 
-[![Download 1.9.4](https://curse.nikky.moe/api/img/287323?logo&style=for-the-badge&version=1.9.4)](https://curse.nikky.moe/api/url/287323?version=1.9.4)
+[![Download 1.11.2](https://curse.nikky.moe/api/img/287323?logo&style=for-the-badge&version=1.11.2)](https://curse.nikky.moe/api/url/287323?version=1.11.2)
+
+[![Download 1.10.2](https://curse.nikky.moe/api/img/287323?logo&style=for-the-badge&version=1.10.2)](https://curse.nikky.moe/api/url/287323?version=1.10.2)
+
+[![Download 1.7.10](https://curse.nikky.moe/api/img/287323?logo&style=for-the-badge&version=1.7.10)](https://curse.nikky.moe/api/url/287323?version=1.7.10)
 
 ## Dependencies
 
@@ -38,7 +36,7 @@ Chat with us on IRC: [#matterlink @ irc.esper.net](irc://irc.esper.net/matterlin
 
 ### Custom bridge commands
 
-includes pass-through to Minecraft commands!  
+including passthrough to MC!  
 Default commands: `help, tps, list, seed, uptime`
 
 Commands are specified in JSON format as follows:
@@ -46,7 +44,6 @@ Commands are specified in JSON format as follows:
 Passthrough command (executes the configured command from the MC server console)
 
 ```json
-{
 "tps": {
     "type": "PASSTHROUGH",
     "execute": "forge tps",
@@ -54,13 +51,11 @@ Passthrough command (executes the configured command from the MC server console)
     "help": "Print server tps",
     "allowArgs": false
 }
-}
 ```
 
 Response command
 
 ```json
-{
 "uptime": {
     "type": "RESPONSE",
     "response": "{uptime}",
@@ -68,44 +63,24 @@ Response command
     "help": "Print server uptime",
     "allowArgs": false
 }
-}
-```
-
-### Acount Linking
-
-To link your chat account to your minecraft uuid  
-execute `!auth Username`  
-make sure to use the proper username and command prefix, the system will then guide you through
-
-internally the identity links are stored like so:
-
-```json
-{ 
-    /* username: NikkyAi */ 
-    "edd31c45-b095-49c5-a9f5-59cec4cfed8c": { 
-        /* discord id */ 
-        "discord.game": [ 
-            "112228624366575616"
-        ]
-    }
-}
 ```
 
 ### Command permissions
 
-Higher numbers mean more permissions. Configured per uuid.  
+Higher numbers mean more permissions. Configured on a network-by-network basis.  
+For IRC, this is your hostmask.  
+For Discord, this is your userid (NOT the four-digit number.)
 
 ```json
 {
-  "edd31c45-b095-49c5-a9f5-59cec4cfed8c": 9000
+  "irc.esper": {
+    "~DaMachina@hostname.com":1000
+  }
 }
 ```
-
+* Edit and reload the config file without restarting the server!
-### Reload
- 
-Edit and reload the config file without restarting the server!
 ```
-/ml <connect|disconnect|reload>
+/bridge <connect|disconnect|reload>
     connect:    Connects the MC chat to the MatterBridge server
     disconnect: Disconnects the chat from the MatterBridge server
     reload:     Disconnects, reloads the config and custom command files, 
@@ -116,42 +91,18 @@ Edit and reload the config file without restarting the server!
 
 Requires the matterbridge config api section to be setup along these lines:
 
-### Local
-
-If ou know the matterbridge will run on the same machine as the Minecraft Server
 ```
 [api]
 [api.local]
-    BindAddress="127.0.0.1:4242" // Listens only for localhost
+    BindAddress="0.0.0.0:4242" # or listen only to localhost: 127.0.0.1:4242
     #OPTIONAL (no authorization if token is empty)
-    Token="" # Token left empty
+    Token="mytoken" # leave this empty if you know its going to run on localhost only
     Buffer=1000
     RemoteNickFormat="{NICK}"
     ShowJoinPart = true
 ```
 
-With this you need no extra configuration steps.. just run matterbridge and then start the minecraft server (or reload matterlink with command if it runs already)
+Now you just need to run MatterBridge on the server, the default configuration works with the provided sample.
-
-### Remote
-
-If the matterbridge runs on a different machine
-
-```
-[api]
-[api.local]
-    BindAddress="0.0.0.0:4242"
-    #OPTIONAL (no authorization if token is empty)
-    Token="mytoken"
-    Buffer=1000
-    RemoteNickFormat="{NICK}"
-    ShowJoinPart = true
-```
-
-you need to know the ip / domain of the matterbridge and the token used, 
-enter them in the ´connection' section in the config and reload matterlink
-
-
-### Sample
 
 Install matterbridge and try out the basic sample:
 
@@ -163,13 +114,6 @@ matterbridge
 
 now start the server with matterlink (and forgelin )in the mods folder
 
-and then [configure](https://github.com/42wim/matterbridge#configuration) all your needed gateways, endpoints etc
+and then [RTFM!!!](https://github.com/42wim/matterbridge#configuration) and configure all your needed gateways, endpoints etc
 
-### Building
+powered by wishful thinking
-
-```bash
-git clone --recursive https://git.lain.faith/sorceress/MatterLink.git
-cd MatterLink/
-./gradlew setupDecompWorkspace
-./gradlew build
-```

TODO.MD

@@ -1,14 +0,0 @@
-# Replacement for guava
-
-# using Fuel everywhere to simplify code
-
-
-# Adittional player values
-
-
-add optional feature:
-GET json dictionary of player values like TEAM, NICK, TOWN
-from url based on uuid / playername
-
-config input: `http://rest.wurmcraft.com/user/find/{UUID}`
-url: `http://rest.wurmcraft.com/user/find/148cf139-dd14-4bf4-97a2-08305dfef0a9`

api

@@ -0,0 +1 @@
+Subproject commit 8a034b55ebbb234fec29470271029b1f7bc950d3

build.gradle

@@ -1,28 +1,16 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath group: "org.jetbrains.kotlin", name: "kotlin-gradle-plugin", version: kotlinVersion
-        classpath group: "org.jetbrains.kotlin", name: "kotlin-serialization", version: kotlinVersion
-    }
-}
-
 plugins {
+    id "org.jetbrains.kotlin.jvm" version '1.2.41'
     id 'idea'
-    id "org.sonarqube" version "2.6.2"
 }
 
 subprojects {
     apply plugin: "kotlin"
-    apply plugin: "kotlinx-serialization"
     apply plugin: "idea"
 
     if (System.env.BUILD_NUMBER) {
-        modVersion += "-${System.env.BUILD_NUMBER}"
+        mod_version += "-${System.env.BUILD_NUMBER}"
     } else if (!project.hasProperty('release')) {
-//        modVersion += "-dev"
+        mod_version += "-dev"
-        modVersion += "-dev"
     }
 
     idea {
@@ -30,44 +18,17 @@ subprojects {
             excludeDirs += [file("run")]
         }
     }
-    if (name == 'Jankson') {
+
-        sonarqube {
-            skipProject = true
-        }
-    }
     repositories {
         jcenter()
-        mavenCentral()
         maven {
-            name = "bintray"
+            name = "unascribed"
-            url = "http://jcenter.bintray.com"
+            url = 'http://unascribed.com/maven/releases'
         }
-        maven {
-            name = "jitpack"
-            url = "https://jitpack.io"
-        }
-        maven {
-            name = "kotlinx"
-            url = "https://kotlin.bintray.com/kotlinx/"
-        }
-//        maven {
-//            name = "elytradev"
-//           // url = 'http://unascribed.com/maven/releases'
-//            url = "https://repo.elytradev.com"
-//        }
         maven {
             name = "shadowfacts"
             url = "http://maven.shadowfacts.net/"
         }
     }
-    compileKotlin {
+
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
-    compileTestKotlin {
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
 }

buildSrc/src/main/kotlin/Constants.kt

@@ -1,11 +0,0 @@
-object MatterLink {
-    const val version = "1.6.5"
-}
-
-object Kotlin {
-    const val version = "1.3.0"
-}
-
-object Forgelin {
-    const val version = "1.8.0"
-}

core/build.gradle

@@ -1,43 +1,32 @@
 buildscript {
+    ext.kotlin_version = '1.2.21'
     repositories {
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath group: "org.jetbrains.kotlin", name: "kotlin-gradle-plugin", version: kotlinVersion
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath group: "com.github.jengelman.gradle.plugins", name: "shadow", version: shadowVersion
-        classpath group: 'com.vanniktech', name: 'gradle-dependency-graph-generator-plugin', version: '0.5.0'
     }
 }
 
+plugins {
+    id "com.github.johnrengelman.shadow" version "1.2.4"
+}
+
 apply plugin: 'kotlin'
-apply plugin: "com.github.johnrengelman.shadow"
-apply plugin: "com.vanniktech.dependency.graph.generator"
 
 sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
+repositories {
+    jcenter()
+}
+
 dependencies {
-    compile project(":Jankson")
+    compile project(':api')
-    shadow(project(':Jankson')) { transitive = false }
+    compile group: 'commons-logging', name: 'commons-logging', version: '1.1.3'
+    compile group: 'com.google.code.gson', name: 'gson', version: '+'
 
-    compile group: 'com.google.guava', name: 'guava', version: '+'
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: project.kotlin_version
-
-    compile(group: "com.github.kittinunf.Fuel", name: "fuel", version: fuelVersion)
-    shadow(group: "com.github.kittinunf.Fuel", name: "fuel", version: fuelVersion) { transitive = true }
-    compile(group: "com.github.kittinunf.Fuel", name: "fuel-coroutines", version: fuelVersion)
-    shadow(group: "com.github.kittinunf.Fuel", name: "fuel-coroutines", version: fuelVersion) { transitive = true }
-    compile(group: "com.github.kittinunf.Fuel", name: "fuel-kotlinx-serialization", version: fuelVersion)
-    shadow(group: "com.github.kittinunf.Fuel", name: "fuel-kotlinx-serialization", version: fuelVersion) { transitive = true }
-//    compile(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion)
-//    shadow(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion) { transitive = false }
-
-//    compile(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutinesVersion)
-//    shadow(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutinesVersion) { transitive = false }
-
-    compile(group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-runtime", version: serializationVersion)
-    shadow(group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-runtime", version: serializationVersion) { transitive = false }
-
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlinVersion
 }
 
 compileKotlin {
@@ -47,12 +36,9 @@ compileKotlin {
 }
 
 shadowJar {
-    classifier = ''
+    classifier ''
 
-    relocate 'blue.endless', 'matterlink.repack.blue.endless'
+    dependencies {
-    relocate 'com.github', 'matterlink.repack.com.github'
+        include project(":api")
-    relocate 'kotlinx', 'matterlink.repack.kotlinx'
+    }
-    configurations = [project.configurations.shadow]
 }
-
-//tasks.build.dependsOn shadowJar

core/src/main/kotlin/matterlink/Area.kt

@@ -1,185 +0,0 @@
-package matterlink
-
-import blue.endless.jankson.JsonObject
-import blue.endless.jankson.impl.SyntaxError
-import kotlin.math.sqrt
-
-fun JsonObject.parseDimensions(): List<Int> = getOrPutList("dimensions", emptyList(), "list of dimension ids")
-fun JsonObject.parseAllDimensions(): Boolean = getOrDefault("allDimensions", false, "ignores dimension list")
-
-sealed class Area {
-    abstract val type: String
-    abstract val dimensions: List<Int>
-    abstract val allDimensions: Boolean
-
-    abstract fun testInBounds(x: Int, y: Int, z: Int): Boolean
-
-    fun testForDim(dimension: Int?): Boolean {
-        if (allDimensions) return true
-        if (dimension == null) return false
-        return dimensions.contains(dimension)
-    }
-
-    companion object {
-        fun parse(jsonObj: JsonObject): Area {
-            val type: String = jsonObj.getOrDefault("type", "INFINITE", "Area type identifier")
-            return when (type.toUpperCase()) {
-                "INFINITE" -> Infinite.parse(jsonObj)
-                "RADIUS" -> Radius.parse(jsonObj)
-                "SPHERE" -> Sphere.parse(jsonObj)
-                "BOX" -> Box.parse(jsonObj)
-                "SQUARE" -> Square.parse(jsonObj)
-                else -> throw SyntaxError("no Area type '$type' found")
-            }
-        }
-    }
-
-    data class Infinite(
-        override val dimensions: List<Int> = listOf(),
-        override val allDimensions: Boolean = false
-    ) : Area() {
-        override val type = "INFINITE"
-
-        override fun testInBounds(x: Int, y: Int, z: Int): Boolean {
-            return true
-        }
-
-        companion object {
-            fun parse(jsonObj: JsonObject): Area {
-                return Infinite(
-                    dimensions = jsonObj.parseDimensions(),
-                    allDimensions = jsonObj.parseAllDimensions()
-                )
-            }
-        }
-
-    }
-
-    data class Radius(
-        override val dimensions: List<Int> = listOf(),
-        override val allDimensions: Boolean = false,
-        val x: Int,
-        val z: Int,
-        val radius: Int?
-    ) : Area() {
-        override val type = "RADIUS"
-
-        override fun testInBounds(x: Int, y: Int, z: Int): Boolean {
-            if (radius == null) return true
-            return sqrt(((this.x - x) * (this.x - x)) + ((this.z - z) * (this.z - z)).toFloat()) < this.radius
-        }
-
-        companion object {
-            fun parse(jsonObj: JsonObject): Area {
-
-                return Radius(
-                    dimensions = jsonObj.parseDimensions(),
-                    allDimensions = jsonObj.parseAllDimensions(),
-                    x = jsonObj.getOrDefault("x", 0),
-                    z = jsonObj.getOrDefault("z", 0),
-                    radius = jsonObj.getReified("radius")
-                )
-            }
-        }
-    }
-
-    class Sphere(
-        override val dimensions: List<Int> = listOf(),
-        override val allDimensions: Boolean = false,
-        val x: Int,
-        val y: Int,
-        val z: Int,
-        val radius: Int? = null
-    ) : Area() {
-        override val type = "SPHERE"
-
-        override fun testInBounds(x: Int, y: Int, z: Int): Boolean {
-            if (radius == null) return true
-            return sqrt(((this.x - x) * (this.x - x)) + ((this.y - y) * (this.y - y)) + ((this.z - z) * (this.z - z)).toFloat()) < this.radius
-        }
-
-        companion object {
-            fun parse(jsonObj: JsonObject): Area {
-
-                return Sphere(
-                    dimensions = jsonObj.parseDimensions(),
-                    allDimensions = jsonObj.parseAllDimensions(),
-                    x = jsonObj.getOrDefault("x", 0),
-                    y = jsonObj.getOrDefault("y", 0),
-                    z = jsonObj.getOrDefault("z", 0),
-                    radius = jsonObj.getReified("radius")
-                )
-            }
-        }
-    }
-
-    class Box(
-        override val dimensions: List<Int> = listOf(),
-        override val allDimensions: Boolean = false,
-        val x1: Int,
-        val x2: Int,
-        val y1: Int,
-        val y2: Int,
-        val z1: Int,
-        val z2: Int
-    ) : Area() {
-        override val type = "BOX"
-
-        override fun testInBounds(x: Int, y: Int, z: Int): Boolean {
-            return x in x1..x2 && y in y1..y2 && z in z1..z2
-        }
-
-        companion object {
-            fun parse(jsonObj: JsonObject): Area {
-
-                return Box(
-                    dimensions = jsonObj.parseDimensions(),
-                    allDimensions = jsonObj.parseAllDimensions(),
-                    x1 = jsonObj.getOrDefault("x1", 0),
-                    x2 = jsonObj.getOrDefault("x2", 0),
-                    y1 = jsonObj.getOrDefault("y1", 0),
-                    y2 = jsonObj.getOrDefault("y2", 0),
-                    z1 = jsonObj.getOrDefault("z1", 0),
-                    z2 = jsonObj.getOrDefault("z2", 0)
-                )
-            }
-        }
-    }
-
-    class Square(
-        override val dimensions: List<Int> = listOf(),
-        override val allDimensions: Boolean = false,
-        val x1: Int,
-        val x2: Int,
-        val z1: Int,
-        val z2: Int
-    ) : Area() {
-        override val type = "SQUARE"
-
-        override fun testInBounds(x: Int, y: Int, z: Int): Boolean {
-            return x in x1..x2 && z in z1..z2
-        }
-
-        companion object {
-            fun parse(jsonObj: JsonObject): Area {
-
-                return Square(
-                    dimensions = jsonObj.parseDimensions(),
-                    allDimensions = jsonObj.parseAllDimensions(),
-                    x1 = jsonObj.getOrDefault("x1", 0),
-                    x2 = jsonObj.getOrDefault("x2", 0),
-                    z1 = jsonObj.getOrDefault("z1", 0),
-                    z2 = jsonObj.getOrDefault("z2", 0)
-                )
-            }
-        }
-    }
-//
-//
-//    class FakePlayer (
-//            val x: Int,
-//            val y: Int,
-//            val z: Int,
-//            val name: String
-//    ): Area()
-}

core/src/main/kotlin/matterlink/IMatterLink.kt

@@ -2,49 +2,60 @@ package matterlink
 
 import matterlink.bridge.MessageHandlerInst
 import matterlink.bridge.command.BridgeCommandRegistry
-import matterlink.bridge.command.IBridgeCommand
 import matterlink.bridge.command.IMinecraftCommandSender
 import matterlink.config.cfg
 import matterlink.update.UpdateChecker
-import java.util.UUID
-
-lateinit var logger: Logger
 
 lateinit var instance: IMatterLink
 
 abstract class IMatterLink {
     abstract val mcVersion: String
     abstract val modVersion: String
-    abstract val buildNumber: Int
     abstract val forgeVersion: String
 
-    abstract fun commandSenderFor(
+    abstract fun commandSenderFor(user: String, userId: String, server: String, op: Boolean): IMinecraftCommandSender
-        user: String,
-        env: IBridgeCommand.CommandEnvironment,
-        op: Boolean
-    ): IMinecraftCommandSender
 
     abstract fun wrappedSendToPlayers(msg: String)
 
-    abstract fun wrappedSendToPlayer(username: String, msg: String)
+    fun start() {
-    abstract fun wrappedSendToPlayer(uuid: UUID, msg: String)
+        MessageHandlerInst.logger = { level, msg ->
-    abstract fun isOnline(username: String): Boolean
+            when (level) {
-    abstract fun nameToUUID(username: String): UUID?
+                "FATAL" -> fatal(msg)
-    abstract fun uuidToName(uuid: UUID): String?
+                "ERROR" -> error(msg)
-
+                "WARN" -> warn(msg)
-    suspend fun start() {
+                "INFO" -> info(msg)
-        MessageHandlerInst.logger = logger
+                "DEBUG" -> debug(msg)
+                "TRACE" -> trace(msg)
+            }
+        }
         serverStartTime = System.currentTimeMillis()
 
         if (cfg.connect.autoConnect)
             MessageHandlerInst.start("Server started, connecting to matterbridge API", true)
-        UpdateChecker.check()
+        UpdateChecker.run()
     }
 
-    suspend fun stop() {
+    fun stop() {
         MessageHandlerInst.stop("Server shutting down, disconnecting from matterbridge API")
     }
 
+    abstract fun log(level: String, formatString: String, vararg data: Any)
+
+    fun fatal(formatString: String, vararg data: Any) = log("FATAL", formatString, *data)
+    fun error(formatString: String, vararg data: Any) = log("ERROR", formatString, *data)
+    fun warn(formatString: String, vararg data: Any) = log("WARN", formatString, *data)
+    fun info(formatString: String, vararg data: Any) = log("INFO", formatString, *data)
+
+    fun debug(formatString: String, vararg data: Any) {
+        if (cfg.debug.logLevel == "DEBUG" || cfg.debug.logLevel == "TRACE")
+            log("INFO", "DEBUG: " + formatString.replace("\n", "\nDEBUG: "), *data)
+    }
+
+    fun trace(formatString: String, vararg data: Any) {
+        if (cfg.debug.logLevel == "TRACE")
+            log("INFO", "TRACE: " + formatString.replace("\n", "\nTRACE: "), *data)
+    }
+
     /**
      * in milliseconds
      */
@@ -74,7 +85,4 @@ abstract class IMatterLink {
     fun registerBridgeCommands() {
         BridgeCommandRegistry.reloadCommands()
     }
-
-    abstract fun collectPlayers(area: Area): Set<UUID>
-
 }

core/src/main/kotlin/matterlink/Logger.kt

@@ -1,9 +0,0 @@
-package matterlink
-
-interface Logger {
-    fun info(message: String)
-    fun debug(message: String)
-    fun error(message: String)
-    fun warn(message: String)
-    fun trace(message: String)
-}

core/src/main/kotlin/matterlink/PasteUtil.kt

@@ -1,90 +0,0 @@
-package matterlink
-
-import blue.endless.jankson.Jankson
-import java.net.HttpURLConnection
-import java.net.URL
-
-
-/**
- * Created by nikky on 09/07/18.
- * @author Nikky
- */
-
-data class Paste(
-    val encrypted: Boolean = false,
-    val description: String,
-    val sections: List<PasteSection>
-)
-
-data class PasteSection(
-    val name: String,
-    val syntax: String = "text",
-    val contents: String
-)
-
-data class PasteResponse(
-    val id: String,
-    val link: String
-)
-
-object PasteUtil {
-    private const val DEFAULT_KEY = "uKJoyicVJFnmpnrIZMklOURWxrCKXYaiBWOzPmvon"
-
-    private val jankson = Jankson.builder()
-        .registerTypeAdapter {
-            PasteResponse(
-                id = it.getReified("id") ?: "",
-                link = it.getReified<String>("link")
-                    ?.replace("\\/", "/")
-                    ?: "invalid"
-            )
-        }
-//            .registerSerializer { paste: Paste, marshaller: Marshaller ->
-//                JsonObject().apply {
-//                    with(paste) {
-//                        if (description.isNotBlank())
-//                            this@apply["description"] = marshaller.serialize(description)
-//                        if (encrypted)
-//                            this@apply["encrypted"] = marshaller.serialize(encrypted)
-//                        this@apply["sections"] = marshaller.serialize(sections)
-//                    }
-//                }
-//            }
-//            .registerSerializer { section: PasteSection, marshaller: Marshaller ->
-//                JsonObject().apply {
-//                    with(section) {
-//                        if (name.isNotBlank())
-//                            this@apply["name"] = marshaller.serialize(name)
-//                        this@apply["syntax"] = marshaller.serialize(syntax)
-//                        this@apply["contents"] = marshaller.serialize(contents.replace("\n", "\\n"))
-//                    }
-//                }
-//            }
-        .build()
-
-    fun paste(paste: Paste, key: String = ""): PasteResponse {
-        val apiKey = key.takeIf { it.isNotBlank() } ?: DEFAULT_KEY
-
-        val url = URL("https://api.paste.ee/v1/pastes")
-        val http = url.openConnection() as HttpURLConnection
-        http.requestMethod = "POST"
-        http.doOutput = true
-
-        val out = jankson.toJson(paste)
-            .toJson(false, false)
-            .toByteArray()
-
-        http.setFixedLengthStreamingMode(out.size)
-        http.setRequestProperty("Content-Type", "application/json; charset=UTF-8")
-        http.setRequestProperty("X-Auth-Token", apiKey)
-        http.connect()
-        http.outputStream.use { os ->
-            os.write(out)
-        }
-
-        val textResponse = http.inputStream.bufferedReader().use { it.readText() }
-        logger.debug("response: $textResponse")
-//        val jsonObject = jankson.load(http.inputStream)
-        return jankson.fromJson(textResponse)
-    }
-}

core/src/main/kotlin/matterlink/Util.kt

@@ -1,14 +1,9 @@
 package matterlink
 
-import blue.endless.jankson.Jankson
+import matterlink.bridge.MessageHandlerInst
-import blue.endless.jankson.JsonArray
-import blue.endless.jankson.JsonElement
-import blue.endless.jankson.JsonObject
-import blue.endless.jankson.impl.Marshaller
 import matterlink.config.cfg
 import java.io.PrintWriter
 import java.io.StringWriter
-import java.util.*
 
 private const val ZWSP: Char = '\u200b'
 
@@ -29,11 +24,11 @@ fun String.mapFormat(env: Map<String, String>): String {
     return result
 }
 
-fun String.lazyFormat(env: Map<String, () -> String?>): String {
+fun String.lazyFormat(env: Map<String, () -> String>): String {
     var result = this
     env.forEach { key, value ->
         if (result.contains(key)) {
-            result = result.replace(key, value().toString())
+            result = result.replace(key, value())
         }
     }
     return result
@@ -42,7 +37,7 @@ fun String.lazyFormat(env: Map<String, () -> String?>): String {
 val String.stripColorOut: String
     get() =
         if (cfg.outgoing.stripColors)
-            this.replace("[&§][0-9A-FK-OR]".toRegex(RegexOption.IGNORE_CASE), "")
+            this.replace("§.?".toRegex(RegexOption.UNIX_LINES), "")
         else
             this
 
@@ -60,90 +55,3 @@ val Exception.stackTraceString: String
         this.printStackTrace(PrintWriter(sw))
         return sw.toString()
     }
-
-fun randomString(length: Int = 6): String =
-    java.util.UUID.randomUUID().toString().replace("-", "").take(length)
-
-fun <T : Any> JsonObject.getOrDefault(key: String, default: T, comment: String? = null): T {
-    logger.trace("type: ${default.javaClass.name} key: $key json: >>>${this.getObject(key)?.toJson()}<<< default: $default")
-    return putDefault(key, default, comment)!!.also {
-        setComment(key, comment)
-    }
-}
-
-inline fun <reified T : Any> Jankson.fromJson(obj: JsonObject): T = this.fromJson(obj, T::class.java)
-inline fun <reified T : Any> Jankson.fromJson(json: String): T = this.fromJson(json, T::class.java)
-
-inline fun <reified T : Any> Jankson.Builder.registerTypeAdapter(noinline adapter: (JsonObject) -> T) =
-    this.registerTypeAdapter(T::class.java, adapter)
-
-inline fun <reified T : Any> Jankson.Builder.registerPrimitiveTypeAdapter(noinline adapter: (Any) -> T) =
-    this.registerPrimitiveTypeAdapter(T::class.java, adapter)
-
-inline fun <reified T : Any> Jankson.Builder.registerSerializer(noinline serializer: (T, Marshaller) -> JsonElement) =
-    this.registerSerializer(T::class.java, serializer)
-
-inline fun <reified T : Any> Marshaller.registerSerializer(noinline serializer: (T) -> JsonElement) =
-    this.registerSerializer(T::class.java, serializer)
-
-inline fun <reified T : Any> Marshaller.registerSerializer(noinline serializer: (T, Marshaller) -> JsonElement) =
-    this.registerSerializer(T::class.java, serializer)
-
-inline fun <reified T : Any> JsonObject.getReified(key: String, comment: String? = null): T? =
-    this.get(T::class.java, key)
-        ?.also { setComment(key, comment) }
-
-inline fun <reified T : Any> JsonObject.getReifiedOrDelete(key: String, comment: String? = null): T? =
-    this.get(T::class.java, key)
-        ?.also { setComment(key, comment) }
-        ?: run {
-            this.remove(key)
-            null
-        }
-
-inline fun <reified T : Any> JsonObject.getList(key: String): List<T>? {
-    return this[key]?.let { array ->
-        when (array) {
-            is JsonArray -> {
-                array.indices.map { i ->
-                    array.get(T::class.java, i) ?: throw NullPointerException("cannot parse ${array.get(i)}")
-                }
-            }
-            else -> null
-        }
-    }
-}
-
-inline fun <reified T : Any> JsonObject.getOrPutList(key: String, default: List<T>, comment: String?): List<T> {
-    return this[key]?.let { array ->
-        when (array) {
-            is JsonArray -> {
-                array.indices.map { i ->
-                    array.get(T::class.java, i) ?: throw NullPointerException("cannot parse ${array.get(i)}")
-                }
-            }
-            else -> null
-        }
-    }.also {
-        setComment(key, comment)
-    } ?: this.putDefault(key, default, comment) ?: default
-}
-
-inline fun <reified T : Any> JsonObject.getOrPutMap(
-    key: String,
-    default: Map<String, T>,
-    comment: String?
-): Map<String, T> {
-    return this[key]?.let { map ->
-        when (map) {
-            is JsonObject -> {
-                map.mapValues { (key, element) ->
-                    map.get(T::class.java, key) ?: throw NullPointerException("cannot parse $element")
-                }
-            }
-            else -> null
-        }
-    }.also {
-        setComment(key, comment)
-    } ?: this.putDefault(key, default, comment) ?: default
-}

core/src/main/kotlin/matterlink/api/ApiMessage.kt

@@ -1,88 +0,0 @@
-package matterlink.api
-
-import kotlinx.serialization.Encoder
-import kotlinx.serialization.Optional
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Serializer
-import kotlinx.serialization.json.JSON
-
-/**
- * Created by nikky on 07/05/18.
- *
- * @author Nikky
- * @version 1.0
- */
-@Serializable
-data class ApiMessage(
-    @Optional var username: String = "",
-    @Optional var text: String = "",
-    @Optional var gateway: String = "",
-    @Optional var timestamp: String = "",
-    @Optional var channel: String = "",
-    @Optional var userid: String = "",
-    @Optional var avatar: String = "",
-    @Optional var account: String = "",
-    @Optional var protocol: String = "",
-    @Optional var event: String = "",
-    @Optional var id: String = "",
-    @Optional var Extra: Map<String, String>? = null
-) {
-
-    fun encode(): String {
-        return JSON.nonstrict.stringify(ApiMessage.serializer(), this)
-    }
-
-
-    override fun toString(): String = encode()
-
-    @Serializer(forClass = ApiMessage::class)
-    companion object {
-        val USER_ACTION = "user_action"
-        val JOIN_LEAVE = "join_leave"
-
-        override fun serialize(output: Encoder, obj: ApiMessage) {
-            val elemOutput = output.beginStructure(descriptor)
-            obj.username.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 0, it)
-            }
-            obj.text.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 1, it)
-            }
-            obj.gateway.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 2, it)
-            }
-            obj.timestamp.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 3, it)
-            }
-            obj.channel.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 4, it)
-            }
-            obj.userid.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 5, it)
-            }
-            obj.avatar.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 6, it)
-            }
-            obj.account.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 7, it)
-            }
-            obj.protocol.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 8, it)
-            }
-            obj.event.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 9, it)
-            }
-            obj.id.takeIf { it.isNotEmpty() }?.let {
-                elemOutput.encodeStringElement(descriptor, 10, it)
-            }
-//            obj.Extra.takeIf { ! it.isNullOrEmpty() }?.let {
-//                elemOutput.encodeStringElement(descriptor, 11, it)
-//            }
-            elemOutput.endStructure(descriptor)
-        }
-
-        fun decode(input: String): ApiMessage {
-            return JSON.nonstrict.parse(ApiMessage.serializer(), input)
-        }
-    }
-}

core/src/main/kotlin/matterlink/api/Config.kt

@@ -1,10 +0,0 @@
-package matterlink.api
-
-data class Config(
-    var url: String = "",
-    var token: String = "",
-    var announceConnect: Boolean = true,
-    var announceDisconnect: Boolean = true,
-    var reconnectWait: Long = 500,
-    var systemUser: String = "Server"
-)

core/src/main/kotlin/matterlink/api/MessageHandler.kt

@@ -1,240 +0,0 @@
-package matterlink.api
-
-import com.github.kittinunf.fuel.core.FuelManager
-import com.github.kittinunf.fuel.core.Method
-import com.github.kittinunf.fuel.core.ResponseDeserializable
-import com.github.kittinunf.fuel.core.extensions.cUrlString
-import com.github.kittinunf.fuel.core.extensions.jsonBody
-import com.github.kittinunf.fuel.coroutines.awaitStringResponseResult
-import com.github.kittinunf.fuel.httpGet
-import com.github.kittinunf.fuel.httpPost
-import com.github.kittinunf.result.Result
-import kotlinx.coroutines.CoroutineName
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.ObsoleteCoroutinesApi
-import kotlinx.coroutines.channels.BroadcastChannel
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.SendChannel
-import kotlinx.coroutines.channels.actor
-import kotlinx.coroutines.channels.broadcast
-import kotlinx.coroutines.channels.consumeEach
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.serialization.json.JSON
-import kotlinx.serialization.list
-import matterlink.Logger
-import java.io.Reader
-import java.net.ConnectException
-import kotlin.coroutines.CoroutineContext
-
-/**
- * Created by nikky on 07/05/18.
- *
- * @author Nikky
- * @version 1.0
- */
-open class MessageHandler : CoroutineScope {
-    override val coroutineContext: CoroutineContext = Job()
-    private var enabled = false
-
-    private var connectErrors = 0
-    private var reconnectCooldown = 0L
-    private var sendErrors = 0
-
-    private var sendChannel: SendChannel<ApiMessage> = senderActor()
-
-    private val messageStream = Channel<ApiMessage>(Channel.UNLIMITED)
-    @UseExperimental(ExperimentalCoroutinesApi::class)
-    var broadcast: BroadcastChannel<ApiMessage> = broadcast {
-        while (true) {
-            val msg = messageStream.receive()
-            send(msg)
-        }
-    }
-        private set
-    private val keepOpenManager = FuelManager().apply {
-        timeoutInMillisecond = 0
-        timeoutReadInMillisecond = 0
-    }
-
-    var config: Config = Config()
-
-    var logger = object : Logger {
-        override fun info(message: String) = println("INFO: $message")
-        override fun debug(message: String) = println("DEBUG: $message")
-        override fun error(message: String) = println("ERROR: $message")
-        override fun warn(message: String) = println("WARN: $message")
-        override fun trace(message: String) = println("TRACE: $message")
-    }
-
-    suspend fun stop(message: String? = null) {
-        if (message != null && config.announceDisconnect) {
-            sendStatusUpdate(message)
-        }
-        enabled = false
-        rcvJob?.cancel()
-        rcvJob = null
-    }
-
-    private var rcvJob: Job? = null
-
-    suspend fun start(message: String?, clear: Boolean) {
-        logger.debug("starting connection")
-        if (clear) {
-            clear()
-        }
-
-        enabled = true
-
-        rcvJob = messageBroadcast()
-
-        if (message != null && config.announceConnect) {
-            sendStatusUpdate(message)
-        }
-    }
-
-    private suspend fun clear() {
-        val url = "${config.url}/api/messages"
-        val (request, response, result) = url.httpGet()
-            .apply {
-                if (config.token.isNotEmpty()) {
-                    headers["Authorization"] = "Bearer ${config.token}"
-                }
-            }
-            .awaitStringResponseResult()
-
-        when (result) {
-            is Result.Success -> {
-                val messages: List<ApiMessage> = JSON.nonstrict.parse(ApiMessage.list, result.value)
-                messages.forEach { msg ->
-                    logger.trace("skipping $msg")
-                }
-                logger.debug("skipped ${messages.count()} messages")
-            }
-            is Result.Failure -> {
-                logger.error("failed to clear messages")
-                logger.error("url: $url")
-                logger.error("cUrl: ${request.cUrlString()}")
-                logger.error("response: $response")
-                logger.error(result.error.exception.localizedMessage)
-                result.error.exception.printStackTrace()
-            }
-        }
-    }
-
-    open suspend fun sendStatusUpdate(message: String) {
-        transmit(ApiMessage(text = message))
-    }
-
-    open suspend fun transmit(msg: ApiMessage) {
-//        if (streamConnection.isConnected || streamConnection.isConnecting) {
-        if (msg.username.isEmpty())
-            msg.username = config.systemUser
-        if (msg.gateway.isEmpty()) {
-            logger.error("missing gateway on message: $msg")
-            return
-        }
-        logger.debug("Transmitting: $msg")
-        sendChannel.send(msg)
-//        }
-    }
-
-    @Deprecated("use coroutine api", level = DeprecationLevel.ERROR)
-    fun checkConnection() {
-    }
-
-    @UseExperimental(ObsoleteCoroutinesApi::class)
-    private fun CoroutineScope.senderActor() = actor<ApiMessage>(context = Dispatchers.IO) {
-        consumeEach {
-            try {
-                logger.debug("sending $it")
-                val url = "${config.url}/api/message"
-                val (request, response, result) = url.httpPost()
-                    .apply {
-                        if (config.token.isNotEmpty()) {
-                            headers["Authorization"] = "Bearer ${config.token}"
-                        }
-                    }
-                    .jsonBody(it.encode())
-                    .responseString()
-                when (result) {
-                    is Result.Success -> {
-                        logger.debug("sent $it")
-                        sendErrors = 0
-                    }
-                    is Result.Failure -> {
-                        sendErrors++
-                        logger.error("failed to deliver: $it")
-                        logger.error("url: $url")
-                        logger.error("cUrl: ${request.cUrlString()}")
-                        logger.error("response: $response")
-                        logger.error(result.error.exception.localizedMessage)
-                        result.error.exception.printStackTrace()
-//                    close()
-                        throw result.error.exception
-                    }
-                }
-            } catch (connectError: ConnectException) {
-                connectError.printStackTrace()
-                sendErrors++
-            }
-        }
-    }
-
-    private fun CoroutineScope.messageBroadcast() = launch(context = Dispatchers.IO + CoroutineName("msgBroadcaster")) {
-        loop@ while (isActive) {
-            logger.info("opening connection")
-            val url = "${config.url}/api/stream"
-            val (request, response, result) = keepOpenManager.request(Method.GET, url)
-                .apply {
-                    if (config.token.isNotEmpty()) {
-                        headers["Authorization"] = "Bearer ${config.token}"
-                    }
-                }
-                .responseObject(object : ResponseDeserializable<Unit> {
-                    override fun deserialize(reader: Reader) =
-                        runBlocking(Dispatchers.IO + CoroutineName("msgReceiver")) {
-                            logger.info("connected successfully")
-                            connectErrors = 0
-                            reconnectCooldown = 0
-
-                            reader.useLines { lines ->
-                                lines.forEach { line ->
-                                    val msg = ApiMessage.decode(line)
-                                    logger.debug("received: $msg")
-                                    if (msg.event != "api_connect") {
-                                        messageStream.send(msg)
-                                    }
-                                }
-                            }
-                        }
-                })
-
-            when (result) {
-                is Result.Success -> {
-                    logger.info("connection closed")
-                }
-                is Result.Failure -> {
-                    connectErrors++
-                    reconnectCooldown = connectErrors * 1000L
-                    logger.error("connectErrors: $connectErrors")
-                    logger.error("connection error")
-                    logger.error("curl: ${request.cUrlString()}")
-                    logger.error(result.error.localizedMessage)
-                    result.error.exception.printStackTrace()
-                    if (connectErrors >= 10) {
-                        logger.error("Caught too many errors, closing bridge")
-                        stop("Interrupting connection to matterbridge API due to accumulated connection errors")
-                        break@loop
-                    }
-                }
-            }
-            delay(reconnectCooldown) // reconnect delay in ms
-        }
-    }
-}

core/src/main/kotlin/matterlink/bridge/MessageHandlerInst.kt

@@ -1,69 +1,11 @@
 package matterlink.bridge
 
-import matterlink.Paste
-import matterlink.PasteSection
-import matterlink.PasteUtil
 import matterlink.antiping
 import matterlink.api.ApiMessage
 import matterlink.api.MessageHandler
-import matterlink.config.cfg
-import matterlink.handlers.ChatEvent
-import matterlink.handlers.LocationHandler
 import matterlink.mapFormat
-import matterlink.stackTraceString
 
-object MessageHandlerInst : MessageHandler() {
+object MessageHandlerInst: MessageHandler()
-    override suspend fun transmit(msg: ApiMessage) {
-        transmit(msg, cause = "")
-    }
-
-    override suspend fun sendStatusUpdate(message: String) {
-        LocationHandler.sendToLocations(
-            msg = message,
-            x = 0, y = 0, z = 0, dimension = null,
-            systemuser = true,
-            event = ChatEvent.STATUS,
-            cause = "status update message"
-        )
-    }
-
-    suspend fun transmit(msg: ApiMessage, cause: String, maxLines: Int = cfg.outgoing.inlineLimit) {
-        if (msg.username.isEmpty()) {
-            msg.username = cfg.outgoing.systemUser
-
-            if (msg.avatar.isEmpty() && cfg.outgoing.avatar.enable) {
-                msg.avatar = cfg.outgoing.avatar.systemUserAvatar
-            }
-        }
-        if (msg.gateway.isEmpty()) {
-            logger.error("dropped message '$msg' due to missing gateway")
-            return
-        }
-
-        if (msg.text.lines().count() >= maxLines) {
-            try {
-                val response = PasteUtil.paste(
-                    Paste(
-                        description = cause,
-                        sections = listOf(
-                            PasteSection(
-                                name = "log.txt",
-                                syntax = "text",
-                                contents = msg.text
-                            )
-                        )
-                    )
-                )
-                msg.text = msg.text.substringBefore('\n')
-                    .take(25) + "...  " + response.link
-            } catch (e: Exception) {
-                logger.error(cause)
-                logger.error(e.stackTraceString)
-            }
-        }
-        super.transmit(msg)
-    }
-}
 
 fun ApiMessage.format(fmt: String): String {
     return fmt.mapFormat(

core/src/main/kotlin/matterlink/bridge/command/AuthBridgeCommand.kt

@@ -1,81 +0,0 @@
-package matterlink.bridge.command
-
-import matterlink.config.AuthRequest
-import matterlink.config.IdentitiesConfig
-import matterlink.config.cfg
-import matterlink.instance
-import matterlink.randomString
-import java.util.UUID
-
-object AuthBridgeCommand : IBridgeCommand() {
-    val syntax = "Syntax: auth [username]"
-    override val help: String = "Requests authentication on the bridge. $syntax"
-    override val permLevel: Double
-        get() = cfg.command.defaultPermUnauthenticated
-
-    override suspend fun execute(alias: String, user: String, env: CommandEnvironment, args: String): Boolean {
-        if (env !is CommandEnvironment.BridgeEnv) {
-            env.respond("please initiate authentication from linked external chat")
-            return true
-        }
-
-        val uuid = env.uuid
-        if (uuid != null) {
-            val name = instance.uuidToName(uuid)
-            env.respond("you are already authenticated as name: $name uuid: $uuid")
-            return true
-        }
-
-        val argList = args.split(' ', limit = 2)
-        val target = argList.getOrNull(0) ?: run {
-            env.respond(
-                "no username/uuid provided\n" +
-                        syntax
-            )
-
-            return true
-        }
-
-        var targetUserName = target
-
-        val targetUUid: String = instance.nameToUUID(target)?.toString() ?: run {
-            try {
-                targetUserName = instance.uuidToName(UUID.fromString(target)) ?: run {
-                    env.respond("cannot find player by username/uuid $target")
-                    return true
-                }
-            } catch (e: IllegalArgumentException) {
-                env.respond("invalid username/uuid $target")
-                return true
-            }
-            target
-        }
-
-        val online = instance.isOnline(targetUserName)
-        if (!online) {
-            env.respond("$targetUserName is not online, please log in and try again to send instructions")
-            return true
-        }
-        val nonce = randomString(length = 3).toUpperCase()
-
-        val requestId = user.toLowerCase()
-        instance.wrappedSendToPlayer(targetUserName, "have you requested authentication with the MatterLink system?")
-        instance.wrappedSendToPlayer(targetUserName, "if yes please execute /auth accept $user $nonce")
-        instance.wrappedSendToPlayer(targetUserName, "otherwise you may ignore this message")
-
-
-        IdentitiesConfig.authRequests.put(
-            requestId,
-            AuthRequest(
-                username = targetUserName,
-                uuid = targetUUid,
-                nonce = nonce,
-                platform = env.platform,
-                userid = env.userId
-            )
-        )
-        env.respond("please accept the authentication request ingame, do not share the code")
-
-        return true
-    }
-}

core/src/main/kotlin/matterlink/bridge/command/BridgeCommandRegistry.kt

@@ -2,88 +2,33 @@ package matterlink.bridge.command
 
 import matterlink.api.ApiMessage
 import matterlink.config.CommandConfig
-import matterlink.config.IdentitiesConfig
 import matterlink.config.PermissionConfig
 import matterlink.config.cfg
-import matterlink.logger
+import matterlink.instance
-import java.util.HashMap
+import java.util.*
-import java.util.UUID
 
 object BridgeCommandRegistry {
 
     private val commandMap: HashMap<String, IBridgeCommand> = hashMapOf()
 
-    /**
+    fun handleCommand(input: ApiMessage): Boolean {
-     *
-     * @return consume message flag
-     */
-    suspend fun handleCommand(input: ApiMessage): Boolean {
         if (!cfg.command.enable || input.text.isBlank()) return false
 
-        if (input.text[0] != cfg.command.prefix || input.text.length < 2) return false
+        if (input.text[0] != cfg.command.prefix[0] || input.text.length < 2) return false
 
         val cmd = input.text.substring(1).split(' ', ignoreCase = false, limit = 2)
         val args = if (cmd.size == 2) cmd[1] else ""
 
-        val uuid = IdentitiesConfig.getUUID(input.account, input.userid)
+        return commandMap[cmd[0]]?.execute(cmd[0], input.username, input.userid, input.account, args) ?: false
-
-        val env = IBridgeCommand.CommandEnvironment.BridgeEnv(
-            input.username,
-            input.userid,
-            input.account,
-            input.gateway,
-            uuid
-        )
-        return commandMap[cmd[0]]?.let {
-            if (!it.reachedTimeout()) {
-                logger.debug("dropped command ${it.alias}")
-                return false
-            }
-            it.preExecute() // resets the tickCounter
-            if (!it.canExecute(uuid)) {
-                env.respond(
-                    text = "${input.username} is not permitted to perform command: ${cmd[0]}"
-                )
-                return false
-            }
-            it.execute(cmd[0], input.username, env, args)
-        } ?: false
-    }
-
-    suspend fun handleCommand(text: String, username: String, uuid: UUID): Boolean {
-        if (!cfg.command.enable || text.isBlank()) return false
-
-        if (text[0] != cfg.command.prefix || text.length < 2) return false
-
-        val cmd = text.substring(1).split(' ', ignoreCase = false, limit = 2)
-        val args = if (cmd.size == 2) cmd[1] else ""
-
-        val env = IBridgeCommand.CommandEnvironment.GameEnv(username, uuid)
-
-        return commandMap[cmd[0]]?.let {
-            if (!it.reachedTimeout()) {
-                logger.debug("dropped command ${it.alias}")
-                return false
-            }
-            it.preExecute() // resets the tickCounter
-            if (!it.canExecute(uuid)) {
-                env.respond(
-                    text = "$username is not permitted to perform command: ${cmd[0]}"
-                )
-                return false
-            }
-
-            it.execute(cmd[0], username, env, args)
-        } ?: false
     }
 
     fun register(alias: String, cmd: IBridgeCommand): Boolean {
         if (alias.isBlank() || commandMap.containsKey(alias)) {
-            logger.error("Failed to register command: '$alias'")
+            instance.error("Failed to register command: '$alias'")
             return false
         }
         if (!cmd.validate()) {
-            logger.error("Failed to validate command: '$alias'")
+            instance.error("Failed to validate command: '$alias'")
             return false
         }
         //TODO: maybe write alias to command here ?
@@ -111,15 +56,9 @@ object BridgeCommandRegistry {
 
     fun reloadCommands() {
         commandMap.clear()
+        val permStatus = PermissionConfig.loadPermFile()
         register("help", HelpCommand)
-        if (cfg.command.authRequests)
+        val cmdStatus = CommandConfig.readConfig()
-            register("auth", AuthBridgeCommand)
-        if (cfg.command.permisionRequests)
-            register("request", RequestPermissionsCommand)
-        PermissionConfig.loadFile()
-        CommandConfig.loadFile()
-        IdentitiesConfig.loadFile()
-
         CommandConfig.commands.forEach { (alias, command) ->
             register(alias, command)
         }
@@ -133,5 +72,4 @@ object BridgeCommandRegistry {
         }
         return null
     }
-
 }

core/src/main/kotlin/matterlink/bridge/command/CustomCommand.kt

@@ -1,9 +1,11 @@
 package matterlink.bridge.command
 
+import matterlink.api.ApiMessage
+import matterlink.bridge.MessageHandlerInst
+import matterlink.handlers.TickHandler
 import matterlink.instance
 import matterlink.lazyFormat
-import matterlink.logger
+import matterlink.stripColorOut
-import matterlink.stripColorIn
 
 data class CustomCommand(
         val type: CommandType = CommandType.RESPONSE,
@@ -11,35 +13,49 @@ data class CustomCommand(
         val response: String? = null,
         override val permLevel: Double = 0.0,
         override val help: String = "",
-    override val timeout: Int = 20,
+        val allowArgs: Boolean = true,
+        val timeout: Int = 20,
         val defaultCommand: Boolean? = null,
-    val execOp: Boolean? = null,
+        val execOp: Boolean? = null
-    val argumentsRegex: Regex? = null
+) : IBridgeCommand {
-) : IBridgeCommand() {
+    val alias: String
+        get() = BridgeCommandRegistry.getName(this)!!
 
-    override suspend fun execute(alias: String, user: String, env: CommandEnvironment, args: String): Boolean {
+    @Transient
-        if (argumentsRegex != null) {
+    private var lastUsed: Int = 0
-            logger.debug("testing '$args' against '${argumentsRegex.pattern}'")
+
-            if (!argumentsRegex.matches(args)) {
+    override fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean {
-                env.respond("$user sent invalid input to command $alias")
+        if (!allowArgs && args.isNotBlank()) return false
+
+        if (TickHandler.tickCounter - lastUsed < timeout) {
+            instance.debug("dropped command $alias")
+            return true //eat command silently
+        }
+
+        if (!canExecute(userId, server)) {
+            MessageHandlerInst.transmit(
+                    ApiMessage(
+                            _text = "$user is not permitted to perform command: $alias".stripColorOut
+                    )
+            )
             return false
         }
-        }
+
+        lastUsed = TickHandler.tickCounter
 
         return when (type) {
             CommandType.EXECUTE -> {
                 // uses a new commandsender for each use
-                val commandSender = instance.commandSenderFor(user, env, execOp ?: false)
+                val commandSender = instance.commandSenderFor(user, userId, server, execOp ?: false)
-                val cmd = execute?.lazyFormat(getReplacements(user, env, args))?.stripColorIn
+                val cmd = "$execute $args"
-                    ?: return false
+                commandSender.execute(cmd) || commandSender.reply.isNotBlank()
-                commandSender.execute(cmd) || commandSender.reply.isNotEmpty()
             }
             CommandType.RESPONSE -> {
-                env.respond(
+                MessageHandlerInst.transmit(
-                    response?.lazyFormat(getReplacements(user, env, args))
+                        ApiMessage(
-                        ?: "", cause = "response to command: $alias"
+                                _text = (response?.lazyFormat(getReplacements(user, userId, server, args))?.stripColorOut ?: "")
+                        )
                 )
-
                 true
             }
         }
@@ -50,7 +66,7 @@ data class CustomCommand(
      */
     override fun validate(): Boolean {
         val typeCheck = when (type) {
-            CommandType.EXECUTE -> execute?.isNotBlank() ?: false
+            CommandType.EXECUTE -> execute != null
             CommandType.RESPONSE -> response?.isNotBlank() ?: false
         }
         if (!typeCheck) return false
@@ -59,37 +75,13 @@ data class CustomCommand(
     }
 
     companion object {
-        val DEFAULT = CustomCommand()
 
-        fun getReplacements(user: String, env: CommandEnvironment, args: String): Map<String, () -> String?> = mapOf(
+        fun getReplacements(user: String, userId: String, server: String, args: String): Map<String, () -> String> = mapOf(
                 "{uptime}" to instance::getUptimeAsString,
                 "{user}" to { user },
-            "{userid}" to {
+                "{userid}" to { userId },
-                when (env) {
+                "{server}" to { server },
-                    is CommandEnvironment.BridgeEnv -> env.userId
+                "{args}" to { args }
-                    else -> null
-                }
-            },
-            "{uuid}" to {
-                when (env) {
-                    is CommandEnvironment.BridgeEnv -> env.uuid.toString()
-                    is CommandEnvironment.GameEnv -> env.uuid.toString()
-                }
-            },
-            "{username}" to {
-                when (env) {
-                    is CommandEnvironment.BridgeEnv -> env.uuid
-                    is CommandEnvironment.GameEnv -> env.uuid
-                }?.let { instance.uuidToName(it) }
-            },
-            "{platform}" to {
-                when (env) {
-                    is CommandEnvironment.BridgeEnv -> env.platform
-                    else -> null
-                }
-            },
-            "{args}" to { args },
-            "{version}" to { instance.modVersion }
         )
     }
 }

core/src/main/kotlin/matterlink/bridge/command/HelpCommand.kt

@@ -1,24 +1,25 @@
 package matterlink.bridge.command
 
-import matterlink.config.cfg
+import matterlink.api.ApiMessage
+import matterlink.bridge.MessageHandlerInst
+import matterlink.stripColorOut
 
-object HelpCommand : IBridgeCommand() {
+object HelpCommand : IBridgeCommand {
     override val help: String = "Returns the help string for the given command. Syntax: help <command>"
-    override val permLevel: Double
+    override val permLevel = 0.0
-        get() = cfg.command.defaultPermUnauthenticated
+    override fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean {
-
-    override suspend fun execute(alias: String, user: String, env: CommandEnvironment, args: String): Boolean {
         val msg: String = when {
             args.isEmpty() ->
-                "Available commands: ${BridgeCommandRegistry.getCommandList(IBridgeCommand.getPermLevel(env.uuid))}"
+                "Available commands: ${BridgeCommandRegistry.getCommandList(IBridgeCommand.getPermLevel(userId, server))}"
             else -> args.split(" ", ignoreCase = false)
                     .joinToString(separator = "\n") {
                         "$it: ${BridgeCommandRegistry.getHelpString(it)}"
                     }
         }
-        env.respond(
+        MessageHandlerInst.transmit(
-            text = msg,
+                ApiMessage(
-            cause = "Help Requested $args"
+                        _text = msg.stripColorOut
+                )
         )
         return true
     }

core/src/main/kotlin/matterlink/bridge/command/IBridgeCommand.kt

@@ -1,92 +1,27 @@
 package matterlink.bridge.command
 
-import matterlink.api.ApiMessage
-import matterlink.bridge.MessageHandlerInst
 import matterlink.config.PermissionConfig
-import matterlink.config.cfg
-import matterlink.handlers.TickHandler
 import matterlink.instance
-import matterlink.logger
-import matterlink.stripColorOut
-import java.util.UUID
 
-abstract class IBridgeCommand {
+interface IBridgeCommand {
-    abstract val help: String
+    val help: String
-    abstract val permLevel: Double
+    val permLevel: Double
-    open val timeout: Int = 20
 
-    sealed class CommandEnvironment {
+    fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean
-        abstract val uuid: UUID?
-        abstract val username: String?
 
-        data class BridgeEnv(
+    fun canExecute(userId: String, server: String): Boolean {
-            val name: String,
+        instance.trace("canExecute this: $this canExecute: $userId server: $server permLevel: $permLevel")
-            val userId: String,
+        val canExec = getPermLevel(userId, server) >= permLevel
-            val platform: String,
+        instance.trace("canExecute return $canExec")
-            val gateway: String,
-            override val uuid: UUID?
-        ) : CommandEnvironment() {
-            override val username: String?
-                get() = uuid?.let { instance.uuidToName(uuid) }
-        }
-
-        data class GameEnv(
-            override val username: String,
-            override val uuid: UUID
-        ) : CommandEnvironment()
-
-        suspend fun respond(text: String, cause: String = "") {
-            when (this) {
-                is BridgeEnv -> {
-                    MessageHandlerInst.transmit(
-                        ApiMessage(
-                            gateway = this.gateway,
-                            text = text.stripColorOut
-                        ),
-                        cause = cause
-                    )
-                }
-                is GameEnv -> {
-                    instance.wrappedSendToPlayer(uuid, text)
-                }
-            }
-
-        }
-    }
-
-
-    private var lastUsed: Int = 0
-
-    val alias: String
-        get() = BridgeCommandRegistry.getName(this)!!
-
-    fun reachedTimeout(): Boolean {
-        return (TickHandler.tickCounter - lastUsed > timeout)
-    }
-
-    fun preExecute() {
-        lastUsed = TickHandler.tickCounter
-    }
-
-    /**
-     *
-     * @return consume message flag
-     */
-    abstract suspend fun execute(alias: String, user: String, env: CommandEnvironment, args: String): Boolean
-
-    fun canExecute(uuid: UUID?): Boolean {
-        logger.trace("canExecute this: $this  uuid: $uuid permLevel: $permLevel")
-        val canExec = getPermLevel(uuid) >= permLevel
-        logger.trace("canExecute return $canExec")
         return canExec
     }
 
-    open fun validate() = true
+    fun validate() = true
 
     companion object {
-        fun getPermLevel(uuid: UUID?): Double {
+        fun getPermLevel(userId: String, server: String): Double {
-            if (uuid == null) return cfg.command.defaultPermUnauthenticated
+            val serverMap = PermissionConfig.perms[server] ?: return 0.0
-            return PermissionConfig.perms[uuid.toString()] ?: cfg.command.defaultPermAuthenticated
+            return serverMap[userId] ?: 0.0
         }
     }
 }

core/src/main/kotlin/matterlink/bridge/command/IMinecraftCommandSender.kt

@@ -1,6 +1,10 @@
 package matterlink.bridge.command
 
-abstract class IMinecraftCommandSender(val user: String, val env: IBridgeCommand.CommandEnvironment, val op: Boolean) {
+import matterlink.api.ApiMessage
+import matterlink.bridge.MessageHandlerInst
+import matterlink.stripColorOut
+
+abstract class IMinecraftCommandSender(val user: String, val userId: String, val server: String, val op: Boolean) {
     /**
      * @param   cmdString The command to execute with its arguments
      *
@@ -8,38 +12,22 @@ abstract class IMinecraftCommandSender(val user: String, val env: IBridgeCommand
      */
     abstract fun execute(cmdString: String): Boolean
 
-    val displayName = env.username ?: user
+    val accountName = "$user (id=$userId server=$server)"
-    val accountName = when (env) {
-        is IBridgeCommand.CommandEnvironment.BridgeEnv -> "$user (id=${env.userId} platform=${env.platform}${env.uuid?.let { " uuid=$it" }
-            ?: ""}${env.username?.let { " username=$it" } ?: ""})"
-        is IBridgeCommand.CommandEnvironment.GameEnv -> "$user (username=${env.username} uuid=${env.uuid})"
-    }
 
     fun canExecute(commandName: String): Boolean {
         if(op) return true
         val command = BridgeCommandRegistry[commandName] ?: return false
-        return command.canExecute(env.uuid)
+        return command.canExecute(userId, server)
     }
 
-    private var finished = true
+    var reply: String = ""
-    val reply = mutableListOf<String>()
 
-    /**
+    fun sendReply(text: String) {
-     * accumulates response
+        reply = text
-     */
+        MessageHandlerInst.transmit(
-    fun appendReply(text: String) {
+                ApiMessage(
-        if (finished) {
+                        _text = text.stripColorOut
-            reply.clear()
+                )
-            finished = false
-        }
-        reply += text
-    }
-
-    suspend fun sendReply(cmdString: String) {
-        env.respond(
-            text = reply.joinToString("\n"),
-            cause = "executed command: $cmdString"
         )
-        finished = true
     }
 }

core/src/main/kotlin/matterlink/bridge/command/RequestPermissionsCommand.kt

@@ -1,46 +0,0 @@
-package matterlink.bridge.command
-
-import matterlink.config.PermissionConfig
-import matterlink.config.PermissionRequest
-import matterlink.config.cfg
-import matterlink.randomString
-
-object RequestPermissionsCommand : IBridgeCommand() {
-    val syntax = " Syntax: request [permissionLevel]"
-    override val help: String = "Requests permissions on the bridge. $syntax"
-    override val permLevel: Double
-        get() = cfg.command.defaultPermAuthenticated
-
-    override suspend fun execute(alias: String, user: String, env: CommandEnvironment, args: String): Boolean {
-
-        val uuid = env.uuid
-        if (uuid == null) {
-            env.respond("$user is not authenticated ($env)")
-            return true
-        }
-
-        val argList = args.split(' ', limit = 2)
-        val requestedLevelArg = argList.getOrNull(0)
-        val requestedLevel = requestedLevelArg?.takeIf { it.isNotEmpty() }?.let {
-            it.toDoubleOrNull() ?: run {
-                env.respond(
-                    "cannot parse permlevel '$requestedLevelArg'\n" +
-                            syntax
-                )
-                return true
-            }
-        }
-
-        val nonce = randomString(length = 3).toUpperCase()
-
-        val requestId = user.toLowerCase()
-
-        PermissionConfig.permissionRequests.put(
-            requestId,
-            PermissionRequest(uuid = uuid, user = user, nonce = nonce, powerlevel = requestedLevel)
-        )
-        env.respond("please ask a op to accept your permission elevation with `/ml permAccept $requestId $nonce [permLevel]`")
-
-        return true
-    }
-}

core/src/main/kotlin/matterlink/command/CommandCore.kt

@@ -0,0 +1,41 @@
+package matterlink.command
+
+import matterlink.bridge.MessageHandlerInst
+import matterlink.bridge.command.BridgeCommandRegistry
+import matterlink.config.cfg
+
+object CommandCore {
+    fun getName() = "bridge"
+
+    fun getAliases() = listOf("BRIDGE", "bridge")
+
+    fun getUsage() = "bridge <connect|disconnect|reload>"
+
+    fun execute(args: Array<String>): String {
+        val cmd = args[0].toLowerCase()
+
+        return when (cmd) {
+            "connect" -> {
+                MessageHandlerInst.start( "Bridge connected by console", true)
+                "Attempting bridge connection!"
+            }
+            "disconnect" -> {
+                MessageHandlerInst.stop("Bridge disconnected by console")
+                "Bridge disconnected!"
+            }
+            "reload" -> {
+//                if (MessageHandlerInst.connected)
+                MessageHandlerInst.stop("Bridge restarting (reload command issued by console)")
+                cfg = cfg.load()
+                BridgeCommandRegistry.reloadCommands()
+//                if (!MessageHandlerInst.connected)
+                MessageHandlerInst.start("Bridge reconnected", false)
+                "Bridge config reloaded!"
+            }
+            else -> {
+                "Invalid arguments for command!"
+            }
+        }
+    }
+
+}

core/src/main/kotlin/matterlink/command/CommandCoreAuth.kt

@@ -1,78 +0,0 @@
-package matterlink.command
-
-import matterlink.config.IdentitiesConfig
-
-object CommandCoreAuth {
-    val name = "auth"
-
-    val aliases = listOf("authenticate")
-
-    val usage = "auth <accept|reject> <id> <code>"
-
-    fun execute(args: Array<String>, user: String, uuid: String?): String {
-        val cmd = args[0].toLowerCase()
-
-        return when (cmd) {
-            "accept" -> {
-                val requestId = args.getOrNull(1)?.toLowerCase() ?: run {
-                    return "no requestId passed"
-                }
-                val request = IdentitiesConfig.authRequests.getIfPresent(requestId.toLowerCase()) ?: run {
-                    return "No request available"
-                }
-                val nonce = args.getOrNull(2)?.toUpperCase() ?: run {
-                    return "no code passed"
-                }
-                if (request.nonce != nonce) {
-                    return "nonce in request does not match"
-                }
-                if (request.username != user) {
-                    return "username in request does not match ${request.username} != $user"
-                }
-                if (request.uuid != uuid) {
-                    return "uuid in request does not match ${request.uuid} != $uuid"
-                }
-
-                IdentitiesConfig.add(
-                    request.uuid,
-                    request.username,
-                    request.platform,
-                    request.userid,
-                    "Accepted by $user"
-                )
-
-                IdentitiesConfig.authRequests.invalidate(requestId)
-                "${request.userid} on ${request.platform} is now identified as $user"
-            }
-            "reject" -> {
-
-                val requestId = args.getOrNull(1)?.toLowerCase() ?: run {
-                    return "no requestId passed"
-                }
-                val request = IdentitiesConfig.authRequests.getIfPresent(requestId.toLowerCase()) ?: run {
-                    return "No request available"
-                }
-                val nonce = args.getOrNull(2)?.toUpperCase() ?: run {
-                    return "no code passed"
-                }
-                if (request.nonce != nonce) {
-                    return "nonce in request does not match"
-                }
-                if (request.username != user) {
-                    return "username in request does not match ${request.username} != $user"
-                }
-                if (request.uuid != uuid) {
-                    return "uuid in request does not match ${request.uuid} != $uuid"
-                }
-
-                IdentitiesConfig.authRequests.invalidate(requestId)
-                "request $nonce for ${request.userid} on ${request.platform} was invalidated"
-            }
-            else -> {
-                "Invalid arguments for command! \n" +
-                        "usage: $usage"
-            }
-        }
-    }
-
-}

core/src/main/kotlin/matterlink/command/CommandCoreML.kt

@@ -1,65 +0,0 @@
-package matterlink.command
-
-import matterlink.bridge.MessageHandlerInst
-import matterlink.bridge.command.BridgeCommandRegistry
-import matterlink.config.PermissionConfig
-import matterlink.config.baseCfg
-import matterlink.config.cfg
-
-object CommandCoreML {
-    val name = "ml"
-
-    val aliases = listOf("matterlink")
-
-    val usage = "ml <connect|disconnect|reload|permAccept>"
-
-    suspend fun execute(args: Array<String>, user: String, uuid: String?): String {
-        val cmd = args[0].toLowerCase()
-
-        return when (cmd) {
-            "connect" -> {
-                MessageHandlerInst.start("Bridge connected by console", true)
-                "Attempting bridge connection!"
-            }
-            "disconnect" -> {
-                MessageHandlerInst.stop("Bridge disconnected by console")
-                "Bridge disconnected!"
-            }
-            "reload" -> {
-//                if (MessageHandlerInst.connected)
-                MessageHandlerInst.stop("Bridge restarting (reload command issued by console)")
-                cfg = baseCfg.load()
-                BridgeCommandRegistry.reloadCommands()
-//                if (!MessageHandlerInst.connected)
-                MessageHandlerInst.start("Bridge reconnected", false)
-                "Bridge config reloaded!"
-            }
-            "permaccept" -> {
-                val requestId = args.getOrNull(1)?.toLowerCase() ?: run {
-                    return "no requestId passed"
-                }
-                val request = PermissionConfig.permissionRequests.getIfPresent(requestId.toLowerCase()) ?: run {
-                    return "No request available"
-                }
-                val nonce = args.getOrNull(2)?.toUpperCase() ?: run {
-                    return "no code passed"
-                }
-                if (request.nonce != nonce) {
-                    return "nonce in request does not match with $nonce"
-                }
-                val powerLevelArg = args.getOrNull(3)?.toDoubleOrNull()
-                val powerLevel = powerLevelArg ?: run { return "permLevel cannot be parsed: ${args.getOrNull(3)}" }
-                ?: request.powerlevel
-                ?: return "no permLevel provided"
-                PermissionConfig.add(request.uuid, powerLevel, "${request.user} Authorized by $user")
-                PermissionConfig.permissionRequests.invalidate(requestId)
-                "added ${request.user} (uuid: ${request.uuid}) with power level: $powerLevel"
-            }
-            else -> {
-                "Invalid arguments for command! \n" +
-                        "usage: ${CommandCoreAuth.usage}"
-            }
-        }
-    }
-
-}

core/src/main/kotlin/matterlink/config/BaseConfig.kt

@@ -1,202 +1,96 @@
 package matterlink.config
 
-import blue.endless.jankson.Jankson
-import blue.endless.jankson.JsonObject
-import blue.endless.jankson.impl.Marshaller
-import blue.endless.jankson.impl.SyntaxError
-import matterlink.Area
 import matterlink.bridge.MessageHandlerInst
-import matterlink.getOrDefault
-import matterlink.getOrPutList
-import matterlink.getReifiedOrDelete
-import matterlink.logger
-import matterlink.registerSerializer
-import matterlink.registerTypeAdapter
-import matterlink.stackTraceString
 import java.io.File
-import java.io.FileNotFoundException
+import java.util.regex.Pattern
 
-lateinit var cfg: BaseConfig.MatterLinkConfig
+lateinit var cfg: BaseConfig
-lateinit var baseCfg: BaseConfig
 
-data class BaseConfig(val rootDir: File) {
+abstract class BaseConfig(rootDir: File) {
     val cfgDirectory: File = rootDir.resolve("matterlink")
-    val configFile: File = cfgDirectory.resolve("matterlink.hjson")
+    val mainCfgFile: File = cfgDirectory.resolve("matterlink.cfg")
 
-    init {
-        logger.info("Reading bridge blueprints... from $rootDir")
-        baseCfg = this
-    }
 
-    data class MatterLinkConfig(
+    var connect = ConnectOptions()
-        val connect: ConnectOptions = ConnectOptions(),
+    var debug = DebugOptions()
-        val outgoingDefaults: DefaultSettingsOutgoing = DefaultSettingsOutgoing(),
+    var incoming = IncomingOption()
-        val incomingDefaults: DefaultSettingsIncoming = DefaultSettingsIncoming(),
+    var outgoing = OutgoingOptions()
-        val locations: List<Location> = listOf(
+    var command = CommandOptions()
-            Location(
+    var update = UpdateOptions()
-                label = "default",
-                gateway = "minecraft",
-                area = Area.Infinite(dimensions = listOf(-1, 0, 1), allDimensions = true),
-                outgoing = SettingsOutgoing(
-                    plain = true,
-                    action = true,
-                    join = true,
-                    leave = true,
-                    advancement = true,
-                    death = true,
-                    broadcast = true,
-                    status = true
-                ),
-                incoming = SettingsIncoming(
-                    plain = true,
-                    action = true,
-                    join_leave = true,
-                    commands = true
-                )
-            )
-        ),
-        val incoming: IncomingOptions = IncomingOptions(),
-        val outgoing: OutgoingOptions = OutgoingOptions(),
-        val command: CommandOptions = CommandOptions(),
-        val update: UpdateOptions = UpdateOptions()
-    )
 
-    data class DefaultSettingsOutgoing(
-        val plain: Boolean = true,
-        val action: Boolean = true,
-        val join: Boolean = false,
-        val leave: Boolean = false,
-        val advancement: Boolean = false,
-        val death: Boolean = false,
-        val broadcast: Boolean = false,
-        val status: Boolean = false
-    )
-
-    data class SettingsOutgoing(
-        val plain: Boolean? = null,
-        val action: Boolean? = null,
-        val join: Boolean? = null,
-        val leave: Boolean? = null,
-        val advancement: Boolean? = null,
-        val death: Boolean? = null,
-        val broadcast: Boolean? = null,
-        val status: Boolean? = null,
-        val skip: List<String> = listOf()
-    )
-
-    data class DefaultSettingsIncoming(
-        val plain: Boolean = true,
-        val action: Boolean = true,
-        val join_leave: Boolean = true,
-        val commands: Boolean = true
-    )
-
-    data class SettingsIncoming(
-        val plain: Boolean? = null,
-        val action: Boolean? = null,
-        val join_leave: Boolean? = null,
-        val commands: Boolean? = null,
-        val skip: List<String> = listOf()
-    )
-
-    data class Location(
-        val label: String = "unlabeled",
-        val gateway: String = "",
-        val area: Area = Area.Infinite(),
-        val outgoing: SettingsOutgoing = SettingsOutgoing(),
-        val incoming: SettingsIncoming = SettingsIncoming()
-    )
 
     data class CommandOptions(
-        val prefix: Char = '!',
+            val prefix: String = "!",
-        val enable: Boolean = true,
+            val enable: Boolean = true
-        val authRequests: Boolean = true,
-        val permisionRequests: Boolean = true,
-        val defaultPermUnauthenticated: Double = 0.0,
-        val defaultPermAuthenticated: Double = 1.0
     )
 
     data class ConnectOptions(
             val url: String = "http://localhost:4242",
             val authToken: String = "",
+            val gateway: String = "minecraft",
             val autoConnect: Boolean = true,
             val reconnectWait: Long = 500
     )
 
-    data class IncomingOptions(
+    data class DebugOptions(
+            var logLevel: String = "INFO"
+    )
+
+    data class IncomingOption(
             val chat: String = "<{username}> {text}",
             val joinPart: String = "§6-- {username} {text}",
             val action: String = "§5* {username} {text}",
-        val stripColors: Boolean = true
+            var stripColors: Boolean = true
     )
 
     data class OutgoingOptions(
             val systemUser: String = "Server",
             //outgoing toggles
-        val announceConnect: Boolean = true,
+            var announceConnect: Boolean = true,
-        val announceDisconnect: Boolean = true,
+            var announceDisconnect: Boolean = true,
             val advancements: Boolean = true,
-        val stripColors: Boolean = true,
+            var stripColors: Boolean = true,
-        val pasteEEKey: String = "",
-        val inlineLimit: Int = 5,
 
-        val joinPart: JoinPartOptions = JoinPartOptions(),
+            var death: DeathOptions = DeathOptions(),
-        var avatar: AvatarOptions = AvatarOptions(),
+            var joinPart: JoinPartOptions = JoinPartOptions()
-        val death: DeathOptions = DeathOptions()
     )
 
     data class DeathOptions(
             val enable: Boolean = true,
             val damageType: Boolean = true,
-        val damageTypeMapping: Map<String, Array<String>> = mapOf(
+            val damageTypeMapping: Map<String, String> = mapOf(
-            "inFire" to arrayOf("\uD83D\uDD25"), //🔥
+                    "inFire" to "\uD83D\uDD25", //🔥
-            "lightningBolt" to arrayOf("\uD83C\uDF29"), //🌩
+                    "lightningBolt" to "\uD83C\uDF29", //🌩
-            "onFire" to arrayOf("\uD83D\uDD25"), //🔥
+                    "onFire" to "\uD83D\uDD25", //🔥
-            "lava" to arrayOf("\uD83D\uDD25"), //🔥
+                    "lava" to "\uD83D\uDD25", //🔥
-            "hotFloor" to arrayOf("♨️"),
+                    "hotFloor" to "♨️",
-            "inWall" to arrayOf(),
+                    "inWall" to "",
-            "cramming" to arrayOf(),
+                    "cramming" to "",
-            "drown" to arrayOf("\uD83C\uDF0A"), //🌊
+                    "drown" to "\uD83C\uDF0A", //🌊
-            "starve" to arrayOf("\uD83D\uDC80"), //💀
+                    "starve" to "\uD83D\uDC80", //💀
-            "cactus" to arrayOf("\uD83C\uDF35"), //🌵
+                    "cactus" to "\uD83C\uDF35", //🌵
-            "fall" to arrayOf("\u2BEF️"), //⯯️
+                    "fall" to "\u2BEF️", //⯯️
-            "flyIntoWall" to arrayOf("\uD83D\uDCA8"), //💨
+                    "flyIntoWall" to "\uD83D\uDCA8", //💨
-            "outOfWorld" to arrayOf("\u2734"), //✴
+                    "outOfWorld" to "\u2734", //✴
-            "generic" to arrayOf("\uD83D\uDC7B"), //👻
+                    "generic" to "\uD83D\uDC7B", //👻
-            "magic" to arrayOf("✨", "⚚"),
+                    "magic" to "✨ ⚚",
-            "indirectMagic" to arrayOf("✨", "⚚"),
+                    "indirectMagic" to "✨ ⚚",
-            "wither" to arrayOf("\uD83D\uDD71"), //🕱
+                    "wither" to "\uD83D\uDD71", //🕱
-            "anvil" to arrayOf(),
+                    "anvil" to "",
-            "fallingBlock" to arrayOf(),
+                    "fallingBlock" to "",
-            "dragonBreath" to arrayOf("\uD83D\uDC32"), //🐲
+                    "dragonBreath" to "\uD83D\uDC32", //🐲
-            "fireworks" to arrayOf("\uD83C\uDF86"), //🎆
+                    "fireworks" to "\uD83C\uDF86", //🎆
 
-            "mob" to arrayOf("\uD83D\uDC80"), //💀
+                    "mob" to "\uD83D\uDC80", //💀
-            "player" to arrayOf("\uD83D\uDDE1"), //🗡
+                    "player" to "\uD83D\uDDE1", //🗡
-            "arrow" to arrayOf("\uD83C\uDFF9"), //🏹
+                    "arrow" to "\uD83C\uDFF9", //🏹
-            "thrown" to arrayOf("彡°"),
+                    "thrown" to "彡°",
-            "thorns" to arrayOf("\uD83C\uDF39"), //🌹
+                    "thorns" to "\uD83C\uDF39", //🌹
-            "explosion" to arrayOf("\uD83D\uDCA3", "\uD83D\uDCA5"), //💣 💥
+                    "explosion" to "\uD83D\uDCA3 \uD83D\uDCA5", //💣 💥
-            "explosion.player" to arrayOf("\uD83D\uDCA3", "\uD83D\uDCA5"), //💣 💥
+                    "explosion.player" to "\uD83D\uDCA3 \uD83D\uDCA5" //💣 💥
-            "ieWireShock" to arrayOf("\uD83D\uDD0C", "\u26A1"), //🔌 ⚡
-            "immersiverailroading:hitByTrain" to arrayOf(
-                "\uD83D\uDE82",
-                "\uD83D\uDE83",
-                "\uD83D\uDE84",
-                "\uD83D\uDE85",
-                "\uD83D\uDE87",
-                "\uD83D\uDE88",
-                "\uD83D\uDE8A"
-            ) //🚂 🚃 🚄 🚅 🚇 🚈 🚊
             )
     )
 
-    data class AvatarOptions(
-        val enable: Boolean = true,
-        val urlTemplate: String = "https://mc-heads.net/head/{uuid}",
-        val systemUserAvatar: String = ""
-    )
-
     data class JoinPartOptions(
             val enable: Boolean = true,
             val joinServer: String = "{username:antiping} has connected to the server",
@@ -207,508 +101,228 @@ data class BaseConfig(val rootDir: File) {
             val enable: Boolean = true
     )
 
-    companion object {
+    protected fun load(
-        val jankson = Jankson
+            getBoolean: (key: String, category: String, default: Boolean, comment: String) -> Boolean,
-            .builder()
+            getString: (key: String, category: String, default: String, comment: String) -> String,
-            .registerTypeAdapter {
+            getStringValidated: (key: String, category: String, default: String, comment: String, pattern: Pattern) -> String,
-                with(MatterLinkConfig()) {
+            getStringValidValues: (key: String, category: String, default: String, comment: String, validValues: Array<String>) -> String,
-                    MatterLinkConfig(
+            getStringList: (name: String, category: String, defaultValues: Array<String>, comment: String) -> Array<String>,
-                        command = it.getOrDefault(
+            addCustomCategoryComment: (key: String, comment: String) -> Unit
-                            "command",
+    ) {
-                            command,
-                            "User commands"
-                        ),
-                        outgoingDefaults = it.getOrDefault(
-                            "outgoingDefaults",
-                            outgoingDefaults,
-                            "default settings for outgoing"
-                        ),
-                        incomingDefaults = it.getOrDefault(
-                            "incomingDefaults",
-                            incomingDefaults,
-                            "default settings for incoming"
-                        ),
-                        locations = it.getOrPutList(
-                            "locations",
-                            locations,
-                            "list of fixed chat locations"
-                        ),
-                        connect = it.getOrDefault(
-                            "connect",
-                            connect,
-                            "Connection Settings"
-                        ),
-                        incoming = it.getOrDefault(
-                            "incoming",
-                            incoming,
-                            """
-                                         Gateway -> Server
-                                         Options all about receiving messages from the API
-                                         Formatting options:
-                                         Available variables: {username}, {text}, {gateway}, {channel}, {protocol}, {username:antiping}
-                                         """.trimIndent()
-                        ),
-                        outgoing = it.getOrDefault(
-                            "outgoing",
-                            outgoing,
-                            """
-                                         Server -> Gateway
-                                         Options all about sending messages to the API
-                                         """.trimIndent()
-                        ),
-                        update = it.getOrDefault(
-                            "update",
-                            update,
-                            "Update Settings"
-                        )
-                    )
-                }
-            }
-            .registerTypeAdapter {
-                with(DefaultSettingsOutgoing()) {
-                    DefaultSettingsOutgoing(
-                        plain = it.getOrDefault(
-                            "plain",
-                            plain,
-                            "plain text messages"
-                        ),
-                        action = it.getOrDefault(
-                            "action",
-                            action,
-                            "action messages"
-                        ),
-                        join = it.getOrDefault(
-                            "join",
-                            join,
-                            "handle join event"
-                        ),
-                        leave = it.getOrDefault(
-                            "leave",
-                            leave,
-                            "handle leave events"
-                        ),
-                        advancement = it.getOrDefault(
-                            "advancement",
-                            advancement,
-                            "handle advancement events"
-                        ),
-                        death = it.getOrDefault(
-                            "death",
-                            death,
-                            "handle death events"
-                        ),
-                        broadcast = it.getOrDefault(
-                            "broadcast",
-                            broadcast,
-                            "handle broadcast command"
-                        ),
-                        status = it.getOrDefault(
-                            "status",
-                            status,
-                            "handles tatus updates"
-                        )
-                    )
-                }
-            }
-            .registerTypeAdapter {
-                with(SettingsOutgoing()) {
-                    SettingsOutgoing(
-                        plain = it.getReifiedOrDelete("plain", "transmit join events"),
-                        action = it.getReifiedOrDelete("action", "transmit join events"),
-                        join = it.getReifiedOrDelete("join", "transmit join events"),
-                        leave = it.getReifiedOrDelete("leave", "transmit leave events"),
-                        advancement = it.getReifiedOrDelete("advancement", "transmit advancements"),
-                        death = it.getReifiedOrDelete("death", "transmit death messages"),
-                        broadcast = it.getReifiedOrDelete("say", "transmit broadcasts"),
-                        status = it.getReifiedOrDelete("status", "transmit status updates"),
-                        skip = it.getOrPutList(
-                            "skip",
-                            skip,
-                            "list of other locations to ignore after handling this"
-                        )
-                    )
-                }
-            }
 
-            .registerTypeAdapter {
+        var category = "commands"
-                with(DefaultSettingsIncoming()) {
+
-                    DefaultSettingsIncoming(
+        addCustomCategoryComment(category, "User commands")
-                        plain = it.getOrDefault(
+        command = CommandOptions(
-                            "plain",
+                enable = getBoolean(
-                            plain,
-                            "plain text messages"
-                        ),
-                        action = it.getOrDefault(
-                            "action",
-                            action,
-                            "action messages"
-                        ),
-                        join_leave = it.getOrDefault(
-                            "join_leave",
-                            join_leave,
-                            "handle join/leave event"
-                        ),
-                        commands = it.getOrDefault(
-                            "commands",
-                            join_leave,
-                            "receive commands"
-                        )
-                    )
-                }
-            }
-            .registerTypeAdapter {
-                with(SettingsIncoming()) {
-                    SettingsIncoming(
-                        plain = it.getReifiedOrDelete("plain", "transmit join events"),
-                        action = it.getReifiedOrDelete("action", "transmit join events"),
-                        join_leave = it.getReifiedOrDelete("join_leave", "transmit join_leave events"),
-                        commands = it.getReifiedOrDelete("commands", "receive commands"),
-                        skip = it.getOrPutList(
-                            "skip",
-                            skip,
-                            "list of other locations to ignore after handling this"
-                        )
-                    )
-                }
-            }
-            .registerTypeAdapter {
-                with(Location()) {
-                    Location(
-                        label = it.getOrDefault(
-                            "label",
-                            label,
-                            "location label for identification"
-                        ),
-                        gateway = it.getOrDefault(
-                            "gateway",
-                            gateway,
-                            "matterbridge gateway identifier"
-                        ),
-                        area = Area.parse(it.getObject("area") ?: JsonObject()),
-                        outgoing = it.getOrDefault(
-                            "outgoing",
-                            outgoing,
-                            "Location outgoing settings"
-                        ),
-                        incoming = it.getOrDefault(
-                            "incoming",
-                            incoming,
-                            "incoming settings"
-                        )
-                    )
-                }
-            }
-            .registerTypeAdapter {
-                with(CommandOptions()) {
-                    CommandOptions(
-                        enable = it.getOrDefault(
                         "enable",
-                            enable,
+                        category,
+                        command.enable,
                         "Enable MC bridge commands"
                 ),
-                        prefix = it.getOrDefault(
+                prefix = getStringValidated(
                         "prefix",
-                            prefix,
+                        category,
-                            "Prefix for MC bridge commands. Accepts a single character (not alphanumeric or /)"
+                        command.prefix,
-                        ),
+                        "Prefix for MC bridge commands. Accepts a single character (not alphanumeric or /)",
-                        authRequests = it.getOrDefault(
+                        Pattern.compile("^[^0-9A-Za-z/]$")
-                            "authRequests",
-                            authRequests,
-                            "Enable the 'auth' command for linking chat accounts to uuid / ingame account"
-                        ),
-                        permisionRequests = it.getOrDefault(
-                            "permisionRequests",
-                            authRequests,
-                            "Enable the 'request' command for requestion permissions from chat"
-                        ),
-                        defaultPermUnauthenticated = it.getOrDefault(
-                            "defaultPermUnauthenticated",
-                            defaultPermUnauthenticated,
-                            "default permission level for unauthenticated players"
-                        ),
-                        defaultPermAuthenticated = it.getOrDefault(
-                            "defaultPermAuthenticated",
-                            defaultPermAuthenticated,
-                            "default permission level for players that hve linked their accounts"
                 )
         )
-                }
+
-            }
+        category = "connection"
-            .registerTypeAdapter {
+        addCustomCategoryComment(category, "Connection settings")
-                with(ConnectOptions()) {
+        connect = ConnectOptions(
-                    ConnectOptions(
+                url = getString(
-                        url = it.getOrDefault(
+                        "connectURL",
-                            "url",
+                        category,
-                            url,
+                        connect.url,
-                            "The URL or IP address of the bridge platform"
+                        "The URL or IP address of the bridge server"
                 ),
-                        authToken = it.getOrDefault(
+                authToken = getString(
                         "authToken",
-                            authToken,
+                        category,
-                            "Auth token used to connect to the bridge platform"
+                        connect.authToken,
+                        "Auth token used to connect to the bridge server"
                 ),
-                        autoConnect = it.getOrDefault(
+                gateway = getString(
+                        "gateway",
+                        category,
+                        connect.gateway,
+                        "MatterBridge gateway"
+                ),
+                autoConnect = getBoolean(
                         "autoConnect",
-                            autoConnect,
+                        category,
+                        connect.autoConnect,
                         "Connect the relay on startup"
-                        ),
-                        reconnectWait = it.getOrDefault(
-                            "reconnectWait",
-                            reconnectWait,
-                            "base delay in milliseconds between attempting reconnects"
                 )
         )
-                }
+
-            }
+        category = "debug"
-            .registerTypeAdapter {
+        addCustomCategoryComment(category, "Options to help you figure out what happens and why, because computers can be silly")
-                with(IncomingOptions()) {
+        debug = DebugOptions(
-                    IncomingOptions(
+                logLevel = getStringValidValues(
-                        chat = it.getOrDefault(
+                        "logLevel",
+                        category,
+                        debug.logLevel,
+                        "MatterLink log level",
+                        arrayOf("INFO", "DEBUG", "TRACE")
+                )
+        )
+
+        category = "incoming"
+        addCustomCategoryComment(category, "Gateway -> Server" +
+                "\nOptions all about receiving messages from the API" +
+                "\nFormatting options: " +
+                "\nAvailable variables: {username}, {text}, {gateway}, {channel}, {protocol}, {username:antiping}")
+        incoming = IncomingOption(
+                chat = getString(
                         "chat",
-                            chat,
+                        category,
+                        incoming.chat,
                         "Generic chat event, just talking"
                 ),
-                        joinPart = it.getOrDefault(
+                joinPart = getString(
                         "joinPart",
-                            joinPart,
+                        category,
+                        incoming.joinPart,
                         "Join and part events from other gateways"
                 ),
-                        action = it.getOrDefault(
+                action = getString(
                         "action",
-                            action,
+                        category,
+                        incoming.action,
                         "User actions (/me) sent by users from other gateways"
                 ),
-                        stripColors = it.getOrDefault(
+                stripColors = getBoolean(
                         "stripColors",
-                            stripColors,
+                        category,
+                        incoming.stripColors,
                         "strip colors from incoming text"
                 )
         )
-                }
+
-            }
+        category = "outgoing"
-            .registerTypeAdapter {
+        addCustomCategoryComment(category, "Server -> Gateway" +
-                with(OutgoingOptions()) {
+                "\nOptions all about sending messages to the API")
-                    OutgoingOptions(
+
-                        systemUser = it.getOrDefault(
+        outgoing = OutgoingOptions(
+                systemUser = getString(
                         "systemUser",
-                            systemUser,
+                        category,
-                            "Name of the platform user (used by death and advancement messages and the /say command)"
+                        outgoing.systemUser,
+                        "Name of the server user (used by death and advancement messages and the /say command)"
                 ),
-                        advancements = it.getOrDefault(
+                //outgoing events toggle
+                advancements = getBoolean(
                         "advancements",
-                            advancements,
+                        category,
+                        outgoing.advancements,
                         "Relay player achievements / advancements"
                 ),
-                        announceConnect = it.getOrDefault(
+                announceConnect = getBoolean(
                         "announceConnect",
-                            announceConnect,
+                        category,
+                        outgoing.announceConnect,
                         "announce successful connection to the gateway"
                 ),
-                        announceDisconnect = it.getOrDefault(
+                announceDisconnect = getBoolean(
                         "announceDisconnect",
-                            announceConnect,
+                        category,
+                        outgoing.announceConnect,
                         "announce intention to disconnect / reconnect"
                 ),
-                        stripColors = it.getOrDefault(
+                stripColors = getBoolean(
                         "stripColors",
-                            stripColors,
+                        category,
+                        outgoing.stripColors,
                         "strip colors from nicknames and messages"
-                        ),
-                        pasteEEKey = it.getOrDefault(
-                            "pasteEEKey",
-                            pasteEEKey,
-                            "paste.ee api key, leave empty to use application default"
-                        ),
-                        inlineLimit = it.getOrDefault(
-                            "inlineLimit",
-                            inlineLimit,
-                            "messages with more lines than this will get shortened via paste.ee"
-                        ),
-                        death = it.getOrDefault(
-                            "death",
-                            DeathOptions(),
-                            "Death messages settings"
-                        ),
-                        avatar = it.getOrDefault(
-                            "avatar",
-                            AvatarOptions(),
-                            "Avatar options"
-                        ),
-                        joinPart = it.getOrDefault(
-                            "joinPart",
-                            JoinPartOptions(),
-                            "relay join and part messages to the gatway"
                 )
         )
-                }
+
-            }
+        category = "outgoing.death"
-            .registerTypeAdapter { jsonObj ->
+        addCustomCategoryComment(category, "Death messages settings")
-                with(DeathOptions()) {
+        outgoing.death = DeathOptions(
-                    DeathOptions(
+
-                        enable = jsonObj.getOrDefault(
+                enable = getBoolean(
                         "enable",
-                            enable,
+                        category,
+                        outgoing.death.enable,
                         "Relay player death messages"
                 ),
-                        damageType = jsonObj.getOrDefault(
+                damageType = getBoolean(
                         "damageType",
-                            damageType,
+                        category,
+                        outgoing.death.damageType,
                         "Enable Damage type symbols on death messages"
                 ),
-                        damageTypeMapping = (jsonObj.getObject("damageTypeMapping")
+                damageTypeMapping = getStringList(
-                            ?: Marshaller.getFallback().serialize(damageTypeMapping) as JsonObject)
+                        "damageTypeMapping",
-                            .let {
+                        category,
-                                jsonObj.setComment(
+                        outgoing.death.damageTypeMapping.map { entry ->
-                                    "damageTypMapping",
+                            "${entry.key}=${entry.value}"
-                                    "Damage type mapping for death cause"
-                                )
-                                it.mapValues { (key, _) ->
-                                    it.getOrDefault(key, damageTypeMapping[key] ?: emptyArray(), key)
-                                        .apply { it[key] }.apply {
-                                            jsonObj["damageTypeMapping"] = it
-                                        }
                         }
+                                .toTypedArray(),
+                        "Damage type mapping for death cause, " +
+                                "\nseparate value and key with '=', " +
+                                "\nseparate multiple values with spaces\n"
+                ).associate {
+                    val key = it.substringBefore('=')
+                    val value = it.substringAfter('=')
+                    Pair(key, value)
                 }
         )
-                }
+
-            }
+        category = "outgoing.join&part"
-            .registerTypeAdapter {
+        addCustomCategoryComment(category, "relay join and part messages to the gatway" +
-                with(AvatarOptions()) {
+                "\nFormatting options: " +
-                    AvatarOptions(
+                "\nAvailable variables: {username}, {username:antiping}")
-                        enable = it.getOrDefault(
+        outgoing.joinPart = JoinPartOptions(
+                enable = getBoolean(
                         "enable",
-                            enable,
+                        category,
-                            "enable ingame avatar"
+                        outgoing.joinPart.enable,
-                        ),
-                        urlTemplate = it.getOrDefault(
-                            "urlTemplate",
-                            urlTemplate,
-                            "template for constructing the user avatar url using the uuid"
-                        ),
-                        systemUserAvatar = it.getOrDefault(
-                            "systemUserAvatar",
-                            systemUserAvatar,
-                            "avatar url for the system user"
-                        )
-                    )
-                }
-            }
-            .registerTypeAdapter {
-                with(JoinPartOptions()) {
-                    JoinPartOptions(
-                        enable = it.getOrDefault(
-                            "enable",
-                            enable,
                         "Relay when a player joins / parts the game" +
                                 "\nany receiving end still needs to be configured with showJoinPart = true" +
                                 "\nto display the messages"
                 ),
-                        joinServer = it.getOrDefault(
+                joinServer = getString(
                         "joinServer",
-                            joinServer,
+                        category,
+                        outgoing.joinPart.joinServer,
                         "user join message sent to other gateways, available variables: {username}, {username:antiping}"
                 ),
-                        partServer = it.getOrDefault(
+                partServer = getString(
                         "partServer",
-                            partServer,
+                        category,
+                        outgoing.joinPart.partServer,
                         "user part message sent to other gateways, available variables: {username}, {username:antiping}"
                 )
         )
-                }
+
-            }
+
-            .registerTypeAdapter {
+
-                with(UpdateOptions()) {
+        category = "update"
-                    UpdateOptions(
+        addCustomCategoryComment(category, "Update Settings")
-                        enable = it.getOrDefault(
+        update = UpdateOptions(
+                enable = getBoolean(
                         "enable",
-                            enable,
+                        category,
+                        update.enable,
                         "Enable Update checking"
                 )
         )
-                }
+
-            }
+
-            .registerSerializer { locationSettings: SettingsOutgoing, marshaller: Marshaller ->
+        MessageHandlerInst.config.url = connect.url
-                val jsonObject = JsonObject()
+        MessageHandlerInst.config.token = connect.authToken
-                locationSettings.plain?.let {
+        MessageHandlerInst.config.gateway = connect.gateway
-                    jsonObject["plain"] = marshaller.serialize(it)
+        MessageHandlerInst.config.reconnectWait = connect.reconnectWait
-                }
+
-                locationSettings.action?.let {
+        MessageHandlerInst.config.systemUser = outgoing.systemUser
-                    jsonObject["action"] = marshaller.serialize(it)
+        MessageHandlerInst.config.announceConnect = outgoing.announceConnect
-                }
+        MessageHandlerInst.config.announceDisconnect = outgoing.announceDisconnect
-                locationSettings.join?.let {
-                    jsonObject["join"] = marshaller.serialize(it)
-                }
-                locationSettings.leave?.let {
-                    jsonObject["leave"] = marshaller.serialize(it)
-                }
-                locationSettings.advancement?.let {
-                    jsonObject["advancement"] = marshaller.serialize(it)
-                }
-                locationSettings.death?.let {
-                    jsonObject["death"] = marshaller.serialize(it)
-                }
-                locationSettings.broadcast?.let {
-                    jsonObject["broadcast"] = marshaller.serialize(it)
-                }
-                locationSettings.status?.let {
-                    jsonObject["status"] = marshaller.serialize(it)
-                }
-                locationSettings.skip.let {
-                    jsonObject["skip"] = marshaller.serialize(it)
-                }
-                jsonObject
-            }
-            .build()!!
     }
 
-    fun load(): MatterLinkConfig {
+    abstract fun load(): BaseConfig
-        val jsonObject = try {
-            jankson.load(configFile)
-        } catch (e: SyntaxError) {
-            logger.error("error loading config: ${e.completeMessage}")
-            jankson.marshaller.serialize(MatterLinkConfig()) as JsonObject
-        } catch (e: FileNotFoundException) {
-            logger.error("creating config file $configFile")
-            configFile.absoluteFile.parentFile.mkdirs()
-            configFile.createNewFile()
-            jankson.marshaller.serialize(MatterLinkConfig()) as JsonObject
-        }
-        logger.info("finished loading base config")
-
-        val tmpCfg = try {
-            //cfgDirectory.resolve("debug.matterlink.hjson").writeText(jsonObject.toJson(false, true))
-            jankson.fromJson(jsonObject, MatterLinkConfig::class.java).apply {
-                configFile.writeText(jsonObject.toJson(true, true))
-                logger.info("loaded config: Main config")
-                logger.debug("loaded config: $this")
-            }
-        } catch (e: SyntaxError) {
-            logger.error("error parsing config: ${e.completeMessage} ")
-            logger.error(e.stackTraceString)
-            cfgDirectory.resolve("error.matterlink.hjson").writeText(jsonObject.toJson(false, true))
-            if (::cfg.isInitialized) cfg else MatterLinkConfig()
-        } catch (e: IllegalStateException) {
-            logger.error(e.stackTraceString)
-            cfgDirectory.resolve("error.matterlink.hjson").writeText(jsonObject.toJson(false, true))
-            if (::cfg.isInitialized) cfg else MatterLinkConfig()
-        } catch (e: NullPointerException) {
-            logger.error("error loading config: ${e.stackTraceString}")
-            cfgDirectory.resolve("error.matterlink.hjson").writeText(jsonObject.toJson(false, true))
-            if (::cfg.isInitialized) cfg else MatterLinkConfig()
-        }
-
-//        val defaultJsonObject = jankson.load("{}")
-//        jankson.fromJson(defaultJsonObject, MatterLinkConfig::class.java)
-//        val nonDefault = jsonObject.getDelta(defaultJsonObject)
-
-        MessageHandlerInst.config.url = tmpCfg.connect.url
-        MessageHandlerInst.config.token = tmpCfg.connect.authToken
-        MessageHandlerInst.config.reconnectWait = tmpCfg.connect.reconnectWait
-
-        MessageHandlerInst.config.systemUser = tmpCfg.outgoing.systemUser
-        MessageHandlerInst.config.announceConnect = tmpCfg.outgoing.announceConnect
-        MessageHandlerInst.config.announceDisconnect = tmpCfg.outgoing.announceDisconnect
-
-        return tmpCfg
-    }
 }

core/src/main/kotlin/matterlink/config/CommandConfig.kt

@@ -1,154 +1,98 @@
 package matterlink.config
 
-import blue.endless.jankson.Jankson
+import com.google.gson.Gson
-import blue.endless.jankson.JsonObject
+import com.google.gson.GsonBuilder
-import blue.endless.jankson.JsonPrimitive
+import com.google.gson.JsonSyntaxException
-import blue.endless.jankson.impl.SyntaxError
+import com.google.gson.reflect.TypeToken
 import matterlink.bridge.command.CommandType
 import matterlink.bridge.command.CustomCommand
-import matterlink.getOrDefault
+import matterlink.instance
-import matterlink.logger
+import matterlink.stackTraceString
-import matterlink.registerPrimitiveTypeAdapter
-import matterlink.registerTypeAdapter
 import java.io.File
-import java.io.FileNotFoundException
 
 typealias CommandMap = MutableMap<String, CustomCommand>
-typealias DefaultCommands = Map<String, Pair<String, CustomCommand>>
 
 object CommandConfig {
-    private val configFile: File = baseCfg.cfgDirectory.resolve("commands.hjson")
+    private val gson: Gson = GsonBuilder().setPrettyPrinting().create()
+    private val configFile: File = cfg.cfgDirectory.resolve("commands.json")
 
-    private val default: DefaultCommands = mapOf(
+    private val default = hashMapOf(
-        "tps" to ("""Your run off the mill tps commands, change it to /sampler tps or /cofh tps if you like
+            "tps" to CustomCommand(
-                |make sure to disable defaultCommand if you want your edits to have any effect
-            """.trimMargin()
-                to CustomCommand(
                     type = CommandType.EXECUTE,
                     execute = "forge tps",
-            help = "Print platform tps",
+                    help = "Print server tps",
+                    allowArgs = false,
                     timeout = 200,
                     defaultCommand = true
-        )),
+            ),
-        "list" to ("lists all the players, this is just a straight pass-through"
+            "list" to CustomCommand(
-                to CustomCommand(
                     type = CommandType.EXECUTE,
                     execute = "list",
                     help = "List online players",
+                    allowArgs = false,
                     defaultCommand = true
-        )),
+            ),
-        "seed" to ("another straight pass-through"
+            "seed" to CustomCommand(
-                to CustomCommand(
                     type = CommandType.EXECUTE,
                     execute = "seed",
-            help = "Print platform world seed",
+                    help = "Print server world seed",
+                    allowArgs = false,
                     defaultCommand = true
-        )),
+            ),
-        "uptime" to ("this is a reponse command, it uses the uptime function, time since the mod was first loaded"
+            "uptime" to CustomCommand(
-                to CustomCommand(
                     type = CommandType.RESPONSE,
+                    permLevel = 1.0,
                     response = "{uptime}",
-            help = "Print platform uptime",
+                    help = "Print server uptime",
+                    allowArgs = false,
                     defaultCommand = true
-        )),
+            ),
-        "whoami" to ("this shows you some of the other response macros"
+            "whoami" to CustomCommand(
-                to CustomCommand(
                     type = CommandType.RESPONSE,
-            response = "name: `{user}` userid: `{userid}` platform: `{platform}` username: `{username}` uuid: `{uuid}`",
+                    response = "server: `{server}` userid: `{userid}` user: `{user}`",
                     help = "Print debug user data",
+                    allowArgs = false,
                     timeout = 200,
                     defaultCommand = true
-        )),
+            ),
-        "version" to ("are you out of date huh ?"
+            "exec" to CustomCommand(
-                to CustomCommand(
-            type = CommandType.RESPONSE,
-            response = "{version}",
-            help = "are you out of date huh ?",
-            timeout = 200,
-            defaultCommand = true
-        )),
-        "exec" to ("this uses arguments in a passed-through command, you could restrict the arguments with a regex"
-                to CustomCommand(
                     type = CommandType.EXECUTE,
-            execute = "{args}",
+                    execute = "",
-            argumentsRegex = ".*".toRegex(),
+                    permLevel = 1.0,
-            permLevel = 50.0,
                     help = "Execute any command as OP, be careful with this one",
+                    allowArgs = true,
                     execOp = true,
                     defaultCommand = true
-        ))
+            )
     )
 
-    val commands: CommandMap = hashMapOf()
+    var commands: CommandMap = default
+        private set
 
-    fun loadFile() {
+    fun readConfig(): Boolean {
-        val jankson = Jankson
+        if (!configFile.exists() || configFile.readText().isBlank()) {
-            .builder()
-            .registerTypeAdapter { jsonObj ->
-                with(CustomCommand.DEFAULT) {
-                    CustomCommand(
-                        type = jsonObj.get(CommandType::class.java, "type") ?: type,
-                        execute = jsonObj.get(String::class.java, "execute") ?: execute,
-                        response = jsonObj.get(String::class.java, "response") ?: response,
-                        permLevel = jsonObj.get(Double::class.java, "permLevel") ?: permLevel,
-                        help = jsonObj.get(String::class.java, "help") ?: help,
-                        timeout = jsonObj.get(Int::class.java, "timeout") ?: timeout,
-                        defaultCommand = jsonObj.get(Boolean::class.java, "defaultCommand") ?: defaultCommand,
-                        execOp = jsonObj.get(Boolean::class.java, "execOp") ?: execOp,
-                        argumentsRegex = jsonObj.get(Regex::class.java, "argumentsRegex") ?: argumentsRegex
-                    )
-                }
-            }
-            .registerPrimitiveTypeAdapter {
-                it.toString().toRegex()
-            }
-            .build()
-
-        jankson.marshaller.registerSerializer(Regex::class.java) { regex, _ ->
-            JsonPrimitive(regex.pattern)
-        }
-
-        val jsonObject = try {
-            jankson.load(configFile)
-        } catch (e: SyntaxError) {
-            logger.error("error parsing config: ${e.completeMessage}")
-            JsonObject()
-        } catch (e: FileNotFoundException) {
             configFile.createNewFile()
-            JsonObject()
+            configFile.writeText(gson.toJson(default))
-        }
+            return true
-        // clear commands
-        commands.clear()
-        jsonObject.forEach { key, element ->
-            logger.trace("loading command '$key'")
-            val command = jsonObject.get(CustomCommand::class.java, key)
-            if (command != null)
-                commands[key] = command
-            else {
-                logger.error("could not parse key: $key, value: '$element' as CustomCommand")
-                logger.error("skipping $key")
-            }
         }
 
-        //apply defaults
+        try {
-        default.forEach { k, (comment, defCommand) ->
+            commands = gson.fromJson(configFile.readText(), object : TypeToken<CommandMap>() {}.type)
-            val command = commands[k]
+            commands.filterValues { it.defaultCommand ?: false }.forEach { commands.remove(it.key) }
-            if (command == null || command.defaultCommand == true) {
+            default.forEach { k, v ->
-                commands[k] = defCommand
+                if(!commands.containsKey(k)){
-                jsonObject.getOrDefault(k, defCommand, comment)
+                    commands[k] = v
                 }
             }
+            configFile.writeText(gson.toJson(commands))
+        } catch (e: JsonSyntaxException) {
+            instance.fatal(e.stackTraceString)
+            instance.fatal("failed to parse $configFile using last good values as fallback")
+
+            return false
+        }
+        return true
+    }
 
-        logger.debug("loaded jsonObj: $jsonObject")
-        logger.debug("loaded commandMap: $commands")
 
-        val defaultJsonObject = jankson.marshaller.serialize(CustomCommand.DEFAULT) as JsonObject
-        val nonDefaultJsonObj = jsonObject.clone()
-        jsonObject.forEach { key, element ->
-            if (element is JsonObject) {
-                nonDefaultJsonObj[key] = element.getDelta(defaultJsonObject)
-            }
-        }
-        configFile.writeText(nonDefaultJsonObj.toJson(true, true))
-    }
 }

core/src/main/kotlin/matterlink/config/IdentitiesConfig.kt

@@ -1,135 +0,0 @@
-package matterlink.config
-
-import blue.endless.jankson.Jankson
-import blue.endless.jankson.JsonObject
-import blue.endless.jankson.impl.Marshaller
-import blue.endless.jankson.impl.SyntaxError
-import com.google.common.cache.Cache
-import com.google.common.cache.CacheBuilder
-import matterlink.getList
-import matterlink.logger
-import matterlink.stackTraceString
-import java.io.File
-import java.io.FileNotFoundException
-import java.util.UUID
-import java.util.concurrent.TimeUnit
-
-typealias IdentMap = Map<String, Map<String, List<String>>>
-
-data class AuthRequest(
-    val username: String,
-    val uuid: String,
-    val nonce: String,
-    val platform: String,
-    val userid: String
-)
-
-object IdentitiesConfig {
-    val authRequests: Cache<String, AuthRequest> = CacheBuilder.newBuilder()
-        .expireAfterWrite(10, TimeUnit.MINUTES)
-        .build()
-
-    private val jankson = Jankson
-        .builder()
-        .build()
-
-    private val configFile: File = baseCfg.cfgDirectory.resolve("identities.hjson")
-
-    private val default = mapOf(
-        ("edd31c45-b095-49c5-a9f5-59cec4cfed8c" to mapOf(
-            "discord.game" to (listOf("112228624366575616") to "discord id")
-        ) to "username: NikkyAi")
-    )
-
-    var idents: IdentMap = mapOf()
-        private set
-
-    private var jsonObject: JsonObject = JsonObject()
-
-    fun loadFile() {
-
-        val defaultJsonObject = JsonObject().apply {
-            default.forEach { (uuid, userMap), uuidComment ->
-                val jsonUserMap = this.putDefault(uuid, JsonObject(), uuidComment)
-                if (jsonUserMap is JsonObject) {
-                    userMap.forEach { platform, (user, comment) ->
-                        logger.trace("loading uuid: $uuid platform: $platform user: $user")
-                        val element = Marshaller.getFallback().serialize(user)
-                        jsonUserMap.putDefault(platform, element, comment.takeUnless { it.isBlank() })
-                    }
-                    this[uuid] = jsonUserMap
-                } else {
-                    logger.error("cannot parse uuid: $uuid , value: '$jsonUserMap' as Map, skipping")
-                }
-            }
-        }
-
-        var save = true
-        jsonObject = try {
-            jankson.load(configFile)
-        } catch (e: SyntaxError) {
-            logger.error("error parsing config: ${e.completeMessage}")
-            save = false
-            defaultJsonObject
-        } catch (e: FileNotFoundException) {
-            logger.error("cannot find config: $configFile .. creating sample permissions mapping")
-            configFile.createNewFile()
-            defaultJsonObject
-        }
-
-        load(save)
-    }
-
-    private fun load(save: Boolean = true) {
-        val tmpIdents: MutableMap<String, Map<String, List<String>>> = mutableMapOf()
-        jsonObject.forEach { uuid, jsonIdentifier ->
-            val identMap: MutableMap<String, List<String>> = tmpIdents[uuid]?.toMutableMap() ?: mutableMapOf()
-            if (jsonIdentifier is JsonObject) {
-                jsonIdentifier.forEach { platform, user ->
-                    logger.info("$uuid $platform $user")
-                    identMap[platform] = jsonIdentifier.getList(platform) ?: emptyList()
-                }
-            }
-            tmpIdents[uuid] = identMap.toMap()
-        }
-        idents = tmpIdents.toMap()
-
-        logger.info("Identities loaded")
-
-        if (save)
-            configFile.writeText(jsonObject.toJson(true, true))
-    }
-
-    fun add(uuid: String, username: String, platform: String, userid: String, comment: String? = null) {
-        val platformObject = jsonObject.getObject(uuid) ?: JsonObject()
-        platformObject.putDefault(platform, userid, comment)
-        val userIdList = platformObject.getList<String>(platform) ?: emptyList()
-        platformObject[platform] = platformObject.marshaller.serialize(userIdList + userid)
-        jsonObject[uuid] = platformObject
-
-        if (jsonObject.getComment(uuid) == null) {
-            jsonObject.setComment(uuid, "Username: $username")
-        }
-
-        load()
-    }
-
-    //TODO: rewrite, store ident map differently in memory
-    fun getUUID(platform: String, userid: String): UUID? {
-        return idents.entries.firstOrNull { (uuid, usermap) ->
-            usermap.entries.any { (_platform, userids) ->
-                if (platform.equals(_platform, true))
-                    logger.info("platform: $_platform userids: $userids")
-                platform.equals(_platform, true) && userids.contains(userid)
-            }
-        }?.key?.let {
-            try {
-                UUID.fromString(it)
-            } catch (e: IllegalArgumentException) {
-                logger.error("cannot parse UUID: $it")
-                logger.error(e.stackTraceString)
-                null
-            }
-        }
-    }
-}

core/src/main/kotlin/matterlink/config/PermissionConfig.kt

@@ -1,85 +1,46 @@
 package matterlink.config
 
-import blue.endless.jankson.Jankson
+import com.google.gson.Gson
-import blue.endless.jankson.JsonObject
+import com.google.gson.GsonBuilder
-import blue.endless.jankson.impl.SyntaxError
+import com.google.gson.JsonSyntaxException
-import com.google.common.cache.Cache
+import com.google.gson.reflect.TypeToken
-import com.google.common.cache.CacheBuilder
+import matterlink.instance
-import matterlink.getReified
+import matterlink.stackTraceString
-import matterlink.logger
 import java.io.File
-import java.io.FileNotFoundException
-import java.util.UUID
-import java.util.concurrent.TimeUnit
 
-typealias PermissionMap = Map<String, Double>
+typealias PermissionMap = Map<String, Map<String, Double>>
-
-data class PermissionRequest(
-    val uuid: UUID,
-    val user: String,
-    val nonce: String,
-    val powerlevel: Double? = null
-)
 
 object PermissionConfig {
-    val permissionRequests: Cache<String, PermissionRequest> = CacheBuilder.newBuilder()
+    private val gson: Gson = GsonBuilder().setPrettyPrinting().create()
-        .expireAfterWrite(10, TimeUnit.MINUTES)
+    private val configFile: File = cfg.cfgDirectory.resolve("permissions.json")
-        .build()
-    private val jankson = Jankson
-        .builder()
-        .build()
-
-    private val configFile: File = baseCfg.cfgDirectory.resolve("permissions.hjson")
 
     private val default = mapOf(
-        "edd31c45-b095-49c5-a9f5-59cec4cfed8c" to 9000.0 to "Superuser"
+            "irc.esper" to mapOf(
+                    "~nikky@nikky.moe" to 0.0,
+                    "user@example." to 0.0
+            ),
+            "discord.game" to mapOf(
+                    "112228624366575616" to 0.0
+            )
     )
 
-    val perms: PermissionMap = mutableMapOf()
+    var perms: PermissionMap = default
-    private var jsonObject: JsonObject = JsonObject()
 
-    fun loadFile() {
+    fun loadPermFile(): Boolean {
-        val defaultJsonObject = JsonObject().apply {
+        if (!configFile.exists() || configFile.readText().isBlank()) {
-            default.forEach { (uuid, level), comment ->
-                jsonObject.putDefault(uuid, level, comment)
-            }
-        }
-
-        var save = true
-        jsonObject = try {
-            jankson.load(configFile)
-        } catch (e: SyntaxError) {
-            logger.error("error parsing config: ${e.completeMessage}")
-            save = false
-            defaultJsonObject
-        } catch (e: FileNotFoundException) {
-            logger.error("cannot find config: $configFile .. creating sample permissions mapping")
             configFile.createNewFile()
-            defaultJsonObject
+            configFile.writeText(gson.toJson(default))
+            return true
         }
 
-        load(save)
+        try {
-    }
+            perms =gson.fromJson(configFile.readText(), object : TypeToken<PermissionMap>() {}.type)
+        } catch (e: JsonSyntaxException) {
+            instance.fatal(e.stackTraceString)
+            instance.fatal("failed to parse $configFile using last good values as fallback")
 
-    private fun load(save: Boolean = true) {
+            return true
-        val tmpPerms = mutableMapOf<String, Double>()
-        for ((uuid, powerlevel) in jsonObject) {
-            val tmpLevel = jsonObject.getReified<Double>(uuid)
-            if (tmpLevel == null) {
-                logger.warn("cannot parse permission uuid: $uuid level: $powerlevel")
-                continue
         }
-            tmpPerms[uuid] = tmpLevel
+        return false
-        }
-
-        logger.info("Permissions reloaded")
-
-        if (save)
-            configFile.writeText(jsonObject.toJson(true, true))
-    }
-
-    fun add(uuid: UUID, powerlevel: Double, comment: String? = null) {
-        jsonObject.putDefault(uuid.toString(), powerlevel, comment)
-        load()
     }
 }

core/src/main/kotlin/matterlink/handlers/ChatProcessor.kt

@@ -1,40 +1,20 @@
 package matterlink.handlers
 
-import matterlink.bridge.command.BridgeCommandRegistry
+import matterlink.api.ApiMessage
-import matterlink.logger
+import matterlink.bridge.MessageHandlerInst
-import java.util.UUID
+import matterlink.instance
+import matterlink.stripColorOut
 
 object ChatProcessor {
-    /**
+    fun sendToBridge(user: String, msg: String, event: String) {
-     * @return cancel message flag
-     */
-    suspend fun sendToBridge(
-        user: String,
-        msg: String,
-        x: Int,
-        y: Int,
-        z: Int,
-        dimension: Int?,
-        event: ChatEvent,
-        uuid: UUID? = null
-    ): Boolean {
-        //TODO: pass message to Locations
-        logger.info("position: $x $y $z dimension: $dimension")
         val message = msg.trim()
-        if (uuid != null && BridgeCommandRegistry.handleCommand(message, user, uuid)) return true
         when {
-            message.isNotBlank() -> LocationHandler.sendToLocations(
+            message.isNotBlank() -> MessageHandlerInst.transmit(ApiMessage(
-                user = user,
+                    _username = user.stripColorOut,
-                msg = message,
+                    _text = message.stripColorOut,
-                x = x, y = y, z = z, dimension = dimension,
+                    _event = event)
-                event = event,
-                cause = "Message from $user",
-                uuid = uuid
             )
-
+            else -> instance.warn("WARN: dropped blank message by '$user'")
-
+        }
-            else -> logger.warn("WARN: dropped blank message by '$user'")
-        }
-        return false
     }
 }

core/src/main/kotlin/matterlink/handlers/DeathHandler.kt

@@ -1,35 +1,29 @@
 package matterlink.handlers
 
 import matterlink.antiping
+import matterlink.api.ApiMessage
+import matterlink.bridge.MessageHandlerInst
 import matterlink.config.cfg
 import matterlink.stripColorOut
-import java.util.Random
+import java.util.*
 
 object DeathHandler {
     private val random = Random()
 
-    suspend fun handleDeath(
+    fun handleDeath(
             player: String,
             deathMessage: String,
-        damageType: String,
+            damageType: String
-        x: Int, y: Int, z: Int,
-        dimension: Int
     ) {
         if (cfg.outgoing.death.enable) {
-            var msg = deathMessage.stripColorOut.replace(player, player.stripColorOut.antiping)
+            var msg = deathMessage.replace(player, player.stripColorOut.antiping)
             if (cfg.outgoing.death.damageType) {
-                val emojis = cfg.outgoing.death.damageTypeMapping[damageType]
+                val emojis = cfg.outgoing.death.damageTypeMapping[damageType]?.split(' ')
-                    ?: arrayOf("\uD83D\uDC7B unknown type '$damageType'")
+                        ?: listOf("\uD83D\uDC7B unknown type '$damageType'")
                 val damageEmoji = emojis[random.nextInt(emojis.size)]
                 msg += " $damageEmoji"
             }
-            LocationHandler.sendToLocations(
+            MessageHandlerInst.transmit(ApiMessage(_text = msg))
-                msg = msg,
-                x = x, y = y, z = z, dimension = dimension,
-                event = ChatEvent.DEATH,
-                cause = "Death Event of $player",
-                systemuser = true
-            )
         }
     }
 }

core/src/main/kotlin/matterlink/handlers/JoinLeaveHandler.kt

@@ -1,16 +1,15 @@
 package matterlink.handlers
 
 import matterlink.antiping
+import matterlink.api.ApiMessage
+import matterlink.api.ApiMessage.Companion.JOIN_LEAVE
+import matterlink.bridge.MessageHandlerInst
 import matterlink.config.cfg
 import matterlink.mapFormat
 import matterlink.stripColorOut
 
 object JoinLeaveHandler {
-    suspend fun handleJoin(
+    fun handleJoin(player: String) {
-        player: String,
-        x: Int, y: Int, z: Int,
-        dimension: Int
-    ) {
         if (cfg.outgoing.joinPart.enable) {
             val msg = cfg.outgoing.joinPart.joinServer.mapFormat(
                     mapOf(
@@ -18,21 +17,16 @@ object JoinLeaveHandler {
                             "{username:antiping}" to player.stripColorOut.antiping
                     )
             )
-            LocationHandler.sendToLocations(
+            MessageHandlerInst.transmit(
-                msg = msg,
+                    ApiMessage(
-                x = x, y = y, z = z, dimension = dimension,
+                            _text = msg,
-                event = ChatEvent.JOIN,
+                            _event = JOIN_LEAVE
-                systemuser = true,
+                    )
-                cause = "$player joined"
             )
         }
     }
 
-    suspend fun handleLeave(
+    fun handleLeave(player: String) {
-        player: String,
-        x: Int, y: Int, z: Int,
-        dimension: Int
-    ) {
         if (cfg.outgoing.joinPart.enable) {
             val msg = cfg.outgoing.joinPart.partServer.mapFormat(
                     mapOf(
@@ -40,12 +34,11 @@ object JoinLeaveHandler {
                             "{username:antiping}" to player.stripColorOut.antiping
                     )
             )
-            LocationHandler.sendToLocations(
+            MessageHandlerInst.transmit(
-                msg = msg,
+                    ApiMessage(
-                x = x, y = y, z = z, dimension = dimension,
+                            _text = msg,
-                event = ChatEvent.JOIN,
+                            _event = JOIN_LEAVE
-                systemuser = true,
+                    )
-                cause = "$player left"
             )
         }
     }

core/src/main/kotlin/matterlink/handlers/LocationHandler.kt

@@ -1,110 +0,0 @@
-package matterlink.handlers
-
-import matterlink.api.ApiMessage
-import matterlink.bridge.MessageHandlerInst
-import matterlink.config.cfg
-import matterlink.logger
-import matterlink.stripColorOut
-import java.util.UUID
-
-
-enum class ChatEvent {
-    PLAIN, ACTION, DEATH, JOIN, LEAVE, ADVANCEMENT, BROADCAST, STATUS
-}
-
-object LocationHandler {
-
-    suspend fun sendToLocations(
-        user: String = cfg.outgoing.systemUser,
-        msg: String,
-        x: Int, y: Int, z: Int,
-        dimension: Int?,
-        event: ChatEvent,
-        systemuser: Boolean = false,
-        uuid: UUID? = null,
-        cause: String
-    ): Boolean {
-        val defaults = cfg.outgoingDefaults
-        var handled = false
-        val skips = mutableSetOf<String>()
-        logger.debug("locations: ${cfg.locations.map { it.label }}")
-        for (location in cfg.locations) {
-            val label = location.label
-            if (skips.contains(label)) {
-                logger.debug("skipping $label (contained in in $skips)")
-                continue
-            }
-            if (!location.area.testForDim(dimension)) {
-                logger.debug("location: $label dropped message '$msg' from $user due to mismatched dimension")
-                continue
-            }
-            if (!location.area.testInBounds(x, y, z)) {
-                logger.debug("location: $label dropped message '$msg' from $user out of coordinate bounds")
-                continue
-            }
-            val matchesEvent = when (event) {
-                ChatEvent.PLAIN -> location.outgoing.plain ?: defaults.plain
-                ChatEvent.ACTION -> location.outgoing.action ?: defaults.action
-                ChatEvent.DEATH -> location.outgoing.death ?: defaults.death
-                ChatEvent.JOIN -> location.outgoing.join ?: defaults.join
-                ChatEvent.LEAVE -> location.outgoing.leave ?: defaults.leave
-                ChatEvent.ADVANCEMENT -> location.outgoing.advancement ?: defaults.advancement
-                ChatEvent.BROADCAST -> location.outgoing.broadcast ?: defaults.broadcast
-                ChatEvent.STATUS -> location.outgoing.status ?: defaults.status
-            }
-
-            if (!matchesEvent) {
-                logger.debug("location: $label dropped message '$msg' from user: '$user', event not enabled")
-                logger.debug("event: $event")
-                logger.debug("location.outgoing: ${location.outgoing}")
-                logger.debug("defaults: $defaults")
-                continue
-            }
-
-            skips.addAll(location.outgoing.skip)
-
-            val eventStr = when (event) {
-                ChatEvent.PLAIN -> ""
-                ChatEvent.ACTION -> ApiMessage.USER_ACTION
-                ChatEvent.DEATH -> ""
-                ChatEvent.JOIN -> ApiMessage.JOIN_LEAVE
-                ChatEvent.LEAVE -> ApiMessage.JOIN_LEAVE
-                ChatEvent.ADVANCEMENT -> ""
-                ChatEvent.BROADCAST -> ""
-                ChatEvent.STATUS -> ""
-            }
-
-            val username = when {
-                systemuser -> cfg.outgoing.systemUser
-                else -> user
-            }
-            val avatar = when {
-                systemuser ->
-                    cfg.outgoing.avatar.systemUserAvatar
-                cfg.outgoing.avatar.enable && uuid != null ->
-                    cfg.outgoing.avatar.urlTemplate.replace("{uuid}", uuid.toString())
-                else ->
-                    null
-            }
-            when {
-                msg.isNotBlank() -> MessageHandlerInst.transmit(
-                    ApiMessage(
-                        username = username.stripColorOut,
-                        text = msg.stripColorOut,
-                        event = eventStr,
-                        gateway = location.gateway
-                    ).apply {
-                        avatar?.let {
-                            this.avatar = it
-                        }
-                    },
-                    cause = cause
-                )
-                else -> logger.warn("WARN: dropped blank message by '$user'")
-            }
-            logger.debug("sent message through location: $label, cause: $cause")
-            handled = true
-        }
-        return handled
-    }
-}

core/src/main/kotlin/matterlink/handlers/ProgressHandler.kt

@@ -1,24 +1,20 @@
 package matterlink.handlers
 
 import matterlink.antiping
+import matterlink.api.ApiMessage
+import matterlink.bridge.MessageHandlerInst
 import matterlink.config.cfg
 import matterlink.stripColorOut
 
 object ProgressHandler {
 
-    suspend fun handleProgress(
+    fun handleProgress(name: String, message: String, display: String) {
-        name: String, message: String, display: String,
-        x: Int, y: Int, z: Int,
-        dimension: Int
-    ) {
         if (!cfg.outgoing.advancements) return
         val usr = name.stripColorOut.antiping
-        LocationHandler.sendToLocations(
+        MessageHandlerInst.transmit(
-            msg = "$usr $message $display".stripColorOut,
+                ApiMessage(
-            x = x, y = y, z = z, dimension = dimension,
+                        _text = "$usr $message $display".stripColorOut
-            event = ChatEvent.ADVANCEMENT,
+                )
-            cause = "Progress Event by $usr",
-            systemuser = true
         )
     }
 }

core/src/main/kotlin/matterlink/handlers/ServerChatHandler.kt

@@ -1,80 +1,25 @@
 package matterlink.handlers
 
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import matterlink.api.ApiMessage
 import matterlink.bridge.MessageHandlerInst
 import matterlink.bridge.command.BridgeCommandRegistry
 import matterlink.bridge.format
 import matterlink.config.cfg
 import matterlink.instance
-import matterlink.logger
+import matterlink.stripColorIn
-import java.util.UUID
 
 object ServerChatHandler {
-    @UseExperimental(ExperimentalCoroutinesApi::class)
-    val rcvChannel = MessageHandlerInst.broadcast.openSubscription()
 
     /**
      * This method must be called every server tick with no arguments.
      */
-    suspend fun writeIncomingToChat() {
+    fun writeIncomingToChat() {
-        val nextMessage = rcvChannel.poll() ?: return
+        if (MessageHandlerInst.queue.isNotEmpty())
-
+            instance.debug("incoming: " + MessageHandlerInst.queue.toString())
-        val defaults = cfg.incomingDefaults
+        val nextMessage = MessageHandlerInst.queue.poll() ?: null
-
-        val sourceGateway = nextMessage.gateway
-
-        // find all areas to send to
-
-        val targetUUIDs = mutableSetOf<UUID>()
-        val skips = mutableSetOf<String>()
-
-        val locations = cfg.locations.filter {
-            it.gateway == sourceGateway
-        }
-
-        if (nextMessage.event.isEmpty()) {
-            // filter command handlers
-            val commandLocations = locations.filter {
-                it.incoming.commands ?: cfg.incomingDefaults.commands
-            }
-
-            // process potential command
-            for ((label, location) in commandLocations) {
-                if (BridgeCommandRegistry.handleCommand(nextMessage)) return
-            }
-        }
-
-
-
-        for (location in locations) {
-            val label = location.label
-            if (skips.contains(label)) {
-                logger.debug("skipping $label")
-                continue
-            }
-            val matchesEvent = when (nextMessage.event) {
-                "" -> {
-//                    if (location.incoming.commands ?: defaults.commands
-//                            && BridgeCommandRegistry.handleCommand(nextMessage)) return
-                    location.incoming.plain ?: defaults.plain
-                }
-                ApiMessage.JOIN_LEAVE -> location.incoming.join_leave ?: defaults.join_leave
-                ApiMessage.USER_ACTION -> location.incoming.action ?: defaults.action
-                else -> {
-                    logger.error("unknown event type '${nextMessage.event}' on incoming message")
-                    return
-                }
-            }
-
-            if (!matchesEvent) {
-                logger.info("location: $label dropped message '$nextMessage' event not enabled")
-                continue
-            }
-
-            targetUUIDs.addAll(instance.collectPlayers(location.area))
-        }
 
+        if (nextMessage?.gateway == cfg.connect.gateway) {
+            if (!nextMessage.text.isBlank()) {
+                nextMessage.text = nextMessage.text.stripColorIn
                 val message = when (nextMessage.event) {
                     "user_action" -> nextMessage.format(cfg.incoming.action)
                     "" -> {
@@ -87,46 +32,16 @@ object ServerChatHandler {
                         val user = nextMessage.username
                         val text = nextMessage.text
                         val json = nextMessage.encode()
-                logger.debug("Threw out message with unhandled event: ${nextMessage.event}")
+                        instance.debug("Threw out message with unhandled event: ${nextMessage.event}")
-                logger.debug(" Message contents:")
+                        instance.debug(" Message contents:")
-                logger.debug(" User: $user")
+                        instance.debug(" User: $user")
-                logger.debug(" Text: $text")
+                        instance.debug(" Text: $text")
-                logger.debug(" JSON: $json")
+                        instance.debug(" JSON: $json")
                         return
                     }
                 }
-
+                instance.wrappedSendToPlayers(message)
-        targetUUIDs.forEach {
+            }
-            //TODO: optimize send to all at once
+        }
-            instance.wrappedSendToPlayer(it, message)
-        }
-
-
-//        if (nextMessage?.gateway == cfg.connect.gateway) {
-//            if (!nextMessage.text.isBlank()) {
-//                nextMessage.text = nextMessage.text.stripColorIn
-//                val message = when (nextMessage.event) {
-//                    "user_action" -> nextMessage.format(cfg.incoming.action)
-//                    "" -> {
-//                        // try to handle command and do not handle as a chat message
-//                        if (BridgeCommandRegistry.handleCommand(nextMessage)) return
-//                        nextMessage.format(cfg.incoming.chat)
-//                    }
-//                    "join_leave" -> nextMessage.format(cfg.incoming.joinPart)
-//                    else -> {
-//                        val user = nextMessage.username
-//                        val text = nextMessage.text
-//                        val json = nextMessage.encode()
-//                        logger.debug("Threw out message with unhandled event: ${nextMessage.event}")
-//                        logger.debug(" Message contents:")
-//                        logger.debug(" User: $user")
-//                        logger.debug(" Text: $text")
-//                        logger.debug(" JSON: $json")
-//                        return
-//                    }
-//                }
-//                instance.wrappedSendToPlayers(message)
-//            }
-//        }
     }
 }

core/src/main/kotlin/matterlink/handlers/TickHandler.kt

@@ -1,5 +1,6 @@
 package matterlink.handlers
 
+import matterlink.bridge.MessageHandlerInst
 import matterlink.update.UpdateChecker
 
 /**
@@ -12,17 +13,17 @@ object TickHandler {
         private set
     private var accumulator = 0
     private const val updateInterval = 12 * 60 * 60 * 20
-    suspend fun handleTick() {
+    fun handleTick() {
         tickCounter++
-//        if (tickCounter % 100 == 0) {
+        if (tickCounter % 100 == 0) {
-//            MessageHandlerInst.checkConnection()
+            MessageHandlerInst.checkConnection()
-//        }
+        }
 
         ServerChatHandler.writeIncomingToChat()
 
         if (accumulator++ > updateInterval) {
             accumulator -= updateInterval
-            UpdateChecker.check()
+            UpdateChecker.run()
         }
     }
 }

core/src/main/kotlin/matterlink/jenkins/Artifact.kt

@@ -1,15 +0,0 @@
-package matterlink.jenkins
-
-import kotlinx.serialization.Serializable
-
-/**
- * Created by nikky on 03/02/18.
- * @author Nikky
- */
-
-@Serializable
-data class Artifact(
-    val displayPath: String,
-    val fileName: String,
-    val relativePath: String
-)

core/src/main/kotlin/matterlink/jenkins/Build.kt

@@ -1,36 +0,0 @@
-package matterlink.jenkins
-
-import com.github.kittinunf.fuel.httpGet
-import com.github.kittinunf.fuel.serialization.kotlinxDeserializerOf
-import com.github.kittinunf.result.Result
-import kotlinx.serialization.json.JSON
-import matterlink.logger
-
-
-/**
- * Created by nikky on 03/02/18.
- * @author Nikky
- */
-
-//@JsonIgnoreProperties(ignoreUnknown = true)
-data class Build(
-    val number: Int,
-    val url: String
-) {
-    fun details(userAgent: String): BuildWithDetails? {
-        val (request, response, result) = "$url/api/json"
-            .httpGet()
-            .header("User-Agent" to userAgent)
-            .responseObject(kotlinxDeserializerOf(loader = BuildWithDetails.serializer(), json = JSON.nonstrict))
-        return when (result) {
-            is Result.Success -> {
-                result.value
-            }
-            is Result.Failure -> {
-                logger.error(result.error.toString())
-                null
-            }
-        }
-    }
-}
-

core/src/main/kotlin/matterlink/jenkins/BuildWithDetails.kt

@@ -1,12 +0,0 @@
-package matterlink.jenkins
-
-import kotlinx.serialization.Serializable
-import java.util.Date
-
-@Serializable
-data class BuildWithDetails(
-    val number: Int,
-    val url: String,
-    val artifacts: List<Artifact>,
-    val timestamp: Date
-)

core/src/main/kotlin/matterlink/jenkins/JenkinsServer.kt

@@ -1,37 +0,0 @@
-package matterlink.jenkins
-
-
-import com.github.kittinunf.fuel.httpGet
-import com.github.kittinunf.fuel.serialization.kotlinxDeserializerOf
-import com.github.kittinunf.result.Result
-import kotlinx.serialization.json.JSON
-import matterlink.logger
-
-/**
- * Created by nikky on 03/02/18.
- * @author Nikky
- */
-
-
-class JenkinsServer(val url: String) {
-
-    fun getUrl(job: String) = url + "/job/" + job.replace("/", "/job/")
-
-    fun getJob(job: String, userAgent: String): Job? {
-        val requestURL = getUrl(job) + "/api/json"
-        val (_, _, result) = requestURL
-            .httpGet()
-            .header("User-Agent" to userAgent)
-            .responseObject(kotlinxDeserializerOf(loader = Job.serializer(), json = JSON.nonstrict))
-        return when (result) {
-            is Result.Success -> {
-                result.value
-            }
-            is Result.Failure -> {
-                logger.error(result.error.toString())
-                null
-            }
-        }
-    }
-
-}

core/src/main/kotlin/matterlink/jenkins/Job.kt

@@ -1,24 +0,0 @@
-package matterlink.jenkins
-
-import kotlinx.serialization.Serializable
-
-/**
- * Created by nikky on 03/02/18.
- * @author Nikky
- */
-
-@Serializable
-data class Job(
-    val url: String,
-    val name: String,
-    val fullName: String,
-    val displayName: String,
-    val fullDisplayName: String,
-    val builds: List<Build>?,
-    val lastSuccessfulBuild: Build?,
-    val lastStableBuild: Build?
-) {
-    fun getBuildByNumber(build: Int, userAgent: String): BuildWithDetails? {
-        return builds?.find { it.number == build }?.details(userAgent)
-    }
-}

core/src/main/kotlin/matterlink/update/CurseFile.kt

@@ -1,12 +1,10 @@
 package matterlink.update
 
-import kotlinx.serialization.Serializable
+import com.google.gson.Gson
 
-@Serializable
 data class CurseFile(
-    val downloadUrl: String,
+        val downloadURL: String,
         val fileName: String,
-    val fileNameOnDisk: String,
         val gameVersion: List<String>,
         val releaseType: String,
         val fileStatus: String

core/src/main/kotlin/matterlink/update/UpdateChecker.kt

@@ -1,92 +1,72 @@
 package matterlink.update
 
-import com.github.kittinunf.fuel.core.extensions.cUrlString
+import com.google.gson.FieldNamingPolicy
-import com.github.kittinunf.fuel.httpGet
+import com.google.gson.GsonBuilder
-import kotlinx.coroutines.CoroutineName
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.serialization.list
 import matterlink.api.ApiMessage
 import matterlink.bridge.MessageHandlerInst
 import matterlink.config.cfg
-import matterlink.handlers.ChatEvent
-import matterlink.handlers.LocationHandler
 import matterlink.instance
-import matterlink.jenkins.JenkinsServer
+import java.io.BufferedReader
-import matterlink.logger
+import java.net.HttpURLConnection
-import com.github.kittinunf.fuel.serialization.kotlinxDeserializerOf
+import java.net.URL
-import com.github.kittinunf.result.Result
-import kotlinx.serialization.json.JSON
 
-object UpdateChecker : CoroutineScope {
+class UpdateChecker : Thread() {
-    override val coroutineContext = Job() + CoroutineName("UpdateChacker")
+    companion object {
-
+        fun run() {
-    suspend fun check() {
             if (cfg.update.enable) {
-            run()
+                UpdateChecker().start()
+            }
         }
     }
 
-    private suspend fun run() {
+    init {
-        if (instance.buildNumber > 0) {
+        name = "UpdateCheckerThread"
-            val server = JenkinsServer("https://ci.elytradev.com")
-            val job = server.getJob("elytra/MatterLink/master", "MatterLink/${instance.modVersion}")
-                ?: run {
-                    logger.error("failed obtaining job: elytra/MatterLink/master")
-                    return
-                }
-            //TODO: add job name to constants at build time
-            val build = job.lastSuccessfulBuild ?: run {
-                logger.error("no successful build found")
-                return
-            }
-            with(build) {
-                when {
-                    number > instance.buildNumber -> {
-                        logger.warn("Mod out of date! New build $number available at $url")
-                        val difference = number - instance.buildNumber
-                        LocationHandler.sendToLocations(
-                            msg = "MatterLink out of date! You are $difference builds behind! Please download new version from $url",
-                            x = 0, y = 0, z = 0, dimension = null,
-                            event = ChatEvent.STATUS,
-                            cause = "MatterLink update notice"
-                        )
-                    }
-                    number < instance.buildNumber -> logger.error("lastSuccessfulBuild: $number is older than installed build: ${instance.buildNumber}")
-                    else -> logger.info("you are up to date")
-                }
     }
+
+    override fun run() {
+        if (instance.modVersion.contains("-build")) {
+            instance.debug("Not checking updates on Jenkins build")
             return
         }
         if (instance.modVersion.contains("-dev")) {
-            logger.debug("Not checking updates on developer build")
+            instance.debug("Not checking updates on developer build")
             return
         }
 
-        logger.info("Checking for new versions...")
+        val gson = GsonBuilder()
-        val (request, response, result) = with(instance) {
+                .setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE)
-            val useragent =
+                .create()
-                "MatterLink/$modVersion MinecraftForge/$mcVersion-$forgeVersion (https://github.com/elytra/MatterLink)"
-            logger.debug("setting User-Agent: '$useragent'")
 
-            "https://curse.nikky.moe/api/addon/287323/files".httpGet()
+        instance.info("Checking for new versions...")
-                .header("User-Agent" to useragent)
+
-                .responseObject(kotlinxDeserializerOf(loader = CurseFile.serializer().list, json = JSON.nonstrict))
+        val url = URL("https://cursemeta.dries007.net/api/v2/direct/GetAllFilesForAddOn/287323")
+        val con = url.openConnection() as HttpURLConnection
+
+        with(instance) {
+            val useragent = "MatterLink/$modVersion MinecraftForge/$mcVersion-$forgeVersion (https://github.com/elytra/MatterLink)"
+            instance.debug("setting User-Agent: '$useragent'")
+            con.setRequestProperty("User-Agent", useragent)
         }
 
-        val apiUpdateList = when(result) {
+        con.connect()
-            is Result.Success -> {
+
-                result.value
+        val apiUpdateList = if (200 == con.responseCode) { //HTTP 200 OK
+            val buffer: BufferedReader = con.inputStream.bufferedReader()
+
+            //put all of the buffer content onto the string
+            val content = buffer.readText()
+            instance.trace("updateData: $content")
+
+            gson.fromJson(content, Array<CurseFile>::class.java)
+                    .filter {
+                        it.fileStatus == "SemiNormal" && it.gameVersion.contains(instance.mcVersion)
                     }
-            is Result.Failure -> {
+                    .sortedByDescending { it.fileName.substringAfterLast(" ") }
-                logger.error("Could not check for updates!")
+
-                logger.error("cUrl: ${request.cUrlString()}")
+        } else {
-                logger.error("request: $request")
+            instance.error("Could not check for updates!")
-                logger.error("response: $response")
             return
         }
-        }
-            .filter { it.fileStatus == "SemiNormal" && it.gameVersion.contains(instance.mcVersion) }
 
         val modVersionChunks = instance.modVersion
                 .substringBefore("-dev")
@@ -98,13 +78,13 @@ object UpdateChecker : CoroutineScope {
 
         val possibleUpdates = mutableListOf<CurseFile>()
         apiUpdateList.forEach {
-            logger.debug(it.toString())
+            instance.debug(it.toString())
             val version = it.fileName.substringAfterLast("-").split('.').map { it.toInt() }
             var bigger = false
             version.forEachIndexed { index, chunk ->
                 if (!bigger) {
                     val currentChunk = modVersionChunks.getOrNull(index) ?: 0
-                    logger.debug("$chunk > $currentChunk")
+                    instance.debug("$chunk > $currentChunk")
                     if (chunk < currentChunk)
                         return@forEach
 
@@ -122,15 +102,15 @@ object UpdateChecker : CoroutineScope {
         val count = possibleUpdates.count()
         val version = if (count == 1) "version" else "versions"
 
-        logger.info("Matterlink out of date! You are $count $version behind")
+        instance.info("Matterlink out of date! You are $count $version behind")
         possibleUpdates.forEach {
-            logger.info("version: ${it.fileName} download: ${it.downloadUrl}")
+            instance.info("version: {} download: {}", it.fileName, it.downloadURL)
         }
 
-        logger.warn("Mod out of date! New $version available at ${latest.downloadUrl}")
+        instance.warn("Mod out of date! New $version available at ${latest.downloadURL}")
         MessageHandlerInst.transmit(
                 ApiMessage(
-                text = "MatterLink out of date! You are $count $version behind! Please download new version from ${latest.downloadUrl}"
+                        _text = "MatterLink out of date! You are $count $version behind! Please download new version from ${latest.downloadURL}"
                 )
         )
     }

core/src/main/resources/mcmod.info

@@ -1,11 +1,11 @@
 [{
   "modid": "matterlink",
   "name": "MatterLink",
-  "description": "Minecraft Server Matterbridge link, Multi-Platform chat",
+  "description": "Minecraft Server Matterbridge link",
   "version": "${version}",
   "mcversion": "${mcversion}",
   "url": "https://github.com/elytra/MatterLink",
-  "authorList":["NikkyAi", "Arcanitor"],
+  "authorList":["Arcanitor", "NikkyAi"],
-  "credits": "Blame Nikky for talking me into this. \n42wim for creating matterbridge \nUna, Falkreon and capitalthree's patience",
+  "credits": "Blame Nikky for talking me into this.",
   "dependencies": ["forgelin"]
 }]

gradle.properties

@@ -1,12 +1,5 @@
-modName = MatterLink
+mod_name = MatterLink
-modVersion = 1.6.4
+mod_version = 1.6.0
-forgelinVersion = 1.8.2
+forgelin_version = 1.6.0
-kotlinVersion = 1.3.10
+curse_id = 287323
-coroutinesVersion = 1.0.1
+curse_release_type = beta
-serializationVersion = 0.9.1
-shadowVersion = 2.0.2
-fuelVersion = 8690665998
-resultVersion = 2.0.0
-cursegradleVersion = 1.1.2
-curseId = 287323
-curseReleaseType = beta

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

scripts/start.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-java -jar forge-installer.jar --installServer
-
-FORGE_FILE=`grep "The server installed successfully, you should now be able to run the file " forge-installer.jar.log | tail -1`
-FORGE_FILE=${FORGE_FILE#"The server installed successfully, you should now be able to run the file "}
-echo $FORGE_FILE
-
-cp -f "$FORGE_FILE" forge.jar
-if [ ! $? -eq 0 ]; then
-    echo "Error installing forge"
-    exit 1
-fi
-
-echo "installed forge"
-
-cp ../eula.txt .
-
-mkdir -p config
-rm -rf config/matterlink
-cp -r ../matterlink_config config/matterlink
-
-java -jar forge.jar

scripts/test12.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-
-RUN="$PWD/run/1.12.2"
-
-rm -rf "$RUN/mods"
-mkdir -p "$RUN/mods"
-
-"$PWD/gradlew" :1.12.2:clean :1.12.2:build && cp -f 1.12.2/build/libs/MatterLink-1.12.2-*-dev.jar "$RUN/mods"
-if [ ! $? -eq 0 ]; then
-    echo "Error compiling matterlink"
-    exit 1
-fi
-
-cd "$RUN"
-
-curl -o forge-installer.jar "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2768/forge-1.12.2-14.23.5.2768-installer.jar"
-curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2640952/download"
-
-$DIR/scripts/start.sh
-
-

scripts/test7.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-
-RUN="$PWD/run/1.7.10"
-
-rm -rf "$RUN/mods"
-mkdir -p "$RUN/mods"
-
-"$PWD/gradlew" :1.7.10:clean :1.7.10:build && cp -f $DIR/1.7.10/build/libs/MatterLink-1.7.10-*-dev.jar "$RUN/mods"
-if [ ! $? -eq 0 ]; then
-    echo "Error compiling matterlink"
-    exit 1
-fi
-
-cd "$RUN"
-
-curl -o forge-installer.jar "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/forge-1.7.10-10.13.4.1614-1.7.10-installer.jar"
-
-$DIR/scripts/start.sh

scripts/test9.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-
-RUN="$PWD/run/1.9.4"
-
-rm -rf "$RUN/mods"
-mkdir -p "$RUN/mods"
-
-"$PWD/gradlew" :1.9.4:clean :1.9.4:build && cp -f 1.9.4/build/libs/MatterLink-1.9.4-*-dev.jar "$RUN/mods"
-if [ ! $? -eq 0 ]; then
-    echo "Error compiling matterlink"
-    exit 1
-fi
-
-cd "$RUN"
-
-curl -o forge-installer.jar "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.9.4-12.17.0.2051/forge-1.9.4-12.17.0.2051-installer.jar"
-curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2640952/download" # "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2573311/download"
-
-$DIR/scripts/start.sh
-
-

settings.gradle

@@ -1,4 +1,2 @@
 rootProject.name = 'MatterLink'
-include 'core'
+include 'core', 'api', '1.12.2', '1.11.2', '1.10.2', '1.7.10'
-include 'Jankson'
-include '1.12.2', '1.9.4', '1.7.10'