Add: warp command

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

@@ -1,16 +1,13 @@
 package com.fardragi.nyaruko
 
-import com.fardragi.nyaruko.auth.AuthModule
+import com.fardragi.nyaruko.modules.auth.AuthModule
 import com.fardragi.nyaruko.config.Config
 import com.fardragi.nyaruko.config.DatabaseConfig
 import com.fardragi.nyaruko.config.DiscordConfig
-import com.fardragi.nyaruko.core.CoreModule
+import com.fardragi.nyaruko.modules.core.CoreModule
 import com.fardragi.nyaruko.database.DatabaseConnection
-import com.fardragi.nyaruko.permission.PermissionModule
-import com.fardragi.nyaruko.services.CommandService
-import com.fardragi.nyaruko.services.GroupService
-import com.fardragi.nyaruko.services.SessionsService
-import com.fardragi.nyaruko.services.UserService
+import com.fardragi.nyaruko.modules.permission.PermissionModule
+import com.fardragi.nyaruko.services.*
 import org.koin.core.module.dsl.createdAtStart
 import org.koin.core.module.dsl.withOptions
 import org.koin.dsl.module
@@ -26,12 +23,9 @@ val appModule = module {
         createdAtStart()
     }
 
-    single { CoreModule() }
-    single { AuthModule() }
-    single { PermissionModule() }
-
     single { UserService(get()) }
     single { SessionsService() }
     single { CommandService() }
     single { GroupService() }
+    single { WarpService() }
 }

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

@@ -1,6 +1,6 @@
 package com.fardragi.nyaruko
 
-import com.fardragi.nyaruko.shared.IProxy
+import com.fardragi.nyaruko.modules.base.IProxy
 import cpw.mods.fml.common.Mod
 import cpw.mods.fml.common.SidedProxy
 import cpw.mods.fml.common.event.FMLInitializationEvent

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

@@ -1,6 +1,6 @@
 package com.fardragi.nyaruko.client
 
-import com.fardragi.nyaruko.shared.IProxy
+import com.fardragi.nyaruko.modules.base.IProxy
 
 class ClientProxy : IProxy {
 }

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

@@ -18,7 +18,7 @@ class DatabaseConnection(config: DatabaseConfig) {
         runBlocking {
             query {
                 SchemaUtils.createMissingTablesAndColumns(
-                    Users, Commands, Groups, UserGroups, GroupCommands
+                    Users, Commands, Groups, UserGroups, GroupCommands, Warps
                 )
             }
         }

src/main/kotlin/com/fardragi/nyaruko/database/tables/Warps.kt

@@ -0,0 +1,14 @@
+package com.fardragi.nyaruko.database.tables
+
+import org.jetbrains.exposed.dao.id.IdTable
+
+object Warps : IdTable<UInt>("warps") {
+    override val id = uinteger("id").autoIncrement().entityId()
+    val name = varchar("name", 255).uniqueIndex()
+    val dimension = integer("dimension")
+    val positionX = integer("position_x")
+    val positionY = integer("position_y")
+    val positionZ = integer("position_z")
+
+    override val primaryKey = PrimaryKey(id)
+}

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

@@ -1,3 +1,3 @@
 package com.fardragi.nyaruko.exceptions
 
-class NotFoundException(className: String?, id: String?) : Exception("$className not found with id: $id")
+class NotFoundException(className: String?, id: String?) : Exception("$className não encontrado: $id")

src/main/kotlin/com/fardragi/nyaruko/extensions/EntityPlayer.kt

@@ -1,5 +1,6 @@
 package com.fardragi.nyaruko.extensions
 
+import com.fardragi.nyaruko.models.Warp
 import com.fardragi.nyaruko.utils.NyarukoTeleporter
 import com.fardragi.nyaruko.viewmodels.PositionViewModel
 import net.minecraft.entity.player.EntityPlayer
@@ -44,6 +45,10 @@ fun EntityPlayer.teleport(position: PositionViewModel) {
     )
 }
 
+fun EntityPlayer.teleport(warp: Warp) {
+    teleport(PositionViewModel(this, warp))
+}
+
 fun EntityPlayer.isTruePlayer(): Boolean {
     return this is EntityPlayerMP && this !is FakePlayer
 }

src/main/kotlin/com/fardragi/nyaruko/models/Warp.kt

@@ -0,0 +1,16 @@
+package com.fardragi.nyaruko.models
+
+import com.fardragi.nyaruko.database.tables.Warps
+import org.jetbrains.exposed.dao.Entity
+import org.jetbrains.exposed.dao.EntityClass
+import org.jetbrains.exposed.dao.id.EntityID
+
+class Warp(id: EntityID<UInt>) : Entity<UInt>(id) {
+    companion object : EntityClass<UInt, Warp>(Warps)
+
+    var name by Warps.name
+    var dimension by Warps.dimension
+    var positionX by Warps.positionX
+    var positionY by Warps.positionY
+    var positionZ by Warps.positionZ
+}

src/main/kotlin/com/fardragi/nyaruko/modules/auth/AuthModule.kt

@@ -0,0 +1,17 @@
+package com.fardragi.nyaruko.modules.auth
+
+import com.fardragi.nyaruko.modules.auth.commands.LoginCommand
+import com.fardragi.nyaruko.modules.auth.commands.RegisterCommand
+import com.fardragi.nyaruko.modules.auth.handlers.AuthHandler
+import com.fardragi.nyaruko.modules.auth.handlers.CheckHandler
+import com.fardragi.nyaruko.modules.base.IModule
+
+class AuthModule() : IModule {
+    override suspend fun start() {
+        AuthHandler().register()
+        CheckHandler().register()
+
+        RegisterCommand().register()
+        LoginCommand().register()
+    }
+}

src/main/kotlin/com/fardragi/nyaruko/auth/commands/LoginCommand.kt → src/main/kotlin/com/fardragi/nyaruko/modules/auth/commands/LoginCommand.kt

@@ -1,19 +1,17 @@
-package com.fardragi.nyaruko.auth.commands
+package com.fardragi.nyaruko.modules.auth.commands
 
-import com.fardragi.nyaruko.auth.messages.LoginMessage
-import com.fardragi.nyaruko.enums.PermissionLevel
+import com.fardragi.nyaruko.modules.auth.messages.LoginMessage
 import com.fardragi.nyaruko.exceptions.MessageException
 import com.fardragi.nyaruko.extensions.sendMessages
 import com.fardragi.nyaruko.services.SessionsService
 import com.fardragi.nyaruko.services.UserService
-import com.fardragi.nyaruko.shared.commands.NyarukoCommandBase
-import com.fardragi.nyaruko.shared.messages.DefaultMessage
+import com.fardragi.nyaruko.modules.base.commands.NyarukoCommandBase
+import com.fardragi.nyaruko.modules.base.messages.DefaultMessage
 import net.minecraft.command.ICommandSender
 import net.minecraft.entity.player.EntityPlayerMP
-import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-class LoginCommand() : NyarukoCommandBase(), KoinComponent {
+class LoginCommand() : NyarukoCommandBase() {
     private val userService: UserService by inject()
     private val sessionsService: SessionsService by inject()
 
@@ -27,7 +25,7 @@ class LoginCommand() : NyarukoCommandBase(), KoinComponent {
 
     override suspend fun processCommandPlayer(player: EntityPlayerMP, args: Array<out String>) {
         if (args.isEmpty()) {
-            throw MessageException(DefaultMessage.usage(LoginMessage.usageAction()))
+            throw MessageException(DefaultMessage.usageFail(LoginMessage.usageAction()))
         }
 
         val userId = player.uniqueID
@@ -44,12 +42,4 @@ class LoginCommand() : NyarukoCommandBase(), KoinComponent {
         player.sendMessages(DefaultMessage.success("Logado com sucesso"))
         sessionsService.setAuthenticate(userId)
     }
-
-    override fun getRequiredPermissionLevel(): Int {
-        return PermissionLevel.All.level
-    }
-
-    override fun canCommandSenderUseCommand(sender: ICommandSender?): Boolean {
-        return true
-    }
 }

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

@@ -1,18 +1,17 @@
-package com.fardragi.nyaruko.auth.commands
+package com.fardragi.nyaruko.modules.auth.commands
 
-import com.fardragi.nyaruko.auth.messages.RegisterMessage
+import com.fardragi.nyaruko.modules.auth.messages.RegisterMessage
 import com.fardragi.nyaruko.enums.PermissionLevel
 import com.fardragi.nyaruko.exceptions.MessageException
 import com.fardragi.nyaruko.extensions.sendMessages
 import com.fardragi.nyaruko.services.UserService
-import com.fardragi.nyaruko.shared.commands.NyarukoCommandBase
-import com.fardragi.nyaruko.shared.messages.DefaultMessage
+import com.fardragi.nyaruko.modules.base.commands.NyarukoCommandBase
+import com.fardragi.nyaruko.modules.base.messages.DefaultMessage
 import net.minecraft.command.ICommandSender
 import net.minecraft.entity.player.EntityPlayerMP
-import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-class RegisterCommand() : NyarukoCommandBase(), KoinComponent {
+class RegisterCommand() : NyarukoCommandBase() {
     private val userService: UserService by inject()
 
     override fun getCommandName(): String {
@@ -25,7 +24,7 @@ class RegisterCommand() : NyarukoCommandBase(), KoinComponent {
 
     override suspend fun processCommandPlayer(player: EntityPlayerMP, args: Array<out String>) {
         if (args.isEmpty() || args.size < 2) {
-            throw MessageException(DefaultMessage.usage(RegisterMessage.usageAction()))
+            throw MessageException(DefaultMessage.usageFail(RegisterMessage.usageAction()))
         }
 
         val userId = player.uniqueID

src/main/kotlin/com/fardragi/nyaruko/auth/handlers/AuthHandler.kt → src/main/kotlin/com/fardragi/nyaruko/modules/auth/handlers/AuthHandler.kt

@@ -1,11 +1,11 @@
-package com.fardragi.nyaruko.auth.handlers
+package com.fardragi.nyaruko.modules.auth.handlers
 
-import com.fardragi.nyaruko.auth.messages.WelcomeMessage
+import com.fardragi.nyaruko.modules.auth.messages.WelcomeMessage
 import com.fardragi.nyaruko.config.DiscordConfig
 import com.fardragi.nyaruko.extensions.sendMessages
 import com.fardragi.nyaruko.services.SessionsService
 import com.fardragi.nyaruko.services.UserService
-import com.fardragi.nyaruko.shared.handlers.NyarukoHandlerBase
+import com.fardragi.nyaruko.modules.base.handlers.NyarukoHandlerBase
 import com.fardragi.nyaruko.viewmodels.PositionViewModel
 import cpw.mods.fml.common.eventhandler.EventPriority
 import cpw.mods.fml.common.eventhandler.SubscribeEvent

src/main/kotlin/com/fardragi/nyaruko/auth/handlers/CheckHandler.kt → src/main/kotlin/com/fardragi/nyaruko/modules/auth/handlers/CheckHandler.kt

@@ -1,11 +1,11 @@
-package com.fardragi.nyaruko.auth.handlers
+package com.fardragi.nyaruko.modules.auth.handlers
 
-import com.fardragi.nyaruko.auth.messages.LoginMessage
-import com.fardragi.nyaruko.core.events.PlayerMoveEvent
+import com.fardragi.nyaruko.modules.auth.messages.LoginMessage
+import com.fardragi.nyaruko.modules.core.events.PlayerMoveEvent
 import com.fardragi.nyaruko.extensions.isTruePlayer
 import com.fardragi.nyaruko.extensions.sendMessages
 import com.fardragi.nyaruko.services.SessionsService
-import com.fardragi.nyaruko.shared.handlers.NyarukoHandlerBase
+import com.fardragi.nyaruko.modules.base.handlers.NyarukoHandlerBase
 import cpw.mods.fml.common.eventhandler.EventPriority
 import cpw.mods.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.event.entity.item.ItemTossEvent

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

@@ -1,4 +1,4 @@
-package com.fardragi.nyaruko.auth.messages
+package com.fardragi.nyaruko.modules.auth.messages
 
 import com.fardragi.nyaruko.utils.MessageBuilder
 import com.fardragi.nyaruko.utils.TextBuilder

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

@@ -1,4 +1,4 @@
-package com.fardragi.nyaruko.auth.messages
+package com.fardragi.nyaruko.modules.auth.messages
 
 import com.fardragi.nyaruko.utils.MessageBuilder
 import com.fardragi.nyaruko.utils.TextBuilder

src/main/kotlin/com/fardragi/nyaruko/auth/messages/WelcomeMessage.kt → src/main/kotlin/com/fardragi/nyaruko/modules/auth/messages/WelcomeMessage.kt

@@ -1,4 +1,4 @@
-package com.fardragi.nyaruko.auth.messages
+package com.fardragi.nyaruko.modules.auth.messages
 
 import com.fardragi.nyaruko.utils.MessageBuilder
 import net.minecraft.event.ClickEvent

src/main/kotlin/com/fardragi/nyaruko/modules/base/IModule.kt

@@ -0,0 +1,7 @@
+package com.fardragi.nyaruko.modules.base
+
+import org.koin.core.component.KoinComponent
+
+fun interface IModule : KoinComponent {
+    suspend fun start()
+}

src/main/kotlin/com/fardragi/nyaruko/shared/IProxy.kt → src/main/kotlin/com/fardragi/nyaruko/modules/base/IProxy.kt

@@ -1,4 +1,4 @@
-package com.fardragi.nyaruko.shared
+package com.fardragi.nyaruko.modules.base
 
 import cpw.mods.fml.common.event.FMLInitializationEvent
 import cpw.mods.fml.common.event.FMLPostInitializationEvent

src/main/kotlin/com/fardragi/nyaruko/shared/commands/NyarukoCommandBase.kt → src/main/kotlin/com/fardragi/nyaruko/modules/base/commands/NyarukoCommandBase.kt

@@ -1,9 +1,10 @@
-package com.fardragi.nyaruko.shared.commands
+package com.fardragi.nyaruko.modules.base.commands
 
 import com.fardragi.nyaruko.NyarukoLog
+import com.fardragi.nyaruko.enums.PermissionLevel
 import com.fardragi.nyaruko.exceptions.MessageException
 import com.fardragi.nyaruko.extensions.sendMessages
-import com.fardragi.nyaruko.shared.messages.DefaultMessage
+import com.fardragi.nyaruko.modules.base.messages.DefaultMessage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -13,9 +14,10 @@ import net.minecraft.command.ServerCommandManager
 import net.minecraft.command.server.CommandBlockLogic
 import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.server.MinecraftServer
+import org.koin.core.component.KoinComponent
 
-abstract class NyarukoCommandBase : CommandBase() {
-    fun register(){
+abstract class NyarukoCommandBase : CommandBase(), KoinComponent {
+    fun register() {
         (MinecraftServer.getServer().commandManager as ServerCommandManager).registerCommand(this)
     }
 
@@ -37,14 +39,26 @@ abstract class NyarukoCommandBase : CommandBase() {
     }
 
     open suspend fun processCommandPlayer(player: EntityPlayerMP, args: Array<out String>) {
-        return
+        throw MessageException(DefaultMessage.error("Você não pode usar esse comando"))
     }
 
     open suspend fun processCommandBlock(commandBlock: CommandBlockLogic, args: Array<out String>) {
-        return
+        throw MessageException(DefaultMessage.error("O comando não pode ser usando em um comand block"))
     }
 
     open suspend fun processCommandConsole(sender: ICommandSender, args: Array<out String>) {
-        return
+        throw MessageException(DefaultMessage.error("Você não pode usar esse comando"))
+    }
+
+    override fun getRequiredPermissionLevel(): Int {
+        return getPermissionLevel().level
+    }
+
+    open fun getPermissionLevel(): PermissionLevel {
+        return PermissionLevel.All
+    }
+
+    override fun canCommandSenderUseCommand(sender: ICommandSender?): Boolean {
+        return true
     }
 }

src/main/kotlin/com/fardragi/nyaruko/shared/events/NyarukoEvent.kt → src/main/kotlin/com/fardragi/nyaruko/modules/base/events/NyarukoEvent.kt

@@ -1,4 +1,4 @@
-package com.fardragi.nyaruko.shared.events
+package com.fardragi.nyaruko.modules.base.events
 
 import cpw.mods.fml.common.eventhandler.Event
 import net.minecraftforge.common.MinecraftForge

src/main/kotlin/com/fardragi/nyaruko/modules/base/events/ServerStartingEvent.kt

@@ -0,0 +1,3 @@
+package com.fardragi.nyaruko.modules.base.events
+
+class ServerStartingEvent() : NyarukoEvent()

src/main/kotlin/com/fardragi/nyaruko/shared/handlers/NyarukoHandlerBase.kt → src/main/kotlin/com/fardragi/nyaruko/modules/base/handlers/NyarukoHandlerBase.kt

@@ -1,4 +1,4 @@
-package com.fardragi.nyaruko.shared.handlers
+package com.fardragi.nyaruko.modules.base.handlers
 
 import cpw.mods.fml.common.FMLCommonHandler
 import net.minecraftforge.common.MinecraftForge

src/main/kotlin/com/fardragi/nyaruko/shared/messages/DefaultMessage.kt → src/main/kotlin/com/fardragi/nyaruko/modules/base/messages/DefaultMessage.kt

@@ -1,11 +1,11 @@
-package com.fardragi.nyaruko.shared.messages
+package com.fardragi.nyaruko.modules.base.messages
 
 import com.fardragi.nyaruko.utils.MessageBuilder
 import com.fardragi.nyaruko.utils.TextBuilder
 import net.minecraft.util.EnumChatFormatting
 
 object DefaultMessage {
-    fun usage(usageAction: TextBuilder): MessageBuilder {
+    fun usageFail(usageAction: TextBuilder): MessageBuilder {
         val messageBuilder = MessageBuilder()
             .addLine { builder ->
                 builder.append("Falha ao executar", EnumChatFormatting.RED)