diff --git a/api/src/main/java/ru/dragonestia/msb3/api/boot/DefaultBootstrap.java b/api/src/main/java/ru/dragonestia/msb3/api/boot/DefaultBootstrap.java index d9b2af9..6939a0a 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/boot/DefaultBootstrap.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/boot/DefaultBootstrap.java @@ -9,8 +9,8 @@ import ru.dragonestia.msb3.api.module.MotdModule; import ru.dragonestia.msb3.api.module.PrometheusMetricsModule; import ru.dragonestia.msb3.api.module.ResourcePackRepositoryModule; import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber; -import ru.dragonestia.msb3.api.talk.dialogue.DialogueRenderer; -import ru.dragonestia.msb3.api.talk.dialogue.DialogueTheme; +import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer; +import ru.dragonestia.msb3.api.ui.dialogue.DialogueTheme; import team.unnamed.creative.ResourcePack; import java.net.InetSocketAddress; diff --git a/api/src/main/java/ru/dragonestia/msb3/api/boot/ServerBootstrap.java b/api/src/main/java/ru/dragonestia/msb3/api/boot/ServerBootstrap.java index dc1172c..4ff835e 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/boot/ServerBootstrap.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/boot/ServerBootstrap.java @@ -9,7 +9,8 @@ import ru.dragonestia.msb3.api.entity.PickableItem; import ru.dragonestia.msb3.api.item.ItemUtil; import ru.dragonestia.msb3.api.resource.DialogueResources; import ru.dragonestia.msb3.api.resource.MonologueResources; -import ru.dragonestia.msb3.api.title.BlackScreen; +import ru.dragonestia.msb3.api.ui.BlackScreen; +import ru.dragonestia.msb3.api.ui.navigator.Navigator; import ru.dragonestia.msb3.api.util.ResourceFromJar; import ru.dragonestia.msb3.resource.Resources; import ru.dragonestia.msb3.resource.glyph.GlyphCharacterFactory; @@ -94,6 +95,7 @@ public final class ServerBootstrap { private void initDefaultGlyphs() { ClassPreLoader.preload(BlackScreen.class); + ClassPreLoader.preload(Navigator.class); MonologueResources.registerAvatar(MonologueResources.DEFAULT, ResourceFromJar.of(ServerBootstrap.CLASS_LOADER, "glyphs/monologue/default_avatar.png")); MonologueResources.registerFrame(MonologueResources.DEFAULT, ResourceFromJar.of(ServerBootstrap.CLASS_LOADER, "glyphs/monologue/avatar_frame.png")); diff --git a/api/src/main/java/ru/dragonestia/msb3/api/title/BlackScreen.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/BlackScreen.java similarity index 92% rename from api/src/main/java/ru/dragonestia/msb3/api/title/BlackScreen.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/BlackScreen.java index 6b86d22..3bba26f 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/title/BlackScreen.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/BlackScreen.java @@ -1,4 +1,4 @@ -package ru.dragonestia.msb3.api.title; +package ru.dragonestia.msb3.api.ui; import lombok.experimental.UtilityClass; import net.kyori.adventure.key.Key; @@ -16,8 +16,7 @@ public class BlackScreen { Key.key("msb3", "black_screen"), ResourceFromJar.of("glyphs/defaults/fullscreen_background.png"), 2500, - 256 - ); + 256); public static void show(Player player) { player.showTitle(Title.title( diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/Themes.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/TalksThemes.java similarity index 78% rename from api/src/main/java/ru/dragonestia/msb3/api/talk/Themes.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/TalksThemes.java index 0386188..3654381 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/Themes.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/TalksThemes.java @@ -1,13 +1,13 @@ -package ru.dragonestia.msb3.api.talk; +package ru.dragonestia.msb3.api.ui; import lombok.experimental.UtilityClass; -import ru.dragonestia.msb3.api.talk.monologue.MonologueTheme; +import ru.dragonestia.msb3.api.ui.monologue.MonologueTheme; import java.util.HashMap; import java.util.Map; @UtilityClass -public class Themes { +public class TalksThemes { private final Map monologueThemes = new HashMap<>(); diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/AnswerClickContext.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/AnswerClickContext.java similarity index 82% rename from api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/AnswerClickContext.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/AnswerClickContext.java index 370d648..af26d36 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/AnswerClickContext.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/AnswerClickContext.java @@ -1,4 +1,4 @@ -package ru.dragonestia.msb3.api.talk.dialogue; +package ru.dragonestia.msb3.api.ui.dialogue; import net.minestom.server.entity.Player; import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber; diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueRenderer.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/DialogueRenderer.java similarity index 98% rename from api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueRenderer.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/DialogueRenderer.java index c8dc885..bc201de 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueRenderer.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/DialogueRenderer.java @@ -1,4 +1,4 @@ -package ru.dragonestia.msb3.api.talk.dialogue; +package ru.dragonestia.msb3.api.ui.dialogue; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -8,7 +8,6 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; -import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.minimessage.MiniMessage; import net.minestom.server.entity.Player; @@ -20,7 +19,6 @@ import net.minestom.server.inventory.InventoryType; import net.minestom.server.item.ItemStack; import net.minestom.server.tag.Tag; import org.apache.commons.text.WordUtils; -import org.jetbrains.annotations.NotNull; import ru.dragonestia.msb3.api.item.BlankSlotItem; import ru.dragonestia.msb3.api.item.ItemUtil; import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber; @@ -29,7 +27,6 @@ import ru.dragonestia.msb3.api.resource.dialog.TextureProperties; import ru.dragonestia.msb3.api.util.StringUtil; import ru.dragonestia.msb3.resource.glyph.GlyphComponent; import ru.dragonestia.msb3.resource.glyph.GlyphComponentBuilder; -import ru.dragonestia.msb3.resource.glyph.GlyphImage; import ru.dragonestia.msb3.resource.glyph.MinecraftFont; import java.util.ArrayList; diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueTheme.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/DialogueTheme.java similarity index 99% rename from api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueTheme.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/DialogueTheme.java index 8865544..e1017d9 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueTheme.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/DialogueTheme.java @@ -1,4 +1,4 @@ -package ru.dragonestia.msb3.api.talk.dialogue; +package ru.dragonestia.msb3.api.ui.dialogue; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/OnCloseDialog.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/OnCloseDialog.java similarity index 62% rename from api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/OnCloseDialog.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/OnCloseDialog.java index 4ec79ff..fe1bd7d 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/OnCloseDialog.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/dialogue/OnCloseDialog.java @@ -1,4 +1,4 @@ -package ru.dragonestia.msb3.api.talk.dialogue; +package ru.dragonestia.msb3.api.ui.dialogue; public interface OnCloseDialog { diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/monologue/Monologue.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/monologue/Monologue.java similarity index 98% rename from api/src/main/java/ru/dragonestia/msb3/api/talk/monologue/Monologue.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/monologue/Monologue.java index fa3687f..3c60fe9 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/monologue/Monologue.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/monologue/Monologue.java @@ -1,4 +1,4 @@ -package ru.dragonestia.msb3.api.talk.monologue; +package ru.dragonestia.msb3.api.ui.monologue; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.Style; diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/monologue/MonologueTheme.java b/api/src/main/java/ru/dragonestia/msb3/api/ui/monologue/MonologueTheme.java similarity index 98% rename from api/src/main/java/ru/dragonestia/msb3/api/talk/monologue/MonologueTheme.java rename to api/src/main/java/ru/dragonestia/msb3/api/ui/monologue/MonologueTheme.java index cfe17ec..ff0d43d 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/monologue/MonologueTheme.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/ui/monologue/MonologueTheme.java @@ -1,4 +1,4 @@ -package ru.dragonestia.msb3.api.talk.monologue; +package ru.dragonestia.msb3.api.ui.monologue; import lombok.AccessLevel; import lombok.Getter;