refactor: updated packages

This commit is contained in:
Andrey Terentev 2025-03-09 21:03:13 +07:00
parent 1d8387403f
commit 899e7ac4ca
10 changed files with 16 additions and 18 deletions

View File

@ -9,8 +9,8 @@ import ru.dragonestia.msb3.api.module.MotdModule;
import ru.dragonestia.msb3.api.module.PrometheusMetricsModule; import ru.dragonestia.msb3.api.module.PrometheusMetricsModule;
import ru.dragonestia.msb3.api.module.ResourcePackRepositoryModule; import ru.dragonestia.msb3.api.module.ResourcePackRepositoryModule;
import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber; import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber;
import ru.dragonestia.msb3.api.talk.dialogue.DialogueRenderer; import ru.dragonestia.msb3.api.ui.dialogue.DialogueRenderer;
import ru.dragonestia.msb3.api.talk.dialogue.DialogueTheme; import ru.dragonestia.msb3.api.ui.dialogue.DialogueTheme;
import team.unnamed.creative.ResourcePack; import team.unnamed.creative.ResourcePack;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

View File

@ -9,7 +9,8 @@ import ru.dragonestia.msb3.api.entity.PickableItem;
import ru.dragonestia.msb3.api.item.ItemUtil; import ru.dragonestia.msb3.api.item.ItemUtil;
import ru.dragonestia.msb3.api.resource.DialogueResources; import ru.dragonestia.msb3.api.resource.DialogueResources;
import ru.dragonestia.msb3.api.resource.MonologueResources; 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.api.util.ResourceFromJar;
import ru.dragonestia.msb3.resource.Resources; import ru.dragonestia.msb3.resource.Resources;
import ru.dragonestia.msb3.resource.glyph.GlyphCharacterFactory; import ru.dragonestia.msb3.resource.glyph.GlyphCharacterFactory;
@ -94,6 +95,7 @@ public final class ServerBootstrap {
private void initDefaultGlyphs() { private void initDefaultGlyphs() {
ClassPreLoader.preload(BlackScreen.class); ClassPreLoader.preload(BlackScreen.class);
ClassPreLoader.preload(Navigator.class);
MonologueResources.registerAvatar(MonologueResources.DEFAULT, ResourceFromJar.of(ServerBootstrap.CLASS_LOADER, "glyphs/monologue/default_avatar.png")); 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")); MonologueResources.registerFrame(MonologueResources.DEFAULT, ResourceFromJar.of(ServerBootstrap.CLASS_LOADER, "glyphs/monologue/avatar_frame.png"));

View File

@ -1,4 +1,4 @@
package ru.dragonestia.msb3.api.title; package ru.dragonestia.msb3.api.ui;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import net.kyori.adventure.key.Key; import net.kyori.adventure.key.Key;
@ -16,8 +16,7 @@ public class BlackScreen {
Key.key("msb3", "black_screen"), Key.key("msb3", "black_screen"),
ResourceFromJar.of("glyphs/defaults/fullscreen_background.png"), ResourceFromJar.of("glyphs/defaults/fullscreen_background.png"),
2500, 2500,
256 256);
);
public static void show(Player player) { public static void show(Player player) {
player.showTitle(Title.title( player.showTitle(Title.title(

View File

@ -1,13 +1,13 @@
package ru.dragonestia.msb3.api.talk; package ru.dragonestia.msb3.api.ui;
import lombok.experimental.UtilityClass; 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.HashMap;
import java.util.Map; import java.util.Map;
@UtilityClass @UtilityClass
public class Themes { public class TalksThemes {
private final Map<String, MonologueTheme> monologueThemes = new HashMap<>(); private final Map<String, MonologueTheme> monologueThemes = new HashMap<>();

View File

@ -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 net.minestom.server.entity.Player;
import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber; import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber;

View File

@ -1,4 +1,4 @@
package ru.dragonestia.msb3.api.talk.dialogue; package ru.dragonestia.msb3.api.ui.dialogue;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -8,7 +8,6 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.Style; 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.format.TextDecoration;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.minestom.server.entity.Player; 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.item.ItemStack;
import net.minestom.server.tag.Tag; import net.minestom.server.tag.Tag;
import org.apache.commons.text.WordUtils; import org.apache.commons.text.WordUtils;
import org.jetbrains.annotations.NotNull;
import ru.dragonestia.msb3.api.item.BlankSlotItem; import ru.dragonestia.msb3.api.item.BlankSlotItem;
import ru.dragonestia.msb3.api.item.ItemUtil; import ru.dragonestia.msb3.api.item.ItemUtil;
import ru.dragonestia.msb3.api.resource.dialog.ButtonNumber; 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.api.util.StringUtil;
import ru.dragonestia.msb3.resource.glyph.GlyphComponent; import ru.dragonestia.msb3.resource.glyph.GlyphComponent;
import ru.dragonestia.msb3.resource.glyph.GlyphComponentBuilder; import ru.dragonestia.msb3.resource.glyph.GlyphComponentBuilder;
import ru.dragonestia.msb3.resource.glyph.GlyphImage;
import ru.dragonestia.msb3.resource.glyph.MinecraftFont; import ru.dragonestia.msb3.resource.glyph.MinecraftFont;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -1,4 +1,4 @@
package ru.dragonestia.msb3.api.talk.dialogue; package ru.dragonestia.msb3.api.ui.dialogue;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,4 +1,4 @@
package ru.dragonestia.msb3.api.talk.dialogue; package ru.dragonestia.msb3.api.ui.dialogue;
public interface OnCloseDialog { public interface OnCloseDialog {

View File

@ -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.Component;
import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.Style;

View File

@ -1,4 +1,4 @@
package ru.dragonestia.msb3.api.talk.monologue; package ru.dragonestia.msb3.api.ui.monologue;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;