Changed the way the plugin handles input storage.

its-c10 · Apr 10, 2022 · ee93d4a · ee93d4a
1 parent 51ff655
commit ee93d4a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/com/nthbyte/dialogue/DialogueListener.java b/src/main/java/com/nthbyte/dialogue/DialogueListener.java
@@ -24,7 +24,6 @@
  */
 public class DialogueListener implements Listener {
 
-    private Map<Player, Map<String, String>> inputStoragePerPlayer = new HashMap<>();
     private DialogueManager dialogueManager;
     private JavaPlugin hookedPlugin;
 
@@ -88,7 +87,7 @@ public void onReceiveInput(ReceiveInputEvent e){
             Player player = e.getPlayer();
             if(onReceiveInputAction != null){
 
-                Map<String, String> inputStorage = inputStoragePerPlayer.get(player);
+                Map<String, String> inputStorage = DialogueManager.getInputStoragePerPlayer().get(player);
                 if(inputStorage == null) {
                     inputStorage = new HashMap<>();
                 }
@@ -103,7 +102,7 @@ public void onReceiveInput(ReceiveInputEvent e){
                 onReceiveInputAction.accept(context, input);
 
                 if(!inputStorage.isEmpty()){
-                    inputStoragePerPlayer.put(player, inputStorage);
+                    DialogueManager.getInputStoragePerPlayer().put(player, inputStorage);
                 }
 
             }
@@ -147,7 +146,7 @@ private void fireReceiveInputEvent(Player player, Dialogue dialogue, String inpu
         if(dialogue.hasMorePrompts()){
             dialogue.nextPrompt(player);
         }else{
-            Map<String, String> inputStorage = inputStoragePerPlayer.remove(player);
+            Map<String, String> inputStorage = DialogueManager.getInputStoragePerPlayer().get(player);
             for(ActionContext context : dialogue.getEndActions().values()){
                 if(context != null){
                     context.setInputStorage(inputStorage);

diff --git a/src/main/java/com/nthbyte/dialogue/DialogueManager.java b/src/main/java/com/nthbyte/dialogue/DialogueManager.java
@@ -16,6 +16,8 @@
  */
 public class DialogueManager {
 
+    private static Map<Player, Map<String, String>> inputStoragePerPlayer = new HashMap<>();
+
     /**
      * The players current in dialogue.
      */
@@ -54,10 +56,11 @@ public void endDialogue(Player player, DialogueEndCause cause){
         Dialogue endedDialogue = playersInDialogue.remove(player.getUniqueId());
         if(endedDialogue == null) return;
 
-        for(Map.Entry<Action.BasePromptAction, ActionContext> pair : endedDialogue.getEndActions().entrySet()){
-            ActionContext context = pair.getValue();
-            Map<String, String> inputStorage = (context == null || !context.hasStoredInputs()) ? new HashMap<>() : context.getInputStorage();
-            Action.BasePromptAction endAction = pair.getKey();
+        for(Map.Entry<Action.BasePromptAction, ActionContext> entry : endedDialogue.getEndActions().entrySet()){
+
+            ActionContext<?> context = entry.getValue();
+            Map<String, String> inputStorage = inputStoragePerPlayer.remove(player);
+            Action.BasePromptAction endAction = entry.getKey();
             // They are defining their own action.
             if(endAction instanceof Action.EndAction || context == null){
                 // Will be null if they are defining their own action (and not using a default one).
@@ -77,13 +80,17 @@ public void endDialogue(Player player, DialogueEndCause cause){
                     endAction.accept(context, "");
                 }
             }
-        }
 
+        }
 
     }
 
     public Dialogue getCurrentDialogue(Player player){
         return playersInDialogue.get(player.getUniqueId());
     }
 
+    public static Map<Player, Map<String, String>> getInputStoragePerPlayer() {
+        return inputStoragePerPlayer;
+    }
+
 }
diff --git a/src/main/java/com/nthbyte/dialogue/Prompt.java b/src/main/java/com/nthbyte/dialogue/Prompt.java
@@ -3,6 +3,7 @@
 import com.nthbyte.dialogue.action.Action;
 import com.nthbyte.dialogue.action.context.ActionContext;
 import com.nthbyte.dialogue.util.Utils;
+import com.sun.org.apache.xalan.internal.xsltc.compiler.Pattern;
 import org.bukkit.entity.Player;
 
 import java.util.*;

diff --git a/src/main/java/com/nthbyte/dialogue/action/Action.java b/src/main/java/com/nthbyte/dialogue/action/Action.java
@@ -17,6 +17,8 @@ public final class Action {
 
     /**
      * Base prompt action. Can run when prompt ends, or on input receive.
+     * @param <T> The type of action context.
+     * @param <U> Another useful piece of information. Could be any data type.
      */
     public interface BasePromptAction<T extends ActionContext, U> extends BiConsumer<T, U> {}