-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PlaceholderAPI, config fixes, code refactor
- Loading branch information
Showing
14 changed files
with
252 additions
and
279 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,42 @@ | ||
| package me.kruase.tablisttweaks | ||
|
|
||
| import me.kruase.tablisttweaks.TablistTweaks.Companion.userConfig | ||
| import me.kruase.tablisttweaks.util.initFeatures | ||
| import me.kruase.tablisttweaks.util.refreshIdleTracking | ||
| import me.kruase.tablisttweaks.util.startIdleTracking | ||
| import me.kruase.tablisttweaks.util.stopIdleTracking | ||
| import me.kruase.tablisttweaks.util.updateDimension | ||
| import me.neznamy.tab.api.event.player.PlayerLoadEvent | ||
| import org.bukkit.entity.Player | ||
| import org.bukkit.event.EventHandler | ||
| import org.bukkit.event.Listener | ||
| import org.bukkit.event.player.* | ||
|
|
||
|
|
||
| class TTEvents : Listener { | ||
| init { | ||
| registerTabApiEvents() | ||
| } | ||
|
|
||
| @EventHandler | ||
| fun onPlayerJoin(event: PlayerJoinEvent) { | ||
| if (TablistTweaks.tabApiInstance == null) | ||
| event.player.joinHandle() | ||
| event.player.initFeatures() | ||
| } | ||
|
|
||
| @EventHandler | ||
| fun onPlayerTeleport(event: PlayerTeleportEvent) { | ||
| if (TablistTweaks.userConfig.enabledFeatures.dimensionColors) | ||
| if (userConfig.enabledFeatures.dimensionColors) | ||
| event.player.updateDimension(destinationLocation = event.to!!) | ||
| } | ||
|
|
||
| @EventHandler | ||
| fun onPlayerRespawn(event: PlayerRespawnEvent) { | ||
| if (TablistTweaks.userConfig.enabledFeatures.dimensionColors) | ||
| if (userConfig.enabledFeatures.dimensionColors) | ||
| event.player.updateDimension(destinationLocation = event.respawnLocation) | ||
| } | ||
|
|
||
| @EventHandler | ||
| fun onPlayerLeave(event: PlayerQuitEvent) { | ||
| if (TablistTweaks.userConfig.enabledFeatures.idleTracking) | ||
| if (userConfig.enabledFeatures.idleTracking) | ||
| event.player.stopIdleTracking() | ||
| } | ||
|
|
||
| @EventHandler | ||
| fun onPlayerMove(event: PlayerMoveEvent) { | ||
| if (TablistTweaks.userConfig.enabledFeatures.idleTracking) | ||
| if (userConfig.enabledFeatures.idleTracking) | ||
| event.player.refreshIdleTracking() | ||
| } | ||
| } | ||
|
|
||
|
|
||
| fun Player.joinHandle() { | ||
| if (TablistTweaks.userConfig.enabledFeatures.dimensionColors) | ||
| updateDimension(isInitial = true) | ||
|
|
||
| if (TablistTweaks.userConfig.enabledFeatures.idleTracking) | ||
| startIdleTracking() | ||
| } | ||
|
|
||
|
|
||
| fun registerTabApiEvents() { | ||
| TablistTweaks.tabApiInstance | ||
| ?.run { | ||
| eventBus?.register(PlayerLoadEvent::class.java) { event -> | ||
| TablistTweaks.instance.server.getPlayer(event.player.uniqueId) | ||
| ?.joinHandle() | ||
| } | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/main/kotlin/me/kruase/tablisttweaks/TTPlaceholderExpansion.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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package me.kruase.tablisttweaks | ||
|
|
||
| import me.clip.placeholderapi.expansion.PlaceholderExpansion | ||
| import me.kruase.tablisttweaks.TablistTweaks.Companion.instance | ||
| import me.kruase.tablisttweaks.util.placeholders | ||
| import org.bukkit.entity.Player | ||
|
|
||
|
|
||
| class TTPlaceholderExpansion : PlaceholderExpansion() { | ||
| override fun getIdentifier() = "tablisttweaks" | ||
| override fun getAuthor() = instance.description.authors.joinToString() | ||
| override fun getVersion() = instance.description.version | ||
| override fun persist(): Boolean = true | ||
|
|
||
| override fun onPlaceholderRequest(player: Player?, name: String): String? { | ||
| if (player == null) | ||
| return null | ||
|
|
||
| return when (name) { | ||
| "dimension_color" -> player.placeholders?.dimensionColor ?: "" | ||
| "dimension_dot" -> player.placeholders?.dimensionDot ?: "" | ||
| "idle_badge" -> player.placeholders?.idleBadge ?: "" | ||
| "idle_flag" -> player.placeholders?.idleFlag ?: "" | ||
| else -> null | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.