From ddd24a73f609175dd551ebf59c5a0863b49079f6 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 27 Jun 2023 01:29:20 +0200 Subject: [PATCH] Fix player config stuff and test event stuff - The chat tests work! --- .../src/main/java/buttondevteam/core/PlayerListener.kt | 8 ++++---- .../java/buttondevteam/lib/architecture/Component.kt | 3 +-- .../java/buttondevteam/lib/player/ChromaGamerBase.kt | 5 ++--- .../java/buttondevteam/lib/player/TBMCPlayerBase.kt | 10 ++++------ .../lib/player/TBMCPlayerGetInfoEvent.java | 3 ++- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.kt b/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.kt index a205029..3977847 100755 --- a/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.kt +++ b/Chroma-Core/src/main/java/buttondevteam/core/PlayerListener.kt @@ -29,13 +29,13 @@ class PlayerListener(val plugin: MainPlugin) : Listener { fun onPlayerJoin(event: PlayerJoinEvent) { val p = event.player val player = TBMCPlayerBase.getPlayer(p.uniqueId, TBMCPlayer::class.java) - val pname = player.playerName.get() + val pname = player.playerName if (pname.isEmpty()) { - player.playerName.set(p.name) - plugin.logger.info("Player name saved: " + player.playerName.get()) + player.playerName = p.name + plugin.logger.info("Player name saved: " + player.playerName) } else if (p.name != pname) { plugin.logger.info(pname + " renamed to " + p.name) - player.playerName.set(p.name) + player.playerName = p.name } } diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.kt b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.kt index 13cfb58..3e372c3 100644 --- a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.kt +++ b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.kt @@ -19,8 +19,7 @@ import java.util.stream.Collectors abstract class Component { var isEnabled = false - var config: IHaveConfig = IHaveConfig({ logWarn("Attempted to save config with null section!") }, null) - private set + val config: IHaveConfig = IHaveConfig({ logWarn("Attempted to save config with null section!") }, null) lateinit var plugin: TP private set diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/player/ChromaGamerBase.kt b/Chroma-Core/src/main/java/buttondevteam/lib/player/ChromaGamerBase.kt index e04397c..5629e74 100755 --- a/Chroma-Core/src/main/java/buttondevteam/lib/player/ChromaGamerBase.kt +++ b/Chroma-Core/src/main/java/buttondevteam/lib/player/ChromaGamerBase.kt @@ -17,12 +17,11 @@ import java.util.function.Supplier @ChromaGamerEnforcer abstract class ChromaGamerBase : Command2Sender { - lateinit var config: IHaveConfig - protected set + val config: IHaveConfig = IHaveConfig({ save() }, null) protected lateinit var commonUserData: CommonUserData protected open fun initConfig() { - config = IHaveConfig({ save() }, commonUserData.playerData) + config.reload(commonUserData.playerData) } /** diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.kt b/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.kt index ee4c82f..ebb5fb7 100755 --- a/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.kt +++ b/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.kt @@ -2,7 +2,6 @@ package buttondevteam.lib.player import buttondevteam.core.MainPlugin import buttondevteam.core.component.channel.Channel -import buttondevteam.lib.architecture.IHaveConfig import org.bukkit.Bukkit import org.bukkit.entity.Player import java.util.* @@ -17,10 +16,9 @@ abstract class TBMCPlayerBase : ChromaGamerBase() { /** * If the player is the console */ - val isConsole = uniqueId == UUID(0, 0) + val isConsole by lazy { uniqueId == UUID(0, 0) } - @JvmField - val playerName = super.config.getData("PlayerName", "") + var playerName by super.config.getData("PlayerName", "") public override fun initConfig() { super.initConfig() val pluginName = if (javaClass.isAnnotationPresent(PlayerClass::class.java)) @@ -29,7 +27,7 @@ abstract class TBMCPlayerBase : ChromaGamerBase() { throw RuntimeException("Class not defined as player class! Use @PlayerClass") val playerData = commonUserData.playerData val section = playerData.getConfigurationSection(pluginName) ?: playerData.createSection(pluginName) - config = IHaveConfig({ save() }, section) + config.reload(section) } /** @@ -55,7 +53,7 @@ abstract class TBMCPlayerBase : ChromaGamerBase() { } override fun getName(): String { - return player?.displayName ?: playerName.get() + return player?.displayName ?: playerName } override fun checkChannelInGroup(group: String?): Channel.RecipientTestResult { diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java b/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java index 471a5f6..fc66492 100755 --- a/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java +++ b/Chroma-Core/src/main/java/buttondevteam/lib/player/TBMCPlayerGetInfoEvent.java @@ -1,5 +1,6 @@ package buttondevteam.lib.player; +import buttondevteam.lib.ChromaUtils; import buttondevteam.lib.player.ChromaGamerBase.InfoTarget; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; @@ -24,7 +25,7 @@ public class TBMCPlayerGetInfoEvent extends Event { private final InfoTarget target; TBMCPlayerGetInfoEvent(ChromaGamerBase player, InfoTarget target) { - super(true); + super(!ChromaUtils.isTest()); this.player = player; infolines = new ArrayList<>(); this.target = target;