From bf1691abe81411b926caba6e4c9ef136ec2403f3 Mon Sep 17 00:00:00 2001 From: Gabriel-Paulucci Date: Fri, 6 Sep 2024 11:35:24 -0300 Subject: [PATCH] Change name project --- addon.gradle | 2 +- build.gradle.kts | 24 +++++++++++++ gradle.properties | 8 ++--- .../dragiutils/auth/handlers/LoginHandler.kt | 21 ------------ .../fardragi/dragiutils/client/ClientProxy.kt | 6 ---- .../dragiutils/database/DatabaseConnection.kt | 21 ------------ .../fardragi/{dragiutils => nyaruko}/App.kt | 12 +++---- .../kotlin/com/fardragi/nyaruko/NyarukoLog.kt | 11 ++++++ .../DragiUtils.kt => nyaruko/NyarukoMod.kt} | 6 ++-- .../{dragiutils => nyaruko}/auth/Auth.kt | 4 +-- .../auth/AuthModule.kt | 6 ++-- .../auth/commands/RegisterCommand.kt | 4 +-- .../nyaruko/auth/handlers/LoginHandler.kt | 34 +++++++++++++++++++ .../nyaruko/auth/messages/LoginMessage.kt | 14 ++++++++ .../nyaruko/auth/messages/RegisterMessage.kt | 14 ++++++++ .../fardragi/nyaruko/client/ClientProxy.kt | 6 ++++ .../{dragiutils => nyaruko}/config/Config.kt | 4 +-- .../config/DatabaseConfig.kt | 2 +- .../nyaruko/database/DatabaseConnection.kt | 26 ++++++++++++++ .../database/Extensions.kt | 13 +++---- .../database/tables/Users.kt | 2 +- .../enums/PermissionLevel.kt | 2 +- .../exceptions/NotFoundException.kt | 2 +- .../{dragiutils => nyaruko}/models/User.kt | 4 +-- .../permission/Permission.kt | 2 +- .../permission/PermissionModule.kt | 2 +- .../server/ServerProxy.kt | 6 ++-- .../services/UserService.kt | 12 +++---- .../shared/commands/NyarukoCommandBase.kt | 18 ++++++++++ .../utils/Minecraft.kt | 2 +- 30 files changed, 195 insertions(+), 95 deletions(-) delete mode 100644 src/main/kotlin/com/fardragi/dragiutils/auth/handlers/LoginHandler.kt delete mode 100644 src/main/kotlin/com/fardragi/dragiutils/client/ClientProxy.kt delete mode 100644 src/main/kotlin/com/fardragi/dragiutils/database/DatabaseConnection.kt rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/App.kt (56%) create mode 100644 src/main/kotlin/com/fardragi/nyaruko/NyarukoLog.kt rename src/main/kotlin/com/fardragi/{dragiutils/DragiUtils.kt => nyaruko/NyarukoMod.kt} (91%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/auth/Auth.kt (62%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/auth/AuthModule.kt (81%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/auth/commands/RegisterCommand.kt (89%) create mode 100644 src/main/kotlin/com/fardragi/nyaruko/auth/handlers/LoginHandler.kt create mode 100644 src/main/kotlin/com/fardragi/nyaruko/auth/messages/LoginMessage.kt create mode 100644 src/main/kotlin/com/fardragi/nyaruko/auth/messages/RegisterMessage.kt create mode 100644 src/main/kotlin/com/fardragi/nyaruko/client/ClientProxy.kt rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/config/Config.kt (75%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/config/DatabaseConfig.kt (94%) create mode 100644 src/main/kotlin/com/fardragi/nyaruko/database/DatabaseConnection.kt rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/database/Extensions.kt (61%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/database/tables/Users.kt (85%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/enums/PermissionLevel.kt (69%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/exceptions/NotFoundException.kt (60%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/models/User.kt (87%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/permission/Permission.kt (75%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/permission/PermissionModule.kt (82%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/server/ServerProxy.kt (85%) rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/services/UserService.kt (59%) create mode 100644 src/main/kotlin/com/fardragi/nyaruko/shared/commands/NyarukoCommandBase.kt rename src/main/kotlin/com/fardragi/{dragiutils => nyaruko}/utils/Minecraft.kt (90%) diff --git a/addon.gradle b/addon.gradle index bbd7c12..15fd17e 100644 --- a/addon.gradle +++ b/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' } diff --git a/build.gradle.kts b/build.gradle.kts index 4279b96..42f7e0c 100644 --- a/build.gradle.kts +++ b/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("startServer") { + group = "fardragi" + standardInput = System.`in` + dependsOn("copyJar") + workingDir("C:\\Users\\mrvul\\Documents\\Minecraft\\FarDragiServer") + commandLine("cmd", "/c", "startserver-java9.bat") +} diff --git a/gradle.properties b/gradle.properties index 17a4923..bced643 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/auth/handlers/LoginHandler.kt b/src/main/kotlin/com/fardragi/dragiutils/auth/handlers/LoginHandler.kt deleted file mode 100644 index 9418b1f..0000000 --- a/src/main/kotlin/com/fardragi/dragiutils/auth/handlers/LoginHandler.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.fardragi.dragiutils.auth.handlers - -import com.fardragi.dragiutils.services.UserService -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.launch - -class LoginHandler(private val userService: UserService) { - @SubscribeEvent - fun onPlayerJoin(event: PlayerLoggedInEvent) { - val userId = event.player.uniqueID.toString() - val userName = event.player.displayName - - CoroutineScope(Dispatchers.IO).launch { - userService.getOrCreateUser(userId, userName) - userService.setPassword(userId, "123456789") - } - } -} diff --git a/src/main/kotlin/com/fardragi/dragiutils/client/ClientProxy.kt b/src/main/kotlin/com/fardragi/dragiutils/client/ClientProxy.kt deleted file mode 100644 index 0128aa2..0000000 --- a/src/main/kotlin/com/fardragi/dragiutils/client/ClientProxy.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.fardragi.dragiutils.client - -import com.fardragi.dragiutils.server.ServerProxy - -class ClientProxy : ServerProxy() { -} diff --git a/src/main/kotlin/com/fardragi/dragiutils/database/DatabaseConnection.kt b/src/main/kotlin/com/fardragi/dragiutils/database/DatabaseConnection.kt deleted file mode 100644 index eefb267..0000000 --- a/src/main/kotlin/com/fardragi/dragiutils/database/DatabaseConnection.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.fardragi.dragiutils.database - -import com.fardragi.dragiutils.config.DatabaseConfig -import com.fardragi.dragiutils.database.tables.UsersTable -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 - ) - - query { - SchemaUtils.createMissingTablesAndColumns(UsersTable) - } - } -} diff --git a/src/main/kotlin/com/fardragi/dragiutils/App.kt b/src/main/kotlin/com/fardragi/nyaruko/App.kt similarity index 56% rename from src/main/kotlin/com/fardragi/dragiutils/App.kt rename to src/main/kotlin/com/fardragi/nyaruko/App.kt index b1c105f..1bcd86a 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/App.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/nyaruko/NyarukoLog.kt b/src/main/kotlin/com/fardragi/nyaruko/NyarukoLog.kt new file mode 100644 index 0000000..0e4f838 --- /dev/null +++ b/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) + } +} diff --git a/src/main/kotlin/com/fardragi/dragiutils/DragiUtils.kt b/src/main/kotlin/com/fardragi/nyaruko/NyarukoMod.kt similarity index 91% rename from src/main/kotlin/com/fardragi/dragiutils/DragiUtils.kt rename to src/main/kotlin/com/fardragi/nyaruko/NyarukoMod.kt index f4a985b..a23e83c 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/DragiUtils.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/auth/Auth.kt b/src/main/kotlin/com/fardragi/nyaruko/auth/Auth.kt similarity index 62% rename from src/main/kotlin/com/fardragi/dragiutils/auth/Auth.kt rename to src/main/kotlin/com/fardragi/nyaruko/auth/Auth.kt index e8f3abd..a0385d2 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/auth/Auth.kt +++ b/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 { diff --git a/src/main/kotlin/com/fardragi/dragiutils/auth/AuthModule.kt b/src/main/kotlin/com/fardragi/nyaruko/auth/AuthModule.kt similarity index 81% rename from src/main/kotlin/com/fardragi/dragiutils/auth/AuthModule.kt rename to src/main/kotlin/com/fardragi/nyaruko/auth/AuthModule.kt index da1d29b..a59ff79 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/auth/AuthModule.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/auth/commands/RegisterCommand.kt b/src/main/kotlin/com/fardragi/nyaruko/auth/commands/RegisterCommand.kt similarity index 89% rename from src/main/kotlin/com/fardragi/dragiutils/auth/commands/RegisterCommand.kt rename to src/main/kotlin/com/fardragi/nyaruko/auth/commands/RegisterCommand.kt index 441ff59..9c9a03b 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/auth/commands/RegisterCommand.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/nyaruko/auth/handlers/LoginHandler.kt b/src/main/kotlin/com/fardragi/nyaruko/auth/handlers/LoginHandler.kt new file mode 100644 index 0000000..b0e6bd9 --- /dev/null +++ b/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) + } + } +} diff --git a/src/main/kotlin/com/fardragi/nyaruko/auth/messages/LoginMessage.kt b/src/main/kotlin/com/fardragi/nyaruko/auth/messages/LoginMessage.kt new file mode 100644 index 0000000..95d139a --- /dev/null +++ b/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 "); + text.chatStyle = ChatStyle().setColor(EnumChatFormatting.YELLOW) + + return text + } +} diff --git a/src/main/kotlin/com/fardragi/nyaruko/auth/messages/RegisterMessage.kt b/src/main/kotlin/com/fardragi/nyaruko/auth/messages/RegisterMessage.kt new file mode 100644 index 0000000..71faa15 --- /dev/null +++ b/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 "); + text.chatStyle = ChatStyle().setColor(EnumChatFormatting.YELLOW) + + return text + } +} diff --git a/src/main/kotlin/com/fardragi/nyaruko/client/ClientProxy.kt b/src/main/kotlin/com/fardragi/nyaruko/client/ClientProxy.kt new file mode 100644 index 0000000..718a22b --- /dev/null +++ b/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() { +} diff --git a/src/main/kotlin/com/fardragi/dragiutils/config/Config.kt b/src/main/kotlin/com/fardragi/nyaruko/config/Config.kt similarity index 75% rename from src/main/kotlin/com/fardragi/dragiutils/config/Config.kt rename to src/main/kotlin/com/fardragi/nyaruko/config/Config.kt index c7d6cfa..565b102 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/config/Config.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/config/DatabaseConfig.kt b/src/main/kotlin/com/fardragi/nyaruko/config/DatabaseConfig.kt similarity index 94% rename from src/main/kotlin/com/fardragi/dragiutils/config/DatabaseConfig.kt rename to src/main/kotlin/com/fardragi/nyaruko/config/DatabaseConfig.kt index 8204a92..a6f408d 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/config/DatabaseConfig.kt +++ b/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" diff --git a/src/main/kotlin/com/fardragi/nyaruko/database/DatabaseConnection.kt b/src/main/kotlin/com/fardragi/nyaruko/database/DatabaseConnection.kt new file mode 100644 index 0000000..2236136 --- /dev/null +++ b/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) + } + } + } +} diff --git a/src/main/kotlin/com/fardragi/dragiutils/database/Extensions.kt b/src/main/kotlin/com/fardragi/nyaruko/database/Extensions.kt similarity index 61% rename from src/main/kotlin/com/fardragi/dragiutils/database/Extensions.kt rename to src/main/kotlin/com/fardragi/nyaruko/database/Extensions.kt index ad35d57..c6066b5 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/database/Extensions.kt +++ b/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 query(block: () -> T): T { - return transaction { +suspend fun query(block: () -> T): T = withContext(Dispatchers.IO) { + transaction { addLogger(CustomLogger) block() } diff --git a/src/main/kotlin/com/fardragi/dragiutils/database/tables/Users.kt b/src/main/kotlin/com/fardragi/nyaruko/database/tables/Users.kt similarity index 85% rename from src/main/kotlin/com/fardragi/dragiutils/database/tables/Users.kt rename to src/main/kotlin/com/fardragi/nyaruko/database/tables/Users.kt index d3c6d5a..8322a38 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/database/tables/Users.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/enums/PermissionLevel.kt b/src/main/kotlin/com/fardragi/nyaruko/enums/PermissionLevel.kt similarity index 69% rename from src/main/kotlin/com/fardragi/dragiutils/enums/PermissionLevel.kt rename to src/main/kotlin/com/fardragi/nyaruko/enums/PermissionLevel.kt index 885bf80..96348a1 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/enums/PermissionLevel.kt +++ b/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), diff --git a/src/main/kotlin/com/fardragi/dragiutils/exceptions/NotFoundException.kt b/src/main/kotlin/com/fardragi/nyaruko/exceptions/NotFoundException.kt similarity index 60% rename from src/main/kotlin/com/fardragi/dragiutils/exceptions/NotFoundException.kt rename to src/main/kotlin/com/fardragi/nyaruko/exceptions/NotFoundException.kt index 1bbda6b..55399a4 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/exceptions/NotFoundException.kt +++ b/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) { } diff --git a/src/main/kotlin/com/fardragi/dragiutils/models/User.kt b/src/main/kotlin/com/fardragi/nyaruko/models/User.kt similarity index 87% rename from src/main/kotlin/com/fardragi/dragiutils/models/User.kt rename to src/main/kotlin/com/fardragi/nyaruko/models/User.kt index 19d7b71..7593c19 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/models/User.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/permission/Permission.kt b/src/main/kotlin/com/fardragi/nyaruko/permission/Permission.kt similarity index 75% rename from src/main/kotlin/com/fardragi/dragiutils/permission/Permission.kt rename to src/main/kotlin/com/fardragi/nyaruko/permission/Permission.kt index b78f410..8b5afd7 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/permission/Permission.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/permission/PermissionModule.kt b/src/main/kotlin/com/fardragi/nyaruko/permission/PermissionModule.kt similarity index 82% rename from src/main/kotlin/com/fardragi/dragiutils/permission/PermissionModule.kt rename to src/main/kotlin/com/fardragi/nyaruko/permission/PermissionModule.kt index 1900b57..32e31b1 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/permission/PermissionModule.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/server/ServerProxy.kt b/src/main/kotlin/com/fardragi/nyaruko/server/ServerProxy.kt similarity index 85% rename from src/main/kotlin/com/fardragi/dragiutils/server/ServerProxy.kt rename to src/main/kotlin/com/fardragi/nyaruko/server/ServerProxy.kt index 80e9587..dd659cc 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/server/ServerProxy.kt +++ b/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 diff --git a/src/main/kotlin/com/fardragi/dragiutils/services/UserService.kt b/src/main/kotlin/com/fardragi/nyaruko/services/UserService.kt similarity index 59% rename from src/main/kotlin/com/fardragi/dragiutils/services/UserService.kt rename to src/main/kotlin/com/fardragi/nyaruko/services/UserService.kt index 2494f3b..a8980d7 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/services/UserService.kt +++ b/src/main/kotlin/com/fardragi/nyaruko/services/UserService.kt @@ -1,11 +1,11 @@ -package com.fardragi.dragiutils.services +package com.fardragi.nyaruko.services -import com.fardragi.dragiutils.database.query -import com.fardragi.dragiutils.exceptions.NotFoundException -import com.fardragi.dragiutils.models.User +import com.fardragi.nyaruko.database.query +import com.fardragi.nyaruko.exceptions.NotFoundException +import com.fardragi.nyaruko.models.User class UserService() { - fun getOrCreateUser(id: String, name: String): User { + suspend fun getOrCreateUser(id: String, name: String): User { return query { var user = User.findById(id) if (user == null) { @@ -19,7 +19,7 @@ class UserService() { } } - fun setPassword(id: String, password: String) { + suspend fun setPassword(id: String, password: String) { query { User.findByIdAndUpdate(id) { user -> user.updatePassword(password) diff --git a/src/main/kotlin/com/fardragi/nyaruko/shared/commands/NyarukoCommandBase.kt b/src/main/kotlin/com/fardragi/nyaruko/shared/commands/NyarukoCommandBase.kt new file mode 100644 index 0000000..22234d8 --- /dev/null +++ b/src/main/kotlin/com/fardragi/nyaruko/shared/commands/NyarukoCommandBase.kt @@ -0,0 +1,18 @@ +package com.fardragi.nyaruko.shared.commands + +import net.minecraft.command.CommandBase +import net.minecraft.command.ICommandSender + +class NyarukoCommandBase : CommandBase() { + override fun getCommandName(): String { + TODO("Not yet implemented") + } + + override fun getCommandUsage(sender: ICommandSender?): String { + TODO("Not yet implemented") + } + + override fun processCommand(sender: ICommandSender?, args: Array?) { + TODO("Not yet implemented") + } +} diff --git a/src/main/kotlin/com/fardragi/dragiutils/utils/Minecraft.kt b/src/main/kotlin/com/fardragi/nyaruko/utils/Minecraft.kt similarity index 90% rename from src/main/kotlin/com/fardragi/dragiutils/utils/Minecraft.kt rename to src/main/kotlin/com/fardragi/nyaruko/utils/Minecraft.kt index 402c722..08efb73 100644 --- a/src/main/kotlin/com/fardragi/dragiutils/utils/Minecraft.kt +++ b/src/main/kotlin/com/fardragi/nyaruko/utils/Minecraft.kt @@ -1,4 +1,4 @@ -package com.fardragi.dragiutils.utils +package com.fardragi.nyaruko.utils import cpw.mods.fml.common.FMLCommonHandler import java.io.File