diff --git a/src/main/kotlin/dev/nikomaru/raceassist/RaceAssist.kt b/src/main/kotlin/dev/nikomaru/raceassist/RaceAssist.kt index e59d905..3f9b254 100644 --- 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 index df7ac27..1e88d46 100644 --- 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 index f7c02f0..6b880e2 100644 --- 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 index 03957f3..ae733b0 100644 --- 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 index 87fa9b6..15011e8 100644 --- 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 index 18366fb..f2d327f 100644 --- 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 index b15e795..6d9c979 100644 --- 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 index 17db9ab..56c0770 100644 --- 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 index 8cf23f8..ad71dc1 100644 --- 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 index 51dc19e..2a54e9e 100644 --- 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 index 3c2dd66..ff291a1 100644 --- 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 index 9f0d153..6f197b3 100644 --- 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 index caa4ca1..ae58861 100644 --- 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 index 19a95a6..0e81a40 100644 --- 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 index 9cea0e1..af5c965 100644 --- 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 index 9a40e5f..8f12d64 100644 --- 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 index d0460a9..37f6702 100644 --- 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 index 8eff68b..babcb58 100644 --- 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 index 03e2de9..c410cd3 100644 --- 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 index 9d6ea43..35f36c3 100644 --- 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 index 7e04aea..ea973c2 100644 --- 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 index 438186d..11f3fd7 100644 --- 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 index 8494c4d..53b3b3e 100644 --- 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 index fe48a1d..cda0a83 100644 --- 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 index c6d7f01..1be1c28 100644 --- 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 index 69f05bd..ddd4c01 100644 --- 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 diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceDebugCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceDebugCommand.kt index 659aeea..dd89c43 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceDebugCommand.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceDebugCommand.kt @@ -16,9 +16,7 @@ package dev.nikomaru.raceassist.race.commands.race -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 @@ -34,17 +32,13 @@ import dev.nikomaru.raceassist.utils.CommandUtils.judgeLap import dev.nikomaru.raceassist.utils.CommandUtils.stop import dev.nikomaru.raceassist.utils.Lang import dev.nikomaru.raceassist.utils.coroutines.minecraft -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.async -import kotlinx.coroutines.delay +import kotlinx.coroutines.* import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer import net.kyori.adventure.title.Title import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.bukkit.entity.Player -import org.bukkit.scoreboard.DisplaySlot -import org.bukkit.scoreboard.Objective -import org.bukkit.scoreboard.ScoreboardManager +import org.bukkit.scoreboard.* import java.awt.Polygon import kotlin.math.hypot import kotlin.math.roundToInt diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStartCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStartCommand.kt index 713bafc..5719d63 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStartCommand.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStartCommand.kt @@ -16,18 +16,15 @@ package dev.nikomaru.raceassist.race.commands.race -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.commands.BetReturnCommand import dev.nikomaru.raceassist.dispatch.discord.DiscordWebhook import dev.nikomaru.raceassist.files.Config -import dev.nikomaru.raceassist.utils.CommandUtils +import dev.nikomaru.raceassist.utils.* import dev.nikomaru.raceassist.utils.CommandUtils.decideRanking import dev.nikomaru.raceassist.utils.CommandUtils.displayLap -import dev.nikomaru.raceassist.utils.CommandUtils.displayScoreboard import dev.nikomaru.raceassist.utils.CommandUtils.getAllJockeys import dev.nikomaru.raceassist.utils.CommandUtils.getCentralPoint import dev.nikomaru.raceassist.utils.CommandUtils.getCircuitExist @@ -39,26 +36,21 @@ import dev.nikomaru.raceassist.utils.CommandUtils.getRaceDegree import dev.nikomaru.raceassist.utils.CommandUtils.getReverse import dev.nikomaru.raceassist.utils.CommandUtils.judgeLap import dev.nikomaru.raceassist.utils.CommandUtils.stop -import dev.nikomaru.raceassist.utils.Lang -import dev.nikomaru.raceassist.utils.RaceAudience import dev.nikomaru.raceassist.utils.coroutines.minecraft -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.async -import kotlinx.coroutines.delay -import kotlinx.coroutines.withContext +import kotlinx.coroutines.* import net.kyori.adventure.text.Component.text +import net.kyori.adventure.text.minimessage.MiniMessage +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer import net.kyori.adventure.title.Title import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.bukkit.entity.Player -import org.bukkit.scoreboard.DisplaySlot +import org.bukkit.scoreboard.* import org.json.simple.JSONArray import org.json.simple.JSONObject import java.awt.Polygon import java.util.* -import kotlin.math.floor -import kotlin.math.hypot -import kotlin.math.roundToInt +import kotlin.math.* @CommandMethod("ra|RaceAssist race") class RaceStartCommand { @@ -250,7 +242,6 @@ class RaceStartCommand { val displayRanking = async(minecraft) { displayScoreboard(finishJockey.plus(decideRanking(totalDegree)), - currentLap, totalDegree, raceAudience, innerCircumference.roundToInt(), @@ -311,4 +302,51 @@ class RaceStartCommand { discordWebHook.sendWebHook(json.toString()) } + private fun displayScoreboard(nowRankings: List, + currentDegree: HashMap, + raceAudience: TreeSet, + innerCircumference: Int, + startDegree: Int, + goalDegree: Int, + lap: Int) { + + raceAudience.forEach { + + if (Bukkit.getOfflinePlayer(it).isOnline) { + val player = Bukkit.getPlayer(it)!! + val manager: ScoreboardManager = Bukkit.getScoreboardManager() + val scoreboard = manager.newScoreboard + val objective: Objective = scoreboard.registerNewObjective(Lang.getText("scoreboard-ranking", player.locale()), + "dummy", + Lang.getComponent("scoreboard-now-ranking", player.locale())) + objective.displaySlot = DisplaySlot.SIDEBAR + + for (i in nowRankings.indices) { + + val playerName = Bukkit.getPlayer(nowRankings[i])?.name + val goalDistance = (((lap - 1).toDouble() + if (goalDegree > startDegree) { + ((goalDegree.toDouble() - startDegree.toDouble()) / 360.0) + } else { + ((goalDegree.toDouble() + 360.0 - startDegree.toDouble()) / 360.0) + }) * innerCircumference.toDouble()).toInt() + + val component = if (currentDegree[Bukkit.getPlayer(nowRankings[i])!!.uniqueId] == null) { + Lang.getComponent("scoreboard-now-ranking-and-name", player.locale(), i + 1, playerName) + .append(Lang.getComponent("finished-the-race", player.locale())) + } else { + val currentDistance = + ((currentDegree[Bukkit.getPlayer(nowRankings[i])!!.uniqueId]!!.toDouble() - startDegree.toDouble()) / 360.0 * innerCircumference.toDouble()).toInt() + + Lang.getComponent("scoreboard-now-ranking-and-name", player.locale(), i + 1, playerName) + .append(MiniMessage.miniMessage().deserialize("${currentDistance}m/${goalDistance}m ")) + } + + val displayDegree = objective.getScore(LegacyComponentSerializer.legacySection().serialize(component)) + displayDegree.score = nowRankings.size - i + } + player.scoreboard = scoreboard + } + } + } + } diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStopCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStopCommand.kt index 5d5f526..d996414 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStopCommand.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/race/RaceStopCommand.kt @@ -16,9 +16,7 @@ package dev.nikomaru.raceassist.race.commands.race -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/setting/SettingCopyCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingCopyCommand.kt index 48110c7..fab05fe 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingCopyCommand.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingCopyCommand.kt @@ -16,18 +16,12 @@ package dev.nikomaru.raceassist.race.commands.setting -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.database.CircuitPoint -import dev.nikomaru.raceassist.database.RaceList -import dev.nikomaru.raceassist.utils.CommandUtils +import dev.nikomaru.raceassist.database.* +import dev.nikomaru.raceassist.utils.* import dev.nikomaru.raceassist.utils.CommandUtils.getOwner -import dev.nikomaru.raceassist.utils.Lang -import dev.nikomaru.raceassist.utils.RaceStaffUtils import kotlinx.coroutines.Dispatchers import org.bukkit.command.CommandSender import org.bukkit.entity.Player diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingCreateCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingCreateCommand.kt index b7f0a9b..8e10b79 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingCreateCommand.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingCreateCommand.kt @@ -16,9 +16,7 @@ package dev.nikomaru.raceassist.race.commands.setting -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/race/commands/setting/SettingDeleteCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingDeleteCommand.kt index 69b9e58..9bc8c87 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingDeleteCommand.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingDeleteCommand.kt @@ -16,9 +16,7 @@ package dev.nikomaru.raceassist.race.commands.setting -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.* diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingStaffCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingStaffCommand.kt index a514b7b..8ca3fa5 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingStaffCommand.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/setting/SettingStaffCommand.kt @@ -16,15 +16,11 @@ package dev.nikomaru.raceassist.race.commands.setting -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 +import dev.nikomaru.raceassist.utils.* import dev.nikomaru.raceassist.utils.CommandUtils.getOwner -import dev.nikomaru.raceassist.utils.Lang -import dev.nikomaru.raceassist.utils.RaceStaffUtils import org.bukkit.Bukkit import org.bukkit.OfflinePlayer import org.bukkit.command.CommandSender diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/utils/InsideCircuit.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/utils/InsideCircuit.kt index 8720746..544ef52 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/utils/InsideCircuit.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/utils/InsideCircuit.kt @@ -23,9 +23,7 @@ import dev.nikomaru.raceassist.utils.Lang import kotlinx.coroutines.Dispatchers import org.bukkit.Bukkit import org.bukkit.entity.Player -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.insert +import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction import java.awt.Polygon diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/utils/OutsideCircuit.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/utils/OutsideCircuit.kt index 74b1779..18883a6 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/race/utils/OutsideCircuit.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/race/utils/OutsideCircuit.kt @@ -23,10 +23,7 @@ import dev.nikomaru.raceassist.utils.Lang import kotlinx.coroutines.Dispatchers import org.bukkit.Bukkit import org.bukkit.entity.Player -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.select +import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction import java.awt.Polygon diff --git a/src/main/kotlin/dev/nikomaru/raceassist/utils/CommandUtils.kt b/src/main/kotlin/dev/nikomaru/raceassist/utils/CommandUtils.kt index 8cfd0e5..869b451 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/utils/CommandUtils.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/utils/CommandUtils.kt @@ -17,24 +17,16 @@ package dev.nikomaru.raceassist.utils import dev.nikomaru.raceassist.RaceAssist.Companion.plugin -import dev.nikomaru.raceassist.database.BetSetting -import dev.nikomaru.raceassist.database.CircuitPoint -import dev.nikomaru.raceassist.database.PlayerList -import dev.nikomaru.raceassist.database.RaceList +import dev.nikomaru.raceassist.database.* import dev.nikomaru.raceassist.utils.RaceStaffUtils.existStaff import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import net.kyori.adventure.text.minimessage.MiniMessage -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer import net.kyori.adventure.title.Title.title import org.bukkit.Bukkit import org.bukkit.OfflinePlayer import org.bukkit.command.CommandSender import org.bukkit.command.ConsoleCommandSender import org.bukkit.entity.Player -import org.bukkit.scoreboard.DisplaySlot -import org.bukkit.scoreboard.Objective -import org.bukkit.scoreboard.ScoreboardManager import org.jetbrains.exposed.sql.and import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction @@ -159,52 +151,7 @@ object CommandUtils { } } - fun displayScoreboard(nowRankings: List, - currentLap: HashMap, - currentDegree: HashMap, - raceAudience: TreeSet, - innerCircumference: Int, - startDegree: Int, - goalDegree: Int, - lap: Int) { - raceAudience.forEach { - - if (Bukkit.getOfflinePlayer(it).isOnline) { - val player = Bukkit.getPlayer(it)!! - val manager: ScoreboardManager = Bukkit.getScoreboardManager() - val scoreboard = manager.newScoreboard - val objective: Objective = scoreboard.registerNewObjective(Lang.getText("scoreboard-ranking", player.locale()), - "dummy", - Lang.getComponent("scoreboard-now-ranking", player.locale())) - objective.displaySlot = DisplaySlot.SIDEBAR - - for (i in nowRankings.indices) { - - val playerName = Bukkit.getPlayer(nowRankings[i])?.name - val goalDistance = (((lap - 1).toDouble() + if (goalDegree > startDegree) { - ((goalDegree.toDouble() - startDegree.toDouble()) / 360.0) - } else { - ((goalDegree.toDouble() + 360.0 - startDegree.toDouble()) / 360.0) - }) * innerCircumference.toDouble()).toInt() - - val component = if (currentDegree[Bukkit.getPlayer(nowRankings[i])!!.uniqueId] == null) { - MiniMessage.miniMessage().deserialize("${i + 1}位 $playerName ") - .append(Lang.getComponent("finished-the-race", player.locale())) - } else { - val currentDistance = - ((currentDegree[Bukkit.getPlayer(nowRankings[i])!!.uniqueId]!!.toDouble() - startDegree.toDouble()) / 360.0 * innerCircumference.toDouble()).toInt() - MiniMessage.miniMessage() - .deserialize("${i + 1}位 $playerName ${currentDistance}m/${goalDistance}m ") - } - - val displayDegree = objective.getScore(LegacyComponentSerializer.legacySection().serialize(component)) - displayDegree.score = nowRankings.size - i - } - player.scoreboard = scoreboard - } - } - } fun decideRanking(totalDegree: HashMap): ArrayList { val ranking = ArrayList() diff --git a/src/main/kotlin/dev/nikomaru/raceassist/utils/RaceStaffUtils.kt b/src/main/kotlin/dev/nikomaru/raceassist/utils/RaceStaffUtils.kt index 2d5e1be..494362d 100644 --- a/src/main/kotlin/dev/nikomaru/raceassist/utils/RaceStaffUtils.kt +++ b/src/main/kotlin/dev/nikomaru/raceassist/utils/RaceStaffUtils.kt @@ -18,10 +18,7 @@ package dev.nikomaru.raceassist.utils import dev.nikomaru.raceassist.database.RaceStaff import kotlinx.coroutines.Dispatchers -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.select +import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction import java.util.* @@ -58,11 +55,4 @@ object RaceStaffUtils { UUID.fromString(it[RaceStaff.uuid]) } } - - suspend fun removeAllStaff(raceId: String) = newSuspendedTransaction(Dispatchers.IO) { - RaceStaff.deleteWhere { - RaceStaff.raceId eq raceId - } - } - } \ No newline at end of file diff --git a/src/main/resources/lang/ja_JP.properties b/src/main/resources/lang/ja_JP.properties index bc77499..cec22dc 100644 --- a/src/main/resources/lang/ja_JP.properties +++ b/src/main/resources/lang/ja_JP.properties @@ -48,7 +48,6 @@ not-find-staff=スタッフが見つかりませんでした not-found-this-race=そのレースは見つかりません now-betting-price={0}円単位 : {1}円かけています now-cannot-bet-race=このレースは現在ベットできません。 -now-lap-and-now-length=現在のラップ{0}/ {1} Lap 現在の距離{2}m now-lap=現在{0} / {1}ラップです now-not-belong=参加していません now-you-not-setting-mode=あなたは設定モードに現在なっていません