fix scenario

TeamMoegMC · Dec 17, 2024 · d505335 · d505335
1 parent b925f5a
commit d505335
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 35 deletions.
diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/CommandNotFoundException.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/CommandNotFoundException.java
@@ -0,0 +1,24 @@
+package com.teammoeg.frostedheart.content.scenario;
+
+public class CommandNotFoundException extends ScenarioExecutionException {
+
+	public CommandNotFoundException() {
+	}
+
+	public CommandNotFoundException(String message) {
+		super(message);
+	}
+
+	public CommandNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public CommandNotFoundException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+	}
+
+	public CommandNotFoundException(Throwable cause) {
+		super(cause);
+	}
+
+}
diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/ScenarioExecutor.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/ScenarioExecutor.java
@@ -236,7 +236,7 @@ public <V> void addTypeAdapter(Class<? super V> cls,TypeAdapter<V,T> conv) {
     public void callCommand(String name, T scenarioVM, Map<String, String> params) {
         ScenarioMethod<T> command = commands.get(name);
         if (command == null) {
-            throw new ScenarioExecutionException("Can not find command " + name);
+            throw new CommandNotFoundException("Can not find command " + name);
         }
         command.execute(scenarioVM, params);
     }

diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/parser/CommandNode.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/parser/CommandNode.java
@@ -21,16 +21,18 @@
 
 import java.util.Map;
 
+import com.teammoeg.frostedheart.content.scenario.CommandNotFoundException;
 import com.teammoeg.frostedheart.content.scenario.runner.ScenarioCommandContext;
 
 public class CommandNode implements Node {
     String command;
     Map<String, String> params;
-
-    public CommandNode(String command, Map<String, String> params) {
+    String origText;
+    public CommandNode(String command, Map<String, String> params,String origText) {
         super();
         this.command = command.toLowerCase();
         this.params = params;
+        this.origText=origText;
     }
 
     @Override
@@ -50,7 +52,11 @@ public boolean isLiteral() {
 
     @Override
     public void run(ScenarioCommandContext runner) {
-        runner.callCommand(command, params);
+    	try {
+    		runner.callCommand(command, params);
+    	}catch(CommandNotFoundException ex) {
+			runner.thread().appendLiteral(origText);
+		} 
     }
 
 }
diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/parser/SavepointNode.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/parser/SavepointNode.java
diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/parser/ScenarioParser.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/parser/ScenarioParser.java
@@ -69,8 +69,8 @@ private static record ParseResult(List<NodeInfo> node,ParserState state) {
 
 
     }
-    private NodeInfo createCommand(String command, Map<String, String> params,ParserState state) {
-        return new NodeInfo(createCommandNode(command,params),state);
+    private NodeInfo createCommand(String command, Map<String, String> params,ParserState state,String text) {
+        return new NodeInfo(createCommandNode(command,params,text),state);
     }
     public static final Map<String,BiFunction<String,Map<String, String>,Node>> nodeFactory=new HashMap<>();
     static {
@@ -82,16 +82,16 @@ private NodeInfo createCommand(String command, Map<String, String> params,Parser
 	    nodeFactory.put("emb",EmbNode::new);
 	    nodeFactory.put("label",LabelNode::new);
 	    //nodeFactory.put("p",ParagraphNode::new);
-	    nodeFactory.put("save",SavepointNode::new);
+	    //nodeFactory.put("save",SavepointNode::new);
 	    nodeFactory.put("sharp",ShpNode::new);
 	    nodeFactory.put("include",IncludeNode::new);
 	    nodeFactory.put("call",CallNode::new);
     }
-    private Node createCommandNode(String command, Map<String, String> params) {
+    private Node createCommandNode(String command, Map<String, String> params,String text) {
         BiFunction<String, Map<String, String>, Node> factory=nodeFactory.get(command);
         if(factory!=null)
         	return factory.apply(command, params);
-        return new CommandNode(command, params);
+        return new CommandNode(command, params,text);
 
     }
     public Scenario parseString(String name,List<String> code) {
@@ -169,7 +169,7 @@ private NodeInfo parseAtCommand(StringParseReader reader) {
         String command = parseLiteralOrString(reader, -1);
         reader.skipWhitespace();
         //System.out.println("cmd:"+command);
-        if(!reader.has()) return createCommand(command, params,state);
+        if(!reader.has()) return createCommand(command, params,state,reader.fromStart());
         while (reader.has()) {
             String name = parseLiteralOrString(reader, '=');
             reader.skipWhitespace();
@@ -182,7 +182,7 @@ private NodeInfo parseAtCommand(StringParseReader reader) {
             params.put(name, val);
             reader.skipWhitespace();
 
-            if (!reader.has()||reader.eat('#')) return createCommand(command, params,state);
+            if (!reader.has()||reader.eat('#')) return createCommand(command, params,state,reader.fromStart());
         }
         return new NodeInfo(new LiteralNode(reader.fromStart()),state);
 
@@ -194,7 +194,7 @@ private NodeInfo parseBarackCommand(StringParseReader reader) {
         String command = parseLiteralOrString(reader, ']');
         reader.skipWhitespace();
 
-        if(reader.eat(']')) return createCommand(command, params,state);
+        if(reader.eat(']')) return createCommand(command, params,state,reader.fromStart());
         while (reader.has()) {
             String name = parseLiteralOrString(reader, '=');
             reader.skipWhitespace();
@@ -205,7 +205,7 @@ private NodeInfo parseBarackCommand(StringParseReader reader) {
             String val = parseLiteralOrString(reader, ']');
             params.put(name, val);
             reader.skipWhitespace();
-            if(reader.eat(']'))return createCommand(command, params,state);
+            if(reader.eat(']'))return createCommand(command, params,state,reader.fromStart());
         }
         return new NodeInfo(new LiteralNode(reader.fromStart()),state);
     }

diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/runner/BaseScenarioRunner.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/runner/BaseScenarioRunner.java
@@ -28,6 +28,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.teammoeg.frostedheart.content.scenario.CommandNotFoundException;
 import com.teammoeg.frostedheart.content.scenario.FHScenario;
 import com.teammoeg.frostedheart.content.scenario.ScenarioExecutionException;
 import com.teammoeg.frostedheart.content.scenario.parser.Node;
@@ -318,6 +319,10 @@ public boolean tickWaitIfNeeded() {
     	}
 		return false;
 	}
+	@Override
+	public void appendLiteral(String text) {
+		scene.appendLiteral(text);
+	}
 	public void tickMain(ScenarioContext ctx) {
 		runIfNeeded(ctx);
 		tickWaitIfNeeded();
@@ -398,6 +403,7 @@ public void callCommand(ScenarioCommandContext ctx,String name,Map<String,String
 			jump(ctx.context(),ctx.context().macros.get(name));
 		}else
 			FHScenario.callCommand(name, ctx, cparams);
+
 	}
 
 

diff --git a/src/main/java/com/teammoeg/frostedheart/content/scenario/runner/ScenarioThread.java b/src/main/java/com/teammoeg/frostedheart/content/scenario/runner/ScenarioThread.java
@@ -133,4 +133,6 @@ default void jump(ScenarioContext ctx,String scenario,String label) {
 	 * Pop call stack.
 	 */
 	void popCallStack(ScenarioContext ctx);
+
+	void appendLiteral(String text);
 }