From 1178730173727d038d0811faeadbf8d1de37f82a Mon Sep 17 00:00:00 2001 From: peet Date: Sun, 9 Jun 2024 14:52:57 +0200 Subject: [PATCH] refactored the GameStates --- bin/cards/maumau/model/ActionHandler.class | Bin 2102 -> 2118 bytes bin/cards/maumau/model/Canceled.class | Bin 0 -> 2130 bytes bin/cards/maumau/model/Finished.class | Bin 0 -> 2130 bytes bin/cards/maumau/model/GameState.class | Bin 0 -> 382 bytes bin/cards/maumau/model/Initialized.class | Bin 0 -> 2473 bytes bin/cards/maumau/model/JackChosen.class | Bin 0 -> 1330 bytes bin/cards/maumau/model/MauMau.class | Bin 6525 -> 6515 bytes bin/cards/maumau/model/Normal.class | Bin 0 -> 1282 bytes bin/cards/maumau/model/SevenChosen.class | Bin 0 -> 2166 bytes bin/cards/maumau/model/SuitChosen.class | Bin 0 -> 2154 bytes .../maumau/model/gamestate/Canceled.class | Bin 353 -> 0 bytes .../maumau/model/gamestate/Finished.class | Bin 353 -> 0 bytes .../maumau/model/gamestate/GameState.class | Bin 128 -> 0 bytes .../maumau/model/gamestate/Initialized.class | Bin 362 -> 0 bytes .../maumau/model/gamestate/JackChosen.class | Bin 359 -> 0 bytes bin/cards/maumau/model/gamestate/Normal.class | Bin 347 -> 0 bytes .../maumau/model/gamestate/SevenChosen.class | Bin 362 -> 0 bytes .../maumau/model/gamestate/SuitChosen.class | Bin 359 -> 0 bytes src/cards/maumau/model/ActionHandler.java | 2 +- .../model/{gamestate => }/Canceled.java | 2 +- .../model/{gamestate => }/Finished.java | 2 +- src/cards/maumau/model/GameState.java | 17 +++++++++++++++++ src/cards/maumau/model/Initialized.java | 16 ++++++++++++++++ .../model/{gamestate => }/JackChosen.java | 2 +- src/cards/maumau/model/MauMau.java | 4 ++-- .../maumau/model/{gamestate => }/Normal.java | 2 +- .../model/{gamestate => }/SevenChosen.java | 2 +- .../model/{gamestate => }/SuitChosen.java | 2 +- .../maumau/model/gamestate/GameState.java | 5 ----- .../maumau/model/gamestate/Initialized.java | 6 ------ 30 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 bin/cards/maumau/model/Canceled.class create mode 100644 bin/cards/maumau/model/Finished.class create mode 100644 bin/cards/maumau/model/GameState.class create mode 100644 bin/cards/maumau/model/Initialized.class create mode 100644 bin/cards/maumau/model/JackChosen.class create mode 100644 bin/cards/maumau/model/Normal.class create mode 100644 bin/cards/maumau/model/SevenChosen.class create mode 100644 bin/cards/maumau/model/SuitChosen.class delete mode 100644 bin/cards/maumau/model/gamestate/Canceled.class delete mode 100644 bin/cards/maumau/model/gamestate/Finished.class delete mode 100644 bin/cards/maumau/model/gamestate/GameState.class delete mode 100644 bin/cards/maumau/model/gamestate/Initialized.class delete mode 100644 bin/cards/maumau/model/gamestate/JackChosen.class delete mode 100644 bin/cards/maumau/model/gamestate/Normal.class delete mode 100644 bin/cards/maumau/model/gamestate/SevenChosen.class delete mode 100644 bin/cards/maumau/model/gamestate/SuitChosen.class rename src/cards/maumau/model/{gamestate => }/Canceled.java (55%) rename src/cards/maumau/model/{gamestate => }/Finished.java (55%) create mode 100644 src/cards/maumau/model/GameState.java create mode 100644 src/cards/maumau/model/Initialized.java rename src/cards/maumau/model/{gamestate => }/JackChosen.java (56%) rename src/cards/maumau/model/{gamestate => }/Normal.java (54%) rename src/cards/maumau/model/{gamestate => }/SevenChosen.java (57%) rename src/cards/maumau/model/{gamestate => }/SuitChosen.java (56%) delete mode 100644 src/cards/maumau/model/gamestate/GameState.java delete mode 100644 src/cards/maumau/model/gamestate/Initialized.java diff --git a/bin/cards/maumau/model/ActionHandler.class b/bin/cards/maumau/model/ActionHandler.class index 0c8f2d463a27051881fadb7b4af53faf79847022..f75a044d47bad129b69520935dec191dd270b754 100644 GIT binary patch literal 2118 zcmai0+fEZv6y2vStu0foau-DuZHrP=pdyH16O{y&1cSjBJWNMA*v{Z|Y9ep?q;J0a z3qEK9G10^i@S}|DoEfGUPt&CI-1b`gwsymxzdwHy(HiAr6k;@?bEi`0(b$H9;4!b_v&1N&7ww8+ zZBJg*{rc=`@pblJ2_cLkOym8tJLy$ug}q?4d9 z^=g!)K1ShGdOJ>x&T15=gxC#g)Irf04TDaR$T~ckyks63g#-=JsNfl6G^O<1P_`w{ z)3`>Rq%rE=FfHRrwY+CI&-h*mdG>ACIxlT=#}sG(GU67^3ZqF?VvY1D8ZQ(!OZ=VT zv?_)7ibznjL*G)_FW(TH6_-1%s5W}{3U#g&{e#Xe-6)+NiZQ@4PC_c4L^|aR9aP!Kx9c+=IeCU71&D$qRlyt zVswU4veIbU31}{FS1ngm5%Pc-la2wa+HJ3C>5fr0thzhR56;)@MBuSpKS%YdjiG>| z%>Nba1*)@UR~_AWU`kyy^m#@M9!(&HForfleL}9-g+xAbg^=Y6nPKh4Uy{0D-;Lca z5FxB%nIF`X37=4ZX8ME%GQVhO2UjB}bnZKzLv$YBgP<1Q5fH>7_AVNxQ5vBO@>bFy zkc&8hP=>*D@YTN6@A@npc1qn!!aS_;ygP6}S@miV6)c)I^q$w{M_G zM=}h0R)PDd92F7sBHd90(*Lz7iz8(qOF`}C;6TttxwNC_vt$RUf&4Rn#&RZchG- UM0z!>Aw%TJm*M{g(enHM07TSIPXGV_ 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<*QfdUoBpYdGbqkuak~l~S5h=A4Eb~s=sM_zWavGz^N$?RJ z8R!B7E4E|ZZ`L*}_mQztWjcc^b8LlnY!Dig6*bRa4s8sh9pGl^Sa`|D^cx$=c z^7K#VWS)svL1biGf2)@@rkWKYK@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&_2N76g`uqjcZ!EK-s$Bmd#;_*^wwhLKWpD0;H5m@HVlBW{Q_Eo)jX%NAXk% zBzWhe5Oc!q~nlo(cgu7cEyc$Yq2lmsI5wt4J} zPy|&}7#0rrA@@Qa?|ZLW2g27?Of#%z9DBhd(bQZEhUq6Vmij3}*{$s{RJJLujWSNm zq6&*)z9D1rvKzI8+U2c~PAoMNpND%~NwYrQtmw8(8P*yZY(tS-47T4FZ1}5KqUdAE z&y`A)h0_e5-^5C!Nq8s%$4{b;47rv`>~vH@gwbQip4n{+NB26y8OC;^ZmJy_bqFA0 z?PvnXxGj{_6ot1^t+=n9Na%JFIHUaQV?A!owy}saChxNh%Wh+=t*Moa_qU8eGdu`h zhrA~g!@8T5?%-DfTUcTET3|9GY3@Kn%_hC6=1QA{Evz$qDp1adnXIMKzo(0qwg*Z! zimmdPdLYGbCrK)rU8(5`4vT1({iMBNvzsW6S@w(L{g2`pcGnE1I92Ky=KuANx_1`tG4u*F?O4f3n%zvg z$`?D*^y#@_Z>*a}h7HiYqVE*FQf!*3yVE#BE01PI^VIbt*x%@(gjpJ=`@$J&7BP{JiGM8zU(3Oh!&B7D%J~>{(gTIRWJ-7e> literal 0 HcmV?d00001 diff --git a/bin/cards/maumau/model/Finished.class b/bin/cards/maumau/model/Finished.class new file mode 100644 index 0000000000000000000000000000000000000000..8aff7e976bd101f26277a94b16f6670db0a7cdd5 GIT binary patch literal 2130 zcmc&#*>2N76g`uqjcZ!EK-s$Bmd#;_*^wwhLKWpD0;H5m@HVlBW{Q_Eo)jX%NAXk% zBzWhe5Oc!q~nlo(cgu7cEyc$Yq2lmsI5c4REm zwg{@IFf1JKL+*t<-uGU$4ur3(m}XebIQD`^qN%wS4AW1DLO*3FyR|)r$~N)ZDC5K| zs<0U58!{FzyHQK1UET`m#8M;idAP@wH0$Hdif+r4VXcv&HZ-}#VEa7wMQHS^SR(eZ z<>yKz%ED=e&u?NS(j+_-f#WApM}}O>Bz8I~A;IXeW6$iig`;~N;S9N*sGDj>MjZl( zSUZ{kGHwecHL>tksulOO6A9f;0%sI|eeB1r*)|q&#>9P=VcBhry*0Ix@&1-c&OEp9-`yQl`{W>EHM7>cGiH zu~i;R53Km@BuPcHD>YrgVG+%;U$rX?UkXgq*oMBNvzsW6S@w(L{g2`pb=M50I92Ky=KuANyLT4uG4u*d+Od<7HM^N~ zl`nRr>C%<(Mc*lUrPwr6cc*cNRvyia=BevPu)onm39~d#_czO!qvzQH z04FgIEYPcFba=B*N|Zma_;%^k5te@uo=q|k{v6KJo)I(n63qkrg&h294*yyX{$dW^ x$-!^pQl_8FIrytN{MT~uwH!QUI5R&taVyhLJqLdqcQWyJv+#txPZ=-a!C&VUKKuXx literal 0 HcmV?d00001 diff --git a/bin/cards/maumau/model/GameState.class b/bin/cards/maumau/model/GameState.class new file mode 100644 index 0000000000000000000000000000000000000000..5067285aa258d319515ea8534a62bc8c7cdc2d0c GIT binary patch literal 382 zcmZvYy-vh15QN9aaUlWjho25n9}O-ks1On~NSqXjf^KmP=fjCnoFMUP6g&VAg;+be z69tmx(e7BEXZQQ(^9#TgjuQ+7P88LJmnF4)Wa$cR#uZ>Z4;h62+Sy_2+5y~z8g zl~#>FN=31-^r35k)A`*$h|aw{d*H{up}Gl7fvtJyWY4BDe%ZA$MU~QaT`ZmR`kFHd zOxEO3MpUMvowtTVZ0t}*d+1-y8-G%{3xR~WA;q7E9p{k)_km_&3fI%UhMB<9Cgz7r@hW_z$Ae~z6Ut^1$7iwzW@LL literal 0 HcmV?d00001 diff --git a/bin/cards/maumau/model/Initialized.class b/bin/cards/maumau/model/Initialized.class new file mode 100644 index 0000000000000000000000000000000000000000..092d124303f483e981a022f67d45334d620c1c83 GIT binary patch literal 2473 zcmc(gYflqF6o%h{%C>8vh=L*)R|IW~Qtv1ripWjzk`$Zhx9N7Ii+gEyrzD_>zsW=) z(L}%dql{C8D^N!Ym! z*OC^ut$k6_5M$`y;k!I%b9X!UvbZBmsiB8qG^FPmcSK%tDHyaecT2YL874MEluM?x zJa@gWnP=!(uqf*y!&Lfsd8WV+TP9W=-RMmsfj)-rbf%C1(I%lG&XC%)T=Amn6otRV zi#8z*YI<+u$&5Mgewh68p|yU-;xxF7X#^Y zQyPwtWv^s3=jlufDV@=EWRX+T={mz;db5R>m%in0Q(Rfv6@K7snjKr_P$y;z=tCRI^s4C;zER3Lvd+s!AHIO0{eJ1Nb(M zb%u|fwXOlvq|@_W)i=eerM@ZsZF|s++AwJErD;aj3AzTNB;vaEk7I)ECq%M*R|W3{Y#RuEuGcp_YoKqB1&Y_ie;nYs5@tzaVvh zvj-TPKES0`V7(S3NeOz}f~J~5Q@DaOSU*FCGU?E!#%j) K`u52V;K5%&nz0Q4 literal 0 HcmV?d00001 diff --git a/bin/cards/maumau/model/MauMau.class b/bin/cards/maumau/model/MauMau.class index 234737019145bf5394870a8808755f23df6fc152..a4409daa3785117b62648e27572ea8b00971ae64 100644 GIT binary patch delta 30 mcmexs^x0?uJEOwniL7Fq71@h<7#Sx|6}Dky+4~|i#U+U)shh>vOL!O=CU*sHFWCzc5=BU;0xqk9w51ZqS!dX|P3*|_R`elw z9wd<9&O;%_NkuOerzpuJ9!);~9?$sqpYJ~b;59rtL`q_TCRD-7Bi**LqZsP->px^q&JEJ#)8IH*B&j%$*$Rz==P z&s*vFnpOCyVkQeqUK$%@jX{+%FoM1`yoCQFX5DPzvLV?eLe?7}q^=uQLngE&ZAx-F zqHyJdL&eijC~YDCecmHYwX0rkbjYIV zPv&PXRbR$U>rpLNpbI@Su_$6Sk;}SQe<|QPRa9NcO(BKJ7!ueMu%9ii8+I9-HtWOK z(36EWbiAoo*nu)|hjiIs2_qZSNWXFHm-4%hhFw3x%v+_BQMMrZj7-k>KMCvCDRj;+pP}?BW z4yrgZ2MadCd|M{s#USnqwZ*#;t!TE>fJfV0Ni#m2tm#l@3~oEe+Z5+IgA?#15RpN! z&?E;F>Ss!&%Ek$XkFOIYvNYNgJvT_>zKpn*Y2x-(N|VBXDCd>s!96LhR2}GMIpDt z7}c`(vTx%$!=PLM<99ks8&n6UvSfzCEcyQ_O9sF*jmeTlg~WVu{{X(VahKs!xuH9R z8PhqPbf5yUDNPk`OqI8nO9lEX1@^BN=vxJPig0dxZs2Av&su^07H;S2@8s!8d5o{DnRO(1aEF?7LQyi$DK5g;5YF! z2_$&uMTHJDMOe4uq1L?C@Ty75B9h2^}PTXQIJo#>j2iHWqN&?EMVGlH1AHb+wZ5?v@d0 zj`#boLw+C>!>XINqwzm z`aupXTxZaw`ZsQ;L)517Hx(i?9EHgHKOr*yUDKEl)v1D*v-S_acNXq4d@5DABQ6ti zb~hO+Up$wlb~m$XxoJup)8toIrgv)~l&tkP2tO)Ugt*w6~jIM9igm59fQjBntA;A%0lH1xW`>HVQD;G{G zW_hF8t+}-W{})65W;?=Fez5O8_&p(AHGQkilN~I_`-i*XGdPFDkrT;8NR|W&+X#pWm-<08f}j@B|mRZi`M;y609^QyuNWhoB#3Y%n54Egi@wTC`=+y! z6|=O-b-B{59r(ZKyN&GxSLwmN`{4J2c-i!AZsvBd9Pc0QhR@&}jKdRfBErQW#A7nG g<3MoxiTHzphlChX21~}oWOom6iU}F#L-a8H17}54v;Y7A diff --git a/bin/cards/maumau/model/gamestate/GameState.class b/bin/cards/maumau/model/gamestate/GameState.class deleted file mode 100644 index 11f0392641b430d05e876e685cd88ddbe958a9f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmX^0Z`VEs1_nn4c6J6PMh3Oy#G;g9{oKS-AkxpxPf5+uPfyHEEiOqcN!51;vVuV@ zb_Nzk27#=^vPAuy#JqHU|D>$cWs^+?b?w&UVd>>HUAvckiYp%+r&7kFwtq;#J)>xqdP|b#!#L=%0jZNGMr>d=1Hv mIHKp`)WHM6{2TF?6g(uNp_Bn1m!ipGAK(f@ae^21F#ZD*&RC)V diff --git a/bin/cards/maumau/model/gamestate/JackChosen.class b/bin/cards/maumau/model/gamestate/JackChosen.class deleted file mode 100644 index b042ae04f41657c0fb1e9a1dd0a84515928598a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmaJ-%TB{E5S&f(C?OEqKi~qC1O5OI5~>6eirPa_?;F=@UGk6;hyUV)#DNd!M)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+{!a6p)prqT1>RocIDWyLWq z+nVi?y&3qw7>7605iZKTeRpHu5%NXb`&vJlA#l8tZ-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+KwPcrf&;b+QD^lRJ$LZgd1omJ%N4=>C!lg k=gQ211Ht?g@rMc?62(wuXv?Kya<~V$!dRKwD|)#81LxydVgLXD diff --git a/bin/cards/maumau/model/gamestate/SuitChosen.class b/bin/cards/maumau/model/gamestate/SuitChosen.class deleted file mode 100644 index 063c2b53084bb6356de6a677f356572ef19872d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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;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