Config Version yay

2024-12-20 10:54:29 +01:00
parent 111242a6aa
commit 3396355193
17 changed files with 24 additions and 36 deletions
--- a/src/main/scala/de/knockoutwhist/cards/stub/StubCardManager.scala
+++ b/src/main/scala/de/knockoutwhist/cards/stub/StubCardManager.scala
@@ -1,8 +1,8 @@
-package de.knockoutwhist.cards.mock
+package de.knockoutwhist.cards.stub

-import de.knockoutwhist.cards.{Card, CardManager, CardValue, Hand, Suit}
+import de.knockoutwhist.cards.*

-object MockCardManager extends CardManager {
+object StubCardManager extends CardManager {
  override def cardContainer: List[Card] = List()

  override def shuffleAndReset(): Unit = {}
--- a/src/main/scala/de/knockoutwhist/components/Configuration.scala
+++ b/src/main/scala/de/knockoutwhist/components/Configuration.scala
@@ -1,8 +1,9 @@
 package de.knockoutwhist.components

 import de.knockoutwhist.cards.CardManager
-import de.knockoutwhist.cards.base.CardBaseManager
 import de.knockoutwhist.control.*
+import de.knockoutwhist.player.AbstractPlayer
+import de.knockoutwhist.utils.CustomPlayerQueue

 trait Configuration {
  def maincomponent: Maincomponent
@@ -13,6 +14,6 @@ trait Configuration {
  def trickcomponent: Tricklogcomponent 
  def cardManager: CardManager
  
-  
+  def createRightQueue(players: Array[AbstractPlayer], start: Int = 0): CustomPlayerQueue[AbstractPlayer]
  
 }
--- a/src/main/scala/de/knockoutwhist/components/DefaultConfiguration.scala
+++ b/src/main/scala/de/knockoutwhist/components/DefaultConfiguration.scala
@@ -2,8 +2,11 @@ package de.knockoutwhist.components

 import de.knockoutwhist.cards.CardManager
 import de.knockoutwhist.cards.base.CardBaseManager
-import de.knockoutwhist.control.controllerBaseImpl.*
 import de.knockoutwhist.control.*
+import de.knockoutwhist.control.controllerBaseImpl.*
+import de.knockoutwhist.player.AbstractPlayer
+import de.knockoutwhist.utils.CustomPlayerQueue
+import de.knockoutwhist.utils.baseQueue.CustomPlayerBaseQueue

 object DefaultConfiguration extends Configuration {
  def maincomponent: Maincomponent = MainLogic
@@ -13,4 +16,8 @@ object DefaultConfiguration extends Configuration {
  def roundlogcomponent: Roundlogcomponent = RoundLogic
  def trickcomponent: Tricklogcomponent = TrickLogic
  def cardManager: CardManager = CardBaseManager
+
+  override def createRightQueue(players: Array[AbstractPlayer], start: Int): CustomPlayerQueue[AbstractPlayer] = {
+    new CustomPlayerBaseQueue(players, start)
+  }
 }
--- a/src/main/scala/de/knockoutwhist/control/ControlHandler.scala
+++ b/src/main/scala/de/knockoutwhist/control/ControlHandler.scala
@@ -1,12 +1,9 @@
 package de.knockoutwhist.control

-import de.knockoutwhist.cards.CardManager
-import de.knockoutwhist.cards.base.CardBaseManager
-import de.knockoutwhist.control.controllerBaseImpl.{MainLogic, MatchLogic, PlayerControl, PlayerLogic, RoundLogic, TrickLogic}
 import de.knockoutwhist.ui.gui.GUIMain
 import de.knockoutwhist.ui.tui.TUIMain
-import de.knockoutwhist.utils.{CustomThread, DelayHandler}
 import de.knockoutwhist.utils.events.EventHandler
+import de.knockoutwhist.utils.{CustomThread, DelayHandler}

 object ControlHandler extends EventHandler {

@@ -14,14 +11,6 @@ object ControlHandler extends EventHandler {
  addListener(TUIMain)
  addListener(DelayHandler)
  
-
-  val maincomponent: Maincomponent = MainLogic
-  val matchcomponent: Matchcomponent = MatchLogic
-  val playeractrcomponent: Playeractrcomponent = PlayerControl
-  val playerlogcomponent: Playerlogcomponent = PlayerLogic
-  val roundlogcomponent: Roundlogcomponent = RoundLogic
-  val trickcomponent: Tricklogcomponent = TrickLogic
-  val cardManager: CardManager = CardBaseManager
 }

 object ControlThread extends CustomThread {
--- a/src/main/scala/de/knockoutwhist/control/controllerBaseImpl/PlayerLogic.scala
+++ b/src/main/scala/de/knockoutwhist/control/controllerBaseImpl/PlayerLogic.scala
@@ -1,7 +1,6 @@
 package de.knockoutwhist.control.controllerBaseImpl

 import de.knockoutwhist.KnockOutWhist
-import de.knockoutwhist.cards.base.CardBaseManager
 import de.knockoutwhist.cards.{Card, Suit}
 import de.knockoutwhist.control.{ControlHandler, Playerlogcomponent}
 import de.knockoutwhist.events.ERROR_STATUS.{INVALID_NUMBER, NOT_A_NUMBER}
--- a/src/main/scala/de/knockoutwhist/control/controllerBaseImpl/RoundLogic.scala
+++ b/src/main/scala/de/knockoutwhist/control/controllerBaseImpl/RoundLogic.scala
@@ -1,7 +1,6 @@
 package de.knockoutwhist.control.controllerBaseImpl

 import de.knockoutwhist.KnockOutWhist
-import de.knockoutwhist.cards.base.CardBaseManager
 import de.knockoutwhist.control.{ControlHandler, Roundlogcomponent}
 import de.knockoutwhist.player.AbstractPlayer
 import de.knockoutwhist.rounds.{Match, Round, Trick}
--- a/src/main/scala/de/knockoutwhist/control/controllerBaseImpl/TrickLogic.scala
+++ b/src/main/scala/de/knockoutwhist/control/controllerBaseImpl/TrickLogic.scala
@@ -2,8 +2,8 @@ package de.knockoutwhist.control.controllerBaseImpl

 import de.knockoutwhist.KnockOutWhist
 import de.knockoutwhist.cards.{Card, Hand}
-import de.knockoutwhist.control.{ControlHandler, Tricklogcomponent}
 import de.knockoutwhist.control.controllerBaseImpl.PlayerControl
+import de.knockoutwhist.control.{ControlHandler, Tricklogcomponent}
 import de.knockoutwhist.events.ERROR_STATUS.{INVALID_INPUT, INVALID_NUMBER, WRONG_CARD}
 import de.knockoutwhist.events.ShowErrorStatus
 import de.knockoutwhist.player.AbstractPlayer
--- a/src/main/scala/de/knockoutwhist/player/PlayerFactory.scala
+++ b/src/main/scala/de/knockoutwhist/player/PlayerFactory.scala
@@ -1,7 +1,7 @@
 package de.knockoutwhist.player

 import de.knockoutwhist.player.Playertype.{AI, HUMAN, STUB}
-import de.knockoutwhist.player.builder.{AIPlayerBuilder, Director, HumanoidBuilder, StubPlayerBuilder, PlayerBuilder}
+import de.knockoutwhist.player.builder.*

 enum Playertype:
  case HUMAN
--- a/src/main/scala/de/knockoutwhist/player/builder/StubPlayerBuilder.scala
+++ b/src/main/scala/de/knockoutwhist/player/builder/StubPlayerBuilder.scala
@@ -1,6 +1,6 @@
 package de.knockoutwhist.player.builder

-import de.knockoutwhist.player.{StubPlayer, AbstractPlayer}
+import de.knockoutwhist.player.{AbstractPlayer, StubPlayer}

 class StubPlayerBuilder extends PlayerBuilder {
  private var unfinished: Option[StubPlayer] = None
--- a/src/main/scala/de/knockoutwhist/rounds/Round.scala
+++ b/src/main/scala/de/knockoutwhist/rounds/Round.scala
@@ -1,10 +1,10 @@
 package de.knockoutwhist.rounds

+import de.knockoutwhist.KnockOutWhist
 import de.knockoutwhist.cards.Suit
 import de.knockoutwhist.player.AbstractPlayer
 import de.knockoutwhist.utils.CustomPlayerQueue
 import de.knockoutwhist.utils.Implicits.*
-import de.knockoutwhist.utils.baseQueue.CustomPlayerBaseQueue

 import scala.collection.immutable
 import scala.collection.immutable.List
@@ -15,7 +15,7 @@ case class Round (trumpSuit: Suit, tricklist: List[Trick], playersin: List[Abstr
    this(trumpSuit, List[Trick](), playersin, firstRound = firstRound)
  }

-  val playerQueue: CustomPlayerQueue[AbstractPlayer] = CustomPlayerBaseQueue[AbstractPlayer](
+  val playerQueue: CustomPlayerQueue[AbstractPlayer] = KnockOutWhist.config.createRightQueue(
    playersin.toArray,
    (startingPlayer == -1) ? Random.nextInt(playersin.length) |: startingPlayer
  )
--- a/src/main/scala/de/knockoutwhist/ui/gui/CardUtils.scala
+++ b/src/main/scala/de/knockoutwhist/ui/gui/CardUtils.scala
@@ -1,7 +1,7 @@
 package de.knockoutwhist.ui.gui

 import de.knockoutwhist.cards.Card
-import de.knockoutwhist.cards.CardValue.{Ace, Eight, Five, Four, Jack, King, Nine, Queen, Seven, Six, Ten, Three, Two}
+import de.knockoutwhist.cards.CardValue.*
 import de.knockoutwhist.cards.Suit.{Clubs, Diamonds, Hearts, Spades}
 import scalafx.scene.image.Image

--- a/src/main/scala/de/knockoutwhist/ui/gui/GUIMain.scala
+++ b/src/main/scala/de/knockoutwhist/ui/gui/GUIMain.scala
@@ -3,11 +3,11 @@ package de.knockoutwhist.ui.gui
 import atlantafx.base.theme.PrimerDark
 import de.knockoutwhist.events.PLAYER_STATUS.{SHOW_TURN, SHOW_WON_PLAYER_TRICK}
 import de.knockoutwhist.events.ROUND_STATUS.WON_ROUND
-import de.knockoutwhist.events.{ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
 import de.knockoutwhist.events.directional.{RequestCardEvent, RequestPickTrumpsuitEvent, RequestPlayersEvent}
 import de.knockoutwhist.events.round.ShowCurrentTrickEvent
 import de.knockoutwhist.events.ui.GameState.{INGAME, MAIN_MENU}
 import de.knockoutwhist.events.ui.GameStateUpdateEvent
+import de.knockoutwhist.events.{ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
 import de.knockoutwhist.ui.UI
 import de.knockoutwhist.utils.CustomThread
 import de.knockoutwhist.utils.events.{EventListener, SimpleEvent}
--- a/src/main/scala/de/knockoutwhist/ui/gui/Game.scala
+++ b/src/main/scala/de/knockoutwhist/ui/gui/Game.scala
@@ -11,7 +11,6 @@ import de.knockoutwhist.rounds.{Round, Trick}
 import de.knockoutwhist.undo.UndoManager
 import de.knockoutwhist.utils.CustomPlayerQueue
 import de.knockoutwhist.utils.Implicits.*
-import de.knockoutwhist.utils.baseQueue.CustomPlayerBaseQueue
 import de.knockoutwhist.utils.gui.Animations
 import javafx.scene.layout.{BackgroundImage, BackgroundPosition, BackgroundRepeat, BackgroundSize}
 import scalafx.geometry.Insets
--- a/src/main/scala/de/knockoutwhist/ui/gui/MainMenu.scala
+++ b/src/main/scala/de/knockoutwhist/ui/gui/MainMenu.scala
@@ -13,9 +13,8 @@ import javafx.scene.{Node, control}
 import scalafx.animation.Timeline
 import scalafx.geometry.Insets
 import scalafx.geometry.Pos.{BottomCenter, Center, TopCenter, TopLeft, TopRight}
-import scalafx.scene.control.{Button, Label, Slider, TextField}
 import scalafx.scene.Parent
-import scalafx.scene.control.{Button, Label}
+import scalafx.scene.control.{Button, Label, Slider, TextField}
 import scalafx.scene.image.{Image, ImageView}
 import scalafx.scene.layout.Priority.Always
 import scalafx.scene.layout.{BorderPane, HBox, StackPane, VBox}
--- a/src/main/scala/de/knockoutwhist/undo/commands/SelectTieCommand.scala
+++ b/src/main/scala/de/knockoutwhist/undo/commands/SelectTieCommand.scala
@@ -2,8 +2,6 @@ package de.knockoutwhist.undo.commands

 import de.knockoutwhist.KnockOutWhist
 import de.knockoutwhist.cards.Card
-import de.knockoutwhist.control.ControlHandler
-import de.knockoutwhist.control.controllerBaseImpl.PlayerLogic
 import de.knockoutwhist.player.AbstractPlayer
 import de.knockoutwhist.rounds.{Match, Round}
 import de.knockoutwhist.undo.Command
--- a/src/main/scala/de/knockoutwhist/undo/commands/TrumpSuitSelectedCommand.scala
+++ b/src/main/scala/de/knockoutwhist/undo/commands/TrumpSuitSelectedCommand.scala
@@ -2,7 +2,6 @@ package de.knockoutwhist.undo.commands

 import de.knockoutwhist.KnockOutWhist
 import de.knockoutwhist.cards.Suit
-import de.knockoutwhist.control.ControlHandler
 import de.knockoutwhist.player.AbstractPlayer
 import de.knockoutwhist.rounds.{Match, Round}
 import de.knockoutwhist.undo.Command
--- a/src/main/scala/de/knockoutwhist/utils/stubQueue/CustomPlayerQueueStub.scala
+++ b/src/main/scala/de/knockoutwhist/utils/stubQueue/CustomPlayerQueueStub.scala
@@ -2,8 +2,6 @@ package de.knockoutwhist.utils.stubQueue

 import de.knockoutwhist.utils.CustomPlayerQueue

-import scala.compiletime.uninitialized
-
 class CustomPlayerQueueStub[A](protected var players: Array[A], val start: Int = 0) extends CustomPlayerQueue[A] {

  private var current = start