From 2b007d989784134dfe615d51a6466728d9426450 Mon Sep 17 00:00:00 2001 From: ScarletRedMan Date: Sun, 9 Mar 2025 23:05:37 +0700 Subject: [PATCH] feat: added method for easy getting player context --- .../dragonestia/msb3/api/player/PlayerContext.java | 5 +++++ .../msb3/api/ui/bossbar/KeyedBossBars.java | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/ru/dragonestia/msb3/api/player/PlayerContext.java b/api/src/main/java/ru/dragonestia/msb3/api/player/PlayerContext.java index 62fdedd..e1a43bd 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/player/PlayerContext.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/player/PlayerContext.java @@ -1,6 +1,7 @@ package ru.dragonestia.msb3.api.player; import lombok.Getter; +import net.minestom.server.entity.Player; @Getter public abstract class PlayerContext { @@ -14,4 +15,8 @@ public abstract class PlayerContext { public abstract void init(); public abstract void dispose(); + + public static T of(Player player, Class clazz) { + return ((MsbPlayer) player).getContext(clazz); + } } diff --git a/api/src/main/java/ru/dragonestia/msb3/api/ui/bossbar/KeyedBossBars.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/bossbar/KeyedBossBars.java index 1605a12..e1d9e66 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/ui/bossbar/KeyedBossBars.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/bossbar/KeyedBossBars.java @@ -5,7 +5,7 @@ import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.minestom.server.entity.Player; -import ru.dragonestia.msb3.api.player.PlayerContextManager; +import ru.dragonestia.msb3.api.player.PlayerContext; import ru.dragonestia.msb3.api.player.defaults.KeyedBossBarContext; import ru.dragonestia.msb3.api.util.ResourceFromJar; import ru.dragonestia.msb3.resource.Resources; @@ -23,22 +23,22 @@ public class KeyedBossBars { } public void hideAll(Player player) { - contextOf(player).hideAll(); + context(player).hideAll(); } public void hide(Player player, String bossBarId) { - contextOf(player).hide(bossBarId); + context(player).hide(bossBarId); } public BossBar show(Player player, String bossBarId, BossBar bossBar) { - return contextOf(player).show(bossBarId, bossBar); + return context(player).show(bossBarId, bossBar); } public BossBar showText(Player player, String bossBarId, Component text) { return show(player, bossBarId, BossBar.bossBar(text, 1, BossBar.Color.WHITE, BossBar.Overlay.PROGRESS)); } - private KeyedBossBarContext contextOf(Player player) { - return PlayerContextManager.getContext(player, KeyedBossBarContext.class); + private KeyedBossBarContext context(Player player) { + return PlayerContext.of(player, KeyedBossBarContext.class); } }