REVIEW

Ladysnake · Feb 12, 2024 · c94f7f3 · c94f7f3
1 parent b9dea51
commit c94f7f3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/org/ladysnake/blabber/api/client/BlabberDialogueScreen.java b/src/main/java/org/ladysnake/blabber/api/client/BlabberDialogueScreen.java
@@ -221,7 +221,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float tickDelta)
         int y = mainTextMinY;
 
         for (String illustrationName : this.handler.getCurrentIllustrations()) {
-            DialogueIllustration illustration = this.handler.getIllustrations().get(illustrationName);
+            DialogueIllustration illustration = this.handler.getIllustration(illustrationName);
             if (illustration != null) {
                 illustration.render(context, this.textRenderer, 0, 0, mouseX, mouseY, tickDelta);
             }
@@ -241,7 +241,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float tickDelta)
             context.drawTextWrapped(this.textRenderer, choice.text(), choiceListMinX, y, choiceListMaxWidth, choiceColor);
 
             for (String illustrationName : choice.illustrations()) {
-                DialogueIllustration illustration = this.handler.getIllustrations().get(illustrationName);
+                DialogueIllustration illustration = this.handler.getIllustration(illustrationName);
                 if (illustration != null) {
                     illustration.render(context, this.textRenderer, choiceListMinX, y, mouseX, mouseY, tickDelta);
                 }

diff --git a/src/main/java/org/ladysnake/blabber/impl/common/DialogueScreenHandler.java b/src/main/java/org/ladysnake/blabber/impl/common/DialogueScreenHandler.java
@@ -75,8 +75,9 @@ public List<String> getCurrentIllustrations() {
         return this.dialogue.getCurrentIllustrations();
     }
 
-    public Map<String, DialogueIllustration> getIllustrations() {
-        return this.dialogue.getIllustrations();
+    @Nullable
+    public DialogueIllustration getIllustration(String name) {
+        return this.dialogue.getIllustration(name);
     }
 
     public ImmutableList<AvailableChoice> getAvailableChoices() {

diff --git a/src/main/java/org/ladysnake/blabber/impl/common/machine/DialogueStateMachine.java b/src/main/java/org/ladysnake/blabber/impl/common/machine/DialogueStateMachine.java
@@ -117,8 +117,9 @@ public List<String> getCurrentIllustrations() {
         return this.getCurrentState().illustrations();
     }
 
-    public Map<String, DialogueIllustration> getIllustrations() {
-        return this.template.illustrations();
+    @Nullable
+    public DialogueIllustration getIllustration(String name) {
+        return this.template.illustrations().get(name);
     }
 
     public ImmutableList<AvailableChoice> getAvailableChoices() {