Merge pull request #10 from Nlkomaru/develop

Develop
RaceAssist · Jun 4, 2022 · 5a146fe · 5a146fe
2 parents 5ec51af + 4a75d57
commit 5a146fe
Show file tree

Hide file tree

Showing 38 changed files with 107 additions and 242 deletions.
diff --git a/src/main/kotlin/dev/nikomaru/raceassist/RaceAssist.kt b/src/main/kotlin/dev/nikomaru/raceassist/RaceAssist.kt
@@ -27,24 +27,12 @@ import dev.nikomaru.raceassist.bet.event.BetGuiClickEvent
 import dev.nikomaru.raceassist.database.*
 import dev.nikomaru.raceassist.files.Config
 import dev.nikomaru.raceassist.race.commands.HelpCommand
-import dev.nikomaru.raceassist.race.commands.audience.AudienceJoinCommand
-import dev.nikomaru.raceassist.race.commands.audience.AudienceLeaveCommand
-import dev.nikomaru.raceassist.race.commands.audience.AudienceListCommand
+import dev.nikomaru.raceassist.race.commands.audience.*
 import dev.nikomaru.raceassist.race.commands.place.*
-import dev.nikomaru.raceassist.race.commands.player.PlayerAddCommand
-import dev.nikomaru.raceassist.race.commands.player.PlayerDeleteCommand
-import dev.nikomaru.raceassist.race.commands.player.PlayerListCommand
-import dev.nikomaru.raceassist.race.commands.player.PlayerRemoveCommand
-import dev.nikomaru.raceassist.race.commands.race.RaceDebugCommand
-import dev.nikomaru.raceassist.race.commands.race.RaceStartCommand
-import dev.nikomaru.raceassist.race.commands.race.RaceStopCommand
-import dev.nikomaru.raceassist.race.commands.setting.SettingCopyCommand
-import dev.nikomaru.raceassist.race.commands.setting.SettingCreateCommand
-import dev.nikomaru.raceassist.race.commands.setting.SettingDeleteCommand
-import dev.nikomaru.raceassist.race.commands.setting.SettingStaffCommand
-import dev.nikomaru.raceassist.race.event.SetCentralPointEvent
-import dev.nikomaru.raceassist.race.event.SetInsideCircuitEvent
-import dev.nikomaru.raceassist.race.event.SetOutsideCircuitEvent
+import dev.nikomaru.raceassist.race.commands.player.*
+import dev.nikomaru.raceassist.race.commands.race.*
+import dev.nikomaru.raceassist.race.commands.setting.*
+import dev.nikomaru.raceassist.race.event.*
 import dev.nikomaru.raceassist.utils.CommandSuggestions
 import dev.nikomaru.raceassist.utils.Lang
 import dev.nikomaru.raceassist.utils.coroutines.minecraft
@@ -150,7 +138,6 @@ class RaceAssist : SuspendingJavaPlugin() {
     companion object {
         lateinit var plugin: RaceAssist
             private set
-
     }
 }
 

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetCanCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetCanCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.BetSetting

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetDeleteCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetDeleteCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.BetList

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetListCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetListCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.BetList

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetOpenCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetOpenCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.bet.gui.BetChestGui

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetRateCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetRateCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import cloud.commandframework.annotations.specifier.Range
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetRemoveCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetRemoveCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.api.VaultAPI
@@ -32,9 +30,7 @@ import net.milkbowl.vault.economy.Economy
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
 import java.util.*
 

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetReturnCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetReturnCommand.kt
@@ -16,29 +16,21 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.api.VaultAPI
 import dev.nikomaru.raceassist.bet.event.BetGuiClickEvent.Companion.getBetOwner
-import dev.nikomaru.raceassist.database.BetList
+import dev.nikomaru.raceassist.database.*
 import dev.nikomaru.raceassist.database.BetList.jockey
-import dev.nikomaru.raceassist.database.BetSetting
-import dev.nikomaru.raceassist.database.PlayerList
 import dev.nikomaru.raceassist.utils.Lang
 import dev.nikomaru.raceassist.utils.coroutines.minecraft
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
 import java.util.*
 import kotlin.math.floor

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetRevertCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetRevertCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.api.VaultAPI
@@ -27,9 +25,7 @@ import dev.nikomaru.raceassist.database.BetList
 import dev.nikomaru.raceassist.utils.CommandUtils.returnRaceSetting
 import dev.nikomaru.raceassist.utils.Lang
 import dev.nikomaru.raceassist.utils.coroutines.minecraft
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import net.milkbowl.vault.economy.Economy
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetSheetCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetSheetCommand.kt
@@ -16,14 +16,9 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
-import com.google.api.services.sheets.v4.model.AddSheetRequest
-import com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest
-import com.google.api.services.sheets.v4.model.Request
-import com.google.api.services.sheets.v4.model.SheetProperties
+import com.google.api.services.sheets.v4.model.*
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.api.sheet.SheetsServiceUtil.getSheetsService
 import dev.nikomaru.raceassist.database.BetSetting

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetTransfarCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/commands/BetTransfarCommand.kt
@@ -16,15 +16,11 @@
 
 package dev.nikomaru.raceassist.bet.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.BetSetting
-import dev.nikomaru.raceassist.utils.CommandUtils
-import dev.nikomaru.raceassist.utils.Lang
-import dev.nikomaru.raceassist.utils.RaceStaffUtils
+import dev.nikomaru.raceassist.utils.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.bukkit.Bukkit

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/event/BetGuiClickEvent.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/event/BetGuiClickEvent.kt
@@ -28,16 +28,11 @@ import dev.nikomaru.raceassist.database.BetList.rowNum
 import dev.nikomaru.raceassist.database.BetSetting
 import dev.nikomaru.raceassist.files.Config.betUnit
 import dev.nikomaru.raceassist.utils.Lang
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer
 import net.milkbowl.vault.economy.Economy
-import org.bukkit.Bukkit
-import org.bukkit.Material
-import org.bukkit.OfflinePlayer
-import org.bukkit.Sound
+import org.bukkit.*
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/gui/BetChestGui.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/gui/BetChestGui.kt
@@ -18,9 +18,7 @@ package dev.nikomaru.raceassist.bet.gui
 
 import com.google.common.collect.ImmutableList
 import dev.nikomaru.raceassist.bet.GuiComponent
-import dev.nikomaru.raceassist.database.BetList
-import dev.nikomaru.raceassist.database.BetSetting
-import dev.nikomaru.raceassist.database.PlayerList
+import dev.nikomaru.raceassist.database.*
 import dev.nikomaru.raceassist.files.Config.betUnit
 import dev.nikomaru.raceassist.utils.Lang
 import kotlinx.coroutines.Dispatchers

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/HelpCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/HelpCommand.kt
@@ -16,10 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
-import cloud.commandframework.annotations.Hidden
+import cloud.commandframework.annotations.*
 import net.kyori.adventure.text.minimessage.MiniMessage
 import org.bukkit.command.CommandSender
 

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/audience/AudienceJoinCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/audience/AudienceJoinCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.audience
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.utils.CommandUtils.audience

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/audience/AudienceLeaveCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/audience/AudienceLeaveCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.audience
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import dev.nikomaru.raceassist.utils.CommandUtils.audience
 import dev.nikomaru.raceassist.utils.Lang
 import org.bukkit.command.CommandSender

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/audience/AudienceListCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/audience/AudienceListCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.audience
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.utils.CommandUtils

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceCentralCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceCentralCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.place
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.utils.CommandUtils.canSetCentral

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceDegreeCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceDegreeCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.place
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.RaceList

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceLapCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceLapCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.place
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import cloud.commandframework.annotations.specifier.Range
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceReverseCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceReverseCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.place
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.RaceList

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceSetCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/place/PlaceSetCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.place
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.utils.CommandUtils.canSetInsideCircuit

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerAddCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerAddCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.player
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.PlayerList

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerDeleteCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerDeleteCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.player
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.PlayerList

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerListCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerListCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.player
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.PlayerList

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerRemoveCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerRemoveCommand.kt
@@ -16,9 +16,7 @@
 
 package dev.nikomaru.raceassist.race.commands.player
 
-import cloud.commandframework.annotations.Argument
-import cloud.commandframework.annotations.CommandMethod
-import cloud.commandframework.annotations.CommandPermission
+import cloud.commandframework.annotations.*
 import com.github.shynixn.mccoroutine.bukkit.launch
 import dev.nikomaru.raceassist.RaceAssist.Companion.plugin
 import dev.nikomaru.raceassist.database.PlayerList