diff --git a/.idea/misc.xml b/.idea/misc.xml
index b573818..c3dfb30 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/ch/zhaw/catan/Command.java b/src/ch/zhaw/catan/Command.java
index 6abf2b5..d8157dc 100644
--- a/src/ch/zhaw/catan/Command.java
+++ b/src/ch/zhaw/catan/Command.java
@@ -8,9 +8,6 @@ public enum Command {
private String commandWord;
- public static > T getEnumValue(TextIO textIO, Class commands) {
- return textIO.newEnumInputReader(commands).read("What would you like to do?");
- }
Command(String commandWord) {
diff --git a/src/ch/zhaw/catan/Parser.java b/src/ch/zhaw/catan/Parser.java
index b131458..1e440d1 100644
--- a/src/ch/zhaw/catan/Parser.java
+++ b/src/ch/zhaw/catan/Parser.java
@@ -3,34 +3,57 @@ import org.beryx.textio.TextIO;
import org.beryx.textio.TextIoFactory;
import org.beryx.textio.TextTerminal;
+import java.awt.*;
+import java.util.HashMap;
+
+import static ch.zhaw.catan.Command.QUIT;
+import static ch.zhaw.catan.Command.UNKNOWN;
+
public class Parser {
TextIO textIO = TextIoFactory.getTextIO();
TextTerminal> textTerminal;
-
-
public Parser() {
textTerminal = textIO.getTextTerminal();
- run();
+ }
+ public Point getPoint() {
+ return null;
}
- public void run() {
- boolean running = true;
- while (running) {
- switch(Command.getEnumValue(textIO, Command.class)){
- case QUIT:
- running = false;
- break;
- case UNKNOWN:
- break;
+ public HashMap gameStart(){
+ return null;
+ //Anzahlspieler,int
+ //Siegespunkte,int
+ }
+ public void giveCoordinatesForStructures(Config.Structure structure) {
- }
+ }
+ public void thrownDices(int number){
+
+ }
+
+ public void playerTurn(Config.Faction faction) {
+
+ }
+
+ public void errorMessage(){
+
+ }
+
+ public Command getAction() {
+
+ switch (textIO.newEnumInputReader(Command.class).read("What would you like to do?")) {
+ case QUIT:
+ System.out.println("quit");
+ return QUIT;
+
+ case UNKNOWN:
+ return UNKNOWN;
+ default:
+ return null;
}
}
-
-
-
}
diff --git a/src/ch/zhaw/catan/Siedler.java b/src/ch/zhaw/catan/Siedler.java
index 8f62515..d3bd7d9 100644
--- a/src/ch/zhaw/catan/Siedler.java
+++ b/src/ch/zhaw/catan/Siedler.java
@@ -15,6 +15,8 @@ public class Siedler {
TextIO textIO = TextIoFactory.getTextIO();
TextTerminal> textTerminal = textIO.getTextTerminal();
textTerminal.println(game.getBoard().getTextView());
+ Parser parser = new Parser();
+ parser.getAction();