From 49d958652a91c06ea1dc5298cd81b2a18410d2cd Mon Sep 17 00:00:00 2001
From: peet <schmelz.johannes@gmx.de>
Date: Sun, 9 Jun 2024 14:34:52 +0200
Subject: [PATCH] added all the ActionHandler states

---
 bin/cards/maumau/gui/GameTableModel.class     | Bin 1702 -> 1751 bytes
 bin/cards/maumau/gui/PlayerFrame.class        | Bin 8430 -> 8478 bytes
 bin/cards/maumau/model/ActionHandler.class    | Bin 2220 -> 2102 bytes
 bin/cards/maumau/model/GameState.class        | Bin 1097 -> 0 bytes
 bin/cards/maumau/model/MauMau.class           | Bin 6515 -> 6525 bytes
 .../maumau/model/gamestate/Canceled.class     | Bin 0 -> 353 bytes
 .../maumau/model/gamestate/Finished.class     | Bin 0 -> 353 bytes
 .../maumau/model/gamestate/GamePlay.class     | Bin 189 -> 0 bytes
 .../maumau/model/gamestate/GameState.class    | Bin 0 -> 128 bytes
 .../maumau/model/gamestate/Initialized.class  | Bin 473 -> 362 bytes
 .../maumau/model/gamestate/JackChosen.class   | Bin 0 -> 359 bytes
 bin/cards/maumau/model/gamestate/Normal.class | Bin 0 -> 347 bytes
 .../maumau/model/gamestate/SevenChosen.class  | Bin 0 -> 362 bytes
 .../maumau/model/gamestate/SuitChosen.class   | Bin 0 -> 359 bytes
 src/cards/maumau/model/ActionHandler.java     |   5 +----
 src/cards/maumau/model/GameState.java         |  20 ------------------
 src/cards/maumau/model/MauMau.java            |   1 +
 .../maumau/model/gamestate/Canceled.java      |   5 +++++
 .../maumau/model/gamestate/Finished.java      |   5 +++++
 .../{GamePlay.java => GameState.java}         |   2 +-
 .../maumau/model/gamestate/Initialized.java   |   3 +--
 .../maumau/model/gamestate/JackChosen.java    |   5 +++++
 src/cards/maumau/model/gamestate/Normal.java  |   5 +++++
 .../maumau/model/gamestate/SevenChosen.java   |   5 +++++
 .../maumau/model/gamestate/SuitChosen.java    |   5 +++++
 25 files changed, 34 insertions(+), 27 deletions(-)
 delete mode 100644 bin/cards/maumau/model/GameState.class
 create mode 100644 bin/cards/maumau/model/gamestate/Canceled.class
 create mode 100644 bin/cards/maumau/model/gamestate/Finished.class
 delete mode 100644 bin/cards/maumau/model/gamestate/GamePlay.class
 create mode 100644 bin/cards/maumau/model/gamestate/GameState.class
 create mode 100644 bin/cards/maumau/model/gamestate/JackChosen.class
 create mode 100644 bin/cards/maumau/model/gamestate/Normal.class
 create mode 100644 bin/cards/maumau/model/gamestate/SevenChosen.class
 create mode 100644 bin/cards/maumau/model/gamestate/SuitChosen.class
 delete mode 100644 src/cards/maumau/model/GameState.java
 create mode 100644 src/cards/maumau/model/gamestate/Canceled.java
 create mode 100644 src/cards/maumau/model/gamestate/Finished.java
 rename src/cards/maumau/model/gamestate/{GamePlay.java => GameState.java} (57%)
 create mode 100644 src/cards/maumau/model/gamestate/JackChosen.java
 create mode 100644 src/cards/maumau/model/gamestate/Normal.java
 create mode 100644 src/cards/maumau/model/gamestate/SevenChosen.java
 create mode 100644 src/cards/maumau/model/gamestate/SuitChosen.java

diff --git a/bin/cards/maumau/gui/GameTableModel.class b/bin/cards/maumau/gui/GameTableModel.class
index 961bf9c039c851e9e246e68cb242045ea3e04c4e..ac806bcb37fc98f3df58281c90c0e9d1f841f31c 100644
GIT binary patch
delta 66
zcmZ3+d!2VfBC}y#XkJljaehu&YKlT~er`c#PGU)Bex5=>QGQZRYHqQW0vD&dqpxec
Vv!kE0tB<S8<X&c_&CSfp%m6S^7JdK#

delta 46
zcmcc4yNq{3BD11zXkJljaehu&YKlT~er`c#PGU)Bex5=>QGQZRYOa;S=FQA1%mAB+
B5c>cC

diff --git a/bin/cards/maumau/gui/PlayerFrame.class b/bin/cards/maumau/gui/PlayerFrame.class
index af19f5df7c1f0369db148df76b6af610a0930bac..3a69d9e88f18c5d05588d8feac02f2aac981e2fa 100644
GIT binary patch
delta 38
ucmaFoIL~QAxB%mt$q@n?9L|n@&aOVLE|XgXls8ukB=9os-+V__h#3F`Ck&(j

delta 25
hcmbQ|^v-cZxBz3#<Ol(c%^L)wc^MCG=8+R(1^|7P2vz_9

diff --git a/bin/cards/maumau/model/ActionHandler.class b/bin/cards/maumau/model/ActionHandler.class
index f288d9a5c62435da1865dc009da36786112866ce..0c8f2d463a27051881fadb7b4af53faf79847022 100644
GIT binary patch
literal 2102
zcmah|+fEZv6kTUpTH8*+f`E4sZ*5VEiXx&2AyG;2l3+0SpbpcK4z^RBPEGVppY+Xl
zf58V$ASRml0e+NmoioF<)M=Vt&TX%C*4}%aKYxGz2C#_5Bs76B({Rg;Qq5@cTdLK|
zR<*QfdUoBpYdGbq<t7mq*uQ1GF-ld#*(^QS*s@GdAiinTEP*2{5d`;)Cckq6X|qyq
zSk7wGCPEKF<%(x<({pD8#Iit2a;<uXN5Xs*p*(NM^U|H&NHQdD*pBVZ3mlIG1u6<_
zylaVxr4d6;M;3zuv3y}I1%U%PQb^0$h>kuak~l~S5h=A4Eb~s=sM_zWavGz^N$?RJ
z8R!B7E4E|ZZ`L*}_mQztWjcc^b<?P>8LlnY!Dig6*bRa4s8sh9pGl^Sa`|D^cx$=c
z^7K#VWS)svL1biGf<SVzmaZpD$rim}5gV0YVH%EURd*MaI=i<-gD|t*63eB!OPH;e
zs!hM$MELCv5vt#+3k~Iic;lu0iY;*JY=3go3WOZX7ozGBdMV4ur8YbDhw<tH*@i1R
zlGrDZZR`!r5IVC|Z#tf=B70BIWnGI=t=*jMn66c`oVGnZ5Eodp7~WWGe=aR+$hxUm
z_ASX$%7Xt_x+kpDYQ5>2)@@rkWKYK@<x9gDlZo+_#xW>e$(bfIQzQMVMjDP|j=wDW
z89%_;Q=&AEhl@Y3zZl!WP;p`h!^K}1UH^eYJ2?EEry7p(e}v5PKTdp#M()Q!9OCDg
z+Epw#juTvwPpJ@`jp1Z)*A=d0lxR^Vcm#~MQP8si1?`Sg>ijg5^5srQcoaoJQRx0*
zNO7h&a4Hgbwl{Dl5_k^zKx)@)7rJCyKvBt`!1-Pj%Uvigu;a2klfC6XjFeyM4SXC4
zoWjLGbcv(X&{y2X@Hb9;^Z1>9)&}ki+jI$+Bf!(0;7TO;YFMs$UM2mNkQSb9nJle#
zU(=DUVi@tG!s`?2rAW;)xE3K~=xaw7?;?fFhP9jK1(GhI9#p50_Z0G>jUf>VxgIji
z@>xoTOmTf1L-FT)mz^{p`Kmv)(PToJIot@ckVcX;n&_<M=QgAkB5z_oKwjl2YpKOL
VlmDWSehphl4ZeK^Zb=jt{sBrrOGN+x

literal 2220
zcmah~+fEx-6kW#{J2nF(Bm@G4lDjc!+?FJiKxnBO2$ge@h>*xjI*g|<V2{ywT&b1%
z);_gweeW0ap{+oXTB#q9kE*ivnPF_)gDe@&ZLf9qUV9z;-G6`o3t$yrWsy>taqOVl
zEY<B6Kc#x3>efoDPUtoKr?y|Mxj`0bh4cINw|1#!`@5wVJNvE^Dx`Pqx~ni*F%Uen
zTl_33<ej}n)Acu79uZa?Dl49)oiJEXP#X$4;o1!Ckc87F!u6AL;?7C%Va@(d;f^U*
zj+??&64Xlu5|ml?d@o!feZho@6Q12-T4idGM;|U)7{(=qzQXKQ4hoko<dB!yxP^XX
za+ttW7Ly871__dkEnJ1g64zIsJ$du8vbrq{A6OWGmBlrMf&ttvVS`zFcFp_Vt>!U<
zivqrBVGu(K!xhhWpSS8eZt%+9sZqO;O2e^hTXx{dI^Il&dtOuFx~c9{ou*7VyIK{+
z+~6#wqSGZ&DkDvhNTUbhKytDfK`46A58tp2&AoWx*uLY|P8NF&TBS@kva*vV$x`2?
zoVI`TX5=j*B5x%KZ7$u%rZ!!=dEgzgiGG7#%kH{yB3BEuCOs144l=Ub;oYGmUSA+>
zSh0}BIfcRI>Cgc}7s`#6ABr|~4-GyTxQuG=UhsS;aO<w$v1i4}#qVGyxv}2)HbpHR
z!ER+Kpve3`!Cq6H%|<J5+%-@8;#8mS$z!IOm>j<d`Y|GI<}4-k=#f6xBR#4|+KuA{
z{te?iaWeCWPI0_ee2bA{-!VpubH^Af{)H>Ym@fW<neDf@evBJ`GAM;x{6C?u8AqD_
z&EX13CoqahrZR=wJii<f;tmR2ky<CFIGaT=zV-oEa;<99W_Sc%(5B!wLrkGChr9ax
zLtKg}<^*n{xT`6w=rEzU*Bdx*1eSUO9~prk;o~^fGpjA1QSB#~*XiHKgI*MsGbkR?
z1R~Eu@ANl~>3`ZA_}U0u#G^Rr5=Y6Qzj%bPKRAgD6m@#11KgjqX$i{)@Z)aqff4*!
zBG(G95`SgH&5zqA%j?~cj%;a$$g7#;`iy=&lJn>MZH=BtXBDHrcUAF&F_AA4?e6nJ
zq08vE)t$(XOys8yhIS(5gkg~{R2T+|+ea8pf6XV_P4hD!`Y#<c14%t!;z?YEJRhM+
osctQQ?Lejy<Qmpv<U@|4WvZ{c_}?@#(y)z8A+oQ+Q$b<lJ^F)cyZ`_I

diff --git a/bin/cards/maumau/model/GameState.class b/bin/cards/maumau/model/GameState.class
deleted file mode 100644
index bde6402e56008601c9f2bfc549fae6ceeaacf589..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1097
zcmah|-%ry}7(I90+EL0jhYtB6h@x%-8Ib797Q!+IE|y_ZS+e+GE~8>ex0$XZ*?*<u
z0iu!k>>p+PzA~UMLfhNhbMN`iJ>UIq|NQ-N0icWx4H1F4mh=vLg|_U|Q)qV&ZMU!^
z+qUIP-_{TnNF2)(S#V|Ns8H?n+X7=d<=yJ1_hz{%FmK)#Ulf=K$lJAg&3apXbA>DA
zdZlVI9<SE-cb6JvbH8c{EPT96FJ5Z7PRH>#1(a;AArP&Q=Qv_I1X2d>AuXVmMwCp}
zym4>&p3^xh)^d$8;@&q9gBpj%V9J2TAkJXMKpZN6%^4VjE|4^xj$QA!4{Yy)JaBD+
zwApP*w;?@;aWJSuL5lqNUz{FUIFWAOrjNyJ?vA8%EaAC^XXHO*cF^<fwt*MO(vC~d
zlY>_G>p&nMPHFGp*lzj7S}4n_Axcv~3ta4d7T5@fjdmh;`(|@OD+Y3SDex*BUU6lw
zR}8Irt#{*}j|!Dvx4M0=Wp6vYX^HEDwaP@w%W{r7((ijTxfasn;L`2pHj7*9R3U|q
za&&8&O9@a<RSbG6Ads5j@-c%7Iu3*Q6NCnY`6~Z}Xr>d&8Iq@%48VhE05So17z@C(
z`ipqV5R+CjIz+~5#)g=-PBHtPL?U=Z?|E7n)O5NhXsIbAF@qEpc9JTn(mXS{(fJ(N
zSSRyrU&}AgonhfdOeF$FLF}1@A9FsG%_5$R!e3L)9G)3sw)sxUUo=bXb61%?$J3Q>
qG;?X~QjPx9V1zYt$d5Gg#9@6sE%N7B{tfZ}xCmAQg#y-se*GUGpy<c|

diff --git a/bin/cards/maumau/model/MauMau.class b/bin/cards/maumau/model/MauMau.class
index b0e84a4d2d84c2faf7c4c315ca9bad54fd1b6093..234737019145bf5394870a8808755f23df6fc152 100644
GIT binary patch
delta 267
zcmWNMIZFd^6vXF&>ze3-*)x)uGK)td1SAT=l0xE9idAe<{PBoulc2^k-(X!{FQScA
z3S%i+ik)p53tKC-vIzK^ACDR44f9(Xlx}pI=2&wR+x1X2TlJRexq3J0WHE#k#$h50
z8$Kp6j~w??yILNj@VRR47zKDJic>%ybNpm>jIt;T$e}EWMP9Y`sKVct!*7;PYjQ2o
zhS1`QJxg1BU<ahQYX{msbcFn4e@q=>1V_l=SU$I<^90K{#U{?6a4x(+giG9_!+(x4
zA`IgSV~8aYal?)2ng?!3_uTN-6AwtDCkr0=#jDXXXVL+^axGn@cfJ$$`Ad{fo|#zr
E2dVf*NB{r;

delta 249
zcmWNKJxjx27)8&E#%MKQlbTd&MTb^|+M&?eL5Pc}IH@>wHQ?u%TEG1T)$+`OxHxst
zE-pG2oLrp*@h6Cr3O-yoa1UJWU+JrKW19(SS$=2IZYM@E^fIhTGKR;LvP@P!liOB~
zLGrTdZaD=4X2?<?Pf@z=g;P;8%QzKXRAt@UG4t~5&6#ESQLaff6`Gnfl$-LH3awpi
z_T)G9J{{9foeT#QY3SD>3mmb*F%c)4Q!Y8<mUHRxBd1B9_93ox(UjP4nQO6weRC&q
lurhE@f(KkW@)Fd{ljPE&=}MGdG_TTDzR9<m4=Il>{R83>J;(q6

diff --git a/bin/cards/maumau/model/gamestate/Canceled.class b/bin/cards/maumau/model/gamestate/Canceled.class
new file mode 100644
index 0000000000000000000000000000000000000000..cfd1f191f94f7d3d0495fea41a97c337afb3412a
GIT binary patch
literal 353
zcmaJ-%TB{E5S&f(fRNJCKj6UgfIk3)R8@jYR1QVGZyc+*auO+V_%BXK9QXh}3bCo^
zwX!|(jJ31l{rUa+1~A7gK|r|B+?JiHxR<S}rZi4%xH6q*Z`6WoZJa3+goNpq-&r}X
zH|nL>8toIrgv)~l&tkP2tO)Ugt*w6~jIM9igm59fQjBntA;A%0lH1xW`>HVQD;G{G
zW_hF8t+}-W{})65W;?=Fez5O8_&p(AHGQkilN~I_`-i*XGdPFDkrT;8NR|W<JQk*Q
h9Eff|k$#8}AQOy5hLns2v)w(yDJH^XK7s+x{s1sERAT@D

literal 0
HcmV?d00001

diff --git a/bin/cards/maumau/model/gamestate/Finished.class b/bin/cards/maumau/model/gamestate/Finished.class
new file mode 100644
index 0000000000000000000000000000000000000000..bff57d1b8c2576f315edada80dcd7aad352dfe3b
GIT binary patch
literal 353
zcmaJ-OHRWu6r7jl10kifH(<ecfe!#eLP%v3l|@naPGYsL@{tmUd$B@d!2viFVp7p<
zWqafq>&+X#pWm-<08f}j@B|mRZi`M;y609^Q<ze%b!9rIol$dJ+iqiu2)^KKtKYRM
zb-h-v+1BJPLMXUAXz)U-<zOWUA86(t1*7YmmB4>yuNWhoB#3Y%n54Egi@wTC`=+y!
z6|=O-b-B{59r(ZKyN&GxSLwmN`{4J2c-i!AZsvBd9Pc0QhR@&}jKdRfBErQW#A7nG
g<3MoxiTHzphlChX21~}oWOom6iU}F#L-a8H17}54v;Y7A

literal 0
HcmV?d00001

diff --git a/bin/cards/maumau/model/gamestate/GamePlay.class b/bin/cards/maumau/model/gamestate/GamePlay.class
deleted file mode 100644
index 95c92cdcd61e21839887d0c82d8d19923da3c4fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmX^0Z`VEs1_nn4PId++Mh4a7#G;g9{oKS-AkxpxPf5+uPfyHEEiOqcN!51;vI24v
zE7=)X7#Rez63Y_xa}x8?_5G8wQj<#<8MuP;ON)|I-7<4h85wwCs`Wq$85uZ(Gt=`D
oOG=A?avC-vRzB$Zt?e*{*ccfY8JK|%1OX-nRxruNzz(K40F^W{`~Uy|

diff --git a/bin/cards/maumau/model/gamestate/GameState.class b/bin/cards/maumau/model/gamestate/GameState.class
new file mode 100644
index 0000000000000000000000000000000000000000..11f0392641b430d05e876e685cd88ddbe958a9f9
GIT binary patch
literal 128
zcmX^0Z`VEs1_nn4c6J6PMh3Oy#G;g9{oKS-AkxpxPf5+uPfyHEEiOqcN!51;vVuV@
zb_Nzk27#=^vPAuy#JqHU|D>$c<Pt^(uHgLAqU2P!%$!t420plQJ&;N^Mg~R(W}sal
Mz{tP~B$*i40O;x=(*OVf

literal 0
HcmV?d00001

diff --git a/bin/cards/maumau/model/gamestate/Initialized.class b/bin/cards/maumau/model/gamestate/Initialized.class
index ac5170d9b4debc482ebb275529ca0e69942689a9..b081c43133ed7f87e983ca3e6cde2719fb2262da 100644
GIT binary patch
delta 70
zcmcb~{ECU|)W2Q(7#J8F8H6Tsc`~X^6p-a~Ps~jXE=ep&ome@0at)(}EDHlKPzetM
VBamce;A7wi(u@oOK$3|;5CFZN4j}*l

delta 157
zcmaFGbd#Cu)W2Q(7#J8F8AK*>c`~X_6p-a`Ps~jX$Vsf6ST$RTk%2QfGd(Y{q_ilN
zks;D2E3qt5KPNFSUEe<`D>b>q+6SmZ6Q;w)CpobwrC2{Vu@s2(bMsSDbM!%y!6k_$
osn&MZlSLUVR9P8#fj06mFak+d20jLUAkD-e044<)gut{g05h>DWB>pF

diff --git a/bin/cards/maumau/model/gamestate/JackChosen.class b/bin/cards/maumau/model/gamestate/JackChosen.class
new file mode 100644
index 0000000000000000000000000000000000000000..b042ae04f41657c0fb1e9a1dd0a84515928598a7
GIT binary patch
literal 359
zcmaJ-%TB{E5S&f(C?OEqKi~qC1O5OI5~>6eirPa_?;F=@UGk6;hyUV)#DNd!M<F&9
zQg4;*k!P%(9q;b<`v<@i#t}TiwdQ8ks**d|s;pP0P-`wt>)09f%KCk}sasP;@Cg@N
z{$N#bwN~?dYqX0H60VL~yolMNHzR}(wzBS#Fu0j43I0^N#Tei;L4+Y8&1_|6U74Ha
zjq^e(##yboSaM@~{xAA&V_U)`JKFaU{hkmn>aNk|+4iRC;pwjb5H2B+<ODJok|kjT
kPlTyG2ZGx##GfK~NCZQXAth&m$^IVT9H}swk)VgsA0Px)#{d8T

literal 0
HcmV?d00001

diff --git a/bin/cards/maumau/model/gamestate/Normal.class b/bin/cards/maumau/model/gamestate/Normal.class
new file mode 100644
index 0000000000000000000000000000000000000000..58026d07cf16bd3cdad74ae4085d1be7c2bfcfb0
GIT binary patch
literal 347
zcmaJ-%TB{E5S&f(fHY9(A0Pw*4)_B=NEH%XqH-weeUn<nm7PeA!+&u?;=l*+QHV{;
zxw1Xl8EIzM`}6zt4Pb_8hKO)pvtM<}aW7Z7cBQRav(sJRpw+zfj%|jRaI)cdR+gK!
zdZ{+L4jEFy<zD-<1TBUjLV9l+6CMbotLr5pew0o*Mi>{!a6p)prqT1>RocIDWyLWq
z+nVi?y&3qw7>7605iZKTeRpHu5%NXb`&vJlA#l8tZ-<ZI3^IzmM0P=PWC+1SVQR~P
f<mMCkhX@f0!Bk|3<w&sD)(MU=5hlA4jBxq~mFH4x

literal 0
HcmV?d00001

diff --git a/bin/cards/maumau/model/gamestate/SevenChosen.class b/bin/cards/maumau/model/gamestate/SevenChosen.class
new file mode 100644
index 0000000000000000000000000000000000000000..c2276f0984b0cfc7fc25959432234bac8a9861ae
GIT binary patch
literal 362
zcmaJ-%TB{E5S&f(fDmZuA8<jX2mApbBvh$fA~*!~zDZZDt30H{>3?xT;=l*+QHV{&
zp{L6B$TO>*9sB3^>l?r`rV%{Ctl)OtnTmVerfSwwnhjUdId)<)*-O3HHl5TFe8ObM
zdp0H48}pX$q;L^J!tF_q7j?@9H$wPmYwMl}quJex;4gGsj1evpL^vaiQ(MbxU**!i
zb6#r4G;InlSKQix|BJrc+Kw<!PtHBc{y>Pcrf&;b+QD^lRJ$LZgd1omJ%N4=>C!lg
k=gQ211Ht?g@rMc?62(wuXv?Kya<~V$!dRKwD|)#81LxydVgLXD

literal 0
HcmV?d00001

diff --git a/bin/cards/maumau/model/gamestate/SuitChosen.class b/bin/cards/maumau/model/gamestate/SuitChosen.class
new file mode 100644
index 0000000000000000000000000000000000000000..063c2b53084bb6356de6a677f356572ef19872d6
GIT binary patch
literal 359
zcmaJ-OHRWu6r7jl10fLT4cGu>fe!#eLX}_>!6K-8C$(Bv`ACVwy;vc!-~b#7by6X9
zSJ@tU#(ML{@AvQf2f!1i5j??lsk>#bYCUkPx?P$|t#oaAr=3yxVBLJ(_NIy83(hzC
zL#s+REA>`vOz9$of~$iTFEq<XGeP)Z8|xkglbhK>;Lq7D#snt`A{+_Q%r@qAs0-7*
z>!M=CG;2#;Ep%r`{xAA&ZF|8iJJ@$0{az5~?a-Cx*^Z{^{^@S~5H7(;JOSq-Tns}z
iCQ~~O1h-#^KPh-fh#_UL<dm4~?g7q_l5s{v4;Nc}PghF-

literal 0
HcmV?d00001

diff --git a/src/cards/maumau/model/ActionHandler.java b/src/cards/maumau/model/ActionHandler.java
index cf99291..5a92269 100644
--- a/src/cards/maumau/model/ActionHandler.java
+++ b/src/cards/maumau/model/ActionHandler.java
@@ -14,8 +14,6 @@ class ActionHandler {
 
     private GameState gameState;
 
-    private GamePlay gameplay;
-
     /**
      * Constructs an ActionHandler for the specified MauMau game.
      *
@@ -23,8 +21,7 @@ class ActionHandler {
      */
     ActionHandler(MauMau game) {
         this.game = game;
-        gameState = GameState.GAME_PLAY;
-        gameplay = new Initialized();
+        gameState = new Initialized();
     }
 
     /**
diff --git a/src/cards/maumau/model/GameState.java b/src/cards/maumau/model/GameState.java
deleted file mode 100644
index a87cebb..0000000
--- a/src/cards/maumau/model/GameState.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cards.maumau.model;
-
-/**
- * Represents the state of the Mau-Mau game.
- */
-public enum GameState {
-    /**
-     * The game has been initialized, but has not yet started.
-     */
-    GAME_PLAY,
-    /**
-     * The game is over. The final ranking of players can be
-     * obtained using {@link MauMau#getRanking()}.
-     */
-    GAME_FINISHED,
-    /**
-     * The game has been canceled due to insufficient cards.
-     */
-    GAME_CANCELED,
-}
diff --git a/src/cards/maumau/model/MauMau.java b/src/cards/maumau/model/MauMau.java
index 46ae664..2fd65fc 100644
--- a/src/cards/maumau/model/MauMau.java
+++ b/src/cards/maumau/model/MauMau.java
@@ -2,6 +2,7 @@ package cards.maumau.model;
 
 import cards.Card;
 import cards.Suit;
+import cards.maumau.model.gamestate.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/cards/maumau/model/gamestate/Canceled.java b/src/cards/maumau/model/gamestate/Canceled.java
new file mode 100644
index 0000000..689959b
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/Canceled.java
@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class Canceled implements GameState{
+
+}
diff --git a/src/cards/maumau/model/gamestate/Finished.java b/src/cards/maumau/model/gamestate/Finished.java
new file mode 100644
index 0000000..cdd0dd2
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/Finished.java
@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class Finished implements GameState{
+
+}
diff --git a/src/cards/maumau/model/gamestate/GamePlay.java b/src/cards/maumau/model/gamestate/GameState.java
similarity index 57%
rename from src/cards/maumau/model/gamestate/GamePlay.java
rename to src/cards/maumau/model/gamestate/GameState.java
index d054e15..381e35f 100644
--- a/src/cards/maumau/model/gamestate/GamePlay.java
+++ b/src/cards/maumau/model/gamestate/GameState.java
@@ -1,5 +1,5 @@
 package cards.maumau.model.gamestate;
 
-public interface GamePlay<T> {
+public interface GameState {
 
 }
diff --git a/src/cards/maumau/model/gamestate/Initialized.java b/src/cards/maumau/model/gamestate/Initialized.java
index 7dc949b..04eb82c 100644
--- a/src/cards/maumau/model/gamestate/Initialized.java
+++ b/src/cards/maumau/model/gamestate/Initialized.java
@@ -1,7 +1,6 @@
 package cards.maumau.model.gamestate;
 
-import cards.maumau.model.GameState;
 
-public class Initialized implements GamePlay <GameState> {
+public class Initialized implements GameState {
     
 }
diff --git a/src/cards/maumau/model/gamestate/JackChosen.java b/src/cards/maumau/model/gamestate/JackChosen.java
new file mode 100644
index 0000000..49998ea
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/JackChosen.java
@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class JackChosen implements GameState{
+
+}
diff --git a/src/cards/maumau/model/gamestate/Normal.java b/src/cards/maumau/model/gamestate/Normal.java
new file mode 100644
index 0000000..9ad9f46
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/Normal.java
@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class Normal implements GameState{
+
+}
diff --git a/src/cards/maumau/model/gamestate/SevenChosen.java b/src/cards/maumau/model/gamestate/SevenChosen.java
new file mode 100644
index 0000000..84c0585
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/SevenChosen.java
@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class SevenChosen implements GameState{
+
+}
diff --git a/src/cards/maumau/model/gamestate/SuitChosen.java b/src/cards/maumau/model/gamestate/SuitChosen.java
new file mode 100644
index 0000000..4de9ffe
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/SuitChosen.java
@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class SuitChosen implements GameState{
+
+}