Fix /reload not handling dialogue additions or removals

Ladysnake · Feb 12, 2024 · bbf46a2 · bbf46a2
1 parent 75d22df
commit bbf46a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/org/ladysnake/blabber/impl/common/BlabberRegistrar.java b/src/main/java/org/ladysnake/blabber/impl/common/BlabberRegistrar.java
@@ -64,7 +64,7 @@ public final class BlabberRegistrar implements EntityComponentInitializer {
     ).buildAndRegister();
     public static final SuggestionProvider<ServerCommandSource> ALL_DIALOGUES = SuggestionProviders.register(
             Blabber.id("available_dialogues"),
-            (context, builder) -> CommandSource.suggestIdentifiers(DialogueRegistry.getIds(), builder)
+            (context, builder) -> CommandSource.suggestIdentifiers(context.getSource() instanceof ServerCommandSource ? DialogueRegistry.getIds() : DialogueRegistry.getClientIds(), builder)
     );
 
     public static void init() {

diff --git a/src/main/java/org/ladysnake/blabber/impl/common/DialogueRegistry.java b/src/main/java/org/ladysnake/blabber/impl/common/DialogueRegistry.java
@@ -19,7 +19,6 @@
 
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 import org.ladysnake.blabber.impl.common.model.DialogueTemplate;
 
 import java.util.Map;
@@ -37,11 +36,15 @@
  */
 
 public final class DialogueRegistry {
-    private static @Nullable Set<Identifier> clientDialogueIds = null;
+    private static Set<Identifier> clientDialogueIds = Set.of();
     private static Map<Identifier, DialogueTemplate> entries = Map.of();
 
+    public static Set<Identifier> getClientIds() {
+        return clientDialogueIds;
+    }
+
     public static Set<Identifier> getIds() {
-        return clientDialogueIds == null ? entries.keySet() : clientDialogueIds;
+        return entries.keySet();
     }
 
     public static Optional<DialogueTemplate> getOrEmpty(Identifier id) {
@@ -57,7 +60,7 @@ static void setEntries(Map<Identifier, DialogueTemplate> newEntries) {
     }
 
     @ApiStatus.Internal // highly internal
-    public static void setClientIds(@Nullable Set<Identifier> dialogueIds) {
+    public static void setClientIds(Set<Identifier> dialogueIds) {
         clientDialogueIds = dialogueIds;
     }
 }