diff --git a/build.gradle.kts b/build.gradle.kts index 00c2fa170..24223b4c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } group = "com.github.shynixn" -version = "7.7.0" +version = "7.8.0" repositories { mavenLocal() @@ -41,8 +41,8 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") // Custom dependencies - implementation("com.github.shynixn.mcutils:common:2024.38") - implementation("com.github.shynixn.mcutils:packet:2024.49") + implementation("com.github.shynixn.mcutils:common:2024.39") + implementation("com.github.shynixn.mcutils:packet:2024.51") implementation("com.github.shynixn.mcutils:database:2024.8") implementation("com.github.shynixn.mcutils:sign:2024.3") implementation("com.github.shynixn.mcutils:guice:2024.2") @@ -72,6 +72,11 @@ tasks.withType { kotlinOptions.jvmTarget = "1.8" } +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + /** * Include all but exclude debugging classes. */ @@ -124,6 +129,8 @@ tasks.register("pluginJarLatest", ShadowJar::class.java) { exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_20_R2/**") exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_20_R3/**") exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_20_R4/**") + exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_21_R1/**") + exclude("com/github/shynixn/blockball/lib/com/github/shynixn/mcutils/packet/nms/v1_21_R2/**") exclude("com/github/shynixn/mcutils/**") exclude("com/github/shynixn/mccoroutine/**") exclude("org/**") diff --git a/docs/resources/arena-files/arena/arena_1.yml b/docs/resources/arena-files/arena/arena_1.yml index e39db7e26..2acb81af0 100644 --- a/docs/resources/arena-files/arena/arena_1.yml +++ b/docs/resources/arena-files/arena/arena_1.yml @@ -439,7 +439,6 @@ meta: yaw: 0.0 pitch: 0.0 world: "world" - walkingSpeed: 0.2 joinMessage: "%blockball_lang_joinSuccessMessage%" leaveMessage: "%blockball_lang_leaveMessage%" signLines: @@ -530,7 +529,6 @@ meta: yaw: 0.0 pitch: 0.0 world: "world" - walkingSpeed: 0.2 joinMessage: "%blockball_lang_joinSuccessMessage%" leaveMessage: "%blockball_lang_leaveMessage%" signLines: diff --git a/docs/resources/arena-files/arena/arena_2.yml b/docs/resources/arena-files/arena/arena_2.yml index 128a9273f..5459eb9fe 100644 --- a/docs/resources/arena-files/arena/arena_2.yml +++ b/docs/resources/arena-files/arena/arena_2.yml @@ -516,7 +516,6 @@ meta: yaw: 0.0 pitch: 0.0 world: "world" - walkingSpeed: 0.2 joinMessage: "%blockball_lang_joinSuccessMessage%" leaveMessage: "%blockball_lang_leaveMessage%" signLines: @@ -613,7 +612,6 @@ meta: yaw: 0.0 pitch: 0.0 world: "world" - walkingSpeed: 0.2 joinMessage: "%blockball_lang_joinSuccessMessage%" leaveMessage: "%blockball_lang_leaveMessage%" signLines: diff --git a/src/main/java/com/github/shynixn/blockball/BlockBallDependencyInjectionModule.kt b/src/main/java/com/github/shynixn/blockball/BlockBallDependencyInjectionModule.kt index 2aa6ba8ca..a3895d9a4 100644 --- a/src/main/java/com/github/shynixn/blockball/BlockBallDependencyInjectionModule.kt +++ b/src/main/java/com/github/shynixn/blockball/BlockBallDependencyInjectionModule.kt @@ -33,7 +33,7 @@ import com.github.shynixn.mcutils.packet.impl.service.ChatMessageServiceImpl import com.github.shynixn.mcutils.packet.impl.service.ItemServiceImpl import com.github.shynixn.mcutils.packet.impl.service.PacketServiceImpl import com.github.shynixn.mcutils.packet.impl.service.RayTracingServiceImpl -import com.github.shynixn.mcutils.packet.nms.v1_21_R2.AreaSelectionServiceImpl +import com.github.shynixn.mcutils.packet.nms.v1_21_R3.AreaSelectionServiceImpl import com.github.shynixn.mcutils.sign.SignService import com.github.shynixn.mcutils.sign.SignServiceImpl import kotlinx.coroutines.CoroutineDispatcher diff --git a/src/main/java/com/github/shynixn/blockball/BlockBallLanguageImpl.kt b/src/main/java/com/github/shynixn/blockball/BlockBallLanguageImpl.kt index fcee20ae4..27e0e5bdf 100644 --- a/src/main/java/com/github/shynixn/blockball/BlockBallLanguageImpl.kt +++ b/src/main/java/com/github/shynixn/blockball/BlockBallLanguageImpl.kt @@ -5,213 +5,189 @@ import com.github.shynixn.mcutils.common.language.LanguageProviderImpl import com.github.shynixn.blockball.contract.Language class BlockBallLanguageImpl : Language, LanguageProviderImpl() { - override val names: List - get() = listOf("en_us", "es_es") - override var gameAlreadyExistsMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Game %1$1s already exists.") + override val names: List + get() = listOf("en_us", "es_es") + override var gameAlreadyExistsMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Game %1$1s already exists.") - override var commandUsage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Use /blockball help to see more info about the plugin.") + override var commandUsage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Use /blockball help to see more info about the plugin.") - override var commandDescription = LanguageItem("All commands for the BlockBall plugin.") + override var commandDescription = LanguageItem("All commands for the BlockBall plugin.") - override var maxLength20Characters = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c The text length has to be less than 20 characters.") + override var maxLength20Characters = LanguageItem("&0&l[&f&lBlockBall&0&l]&c The text length has to be less than 20 characters.") - override var gameDoesNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Game %1$1s does not exist.") + override var gameDoesNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Game %1$1s does not exist.") - override var teamDoesNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Team %1$1s does not exist.") + override var teamDoesNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Team %1$1s does not exist.") - override var gameTypeNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c GameType %1$1s does not exist.") + override var gameTypeNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c GameType %1$1s does not exist.") - override var selectionTypeDoesNotExistMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c This selection type is not known.") + override var selectionTypeDoesNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c This selection type is not known.") - override var signTypeDoesNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c This sign type is not known.") + override var signTypeDoesNotExistMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c This sign type is not known.") - override var noPermissionForGameMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c You do not have permission to join game %1$1s.") + override var noPermissionForGameMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c You do not have permission to join game %1$1s.") - override var noPermissionMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c You do not have permission.") + override var noPermissionMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c You do not have permission.") - override var commandSenderHasToBePlayer = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c The command sender has to be a player!") + override var commandSenderHasToBePlayer = LanguageItem("&0&l[&f&lBlockBall&0&l]&c The command sender has to be a player!") - override var gameCreatedMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Created game %1$1s.") + override var gameCreatedMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Created game %1$1s.") - override var deletedGameMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Deleted game %1$1s.") + override var deletedGameMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Deleted game %1$1s.") - override var gameIsFullMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Game is already full.") + override var gameIsFullMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c Game is already full.") - override var joinTeamRedMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Successfully joined team red.") + override var joinTeamRedMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Successfully joined team red.") - override var joinTeamBlueMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Successfully joined team blue.") + override var joinTeamBlueMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Successfully joined team blue.") - override var leftGameMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Left the game.") + override var leftGameMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Left the game.") - override var selectionSetMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Selection %1$1s was set.") + override var selectionSetMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Selection %1$1s was set.") - override var enabledArenaMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Game enable state was set to %1$1s.") + override var enabledArenaMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Game enable state was set to %1$1s.") - override var reloadedAllGamesMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Reloaded all games.") + override var reloadedAllGamesMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Reloaded all games.") - override var reloadedGameMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Reloaded game %1$1s.") + override var reloadedGameMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Reloaded game %1$1s.") - override var updatedInventoryMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Updated inventory of game.") + override var updatedInventoryMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Updated inventory of game.") - override var updatedArmorMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Updated armor of game.") + override var updatedArmorMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Updated armor of game.") - override var gameRuleChangedMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Updated a gamerule.") + override var gameRuleChangedMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Updated a gamerule.") - override var rightClickOnSignMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&7 RightClick on a sign to convert it into a game sign.") + override var rightClickOnSignMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 RightClick on a sign to convert it into a game sign.") - override var addedSignMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 A sign was added to the game.") + override var addedSignMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 A sign was added to the game.") - override var noLeftClickSelectionMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c You need to select a location using the BlockBall axe with left click.") + override var noLeftClickSelectionMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c You need to select a location using the BlockBall axe with left click.") - override var noRightClickSelectionMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c You need to select a location using the BlockBall axe with right click.") + override var noRightClickSelectionMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&c You need to select a location using the BlockBall axe with right click.") - override var toggleHighlightMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Toggled highlighting the important areas.") + override var toggleHighlightMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Toggled highlighting the important areas.") - override var axeReceivedMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&7 The BlockBall axe has been added to your inventory.") + override var axeReceivedMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 The BlockBall axe has been added to your inventory.") - override var bossBarMessage = - LanguageItem("&cTeam Red %blockball_game_redScore% : &9%blockball_game_blueScore% Team Blue") + override var bossBarMessage = LanguageItem("&cTeam Red %blockball_game_redScore% : &9%blockball_game_blueScore% Team Blue") - override var hologramMessage = - LanguageItem("&cTeam Red %blockball_game_redScore% : &9Team Blue %blockball_game_blueScore%") + override var hologramMessage = LanguageItem("&cTeam Red %blockball_game_redScore% : &9Team Blue %blockball_game_blueScore%") - override var scoreRed = LanguageItem("&c%blockball_game_redScore% : &9%blockball_game_blueScore%") + override var scoreRed = LanguageItem("&c%blockball_game_redScore% : &9%blockball_game_blueScore%") - override var scoreBlue = LanguageItem("&9%blockball_game_blueScore% : &c%blockball_game_redScore%") + override var scoreBlue = LanguageItem("&9%blockball_game_blueScore% : &c%blockball_game_redScore%") - override var winRed = LanguageItem("&cTeam Red") + override var winRed = LanguageItem("&cTeam Red") - override var winBlue = LanguageItem("&9Team Blue") + override var winBlue = LanguageItem("&9Team Blue") - override var winDraw = LanguageItem("&fDraw") + override var winDraw = LanguageItem("&fDraw") - override var gameStatusJoinAble = LanguageItem("&aJoin") + override var gameStatusJoinAble = LanguageItem("&aJoin") - override var gameStatusDisabled = LanguageItem("&4Disabled") + override var gameStatusDisabled = LanguageItem("&4Disabled") - override var gameStatusRunning = LanguageItem("&1Running") + override var gameStatusRunning = LanguageItem("&1Running") - override var hubGameJoinHeader = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Click on the team to join the match.") + override var hubGameJoinHeader = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Click on the team to join the match.") - override var hubGameJoinRed = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 &c[Team Red]") + override var hubGameJoinRed = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 &c[Team Red]") - override var hubGameJoinBlue = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 &9[Team Blue]") + override var hubGameJoinBlue = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 &9[Team Blue]") - override var commandCreateToolTip = LanguageItem("Creates a new arena for a BlockBall game.") + override var commandCreateToolTip = LanguageItem("Creates a new arena for a BlockBall game.") - override var commandDeleteToolTip = LanguageItem("Deletes a BlockBall game.") + override var commandDeleteToolTip = LanguageItem("Deletes a BlockBall game.") - override var commandListToolTip = LanguageItem("Lists all games you have created.") + override var commandListToolTip = LanguageItem("Lists all games you have created.") - override var commandToggleToolTip = - LanguageItem("Enables or disables your game. If a game is disabled, nobody can join.") + override var commandToggleToolTip = LanguageItem("Enables or disables your game. If a game is disabled, nobody can join.") - override var commandJoinToolTip = - LanguageItem("Lets the player executing the command join the game. The optional team argument allows to directly join a specific team. If the team is full, the other team will be chosen. If no team is specified, a random team will be selected.") + override var commandJoinToolTip = LanguageItem("Lets the player executing the command join the game. The optional team argument allows to directly join a specific team. If the team is full, the other team will be chosen. If no team is specified, a random team will be selected.") - override var commandLeaveToolTip = LanguageItem("Lets the player executing the command leave the game.") + override var commandLeaveToolTip = LanguageItem("Lets the player executing the command leave the game.") - override var commandSelectionToolTip = LanguageItem("Updates a location selection of a part of the arena.") + override var commandSelectionToolTip = LanguageItem("Updates a location selection of a part of the arena.") - override var commandInventoryToolTip = - LanguageItem("Copies the inventory of the player executing the command. This copy will be applied to players when they join a game.") + override var commandInventoryToolTip = LanguageItem("Copies the inventory of the player executing the command. This copy will be applied to players when they join a game.") - override var commandArmorToolTip = - LanguageItem("Copies the armor inventory of the player executing the command. This copy will be applied to players when they join a game.") + override var commandArmorToolTip = LanguageItem("Copies the armor inventory of the player executing the command. This copy will be applied to players when they join a game.") - override var commandSignToolTip = - LanguageItem("Enables the player to add a specific sign by right-clicking any sign. You can remove signs by simply breaking the block.") + override var commandSignToolTip = LanguageItem("Enables the player to add a specific sign by right-clicking any sign. You can remove signs by simply breaking the block.") - override var commandReloadToolTip = LanguageItem("Allows to reload all games or a specific single one.") + override var commandReloadToolTip = LanguageItem("Allows to reload all games or a specific single one.") - override var commandAxeToolTip = LanguageItem("Gives you the BlockBall selection axe.") + override var commandAxeToolTip = LanguageItem("Gives you the BlockBall selection axe.") - override var commandHighlightToolTip = LanguageItem("Toggles highlighting the important areas of your arena.") + override var commandHighlightToolTip = LanguageItem("Toggles highlighting the important areas of your arena.") - override var commandSelectToolTip = LanguageItem("Sets a selected location for your arena.") + override var commandSelectToolTip = LanguageItem("Sets a selected location for your arena.") - override var commandGameRuleToolTip = LanguageItem("Sets a gamerule in BlockBall.") + override var commandGameRuleToolTip = LanguageItem("Sets a gamerule in BlockBall.") - override var joinSignLine1 = LanguageItem("&0&l[&f&lBlockBall&0&l]&7") + override var joinSignLine1 = LanguageItem("&0&l[&f&lBlockBall&0&l]&7") - override var joinSignLine2 = LanguageItem("%blockball_game_stateDisplayName%") + override var joinSignLine2 = LanguageItem("%blockball_game_stateDisplayName%") - override var joinSignLine3 = LanguageItem("%blockball_game_players%/%blockball_game_maxPlayers%") + override var joinSignLine3 = LanguageItem("%blockball_game_players%/%blockball_game_maxPlayers%") - override var joinSignLine4 = LanguageItem("") + override var joinSignLine4 = LanguageItem("") - override var leaveSignLine1 = LanguageItem("&0&l[&f&lBlockBall&0&l]&7") + override var leaveSignLine1 = LanguageItem("&0&l[&f&lBlockBall&0&l]&7") - override var leaveSignLine2 = LanguageItem("&fLeave") + override var leaveSignLine2 = LanguageItem("&fLeave") - override var leaveSignLine3 = LanguageItem("%blockball_game_players%/%blockball_game_maxPlayers%") + override var leaveSignLine3 = LanguageItem("%blockball_game_players%/%blockball_game_maxPlayers%") - override var leaveSignLine4 = LanguageItem("") + override var leaveSignLine4 = LanguageItem("") - override var failedToReloadMessage = - LanguageItem("&0&l[&f&lBlockBall&0&l]&7 &cFailed to reload arena %1$1s. Recommended action: &e%2$1s") + override var failedToReloadMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 &cFailed to reload arena %1$1s. Recommended action: &e%2$1s") - override var teamRedDisplayName = LanguageItem("Team Red") + override var teamRedDisplayName = LanguageItem("Team Red") - override var teamBlueDisplayName = LanguageItem("Team Blue") + override var teamBlueDisplayName = LanguageItem("Team Blue") - override var gameIsNotARefereeGame = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c This game is not a game where you can use a referee. Convert the game to a referee game first.") + override var gameIsNotARefereeGame = LanguageItem("&0&l[&f&lBlockBall&0&l]&c This game is not a game where you can use a referee. Convert the game to a referee game first.") - override var gameTypeRefereeOnlyForPatreons = - LanguageItem("&0&l[&f&lBlockBall&0&l]&c The game type where you can have a referee requires the premium version of BlockBall. Obtainable via https://www.patreon.com/Shynixn.") + override var gameTypeRefereeOnlyForPatreons = LanguageItem("&0&l[&f&lBlockBall&0&l]&c The game type where you can have a referee requires the premium version of BlockBall. Obtainable via https://www.patreon.com/Shynixn.") - override var joinTeamRefereeMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Successfully joined team referee.") + override var joinTeamRefereeMessage = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Successfully joined team referee.") - override var waitingForRefereeToStart = LanguageItem("Waiting for the referee to start the game...") + override var waitingForRefereeToStart = LanguageItem("Waiting for the referee to start the game...") - override var waitingForRefereeToStartHint = - LanguageItem("Execute &a/blockball referee startgame &fto start the lobby timer.") + override var waitingForRefereeToStartHint = LanguageItem("Execute &a/blockball referee startgame &fto start the lobby timer.") - override var nextPeriodReferee = LanguageItem("This period has ended. You are now in overtime.") + override var nextPeriodReferee = LanguageItem("This period has ended. You are now in overtime.") - override var nextPeriodRefereeHint = LanguageItem("This period has ended. Execute &a/blockball referee nextperiod.") + override var nextPeriodRefereeHint = LanguageItem("This period has ended. Execute &a/blockball referee nextperiod.") - override var whistleTimeOutReferee = LanguageItem("Waiting for the referee to resume the game...") + override var whistleTimeOutReferee = LanguageItem("Waiting for the referee to resume the game...") - override var whistleTimeOutRefereeHint = - LanguageItem("You can resume the match by executing &a/blockball referee whistleresume.") + override var whistleTimeOutRefereeHint = LanguageItem("You can resume the match by executing &a/blockball referee whistleresume.") - override var refereeStartedGame = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 You have started the game.") + override var refereeStartedGame = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 You have started the game.") - override var refereeStoppedGame = - LanguageItem("&0&l[&f&lBlockBall&0&l]&7 You have stopped the game and transitioned to the last configured period.") + override var refereeStoppedGame = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 You have stopped the game and transitioned to the last configured period.") - override var refereeBallEnabled = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Players can kick the ball now.") + override var refereeBallEnabled = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Players can kick the ball now.") - override var refereeBallDisabled = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Players can no longer kick the ball.") + override var refereeBallDisabled = LanguageItem("&0&l[&f&lBlockBall&0&l]&7 Players can no longer kick the ball.") - override var commandRefereeStartGameToolTip = LanguageItem("Starts the game.") + override var commandRefereeStartGameToolTip = LanguageItem("Starts the game.") - override var commandRefereeStopGameToolTip = - LanguageItem("Transitions the game to the final period. Executing this command again stops it.") + override var commandRefereeStopGameToolTip = LanguageItem("Transitions the game to the final period. Executing this command again stops it.") - override var commandRefereeWhistleResumeToolTip = LanguageItem("Resumes the game and sets the ball interactable.") + override var commandRefereeWhistleResumeToolTip = LanguageItem("Resumes the game and sets the ball interactable.") - override var commandRefereeWhistleStopToolTip = LanguageItem("Stops the game and sets the ball inactive.") + override var commandRefereeWhistleStopToolTip = LanguageItem("Stops the game and sets the ball inactive.") - override var commandRefereeFreezeTimeToolTip = LanguageItem("Freezes the countdown and sets the ball inactive.") + override var commandRefereeFreezeTimeToolTip = LanguageItem("Freezes the countdown and sets the ball inactive.") - override var commandRefereeSetBallToolTip = LanguageItem("Teleports the ball to the position of the referee.") + override var commandRefereeSetBallToolTip = LanguageItem("Teleports the ball to the position of the referee.") - override var commandRefereeNextPeriodToolTip = LanguageItem("Transitions to the next configured period.") + override var commandRefereeNextPeriodToolTip = LanguageItem("Transitions to the next configured period.") - override var commandPlaceHolderToolTip = LanguageItem("Resolves a given placeholder.") + override var commandPlaceHolderToolTip = LanguageItem("Resolves a given placeholder.") - override var commandPlaceHolderMessage = LanguageItem("Evaluated placeholder: %1$1s") + override var commandPlaceHolderMessage = LanguageItem("Evaluated placeholder: %1$1s") } diff --git a/src/main/java/com/github/shynixn/blockball/BlockBallPlugin.kt b/src/main/java/com/github/shynixn/blockball/BlockBallPlugin.kt index 2ce87863c..e81a75a3e 100644 --- a/src/main/java/com/github/shynixn/blockball/BlockBallPlugin.kt +++ b/src/main/java/com/github/shynixn/blockball/BlockBallPlugin.kt @@ -71,10 +71,11 @@ class BlockBallPlugin : JavaPlugin() { Version.VERSION_1_20_R4, Version.VERSION_1_21_R1, Version.VERSION_1_21_R2, + Version.VERSION_1_21_R3, ) } else { arrayOf( - Version.VERSION_1_21_R2, + Version.VERSION_1_21_R3, ) } diff --git a/src/main/java/com/github/shynixn/blockball/entity/GameStorage.kt b/src/main/java/com/github/shynixn/blockball/entity/GameStorage.kt index 0361fa509..c26594f31 100644 --- a/src/main/java/com/github/shynixn/blockball/entity/GameStorage.kt +++ b/src/main/java/com/github/shynixn/blockball/entity/GameStorage.kt @@ -43,11 +43,6 @@ class GameStorage { */ var gameMode: GameMode = GameMode.SURVIVAL - /** - * Walking Speed of the player. - */ - var walkingSpeed: Double = 1.0 - /** * Counter of enemy goals. */ diff --git a/src/main/java/com/github/shynixn/blockball/entity/TeamMeta.kt b/src/main/java/com/github/shynixn/blockball/entity/TeamMeta.kt index 7c875cec3..9a24aaa9e 100644 --- a/src/main/java/com/github/shynixn/blockball/entity/TeamMeta.kt +++ b/src/main/java/com/github/shynixn/blockball/entity/TeamMeta.kt @@ -26,9 +26,6 @@ class TeamMeta { /** Goal properties of the team. */ val goal: Selection = Selection() - /** WalkingSpeed of the players in this team. */ - var walkingSpeed: Double = 0.2 - var armor: Array = arrayOfNulls(4) var inventory: Array = arrayOfNulls(36) diff --git a/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt b/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt index cb67f43aa..2768a32fe 100644 --- a/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt +++ b/src/main/java/com/github/shynixn/blockball/impl/SoccerGameImpl.kt @@ -849,7 +849,6 @@ abstract class SoccerGameImpl( stats.gameMode = player.gameMode stats.armorContents = player.inventory.armorContents.clone() stats.inventoryContents = player.inventory.contents.clone() - stats.walkingSpeed = player.walkSpeed.toDouble() stats.level = player.level stats.exp = player.exp.toDouble() stats.maxHealth = player.maxHealth @@ -861,7 +860,6 @@ abstract class SoccerGameImpl( player.allowFlight = false player.isFlying = false player.gameMode = arena.meta.lobbyMeta.gamemode - player.walkSpeed = teamMeta.walkingSpeed.toFloat() player.foodLevel = 20 player.level = 0 player.exp = 0.0F @@ -912,7 +910,6 @@ abstract class SoccerGameImpl( player.gameMode = stats.gameMode player.allowFlight = stats.gameMode == GameMode.CREATIVE player.isFlying = false - player.walkSpeed = stats.walkingSpeed.toFloat() player.level = stats.level player.scoreboard = Bukkit.getScoreboardManager()!!.newScoreboard player.exp = stats.exp.toFloat() diff --git a/src/main/resources/arena_sample.yml b/src/main/resources/arena_sample.yml index 9f954d21b..e14785985 100644 --- a/src/main/resources/arena_sample.yml +++ b/src/main/resources/arena_sample.yml @@ -320,8 +320,6 @@ meta: yaw: 0.0 pitch: 0.0 world: "world" - # Player walking speed. - walkingSpeed: 0.2 # The armor a player receives when joining a game. Should only be set inGame. armor: - null @@ -389,7 +387,6 @@ meta: yaw: 0.0 pitch: 0.0 world: "world" - walkingSpeed: 0.2 armor: - null - null diff --git a/src/main/resources/plugin-legacy.yml b/src/main/resources/plugin-legacy.yml index 7e487440b..1bfd25042 100644 --- a/src/main/resources/plugin-legacy.yml +++ b/src/main/resources/plugin-legacy.yml @@ -1,5 +1,5 @@ name: BlockBall -version: 7.7.0 +version: 7.8.0 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.blockball.BlockBallPlugin diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 85b0ab46d..d4754934e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: BlockBall -version: 7.7.0 +version: 7.8.0 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.blockball.BlockBallPlugin