Change TUI printing logic

Author: patzly

.gitignore

@@ -29,4 +29,6 @@ metals.sbt
 # IDEA
 .idea
 .idea_modules
-/.worksheet/
+/.worksheet/
+
+out/artifacts/

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: de.htwg.se.set.Set
+

src/main/scala/de/htwg/se/set/Set.scala

@@ -7,9 +7,10 @@ import de.htwg.se.set.view.{Gui, Tui}
 
 import java.awt.GraphicsEnvironment
 
-@main
-def main(): Unit =
-  val injector = Guice.createInjector(new SetModule)
-  val controller = injector.getInstance(classOf[IController])
-  if !GraphicsEnvironment.isHeadless then Gui(controller)
-  Tui(controller)
+object Set:
+  
+  def main(args: Array[String]): Unit =
+    val injector = Guice.createInjector(new SetModule)
+    val controller = injector.getInstance(classOf[IController])
+    if !GraphicsEnvironment.isHeadless then Gui(controller)
+    Tui(controller)

src/main/scala/de/htwg/se/set/controller/IController.scala

@@ -13,7 +13,7 @@ trait IController extends Observable:
   def game: IGame
 
   def changeState(s: IState): Unit
-  def printState(): Unit
+  def currentState: String
   def actionFromInput(input: String): IAction
   def handleAction(action: IAction): Unit
   def snapshot: Snapshot
@@ -52,8 +52,7 @@ trait ISnapshot:
   def toJson: JsValue
 
 trait IState:
-
-  def print(): Unit
+  
   def message: String
   def actionFromInput(input: String): IAction
   def handleInput(input: IUserInput): IAction

src/main/scala/de/htwg/se/set/controller/controller/Controller.scala

@@ -7,7 +7,6 @@ import play.api.libs.json.Json
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Paths}
-import java.security.MessageDigest
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import scala.xml.{Elem, PrettyPrinter, Utility, XML}
@@ -17,12 +16,12 @@ case class Controller @Inject() (var settings: ISettings, var game: IGame) exten
   private val undoManager = new UndoManager
   private var state: IState = SettingsState(this)
 
+  override def currentState: String = state.toString
+
   override def changeState(s: IState): Unit =
     state = s
     notifyObservers(Event.STATE_CHANGED)
 
-  override def printState(): Unit = state.print()
-
   override def actionFromInput(input: String): IAction = state.actionFromInput(input)
 
   override def handleAction(action: IAction): Unit =

src/main/scala/de/htwg/se/set/controller/controller/State.scala

@@ -9,8 +9,6 @@ import scala.xml.Elem
 
 private class State extends IState:
 
-  def print(): Unit = ()
-
   def message: String = ""
 
   def actionFromInput(input: String): IAction = NoAction()
@@ -28,10 +26,10 @@ private class State extends IState:
 
 case class SettingsState(controller: IController) extends State:
 
-  override def print(): Unit =
-    println(PrintUtil.bold("1") + " Start game")
-    println(PrintUtil.bold("2") + " Change number of players")
-    println(PrintUtil.bold("3") + " Switch to " + (if controller.settings.easy then "normal" else "easy") + " mode")
+  override def toString: String =
+    PrintUtil.bold("1") + " Start game" + "\n" +
+      PrintUtil.bold("2") + " Change number of players" + "\n" +
+      PrintUtil.bold("3") + " Switch to " + (if controller.settings.easy then "normal" else "easy") + " mode"
 
   override def actionFromInput(input: String): IAction =
     InputUtil.intInput(input, 1, 3, controller.canUndo, controller.canRedo, false) match
@@ -42,7 +40,7 @@ case class SettingsState(controller: IController) extends State:
 
 case class ChangePlayerCountState(controller: IController) extends State:
 
-  override def print(): Unit = println("Enter number of players:")
+  override def toString: String = "Enter number of players:"
 
   override def actionFromInput(input: String): IAction =
     InputUtil.intInput(input, 1, 10, controller.canUndo, controller.canRedo, false) match
@@ -51,9 +49,11 @@ case class ChangePlayerCountState(controller: IController) extends State:
 
 case class SelectPlayerState(controller: IController) extends State:
 
-  override def print(): Unit =
+  override def toString: String =
     if !controller.settings.singlePlayer then
-      println("Input player who found a SET (e.g. 1) or 0 if no SET can be found:")
+      "Input player who found a SET (e.g. 1) or 0 if no SET can be found:"
+    else
+      ""
 
   override def message: String = "Select player who found a SET or press ADD CARDS if no SET can be found."
 
@@ -69,18 +69,18 @@ case class SelectPlayerState(controller: IController) extends State:
       case other => super.handleInput(other)
 
 case class GameState(controller: IController) extends State:
+
+  override def toString: String =
+    if controller.settings.singlePlayer then
+      "Select 3 cards for a SET (e.g. A1 B2 C3):"
+    else
+      "Player " + player.number + ", select 3 cards for a SET (e.g. A1 B2 C3):"
 
   private def player =
     controller.game.selectedPlayer match 
       case Some(p) => p
       case None => throw IllegalStateException("No player selected")
 
-  override def print(): Unit =
-    if controller.settings.singlePlayer then
-      println("Select 3 cards for a SET (e.g. A1 B2 C3):")
-    else
-      println("Player " + player.number + ", select 3 cards for a SET (e.g. A1 B2 C3):")
-
   override def message: String =
     if controller.settings.singlePlayer then
       "Select 3 cards for a SET."
@@ -95,11 +95,14 @@ case class GameState(controller: IController) extends State:
 
 case class GameEndState(controller: IController) extends State:
 
-  override def print(): Unit =
-    println("\n" + PrintUtil.yellow(PrintUtil.bold("All SETs found!")))
-    if !controller.settings.singlePlayer then
-      controller.game.players.sortBy(player => (-player.sets.length, player.number)).foreach(player => println(player))
-    println("\nType f to finish:")
+  override def toString: String =
+    val players = controller.game.players
+      .sortBy(player => (-player.sets.length, player.number))
+      .map(player => player.toString)
+      .mkString("\n")
+    "\n" + PrintUtil.yellow(PrintUtil.bold("All SETs found!"))
+      + (if !controller.settings.singlePlayer then "\n" + players else "")
+      + "\nType f to finish:"
 
   override def actionFromInput(input: String): IAction =
     InputUtil.finishInput(input, controller.canUndo, controller.canRedo) match

src/main/scala/de/htwg/se/set/model/game/Grid.scala

@@ -10,7 +10,7 @@ case class Grid(columns: Int, cards: List[ICard], easy: Boolean) extends IGrid:
   private def columnWidth: Int = if easy then 3 else 4
 
   private def legend(columns: Int): String =
-    "  " + (65 until 65 + columns).map(_.toChar).map("│" + _ + (" " * (columnWidth - 1))).mkString
+    ">>" + (65 until 65 + columns).map(_.toChar).map("│" + _ + (">" * (columnWidth - 1))).mkString
 
   private def line(columns: Int): String = "──" + ("┼" + "─" * columnWidth) * columns
 

src/main/scala/de/htwg/se/set/view/Tui.scala

@@ -1,6 +1,6 @@
 package de.htwg.se.set.view
 
-import de.htwg.se.set.controller.controller.InvalidAction
+import de.htwg.se.set.controller.controller.{InvalidAction, NoAction}
 import de.htwg.se.set.controller.{Event, IAction, IController}
 import de.htwg.se.set.util.{Observer, PrintUtil}
 
@@ -13,7 +13,7 @@ case class Tui(controller: IController) extends Observer:
 
   println(PrintUtil.bold("Welcome to the SET Game!"))
   println(controller.settingsToString)
-  controller.printState()
+  println(controller.currentState)
   loop()
 
   @tailrec
@@ -34,5 +34,5 @@ case class Tui(controller: IController) extends Observer:
       case Event.SETTINGS_CHANGED => println(controller.settingsToString)
       case Event.CARDS_CHANGED => println(controller.gameToString)
       case Event.SETTINGS_OR_GAME_CHANGED => println(controller)
-      case Event.STATE_CHANGED => controller.printState()
+      case Event.STATE_CHANGED => println(controller.currentState)
       case _ =>