Change name project

addon.gradle

@@ -18,5 +18,5 @@ buildConfig {
 }
 
 shadowJar {
-    relocate 'org.slf4j', 'com.fardragi.dragiutils.shadow.org.sl4j'
+    relocate 'org.slf4j', 'com.fardragi.nyaruko.shadow.org.sl4j'
 }

build.gradle.kts

@@ -9,3 +9,27 @@ sonar {
         property("sonar.projectName", "DragiUtils")
     }
 }
+
+tasks.register("copyJar") {
+    group = "fardragi"
+    dependsOn("build")
+    doLast() {
+        val target = File("C:\\Users\\mrvul\\Documents\\Minecraft\\FarDragiServer\\mods\\dragiutils.jar")
+        val jar = File("./build/libs").walk()
+            .filter { it.isFile && it.name.endsWith(".jar") }
+            .sortedByDescending { it.lastModified() }
+            .take(4)
+            .sortedBy { it.name }
+            .last()
+
+        jar.copyTo(target, overwrite = true)
+    }
+}
+
+tasks.register<Exec>("startServer") {
+    group = "fardragi"
+    standardInput = System.`in`
+    dependsOn("copyJar")
+    workingDir("C:\\Users\\mrvul\\Documents\\Minecraft\\FarDragiServer")
+    commandLine("cmd", "/c", "startserver-java9.bat")
+}

gradle.properties

@@ -3,15 +3,15 @@
 gtnh.settings.blowdryerTag = 0.2.2
 
 # Human-readable mod name, available for mcmod.info population.
-modName = DragiUtils
+modName = Nyaruko
 
 # Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
 # Conventionally lowercase.
-modId = dragiutils
+modId = nyaruko
 
 # Root package of the mod, used to find various classes in other properties,
 # mcmod.info substitution, enabling assertions in run tasks, etc.
-modGroup = com.fardragi.dragiutils
+modGroup = com.fardragi.nyaruko
 
 # Whether to use modGroup as the maven publishing group.
 # Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
@@ -50,7 +50,7 @@ enableGenericInjection = true
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.
 # If gradleTokenVersion is empty or missing, the field will not be present in the class.
-generateGradleTokenClass = com.fardragi.dragiutils.Tags
+generateGradleTokenClass = com.fardragi.nyaruko.Tags
 
 # Name of the token containing the project's current version to generate/replace.
 gradleTokenVersion = VERSION

src/main/kotlin/com/fardragi/dragiutils/App.kt → src/main/kotlin/com/fardragi/nyaruko/App.kt

@@ -1,10 +1,10 @@
-package com.fardragi.dragiutils
+package com.fardragi.nyaruko
 
-import com.fardragi.dragiutils.auth.authModule
-import com.fardragi.dragiutils.config.Config
-import com.fardragi.dragiutils.config.DatabaseConfig
-import com.fardragi.dragiutils.database.DatabaseConnection
-import com.fardragi.dragiutils.permission.permissionModule
+import com.fardragi.nyaruko.auth.authModule
+import com.fardragi.nyaruko.config.Config
+import com.fardragi.nyaruko.config.DatabaseConfig
+import com.fardragi.nyaruko.database.DatabaseConnection
+import com.fardragi.nyaruko.permission.permissionModule
 import org.koin.core.module.dsl.createdAtStart
 import org.koin.core.module.dsl.withOptions
 import org.koin.dsl.module

src/main/kotlin/com/fardragi/nyaruko/NyarukoLog.kt

@@ -0,0 +1,11 @@
+package com.fardragi.nyaruko
+
+import org.apache.logging.log4j.LogManager
+
+object NyarukoLog {
+    private val logger = LogManager.getLogger("Nyaruko")
+
+    fun info(message: String) {
+        logger.info(message)
+    }
+}

src/main/kotlin/com/fardragi/dragiutils/DragiUtils.kt → src/main/kotlin/com/fardragi/nyaruko/NyarukoMod.kt

@@ -1,6 +1,6 @@
-package com.fardragi.dragiutils
+package com.fardragi.nyaruko
 
-import com.fardragi.dragiutils.server.ServerProxy
+import com.fardragi.nyaruko.server.ServerProxy
 import cpw.mods.fml.common.Mod
 import cpw.mods.fml.common.SidedProxy
 import cpw.mods.fml.common.event.FMLInitializationEvent
@@ -17,7 +17,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent
     acceptedMinecraftVersions = "[1.7.10]",
     acceptableRemoteVersions = "*"
 )
-object DragiUtils {
+object NyarukoMod {
     @SidedProxy(serverSide = "$GROUPNAME.server.ServerProxy", clientSide = "$GROUPNAME.client.ClientProxy")
     lateinit var proxy: ServerProxy
 

src/main/kotlin/com/fardragi/dragiutils/auth/Auth.kt → src/main/kotlin/com/fardragi/nyaruko/auth/Auth.kt

@@ -1,6 +1,6 @@
-package com.fardragi.dragiutils.auth
+package com.fardragi.nyaruko.auth
 
-import com.fardragi.dragiutils.services.UserService
+import com.fardragi.nyaruko.services.UserService
 import org.koin.dsl.module
 
 val authModule = module {

src/main/kotlin/com/fardragi/dragiutils/auth/AuthModule.kt → src/main/kotlin/com/fardragi/nyaruko/auth/AuthModule.kt

@@ -1,7 +1,7 @@
-package com.fardragi.dragiutils.auth
+package com.fardragi.nyaruko.auth
 
-import com.fardragi.dragiutils.auth.commands.RegisterCommand
-import com.fardragi.dragiutils.auth.handlers.LoginHandler
+import com.fardragi.nyaruko.auth.commands.RegisterCommand
+import com.fardragi.nyaruko.auth.handlers.LoginHandler
 import cpw.mods.fml.common.FMLCommonHandler
 import net.minecraft.command.ServerCommandManager
 import net.minecraft.server.MinecraftServer

src/main/kotlin/com/fardragi/dragiutils/auth/commands/RegisterCommand.kt → src/main/kotlin/com/fardragi/nyaruko/auth/commands/RegisterCommand.kt

@@ -1,6 +1,6 @@
-package com.fardragi.dragiutils.auth.commands
+package com.fardragi.nyaruko.auth.commands
 
-import com.fardragi.dragiutils.enums.PermissionLevel
+import com.fardragi.nyaruko.enums.PermissionLevel
 import net.minecraft.command.CommandBase
 import net.minecraft.command.ICommandSender
 import net.minecraft.server.MinecraftServer

src/main/kotlin/com/fardragi/nyaruko/auth/handlers/LoginHandler.kt

@@ -0,0 +1,34 @@
+package com.fardragi.nyaruko.auth.handlers
+
+import com.fardragi.nyaruko.auth.messages.LoginMessage
+import com.fardragi.nyaruko.auth.messages.RegisterMessage
+import com.fardragi.nyaruko.services.UserService
+import cpw.mods.fml.common.eventhandler.EventPriority
+import cpw.mods.fml.common.eventhandler.SubscribeEvent
+import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class LoginHandler(private val userService: UserService) {
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    fun onPlayerJoin(event: PlayerLoggedInEvent) {
+        val player = event.player
+        val userId = player.uniqueID.toString()
+        val userName = player.displayName
+
+        CoroutineScope(Dispatchers.IO).launch {
+            val user = userService.getOrCreateUser(userId, userName)
+
+            delay(2000)
+
+            val message = if (user.isRegistered)
+                LoginMessage.create()
+            else
+                RegisterMessage.create()
+
+            player.addChatMessage(message)
+        }
+    }
+}

src/main/kotlin/com/fardragi/nyaruko/auth/messages/LoginMessage.kt

@@ -0,0 +1,14 @@
+package com.fardragi.nyaruko.auth.messages
+
+import net.minecraft.util.ChatComponentText
+import net.minecraft.util.ChatStyle
+import net.minecraft.util.EnumChatFormatting
+
+object LoginMessage {
+    fun create(): ChatComponentText {
+        val text = ChatComponentText("use /login <password>");
+        text.chatStyle = ChatStyle().setColor(EnumChatFormatting.YELLOW)
+
+        return text
+    }
+}

src/main/kotlin/com/fardragi/nyaruko/auth/messages/RegisterMessage.kt

@@ -0,0 +1,14 @@
+package com.fardragi.nyaruko.auth.messages
+
+import net.minecraft.util.ChatComponentText
+import net.minecraft.util.ChatStyle
+import net.minecraft.util.EnumChatFormatting
+
+object RegisterMessage {
+    fun create(): ChatComponentText {
+        val text = ChatComponentText("use /register <password> <password>");
+        text.chatStyle = ChatStyle().setColor(EnumChatFormatting.YELLOW)
+
+        return text
+    }
+}

src/main/kotlin/com/fardragi/nyaruko/client/ClientProxy.kt

@@ -0,0 +1,6 @@
+package com.fardragi.nyaruko.client
+
+import com.fardragi.nyaruko.server.ServerProxy
+
+class ClientProxy : ServerProxy() {
+}

src/main/kotlin/com/fardragi/dragiutils/config/Config.kt → src/main/kotlin/com/fardragi/nyaruko/config/Config.kt

@@ -1,6 +1,6 @@
-package com.fardragi.dragiutils.config
+package com.fardragi.nyaruko.config
 
-import com.fardragi.dragiutils.utils.Minecraft
+import com.fardragi.nyaruko.utils.Minecraft
 import net.minecraftforge.common.config.Configuration
 import java.io.File
 

src/main/kotlin/com/fardragi/dragiutils/config/DatabaseConfig.kt → src/main/kotlin/com/fardragi/nyaruko/config/DatabaseConfig.kt

@@ -1,4 +1,4 @@
-package com.fardragi.dragiutils.config
+package com.fardragi.nyaruko.config
 
 private const val CATEGORY = "database"
 

src/main/kotlin/com/fardragi/nyaruko/database/DatabaseConnection.kt

@@ -0,0 +1,26 @@
+package com.fardragi.nyaruko.database
+
+import com.fardragi.nyaruko.config.DatabaseConfig
+import com.fardragi.nyaruko.database.tables.UsersTable
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.SchemaUtils
+
+class DatabaseConnection(config: DatabaseConfig) {
+    init {
+        Database.connect(
+            url = "jdbc:mariadb://${config.host}:${config.port}/${config.name}",
+            driver = "org.mariadb.jdbc.Driver",
+            user = config.user,
+            password = config.password
+        )
+
+        CoroutineScope(Dispatchers.IO).launch {
+            query {
+                SchemaUtils.createMissingTablesAndColumns(UsersTable)
+            }
+        }
+    }
+}

src/main/kotlin/com/fardragi/dragiutils/database/Extensions.kt → src/main/kotlin/com/fardragi/nyaruko/database/Extensions.kt

@@ -1,6 +1,8 @@
-package com.fardragi.dragiutils.database
+package com.fardragi.nyaruko.database
 
-import org.apache.logging.log4j.LogManager
+import com.fardragi.nyaruko.NyarukoLog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.jetbrains.exposed.sql.SqlLogger
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.addLogger
@@ -9,15 +11,14 @@ import org.jetbrains.exposed.sql.transactions.TransactionManager
 import org.jetbrains.exposed.sql.transactions.transaction
 
 object CustomLogger : SqlLogger {
-    private val logger = LogManager.getLogger("DragiUtils")
 
     override fun log(context: StatementContext, transaction: Transaction) {
-        logger.info(context.sql(TransactionManager.current()))
+        NyarukoLog.info(context.sql(TransactionManager.current()))
     }
 }
 
-fun <T> query(block: () -> T): T {
-    return transaction {
+suspend fun <T> query(block: () -> T): T = withContext(Dispatchers.IO) {
+    transaction {
         addLogger(CustomLogger)
         block()
     }

src/main/kotlin/com/fardragi/dragiutils/database/tables/Users.kt → src/main/kotlin/com/fardragi/nyaruko/database/tables/Users.kt

@@ -1,4 +1,4 @@
-package com.fardragi.dragiutils.database.tables
+package com.fardragi.nyaruko.database.tables
 
 import org.jetbrains.exposed.dao.id.IdTable
 

src/main/kotlin/com/fardragi/dragiutils/enums/PermissionLevel.kt → src/main/kotlin/com/fardragi/nyaruko/enums/PermissionLevel.kt

@@ -1,4 +1,4 @@
-package com.fardragi.dragiutils.enums
+package com.fardragi.nyaruko.enums
 
 enum class PermissionLevel(val level: Int) {
     True(0),

src/main/kotlin/com/fardragi/dragiutils/exceptions/NotFoundException.kt → src/main/kotlin/com/fardragi/nyaruko/exceptions/NotFoundException.kt

@@ -1,4 +1,4 @@
-package com.fardragi.dragiutils.exceptions
+package com.fardragi.nyaruko.exceptions
 
 class NotFoundException(message: String) : Exception(message) {
 }

src/main/kotlin/com/fardragi/dragiutils/models/User.kt → src/main/kotlin/com/fardragi/nyaruko/models/User.kt

@@ -1,6 +1,6 @@
-package com.fardragi.dragiutils.models
+package com.fardragi.nyaruko.models
 
-import com.fardragi.dragiutils.database.tables.UsersTable
+import com.fardragi.nyaruko.database.tables.UsersTable
 import org.jetbrains.exposed.dao.Entity
 import org.jetbrains.exposed.dao.EntityClass
 import org.jetbrains.exposed.dao.id.EntityID

src/main/kotlin/com/fardragi/dragiutils/permission/Permission.kt → src/main/kotlin/com/fardragi/nyaruko/permission/Permission.kt

@@ -1,4 +1,4 @@
-package com.fardragi.dragiutils.permission
+package com.fardragi.nyaruko.permission
 
 import org.koin.dsl.module
 

src/main/kotlin/com/fardragi/dragiutils/permission/PermissionModule.kt → src/main/kotlin/com/fardragi/nyaruko/permission/PermissionModule.kt

@@ -1,4 +1,4 @@
-package com.fardragi.dragiutils.permission
+package com.fardragi.nyaruko.permission
 
 import org.koin.core.component.KoinScopeComponent
 import org.koin.core.component.createScope

src/main/kotlin/com/fardragi/dragiutils/server/ServerProxy.kt → src/main/kotlin/com/fardragi/nyaruko/server/ServerProxy.kt

@@ -1,7 +1,7 @@
-package com.fardragi.dragiutils.server
+package com.fardragi.nyaruko.server
 
-import com.fardragi.dragiutils.appModule
-import com.fardragi.dragiutils.auth.AuthModule
+import com.fardragi.nyaruko.appModule
+import com.fardragi.nyaruko.auth.AuthModule
 import cpw.mods.fml.common.event.FMLInitializationEvent
 import cpw.mods.fml.common.event.FMLPostInitializationEvent
 import cpw.mods.fml.common.event.FMLPreInitializationEvent