From 29ea2ee3d82530bd9b8f9712ce3ecc128b4b8692 Mon Sep 17 00:00:00 2001 From: ScarletRedMan Date: Sun, 15 Dec 2024 18:07:59 +0700 Subject: [PATCH] feat: updated dialogues --- .../api/talk/dialogue/DialogueRenderer.java | 2 +- .../msb3/api/talk/dialogue/DialogueTheme.java | 33 +++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueRenderer.java b/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueRenderer.java index d6fea2f..5bfca5b 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueRenderer.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueRenderer.java @@ -28,7 +28,7 @@ public class DialogueRenderer extends Inventory { public static final int CHEST_GUI_WIDTH = 176; - private final GlyphResourcePack glyphResourcePack = ServerBootstrap.getInstance().getResourcePackManager().getGlyphResourcePack(); + @Getter private final GlyphResourcePack glyphResourcePack = ServerBootstrap.getInstance().getResourcePackManager().getGlyphResourcePack(); private final Player player; @Getter @Setter private DialogueTheme theme; @Getter private String text = ""; diff --git a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueTheme.java b/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueTheme.java index 20bf612..caac92d 100644 --- a/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueTheme.java +++ b/api/src/main/java/ru/dragonestia/msb3/api/talk/dialogue/DialogueTheme.java @@ -1,6 +1,7 @@ package ru.dragonestia.msb3.api.talk.dialogue; import lombok.AccessLevel; +import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; @@ -8,7 +9,6 @@ import ru.dragonestia.msb3.api.ServerBootstrap; import ru.dragonestia.msb3.api.glyph.glyph.image.ImageGlyph; import ru.dragonestia.msb3.api.glyph.glyph.image.multicharacter.LanguageGlyphCollection; import ru.dragonestia.msb3.api.resource.DialogueResources; -import ru.dragonestia.msb3.api.resource.ResourcePackManager; import ru.dragonestia.msb3.api.resource.dialog.*; @Log4j2 @@ -16,7 +16,7 @@ import ru.dragonestia.msb3.api.resource.dialog.*; @RequiredArgsConstructor(access = AccessLevel.PRIVATE) public class DialogueTheme { - private final ResourcePackManager resourcePackManager = ServerBootstrap.getInstance().getResourcePackManager(); + private final DialogueResources resources = ServerBootstrap.getInstance().getResourcePackManager().getDialogueResources(); private final DialogGlyphPositions positions; private final Background background; @@ -39,6 +39,32 @@ public class DialogueTheme { private final ImageGlyph button4; private final LanguageGlyphCollection font; + public Builder toBuilder() { + return new Builder( + resources, + positions, + background, + substrate, + avatar, + avatarFrame, + scrollTextUp, + scrollTextDown, + activeTextField1, + activeTextField2, + activeTextField3, + activeTextField4, + notActiveTextField1, + notActiveTextField2, + notActiveTextField3, + notActiveTextField4, + button1, + button2, + button3, + button4, + font + ); + } + public static Builder builder() { return builder(DialogGlyphPositions.DEFAULT); } @@ -47,9 +73,10 @@ public class DialogueTheme { return new Builder(positions); } + @AllArgsConstructor(access = AccessLevel.PRIVATE) public static class Builder { - private final DialogueResources resources; + @Getter private final DialogueResources resources; private final DialogGlyphPositions positions; private Background background;