-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
Merge pull request #75 from Shynixn/development
Merge changes to master --release
Showing
40 changed files
with
598 additions
and
875 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
.gradle | ||
.idea | ||
build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Bedrock | ||
|
||
MCTennis supports crossplay with Bedrock clients (SmartPhone,Windows,Console, etc.) using [GeyserMC](https://geysermc.org/). | ||
|
||
### Initial Setup | ||
|
||
* Install [GeyserMC](https://geysermc.org/) on your server or on your proxy server. | ||
* Install MCTennis on your Spigot/Paper based server | ||
* Join your server with a BedRock client and join the MCTennis game ``/mctennis join game1``. | ||
* Observe that the ball will be displayed as a simple player_head because bedrock does not support custom player heads. | ||
* Observe, that the ball will not be able to rotate. | ||
|
||
### Fixing skin and rotations via GeyserMC (PatreonOnly) | ||
|
||
Thanks to my **Patreon supporters**, who have funded this feature :heart: . | ||
They can download my [prepared zip file](https://www.patreon.com/Shynixn) to easily setup MCTennis for Bedrock. | ||
|
||
If you are using the free version of MCTennis, you can still configure MCTennis for Bedrock, but it is more work for you. If you want | ||
to save time, become a patreon member at [https://www.patreon.com/Shynixn](https://www.patreon.com/Shynixn). | ||
|
||
=== "Spigot/Paper" | ||
|
||
* Download the ``MCTennis-GeyserMC.zip`` file from [https://www.patreon.com/Shynixn](https://www.patreon.com/Shynixn). | ||
* Extract the ``MCTennis-GeyserMC.zip`` contents into your ``plugins\Geyser-Spigot``. | ||
* Extract the ``custom-skulls_mctennis.yml`` into ``plugins\Geyser-Spigot\custom-skulls_mctennis.yml`` | ||
* Extract the ``packs/MCTennisPack.mcpack`` into ``plugins\Geyser-Spigot\packs\MCTennisPack.mcpack`` | ||
* Copy the ``player-profiles`` values from ``plugins\Geyser-Spigot\custom-skulls_mctennis.yml`` into the ``plugins\Geyser-Spigot\custom-skulls.yml`` file. | ||
|
||
=== "Proxies (BungeeCord, Velocity, etc.)" | ||
|
||
* Download the ``MCTennis-GeyserMC.zip`` file from [https://www.patreon.com/Shynixn](https://www.patreon.com/Shynixn). | ||
* Extract the ``MCTennis-GeyserMC.zip`` contents into your ``plugins\Geyser-<Proxy>``. | ||
* Extract the ``custom-skulls_mctennis.yml`` into ``plugins\Geyser-<Proxy>\custom-skulls_mctennis.yml`` | ||
* Extract the ``packs/MCTennisPack.mcpack`` into ``plugins\Geyser-<Proxy>\packs\MCTennisPack.mcpack`` | ||
* Copy the ``player-profiles`` values from ``plugins\Geyser-<Proxy>\custom-skulls_mctennis.yml`` into the ``plugins\Geyser-<Proxy>\custom-skulls.yml`` file. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Signs | ||
|
||
This page explains how to create signs for joining and leave. | ||
|
||
### Create a join sign | ||
|
||
* Place a new sign in your world | ||
* Execute the following command: | ||
|
||
``` | ||
/mctennis sign game1 join | ||
``` | ||
|
||
* Rightclick on a sign | ||
* This sign simply executes the ``/mctennis join`` command on behalf of the player. You can create team join signs by searching for the created sign in your ``game1.yml`` and editing the command to e.g. ``/mctennis join red`` | ||
|
||
### Create a leave sign | ||
|
||
* Place a new sign in your world | ||
* Execute the following command: | ||
|
||
``` | ||
/mctennis sign game1 leave | ||
``` | ||
|
||
* Rightclick on a sign | ||
* This sign simply executes the ``/mctennis leave`` command on behalf of the player. | ||
|
||
### Removing a sign | ||
|
||
* Simply destroy the sign with your hand |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
kotlin.code.style=official | ||
org.gradle.jvmargs=-Xms4g |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1 @@ | ||
rootProject.name = "mctennis" | ||
|
||
pluginManagement { | ||
plugins { | ||
kotlin("jvm") version "1.6.21" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 58 additions & 62 deletions
120
src/main/kotlin/com/github/shynixn/mctennis/MCTennisLanguageImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,120 +1,116 @@ | ||
package com.github.shynixn.mctennis | ||
|
||
import com.github.shynixn.mctennis.contract.Language | ||
import com.github.shynixn.mcutils.common.language.LanguageItem | ||
import com.github.shynixn.mcutils.common.language.LanguageProviderImpl | ||
import com.github.shynixn.mctennis.contract.MCTennisLanguage | ||
|
||
class MCTennisLanguageImpl() : Language, LanguageProviderImpl() { | ||
override val names: List<String> | ||
get() = listOf("en_us") | ||
class MCTennisLanguageImpl : MCTennisLanguage { | ||
override val names: List<String> | ||
get() = listOf("en_us") | ||
override var gameStartingMessage = LanguageItem("[&9MCTennis&f] Game is starting in %1$1d seconds.") | ||
|
||
override var gameStartingMessage: LanguageItem = LanguageItem() | ||
override var gameStartCancelledMessage = LanguageItem("[&9MCTennis&f] Game start has been cancelled.") | ||
|
||
override var gameStartCancelledMessage: LanguageItem = LanguageItem() | ||
override var gameDoesNotExistMessage = LanguageItem("[&9MCTennis&f] Game %1$1s does not exist.") | ||
|
||
override var gameDoesNotExistMessage: LanguageItem = LanguageItem() | ||
override var noPermissionForGameMessage = LanguageItem("[&9MCTennis&f] You do not have permission to join game %1$1s.") | ||
|
||
override var noPermissionForGameMessage: LanguageItem = LanguageItem() | ||
override var noPermissionMessage = LanguageItem("[&9MCTennis&f] You do not have permission.") | ||
|
||
override var noPermissionMessage: LanguageItem = LanguageItem() | ||
override var locationTypeDoesNotExistMessage = LanguageItem("[&9MCTennis&f] This location type is not known. For more locations, open the arena.yml.") | ||
|
||
override var locationTypeDoesNotExistMessage: LanguageItem = LanguageItem() | ||
override var spawnPointSetMessage = LanguageItem("[&9MCTennis&f] Location was set on %1$1s.") | ||
|
||
override var spawnPointSetMessage: LanguageItem = LanguageItem() | ||
override var gameAlreadyExistsMessage = LanguageItem("[&9MCTennis&f] Game %1$1s already exists.") | ||
|
||
override var gameAlreadyExistsMessage: LanguageItem = LanguageItem() | ||
override var enabledArenaMessage = LanguageItem("[&9MCTennis&f] Game enable state was set to %1$1s.") | ||
|
||
override var enabledArenaMessage: LanguageItem = LanguageItem() | ||
override var gameIsFullMessage = LanguageItem("[&9MCTennis&f] Game is already full.") | ||
|
||
override var gameIsFullMessage: LanguageItem = LanguageItem() | ||
override var gameCreatedMessage = LanguageItem("[&9MCTennis&f] Created game %1$1s.") | ||
|
||
override var gameCreatedMessage: LanguageItem = LanguageItem() | ||
override var reloadedAllGamesMessage = LanguageItem("[&9MCTennis&f] Reloaded all games.") | ||
|
||
override var reloadedAllGamesMessage: LanguageItem = LanguageItem() | ||
override var reloadedGameMessage = LanguageItem("[&9MCTennis&f] Reloaded game %1$1s.") | ||
|
||
override var reloadedGameMessage: LanguageItem = LanguageItem() | ||
override var joinTeamRedMessage = LanguageItem("[&9MCTennis&f] Successfully joined team red.") | ||
|
||
override var joinTeamRedMessage: LanguageItem = LanguageItem() | ||
override var joinTeamBlueMessage = LanguageItem("[&9MCTennis&f] Successfully joined team blue.") | ||
|
||
override var joinTeamBlueMessage: LanguageItem = LanguageItem() | ||
override var leftGameMessage = LanguageItem("[&9MCTennis&f] Left the game.") | ||
|
||
override var leftGameMessage: LanguageItem = LanguageItem() | ||
override var deletedGameMessage = LanguageItem("[&9MCTennis&f] Deleted game %1$1s.") | ||
|
||
override var deletedGameMessage: LanguageItem = LanguageItem() | ||
override var notEnoughPlayersMessage = LanguageItem("[&9MCTennis&f] Not enough players! Game start was cancelled.") | ||
|
||
override var notEnoughPlayersMessage: LanguageItem = LanguageItem() | ||
override var teamDoesNotExistMessage = LanguageItem("[&9MCTennis&f] Team %1$1s does not exist.") | ||
|
||
override var teamDoesNotExistMessage: LanguageItem = LanguageItem() | ||
override var updatedInventoryMessage = LanguageItem("[&9MCTennis&f] Updated inventory of game.") | ||
|
||
override var updatedInventoryMessage: LanguageItem = LanguageItem() | ||
override var updatedArmorMessage = LanguageItem("[&9MCTennis&f] Updated armor of game.") | ||
|
||
override var updatedArmorMessage: LanguageItem = LanguageItem() | ||
override var secondsRemaining = LanguageItem("[&9MCTennis&f] %1$1s second(s) remaining.") | ||
|
||
override var secondsRemaining: LanguageItem = LanguageItem() | ||
override var gameCancelledMessage = LanguageItem("[&9MCTennis&f] Game has been cancelled.") | ||
|
||
override var gameCancelledMessage: LanguageItem = LanguageItem() | ||
override var scoreRed = LanguageItem("&c&l%mctennis_game_score%") | ||
|
||
override var scoreRed: LanguageItem = LanguageItem() | ||
override var scoreBlue = LanguageItem("&9&l%mctennis_game_score%") | ||
|
||
override var scoreBlue: LanguageItem = LanguageItem() | ||
override var winRed = LanguageItem("&c&lTeam Red") | ||
|
||
override var winRed: LanguageItem = LanguageItem() | ||
override var winSetRed = LanguageItem("&cTeam Red") | ||
|
||
override var winSetRed: LanguageItem = LanguageItem() | ||
override var winBlue = LanguageItem("&9Team Blue") | ||
|
||
override var winBlue: LanguageItem = LanguageItem() | ||
override var winSetBlue = LanguageItem("&9Team Blue") | ||
|
||
override var winSetBlue: LanguageItem = LanguageItem() | ||
override var winDraw = LanguageItem("&fDraw") | ||
|
||
override var winDraw: LanguageItem = LanguageItem() | ||
override var readyMessage = LanguageItem("&6&lReady?") | ||
|
||
override var readyMessage: LanguageItem = LanguageItem() | ||
override var bounceOutHologram = LanguageItem("&lOut") | ||
|
||
override var bounceOutHologram: LanguageItem = LanguageItem() | ||
override var bounceSecondHologram = LanguageItem("&l2nd Bounce") | ||
|
||
override var bounceSecondHologram: LanguageItem = LanguageItem() | ||
override var joinSignLine1 = LanguageItem("&f[&r&lMCTennis&r&f]") | ||
|
||
override var joinSignLine1: LanguageItem = LanguageItem() | ||
override var joinSignLine2 = LanguageItem("%mctennis_game_stateDisplayName%") | ||
|
||
override var joinSignLine2: LanguageItem = LanguageItem() | ||
override var joinSignLine3 = LanguageItem("%mctennis_game_players%/%mctennis_game_maxPlayers%") | ||
|
||
override var joinSignLine3: LanguageItem = LanguageItem() | ||
override var joinSignLine4 = LanguageItem("") | ||
|
||
override var joinSignLine4: LanguageItem = LanguageItem() | ||
override var leaveSignLine1 = LanguageItem("&f[&r&lMCTennis&r&f]") | ||
|
||
override var leaveSignLine1: LanguageItem = LanguageItem() | ||
override var leaveSignLine2 = LanguageItem("&f&lLeave") | ||
|
||
override var leaveSignLine2: LanguageItem = LanguageItem() | ||
override var leaveSignLine3 = LanguageItem("%mctennis_game_players%/%mctennis_game_maxPlayers%") | ||
|
||
override var leaveSignLine3: LanguageItem = LanguageItem() | ||
override var leaveSignLine4 = LanguageItem("") | ||
|
||
override var leaveSignLine4: LanguageItem = LanguageItem() | ||
override var gameStateJoinAble = LanguageItem("&aJoin") | ||
|
||
override var gameStateJoinAble: LanguageItem = LanguageItem() | ||
override var gameStateDisabled = LanguageItem("&4Disabled") | ||
|
||
override var gameStateDisabled: LanguageItem = LanguageItem() | ||
override var gameStateRunning = LanguageItem("&1Running") | ||
|
||
override var gameStateRunning: LanguageItem = LanguageItem() | ||
override var rightClickOnSignMessage = LanguageItem("RightClick on a sign to convert it into a game sign.") | ||
|
||
override var rightClickOnSignMessage: LanguageItem = LanguageItem() | ||
override var signTypeDoesNotExist = LanguageItem("This sign type does not exist.") | ||
|
||
override var signTypeDoesNotExist: LanguageItem = LanguageItem() | ||
override var addedSignMessage = LanguageItem("A sign was added to the game.") | ||
|
||
override var addedSignMessage: LanguageItem = LanguageItem() | ||
override var commandDescription = LanguageItem("All commands for the MCTennis plugin.") | ||
|
||
override var commandDescription: LanguageItem = LanguageItem() | ||
override var commandUsage = LanguageItem("[&9MCTennis&f] Use /mctennis help to see more info about the plugin.") | ||
|
||
override var commandUsage: LanguageItem = LanguageItem() | ||
override var maxLength20Characters = LanguageItem("The text length has to be less than 20 characters.") | ||
|
||
override var maxLength20Characters: LanguageItem = LanguageItem() | ||
override var commandSenderHasToBePlayer = LanguageItem("The command sender has to be a player!") | ||
|
||
override var commandSenderHasToBePlayer: LanguageItem = LanguageItem() | ||
override var freeVersionMessage = LanguageItem("This version of MCTennis does only allow 1 game per server. Go to https://patreon.com/Shynixn for the premium version.") | ||
|
||
override var freeVersionMessage: LanguageItem = LanguageItem() | ||
override var commandPlaceHolderMessage = LanguageItem("Evaluated placeholder: %1$1s") | ||
|
||
override var commandPlaceHolderMessage: LanguageItem = LanguageItem() | ||
|
||
override var queueTimeOutMessage: LanguageItem = LanguageItem().also { | ||
it.text = "[&9MCTennis&f]&c Not enough players joined in time to start the game." | ||
} | ||
override var queueTimeOutMessage = LanguageItem("[&9MCTennis&f]&c Not enough players joined in time to start the game.") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 0 additions & 16 deletions
16
src/main/kotlin/com/github/shynixn/mctennis/contract/BedrockService.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 0 additions & 10 deletions
10
src/main/kotlin/com/github/shynixn/mctennis/contract/PlaceHolderService.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
182 changes: 157 additions & 25 deletions
182
src/main/kotlin/com/github/shynixn/mctennis/enumeration/PlaceHolder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,164 @@ | ||
package com.github.shynixn.mctennis.enumeration | ||
|
||
enum class PlaceHolder(val fullPlaceHolder: String) { | ||
import com.github.shynixn.mctennis.MCTennisPlugin | ||
import com.github.shynixn.mctennis.contract.GameService | ||
import com.github.shynixn.mctennis.contract.MCTennisLanguage | ||
import com.github.shynixn.mctennis.contract.TennisGame | ||
import com.github.shynixn.mcutils.common.placeholder.PlaceHolderService | ||
import org.bukkit.entity.Player | ||
|
||
enum class PlaceHolder(val text: String, val f: (Player?, TennisGame?, Map<String, Any>?) -> String?) { | ||
// Game | ||
GAME_ENABLED("%mctennis_game_isEnabled%"), | ||
GAME_JOINABLE("%mctennis_game_isJoinAble%"), | ||
GAME_STARTED("%mctennis_game_isRunning%"), | ||
GAME_DISPLAYNAME("%mctennis_game_displayName%"), | ||
GAME_RAWSCORETEAMRED("%mctennis_game_rawScoreTeamRed%"), | ||
GAME_RAWSCORETEAMBLUE("%mctennis_game_rawScoreTeamBlue%"), | ||
GAME_SCORE("%mctennis_game_score%"), | ||
GAME_CURRENT_SET("%mctennis_game_currentSet%"), | ||
GAME_WON_SETS_TEAM_RED("%mctennis_game_wonSetsTeamRed%"), | ||
GAME_WON_SETS_TEAM_BLUE("%mctennis_game_wonSetsTeamBlue%"), | ||
GAME_STATE("%mctennis_game_state%"), | ||
GAME_STATE_DISPLAYNAME("%mctennis_game_stateDisplayName%"), | ||
GAME_PLAYER_AMOUNT("%mctennis_game_players%"), | ||
GAME_MAX_PLAYER_AMOUNT("%mctennis_game_maxPlayers%"), | ||
GAME_NAME("%mctennis_game_name_[game]%", { _, game, _ -> game?.arena?.name }), | ||
GAME_DISPLAYNAME("%mctennis_game_displayName_[game]%", { _, game, _ -> game?.arena?.displayName }), | ||
GAME_SUM_MAXPLAYERS("%mctennis_game_maxPlayers_[game]%", { _, game, _ -> | ||
if (game != null) { | ||
(game.arena.maxPlayersPerTeam * 2).toString() | ||
} else { | ||
null | ||
} | ||
}), | ||
GAME_ENABLED("%mctennis_game_isEnabled_[game]%", { _, game, _ -> game?.arena?.isEnabled?.toString() }), | ||
GAME_JOINABLE("%mctennis_game_isJoinAble_[game]%", { _, game, _ -> | ||
if (game != null) { | ||
((game.gameState == GameState.LOBBY_IDLE || game.gameState == GameState.LOBBY_COUNTDOWN) && !game.isFull()).toString() | ||
} else { | ||
null | ||
} | ||
}), | ||
GAME_STARTED("%mctennis_game_isRunning_[game]%", { _, game, _ -> | ||
if (game != null) { | ||
(game.gameState == GameState.RUNNING_SERVING || game.gameState == GameState.RUNNING_PLAYING).toString() | ||
} else { | ||
null | ||
} | ||
}), | ||
GAME_RAWSCORETEAMRED("%mctennis_game_rawScoreTeamRed_[game]%", { _, game, _ -> game?.teamRedScore?.toString() }), | ||
GAME_RAWSCORETEAMBLUE("%mctennis_game_rawScoreTeamBlue_[game]%", { _, game, _ -> game?.teamBlueScore?.toString() }), | ||
GAME_SCORE("%mctennis_game_score_[game]%", { _, game, _ -> game?.getScoreText() }), | ||
GAME_CURRENT_SET("%mctennis_game_currentSet_[game]%", { _, game, _ -> game?.currentSet?.toString() }), | ||
GAME_WON_SETS_TEAM_RED( | ||
"%mctennis_game_wonSetsTeamRed_[game]%", | ||
{ _, game, _ -> game?.teamRedSetScore?.toString() }), | ||
GAME_WON_SETS_TEAM_BLUE( | ||
"%mctennis_game_wonSetsTeamBlue_[game]%", | ||
{ _, game, _ -> game?.teamBlueSetScore?.toString() }), | ||
GAME_STATE("%mctennis_game_state%", { _, game, _ -> | ||
if (game != null) { | ||
if (!game.arena.isEnabled) { | ||
"DISABLED" | ||
} else if (game.gameState == GameState.RUNNING_PLAYING || game.gameState == GameState.RUNNING_SERVING || game.gameState == GameState.ENDING) { | ||
"RUNNING" | ||
} else { | ||
"JOINABLE" | ||
} | ||
} else { | ||
null | ||
} | ||
}), | ||
GAME_STATE_DISPLAYNAME("%mctennis_game_stateDisplayName_[game]%", { _, game, context -> | ||
val language = context?.get(MCTennisPlugin.languageKey) as MCTennisLanguage? | ||
if (language != null && game != null) { | ||
if (!game.arena.isEnabled) { | ||
language.gameStateDisabled.text | ||
} else if (game.gameState == GameState.RUNNING_PLAYING || game.gameState == GameState.RUNNING_SERVING || game.gameState == GameState.ENDING) { | ||
language.gameStateRunning.text | ||
} else { | ||
language.gameStateJoinAble.text | ||
} | ||
} else { | ||
null | ||
} | ||
}), | ||
GAME_PLAYER_AMOUNT("%mctennis_game_players_[game]%", { _, game, _ -> | ||
if (game != null) { | ||
(game.teamBluePlayers.size + game.teamRedPlayers.size).toString() | ||
} else { | ||
null | ||
} | ||
}), | ||
|
||
// Game (Ball) | ||
GAME_BALL_LOCATION_WORLD("%mctennis_ball_locationWorld%"), | ||
GAME_BALL_LOCATION_X("%mctennis_ball_locationX%"), | ||
GAME_BALL_LOCATION_Y("%mctennis_ball_locationY%"), | ||
GAME_BALL_LOCATION_Z("%mctennis_ball_locationZ%"), | ||
GAME_BALL_LOCATION_YAW("%mctennis_ball_locationYaw%"), | ||
GAME_BALL_LOCATION_PITCH("%mctennis_ball_locationPitch%"), | ||
GAME_BALL_LOCATION_WORLD("%mctennis_ball_locationWorld_[game]%", { _, game, _ -> | ||
if (game?.ball != null && !game.ball!!.isDead) { | ||
game.ball!!.getLocation().world!!.name | ||
} else { | ||
"" | ||
} | ||
}), | ||
GAME_BALL_LOCATION_X("%mctennis_ball_locationX_[game]%", { _, game, _ -> | ||
if (game?.ball != null && !game.ball!!.isDead) { | ||
game.ball!!.getLocation().x.toString() | ||
} else { | ||
"0" | ||
} | ||
}), | ||
GAME_BALL_LOCATION_Y("%mctennis_ball_locationY_[game]%", { _, game, _ -> | ||
if (game?.ball != null && !game.ball!!.isDead) { | ||
game.ball!!.getLocation().y.toString() | ||
} else { | ||
"0" | ||
} | ||
}), | ||
GAME_BALL_LOCATION_Z("%mctennis_ball_locationZ_[game]%", { _, game, _ -> | ||
if (game?.ball != null && !game.ball!!.isDead) { | ||
game.ball!!.getLocation().z.toString() | ||
} else { | ||
"0" | ||
} | ||
}), | ||
GAME_BALL_LOCATION_YAW("%mctennis_ball_locationYaw_[game]%", { _, game, _ -> | ||
if (game?.ball != null && !game.ball!!.isDead) { | ||
game.ball!!.getLocation().yaw.toString() | ||
} else { | ||
"0" | ||
} | ||
}), | ||
GAME_BALL_LOCATION_PITCH("%mctennis_ball_locationPitch_[game]%", { _, game, _ -> | ||
if (game?.ball != null && !game.ball!!.isDead) { | ||
game.ball!!.getLocation().pitch.toString() | ||
} else { | ||
"0" | ||
} | ||
}), | ||
|
||
// Player | ||
PLAYER_ISINGAME("%mctennis_player_isInGame%"), | ||
PLAYER_NAME("%mctennis_player_name%"), | ||
PLAYER_ISINGAME("%mctennis_player_isInGame%", { _, game, _ -> (game != null).toString() }), | ||
PLAYER_NAME("%mctennis_player_name%", { player, _, _ -> player?.name }), | ||
|
||
// Player and Game | ||
GAME_ISTEAMREDPLAYER("%mctennis_game_isTeamRedPlayer%"), | ||
GAME_ISTEAMBLUEPLAYER("%mctennis_game_isTeamBluePlayer%"), | ||
GAME_ISTEAMREDPLAYER( | ||
"%mctennis_game_isTeamRedPlayer_[game]%", | ||
{ player, game, _ -> game?.teamRedPlayers?.contains(player)?.toString() }), | ||
GAME_ISTEAMBLUEPLAYER( | ||
"%mctennis_game_isTeamBluePlayer_[game]%", | ||
{ player, game, _ -> game?.teamBluePlayers?.contains(player)?.toString() }); | ||
|
||
companion object { | ||
/** | ||
* Registers all placeHolder. Overrides previously registered placeholders. | ||
*/ | ||
fun registerAll( | ||
placeHolderService: PlaceHolderService, | ||
gameService: GameService, | ||
language: MCTennisLanguage | ||
) { | ||
for (placeHolder in PlaceHolder.values()) { | ||
placeHolderService.register(placeHolder.text) { player, context -> | ||
val newContext = context.toMutableMap() | ||
newContext[MCTennisPlugin.languageKey] = language | ||
val gameNameReference = newContext[MCTennisPlugin.gameKey] as String? | ||
val game = if (gameNameReference != null) { | ||
gameService.getByName(gameNameReference) | ||
} else if (player != null) { | ||
gameService.getByPlayer(player) | ||
} else { | ||
null | ||
} | ||
|
||
placeHolder.f.invoke(player, game, newContext) | ||
} | ||
} | ||
} | ||
} | ||
} |
20 changes: 0 additions & 20 deletions
20
src/main/kotlin/com/github/shynixn/mctennis/enumeration/PluginDependency.kt
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
src/main/kotlin/com/github/shynixn/mctennis/enumeration/VisibilityType.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 0 additions & 95 deletions
95
src/main/kotlin/com/github/shynixn/mctennis/impl/service/BedrockServiceImpl.kt
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
...main/kotlin/com/github/shynixn/mctennis/impl/service/DependencyGeyserSpigotServiceImpl.kt
This file was deleted.
Oops, something went wrong.
99 changes: 0 additions & 99 deletions
99
...in/kotlin/com/github/shynixn/mctennis/impl/service/DependencyPlaceholderApiServiceImpl.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
181 changes: 0 additions & 181 deletions
181
src/main/kotlin/com/github/shynixn/mctennis/impl/service/PlaceHolderServiceImpl.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters