From dff4261c2834d7cdefb075fb041573b999b6757b Mon Sep 17 00:00:00 2001 From: pbs2h20aal Date: Fri, 26 Nov 2021 12:45:35 +0100 Subject: [PATCH 1/2] Merging --- .../dependencies-accessors.lock | Bin 17 -> 38 bytes .../executionHistory/executionHistory.bin | Bin 53344 -> 53344 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 38 bytes .../.gradle/7.1.1/fileHashes/fileHashes.bin | Bin 22397 -> 22397 bytes .../.gradle/7.1.1/fileHashes/fileHashes.lock | Bin 17 -> 38 bytes .../buildOutputCleanup.lock | Bin 17 -> 38 bytes Happy_Bird/.gradle/checksums/checksums.lock | Bin 17 -> 38 bytes .../example/happy_bird/HappyBirdMain.class | Bin 9739 -> 10078 bytes .../build/libs/Happy_Bird-1.0-SNAPSHOT.jar | Bin 355852 -> 355932 bytes .../compileJava/previous-compilation-data.bin | Bin 17587 -> 17587 bytes .../com/example/happy_bird/HappyBirdMain.java | 23 +++++++++--------- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock b/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock index 1504b9c09125b7c12d2aa3f6bd196d435b80f3fa..367093e311fbd04a48792e6beaa2cf70c5df5b47 100644 GIT binary patch literal 38 ocmZQhzQrlOW~*-$0~9bbFudd6v;6K`^T2Ip3@m1*re+Kb0LCQ=>;M1& literal 17 TcmZQhzQrlOW~*-$0~7!ND^3G( diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 98fece45e50b77a97e0e85bf3027c97a1b716182..20187b7dd20c82c171919aa81ee2e45c093c511e 100644 GIT binary patch delta 926 zcmaE`fce1!<_+Zus@$Tp^K-IHD$A;}^70aMOL9^ZGqMWJQ{rGw)B{pCLZkElYqM#JQ^9HTi9ZCd*HdgjA*~%YP8V8OF%TRAlL20Th{-X%-4% zT-9Ipk)4@A;K$Pt-d83}ovd!WI`xm|903Z+%-H=T&G^L*4FQX!B<85aKp}yR2c%D4 zzu>AYuj2hiT_px6gznhMJ=y zt-Rpv`(TrbOvcrd0|O)`*Pr0nyup70BjaD7($L8Q0pgSYm-qtX&1JHKztH54QnSrx z0wtIx?@Tt|EFB`vDk$y86}stw?9BbEFS4AdKD`7SUV<1--Mp|amr;K9+$mExuiW*z z*LqTNLByv`%T|Iy<<1>Z7DfgJ;Z>9O*VsrtOP~ir*AkF>?)goQKcmI66Udp|dq$V#1c}vM#i8m%7>sTITBaE@K0$d%v-(?w(|02ZFZdg1aRAQAWskwPl zMN*zLTM;bHG3i`XT;Yfl;86%>rGD(I(*u(rklESMi!wkEV}e>pkn!1rq|-4OkF6yQ z4PlIv#zUE_!N4*_SyPmM^P6QX6MXgCi>EDu!n`&NmA6z6a(^bExMsY+LCu=$sHl(O z?&;?f(BN`#xtbNlOLM#scVkcxnIITg+>9TnRg@hct6^)k-}RpvYo zA3vS%voS9zCpANgj2r+FQ59o@?t^6J;`2} zDsX^T;bzb(UXEsr&QvScLH{iacvQX}y)Yf>y zM6IQ^25q4jVhNz+n_$GyKwP3kjES$Mw#J`KaomZm5x`-ZIxA;9)LSdYqn#i5>?&RO zO~D*=Z}ETV>Vl#0@>cYK4vTSNX#CdZqn@>*nzKJvS(@fSpk^(-f4Vw9xTCSf*Xx4j zvx6>N``h_nFZHO%2O^Zt)kC=P6-K(V;dO+$y(}p|iG>#>$0W$g5^Wq_Rn)YgHiTUy zE;1)rA8F1d9q!Z9`kc^TD571pZ|X(xynPL)b#YHS-0)+=c1<-kzM*d>CZp?%2Am;s z*p6YE`a8nedOdL;%nv)-(-%p@W3r_cVIb6cva6pEUWr<7_V=VwrR4`U6ULaJ9ueEs zfpt71y>FMgRV674JTx*zK-^cce>n6Y$JK5(zFQ}k&k)eL&@8L!5IB3v@vhr~>Ut-% zQF diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock index c2df6c5e7aae07b9287a9f3818bf2825a8926f67..53583553112d604c5b91af708cc8e745908f9164 100644 GIT binary patch literal 38 qcmZRcFR$V0A8pga00xXVnHd<~@%I?doa#}yS&M43sVaDZR;#9z~Ng zecV{0p9Ka^{^%v8Ak-GXsyaE>t-Rpv`(TrbOt7wJL0k}B>T#3b`lta_2U$*z4bo?R z7UVHm-&1Px?I2MgJ8yEeuatt#|3i86QWqR`SibZe+XIDT5EFt+AttzNo*WsX#uDyR zb7JztP^roHJw+z-`pHes4gs1F{1PSxv;xQx^pl$0?`Nbid+wB}n^*37-D^E5xgg@x zCWw(C%fLpm=EY2Y=(h)`BZPnQLjP|dtv@Hv4$uQJ{!cy&WBdm*fNBf_K~g~xlMe<- JEv^k@0{|jCdQSiV delta 367 zcmeynj`8n0#toOfRRWedwM1@rUAQ~$hoQ74dkX^tV{N$StR4n15U~VOdXpVJiY90J zxUqzF{8X9z(Mw7p?TMnjkMY((1BMVz13CR!5M6V{A-W{COn&R522x!#`LBl_grV;# zHTias2urxzEVN|Z+(~enYW|t@zau7_D!rgP&4!)X1Mr+Y&HfGnn0`w!U96V zOP6Fut$K2)a{2ejOFb{ZI{4p30wsZf(PZ*jPqoRsesT)f6@G63tAi?J3FrSlVX~l~ z)Z~6YBZZoyXZ>^!iCtw2@0q*P;w%r;F&$tXteG1pKlIxJ(y@N>LjP|Nt+NC4K#cj5 Y&%zl0VGP4Su&0|Q9}JROTpP#+0M6BbNdN!< diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock index b094980aa75e8cce8e8014b273802eab6abc039b..0d4901ed8357ab2cf17fca92f654f8048add4379 100644 GIT binary patch literal 38 qcmZP;4v=Q+u;Wl;00S0wW(J0L{I{oU$}QI}Tf)F%W@>82zyJV%1qZ7D literal 17 UcmZP;4v=Q+u;Wl;00ZV%027P?X#fBK diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ef9f0a7b150406b5ef9ad4ea2a21671112f2abad..636d40ca771233a2afbb35d72f41967776dacde5 100644 GIT binary patch literal 38 qcmZR6*X{eBQS{781~6b2V`gA@$L~1fusz?+<6#UeW~QcQ3=9C*unHCc literal 17 VcmZR6*X{eBQS{781~6de2LLvc1Xch5 diff --git a/Happy_Bird/.gradle/checksums/checksums.lock b/Happy_Bird/.gradle/checksums/checksums.lock index 3d09054125383aee8571687d7c1ae8522bb9938b..23d6a8a8d8e5bcee4f22588f90c0043eba8b63ca 100644 GIT binary patch literal 38 qcmZSHBc?B=__%_P0Sp+um>C$}@fQTWpK_;pG8Y4jnW?E60|Nl7y9o;b literal 17 UcmZSHBc?B=__%_P0Sp+u03pQ!@Bjb+ diff --git a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class index 126434bbf5ca24c370e2113a55c3a1b055061094..f57fc668ef25ff52ad82ffe807f2c9260da4f88b 100644 GIT binary patch delta 1613 zcmY*ZZBSHY6n@Tom%Y1pcLf&iu6Nm$58X5o6;sm1Oj5@&DKi^QrfGs)@rP0gmL>}6 zHZ|iE>5Ey6f~hH>m@By^B{oxyX^vlGGxnj88Hyj^XIYwduBO%gIPY_I&w0=Docr8e zl7IYhZST#NRsgv)CaR^`y>7;RmC3dwkL+?-rI8$v{&>F}=u)|6AED`P z%?i#B5ar#?|JyUS*&iQKt&8VBTygFX~V5; zpQ2&vc5DnK-37^UJJBHL_=n_gGJNi)7(Oz5+!MnV!>4=Rh#~rA1RlKGFNPNk-wu=t zOfh^)3|k|HdEq~k9fr%$jl>o--BvZ8?c;5o`dA&o^5O~Ui^ET++PgsBA6=_Smdx%}Hg%%%wDP!(RL8qB3eyh<%t zM7yw=6gCR~*GRq7C~*JNAobSH;F!`I$CWI!DPwR(nTkuwD`ZjTQyh*1bjcF6EJ( zH0WX^4JQZJd3dW|kds{S3c4sqr{z<=T$;AP(x9>--RV!Ub&Au2v{k;99(^?t$l{iB7A~!u&Mcc z6Q9Y9;PQ$DjnXKcJ@6x6)5yF`M%jJcM`QRlGh{I=tvPW@j#annachubSaj>4kZP#> zj#l@xaEMr$&&hvR=VKo8!AJKZ2$lO delta 1406 zcmY*XZBSHY6n@To`PjXC7jR*LyUQXA>_7qm8hwB%rISNaX_SovY8Zqw0VRY*Q({DA z=0wdKO&Qv5YS1PUZKC3U&iJE&u_z*&{6LCQiL%hLPqA}pvhl|~=Q;0vp7(sbXXMTo z3)O+Co<0D1w6IG}Fe@f(m0iIFGQkoo^G&nlH6aypP>rCs<*1ru@j+4H!`&vlBf~72 zsXnYW;tIo58K%X?ckR;9f!&0VHKo;MmF0v%>C;?tg*i_yi7A%hTAZq)9`9@D!UwX? zoEc^V;X^~Uhu}(O#%Ah}t=f6E&DQ-&2L=O&B2&qb2AadygbIUXcgVALTTs^3_tyuO z#@5o}nc*QcM}>*5(Kh{Tf0%JM@M0sjB+KqyiIm$ zyS(QBe9QM@dv4@^AS$>QK3U|-iQS<)Y&*NrraM^EjdtB(kAA)z?@F&LCdJ>R8*<&G zhw7Sc(XF~&pV5Q&fNpf^mL3GAksNm2N3AkFKAF67X?%>mQ#Z51#8%a5+JYML<5B8F z9ra@!4dXF7j;Co1jWmI0XcEuTB|Ik-)Cn_Q5H@TQPHYxwcu8cTS=^47#l3h%l;BlS z)_@jKiPuC8UKi`}hG=5KCbSAKx`ZFyB7nW(Aohs?>=#4m5yx;qjG|Xepif-HK{16x zN-+8rD+Uxhjwo(?tfXL2nUAlOB7Ci^#Ra7fzhDF)2jaNNY@Eg!*tqmuoJGSpqPe16 ze2)n@jQ7JSjPk-7=m-4BOK4K6aSlI0AVyh*pD_sq8A<`p;{t-PP?^ow|B7HNQxb3y zzaaz_N;rPUI6~1bKEWTH&V+zCj6WHfx$u4Xi;;?c(b0gv8CozVBrahJ8qSH0xXfo( z$`AzvB7{*hogu*&hSL^0K?et7 zGpVqPEV_*>%!}r!9wv>fh!Hd)W8HUpv!`+T?`QIV}-@(qKb#m!$9&8F1nZZ+C#6{e}zKCa8#Z#)5{?~>~A9NY7&y$`0NwK5@5h^8+TaG3_#Qha|JcZsS^VR+3B8){_ zIqf#g#9Q#NPs4U(VFz-s6LZmqWoSnU`_=H{N$f%+`;FKwdp#{uO-ah0P1)puLg|!q W1>JZBl4S>wS0o zJ^?b_s1A%kI8xo=rk$`!67!79lEUrVAIBibTbDd%(jW$5*f535K`Yl_rz-N7uZ3;w0vwbtUmmHT4GV{>A|rIr-(q zTQZ!mG;bD07+mvdDyG-k-UnlT6h{^2VP+f(}d8etf#n>7skEk4jwhZtEfN zZCbN&8_Y1$)F|G@V$<2lr z4xLg+YdH%wF&P`II{8X*;MlEx7k*l7)nmyQ!fM_96!E?z!N?j^44p)`tB$QUi^yA0 z?0RN^^jn#YEl|pIcNHxkvhRz(E^u&lNnjIHGR8g4T>B#QrdcTL!-

`j#S@&h!EH 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 b8BFwIkCPR%6HG*b(M5vkNYoLRNdo*254-$H diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin index e61e91a463b3b8d54e1054eb977fc411e281f170..2af1e058ed2b6f2529695e856324cc6b679bb73f 100644 GIT binary patch delta 29 lcmdno$+)?bal!-vp|${4)ycVT>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de + int yPosition = 225; for (Button button : buttons) { @@ -113,19 +113,19 @@ public class HappyBirdMain extends Application { startGame.setVisible(false); -<<<<<<< HEAD + Label nameLabel = new Label("Name:"); Label acronymLabel = new Label("Kürzel:"); Label startLabels[] = {nameLabel, acronymLabel}; -======= - startButton.setOnAction(event -> { + + startButton.setOnAction(event -> { headline.setText("Start"); - for(Button button : buttons) { + for (Button button : buttons) { button.setVisible(false); menuButton.setVisible(true); } ->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de + }); int yPositionStartLabels = 225; for(Label label : startLabels) { @@ -188,11 +188,10 @@ public class HappyBirdMain extends Application { }); -<<<<<<< HEAD - startGame.setOnAction(event -> {}); -======= + + //startGame.setOnAction(event -> {}); + //startButton.setOnAction(event -> {}); ->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de From 5378876ff9b0ebf7f259e26eb21209e4b4ed2024 Mon Sep 17 00:00:00 2001 From: pbs2h20aal Date: Mon, 29 Nov 2021 13:19:52 +0100 Subject: [PATCH 2/2] Auslagerung der Methoden zum Formatieren --- .../dependencies-accessors.lock | Bin 38 -> 17 bytes .../executionHistory/executionHistory.bin | Bin 53344 -> 53344 bytes .../executionHistory/executionHistory.lock | Bin 38 -> 17 bytes .../.gradle/7.1.1/fileHashes/fileHashes.bin | Bin 22397 -> 22397 bytes .../.gradle/7.1.1/fileHashes/fileHashes.lock | Bin 38 -> 17 bytes .../buildOutputCleanup.lock | Bin 38 -> 17 bytes Happy_Bird/.gradle/checksums/checksums.lock | Bin 38 -> 17 bytes .../example/happy_bird/HappyBirdMain.class | Bin 10078 -> 9079 bytes .../build/libs/Happy_Bird-1.0-SNAPSHOT.jar | Bin 355932 -> 356032 bytes .../com/example/happy_bird/happyBird.fxml | 3 + .../compileJava/previous-compilation-data.bin | Bin 17587 -> 17587 bytes .../com/example/happy_bird/HappyBird.java | 8 +- .../com/example/happy_bird/HappyBirdMain.java | 433 +++++++++++------- 13 files changed, 266 insertions(+), 178 deletions(-) diff --git a/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock b/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock index 367093e311fbd04a48792e6beaa2cf70c5df5b47..1504b9c09125b7c12d2aa3f6bd196d435b80f3fa 100644 GIT binary patch literal 17 TcmZQhzQrlOW~*-$0~7!ND^3G( literal 38 ocmZQhzQrlOW~*-$0~9bbFudd6v;6K`^T2Ip3@m1*re+Kb0LCQ=>;M1& diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 20187b7dd20c82c171919aa81ee2e45c093c511e..57b018eac097686dedf1d067755f48c0a50f8096 100644 GIT binary patch delta 503 zcmaE`fce1!<_%Q|N+uaq#aYJ2>6ulj=4I)r#yN>O$;qi1$!UcQ5HNf5oP>T(mX%Y^ zJ(#SYr4C_4W$CbN28ncKsX`c=VT?OjiY$9UQjFPVEXRS2&DPmLj7r&+6{!`OW@!ak zi6&)*;`C*mh zYARVBB0+x`9Km@%EzCpFO)YmL&78%Px2ke{r&6P~heXb#;vL|4-;}ci%Z} z(yk(BZ(P$qa95Otk%2*Y)#Uy@+sPZE(l%dcXtX5gE=H5d|981=KC>j1 zPeAp!Wc`X+vwo&7W05u3zN2@u<7N?N0c}p>`zl*pd7^ydw)FThf1ez9=7a>g4^}<| zx#7FpWW%$Q%?@;*Z$6m&t~%|8%$h|G5-H3K0!iHo7B6m{`CiX8|B1Vy!7-rFMT-VG z(;JV0UOD=!e95V$lQ)(LPv$)*B)tJ_)(0k_8uU=u?6>0@qi9>V_vbwYo(*%NJ{Bi; O20u9u(lA-|f;9lC&fw?( delta 503 zcmaE`fce1!<_%Q|O8GfiCY5DXS$TPhxg|NNi5Xdi=BY^~X(_1;5HNl7oP>T(mY2(C z-k+?Wr4C_4W$Cc|1c`KIsj~bBF*d^(cd`^&`d0u&7_-g5jLp{BL5zg$soh-Yp~bTK zX2D}70im`4R@KS5Zsi4U-v^siWKMoqB{})6ALr%`{u3BC*OhMI5R~@g3f*)-cIN)o z7g+;C^!&bW&ojoE+YzS``#S%g`j z^3CO^S08*7Z0tO>{^5zg=Ozc9IU#}WgRUhYH{A1^Y<{9 literal 38 qcmZRcFR$V0A8pga00xXVnHd<~@%I?doa#}yS&Mu2gR7FmPsJ9-%y7;CeoAKqgC11(7)r8n8pqiAxb zPm01CyQj?0FWFZo{q#B1uudlmqWHr~h+^gP$!~qSShA%*Y?xf_D<#p^?frRAfoH>< zsE@_Toxx9_s?See>pO`hMz~9J^21Q6$@e`)ARIwIsmc9*MhgE==x}%6Ic?J?#}ee_ xyKyT-+ea0!C9HV|CO`Ds1JdC>d7=L|5W{%#>;OFo<1CEvAHuNRY#8Xn1^|3)SbP8g delta 238 zcmeynj`8n0#toOfRb;=;2yVDDZ)e=akH+l3a$hkpFxEyt-FTh>43sVaDZR;#9z~Ng zeNq&J+5%WrC+E7A7rcERY*LX4R{Si83!+#(Zt`27E|%zLL3xv_eWfI9{vXPlm%8An z!}6u)*d8bxgQyNJoxIj}5>Qp}%gGNzr6%9^6oGIA{iG)M`xzH9*_2=Z-0eT?D|H)@zjQ?Op2>)ioKp!>$ DPibPr diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock index 0d4901ed8357ab2cf17fca92f654f8048add4379..56bc7b5f7d0619345c44797f9c21dc8d4443312a 100644 GIT binary patch literal 17 UcmZP;4v=Q+u;Wl;00UMA01~DFfdBvi literal 38 qcmZP;4v=Q+u;Wl;00S0wW(J0L{I{oU$}QI}Tf)F%W@>82zyJV%1qZ7D diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 636d40ca771233a2afbb35d72f41967776dacde5..d267a8dd2247511265da1f8012f0b3daa65219a1 100644 GIT binary patch literal 17 VcmZR6*X{eBQS{781~6b@1pqdS1Wf<{ literal 38 qcmZR6*X{eBQS{781~6b2V`gA@$L~1fusz?+<6#UeW~QcQ3=9C*unHCc diff --git a/Happy_Bird/.gradle/checksums/checksums.lock b/Happy_Bird/.gradle/checksums/checksums.lock index 23d6a8a8d8e5bcee4f22588f90c0043eba8b63ca..3d09054125383aee8571687d7c1ae8522bb9938b 100644 GIT binary patch literal 17 UcmZSHBc?B=__%_P0Sp+u03pQ!@Bjb+ literal 38 qcmZSHBc?B=__%_P0Sp+um>C$}@fQTWpK_;pG8Y4jnW?E60|Nl7y9o;b diff --git a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class index f57fc668ef25ff52ad82ffe807f2c9260da4f88b..47194ed1389751f5fe228c3e3bef21c0edd73ae7 100644 GIT binary patch literal 9079 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 V@6K#*j6L-Z=Oz(%Nm3@@`Cs>m=DGj? literal 10078 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 delta 4581 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 I2|DNeALqP}l>h($ diff --git a/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml b/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml index ac1c9d6..2301392 100644 --- a/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml +++ b/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml @@ -7,10 +7,13 @@ +<<<<<<< HEAD +======= +>>>>>>> 5db5b6bb195a2b7d1296e7d3f9b98d6c75dba2c2 diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin index 2af1e058ed2b6f2529695e856324cc6b679bb73f..825eb6d152a0cdaf4a871ff1777b36248bf926ef 100644 GIT binary patch delta 2517 zcmXw5dr*^C7QZLoD~g3!M34eO2oeH*#PCSOj}QVuP%sGAM?fWksI*9095BEyN~yBvOQ-qco_o*v-QRiM zZ{pnv-kq>#kLslPOXmKKjLojG{7c(TCph*Vd4H=lT#OLaVrV33t}S<0yJwQta!++# zji*W(MVjmD>O9pzAb>>YYYJkP&&r7vwPI)-X#=6<0 zsnT6l;kzW}hbNLIr^{Uh5QHT9;_x}7xvH|lUE{MGink_-$zo^L?)>?T~sU0q)Cn$WHiYrwpdM>WS6u2?X@+Y z`sxZRX{`LE8xT#h@+{e;X}wG>A1%JsR+yf%l{7nR+|_jeeuT^~vgDFx_d9MUo)MO3 zTadX>%ojroP`d$9%0;BPyspwyZ6{6g*@r4Dv@9mAp4v*;;L{Z4M;DW3k5f)l=Jf+$ z2w9T(=8~o2GEu!8lf*(P6IPI&1yz-6tJnWb<;X9wmx?RJ&{br2xu>ei?Q>SETupYl zYTY#(oUST&8D>@clV@k1ODq@F6{NXRPEDCj{g^0-r6Lmx>2xV`2rB3kMh~UlXf_-m zl4f#=k)>sAuuioyF6%nmQn#!l<@z1__Z6Ry={UEC89&R=)r588~c5e}{1t_JP z1sf7x6fQs<-KI1s7TRgQvKUr-m6M_X%-;CP41j|s`YltY-%yYp^)9pb*M5-z*|cxU z3cuyb7Yfo;wdtL8Wi;@$EKqxwy*3>J(z_V4tGwJ@TU&{FEuvfe7r+wwvA+&n^of5u ztfcw?4V2M01KxrZ`cXgw6i}1uCjT>L{^v~gEk+~Jy;IkMla5V|VhWUY8u9uV*l9>$Cd5-mprpy(&61Wn zPmQmPji6fb@S#f?aj$*Zf?vJ0t@)F)?QC&49Sl4I;k0C0ET+6;8V6vcJA)jk8VTxv z61rvjFj#3pa4^=&9UKR0`d;vH&{9)~1NStf1SC2d(u8aMjO&m^ZJ`ntXnW`iNTUA^ z9RdsOe8Yuo<8MeaT;DKH6i*eZA69)?`}|K~?OrzV+@}ileUTQ1&BDlk5f+J@ong6< z>ithxAmFv<;mKg2x`;VQR~lhP&7lY_YA#2t!hoXH^15BU0oO6L71Nd?w?QHOAaXC# z*=J6NFuG=DS%_WrV&md@KbD-^*YWa^cIdq2eh+Uy#jd7zW^M)(bwt$$Mya0NdssTW zf6b)54+ctckOr=2%=DBL5L*#Ce#c%T6rW z1*)1uS+_LM_nF_hu7R|*IsQ7;*j3BjptHXz*){lMXH=W{_HiNmgkU?v*y$EsE#7>r z^FRVEiw}Wl@22<$z=XyVTu8iXb}3H#&};|bVS3^Y^w^cyg@sJf{{>?h(|-(k^x~W= zm`jV{U5s}-^p?a$b>A5NQ(l<6zP_54aS85 zb`a66iud_EI+C<-s(yrj!G|@l18hGxA#`&FYDu<>4j|zt6`v}4mz<$e0jofYS z9%p#KO>k$BV32*mkMXbg?Lw=QEA%?y( z&7jXyVy7;_Z>#KwoWhV4S2>B!PEA6%Gc__uH^3hD1$I(_vC2^nvU&7Css`;tsg4;E zxy}5P))%teDG(lB>yKw4^&Wti>dZ!+W$GWL&HaameOpDad!oJGm)M~GB}E$YXULZlOE2e%r~ z9!$QHVVKDSl>Bi)+K;iGVhrSKSzkoHk@3DpK9&^*@~y1+f$!zXGu*{^+WEo@a2M{t zWk#O0VMWGO{x)wJ<-gMNO`2)&srGcs? zO|*m~-oX1JYDD4Jz}l|CgdmUAAbV7S~1WVBvKE~Dh}Lu$^LGGD$!hGm09KQgz3<8yf=KbU?FZ%%NBu_kA@4}A|N z%tk9RG>o2DXj?|?>k<}zRA#=)k;f<}N%V3?p;AZ2Wu=XVS*-XCTWtyFY&f72ZLl=s z+gE1hOvO3r=6dA`A*ThzI_T=mzfYD1Ins?+5o)w{;7DD!Mj_1;tJ&rxZSr3w18GO0 zeu;6l^Vi@oe^k+ny}88WjL9#$f&D4(9swWHX#w5HJ#NHt#9R!tJ}V6*@0lzH{tw7! B=D`2} delta 2517 zcmXw5dr*^C7Qg3vMzIn_1S#(XNr-+Q667V1gqI2tqF9BXUM-8vn2WxE}>byn-TY-^oXtdCYol|5fN%^&yNd(Q8?&-o^v zUEtXTd-tlRyRCc_-H`j%#&1W9;x||AJNn)>OURPY;;`IsDMAX0B+Y9#Z>Ux&KOo>w zG(}n|N(!1y+;#Q#bxu_@X;vr@#>bcFGWAl7WRQa9pxEK8an2>J4p&Wmt*crk5qCp< zy{iVmmk_xqRx+sOk!A%1iYkdKGG@k0^CiQ!1kzG%-{NYhS0$3&cE=m*YF!OAl}V(j z>Q_#$c5-gYa{U6*5}{UhAx>2k;>zYnd^dxSboFc6=i$Cudu(d7-pO3R;ZpO$bxv5x1kh%2kt3nw7T~ zW+~DyA@1s`N@uP2U0^j9l2%t;l>+o~td`)V#O<EY-8w)m%h6@3hL(RM# zZYyhp_3G97tQ%ZQ{mPE{H|`YvQ2FsWDDr^R50ZiI<>$h3dXcA)?^!130BrPaF$WD^ z5-&m|-L8sb7Ut7_RS~TAs3t`M%<~u~vjD|Z_F1Wl{e&Sq8!F~`-th?sFwwp#B|a-u z&l%EOy=CM2GV1qA78pD$UzrKMv0W_L?Ql5j>Z&lyJi2vi9xS6DO^tyy^zqa*D5bH! zS}3Eh`MwUb>4(0Ju$X45b9~~jvRLa{taUcsuP%jE^r5;b%%qO%{pY(cg}w*&x=_Q0 zs|%0(i?w{lF8rL$zQt-~x^LP#D5qo7BH6{Nd>T4^4DxB9pBYl9%`a7J+QX5SdRMKt zs7;_QdGMe@6?(6IW!|q}-|qhSTsv2!r-Ob+K~GC(L}SW3XYc?Hy35~&tP%eXD4|QYt&P8$I%~~0>|^E$qyDk%e|69P6x{CNv9L@`J2iYe6wvp>_o2DM zh?$_HYa`YK=BuA?Ub^6?()0T}UOdzdT`+ysBNU$IR?|BXZ$mt_Mb`OA>ZkV}tQtPB zcGAA_%-pGMOP|EiyOAHD!=suuJm+X_kVRXxMzGK!tpry3KAR(uiPnjNef^`gV-*Ivif1AI@ zYwq(C{8=snqM&4a!5ELj0of~OJ63< zqR-|>Pg{l`Z^aKejUh4Dc$v;kFe2QZ5bmEmz#Z`hc8bARl_&?f9C|Q8i}Ila+bo&f zW`9oW3x)0yNjVVlrkFvcL<2guC58)L8#3LVsDosBGBHUiCmq}`KD+P+GWo4Sj&kIf zA}Ht<$#J}Jqrw2Ep}tA7zXQb{f%Ge|J{7rul(o>JB%NSBBy7 zLqAWBMe*d6Shd{7Ul#iLc9kNy&zIA@l%P0ohdP=mx&^8Uq z1IU*O3^TcpR5&5Z2Qb#ttcHB8@U7$<1@CR-BZZ+M-zkhAgB{Cnnwg2oa4w~p0Yc5(yQEBMF;IoE9T?8R#fSWqIB(CtJp0jTPDP` zdpx;>DCiW)Wd&_XCRdOO_#sWtn3ARFkYPn2(+|^ILU3IkDht!kqviyE1Z#4Z|G>L2 zIy0@z(6Sa{q-`0|(`79DsABmVPaYwiB-1MyR#h??SD0oRY|6xMSh*>LH{*cHw9(|o z-B+1&r{SD*^S#Q1kTW7;i)p#}?~~<0o^+!sLK8DPaHMWzMxvR=ndv#@q)quxr6KJ| z!d_rp?ZS09A{=9Su{W0moH1pi8@ZqJ?h$d3&WPwn>2VW|Bj%!^4OuB5d(LLD@PB)f B<9`4E diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBird.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBird.java index b1b66ae..07b4181 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBird.java +++ b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBird.java @@ -1,5 +1,9 @@ package com.example.happy_bird; -public class HappyBird { - +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.TextField; + +public class HappyBird extends HappyBirdMain { + } diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java index 713e65b..7c78805 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java +++ b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java @@ -22,20 +22,46 @@ import java.io.IOException; public class HappyBirdMain extends Application { + private Pane pane = new Pane(); + private Scene scene = new Scene(pane, 800, 700); + + private Label nameLabel = new Label("NAME"); + private Label acronymLabel = new Label("KÜRZEL"); + private Label headline = new Label("HAPPY BIRD"); + private Label soundLabel = new Label("SOUND"); + + private Label labels[] = {nameLabel, acronymLabel, soundLabel}; + private Label headlineLabels[] = {headline}; + + private Button startButton = new Button("START"); + private Button highscoresButton = new Button("HIGHSCORES"); + private Button settingsButton = new Button("EINSTELLUNGEN"); + private Button startGameButton = new Button("SPIEL STARTEN"); + private Button menuButton = new Button("ZURÜCK"); + + private Button[] buttons = {startButton, highscoresButton, settingsButton, startGameButton, menuButton}; + + private TextField name = new TextField(); + private TextField acronym = new TextField(); + + private TextField inputFields[] = {name, acronym}; + + private Slider soundSlider = new Slider(); + public static void main(String[] args) { launch(args); } @Override public void start(Stage stage) throws IOException { - Pane pane = new Pane(); - Scene scene = new Scene(pane, 800, 700); stage.setTitle("Happy Bird"); stage.setScene(scene); - //Backgroundimage + /**Bild für Hintergrund erstellen:*/ Image image = new Image("file:src/main/resources/com/example/happy_bird/pics/Background.png"); + + /**Hintergrund erstellen:*/ BackgroundImage backgroundImageImg = new BackgroundImage( image, BackgroundRepeat.NO_REPEAT, @@ -44,68 +70,121 @@ public class HappyBirdMain extends Application { BackgroundSize.DEFAULT ); + /**Hintergrund zu Pane hinzufügen:*/ Background background = new Background(backgroundImageImg); pane.setBackground(background); - //Headline-Label - Label headline = new Label("Happy Bird"); - headline.setPrefSize(300, 75); - headline.setTextAlignment(TextAlignment.CENTER); - headline.setStyle("-fx-background-color: #DED894; " + - "-fx-text-fill: #000000; " + - "-fx-font-size: 35px; " + - "-fx-border-width: 5px;" + - "-fx-border-color: #543847;" + - "-fx-font-weight: bold;" + - "-fx-alignment: center;" + - "-fx-background-radius: 20px;" + - "-fx-border-radius: 15px;"); + + + /**Labels erstellen:*/ + + + /**Labels in Arrays speichern:*/ + + + /**Labels formatieren:*/ + labelsFormating(labels, pane); + headlineFormating(headlineLabels, pane); + + /**alle labels an ihre Stelle:*/ + int yPositionLabels = 225; + for (Label label : labels) { + label.setLayoutX(275); + label.setLayoutY(yPositionLabels); + yPositionLabels += 150; + } + + /**headline an ihre Stelle:*/ headline.setLayoutX(250); headline.setLayoutY(100); - pane.getChildren().add(headline); + /**soundLabel an seine Stelle:*/ + soundLabel.setLayoutY(225); - //Buttons: - Button startButton = new Button("START"); - Button highscoresButton = new Button("HIGHSCORES"); - Button settingsButton = new Button("EINSTELLUNGEN"); - Button startGame = new Button("SPIEL STARTEN"); - Button buttons[] = {startButton, highscoresButton, settingsButton, startGame}; - Button menuButton = new Button("ZURÜCK"); - menuButton.setStyle("-fx-background-color: #e86000; " + - "-fx-text-fill: #FFFFFF; " + - "-fx-font-size: 20px; " + - "-fx-border-width: 5px;" + - "-fx-border-color: #FFFFFF;" + - "-fx-font-weight: bold;" + - "-fx-border-radius: 15px;" + - "-fx-background-radius: 20px;"); - pane.getChildren().add(menuButton); - menuButton.setPrefSize(200, 50); + + /**Buttons erstellen:*/ + + + /**Buttons in Array speichern:*/ + + + /**Buttons formatieren:*/ + buttonsFormating(buttons, pane); + + /**alle Buttons an ihre Stelle:*/ + int yPositionButtons = 225; + for (Button button : buttons) { + button.setLayoutX(300); + button.setLayoutY(yPositionButtons); + yPositionButtons += 100; + } + + /**menuButton an seine Stelle und vorerst ausblenden:*/ menuButton.setLayoutX(575); menuButton.setLayoutY(625); menuButton.setVisible(false); -<<<<<<< HEAD -======= ->>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6 - startGame.setVisible(false); + /**startGameButton unsichtbar*/ + startGameButton.setVisible(false); - //Button buttons[] = {startButton, highscoresButton, settingsButton}; -<<<<<<< HEAD -======= ->>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6 + /**Textfelder erstellen:*/ - int yPosition = 225; + + /**Textfelder in Array speichern:*/ + + + /**Textfelder formatieren:*/ + textfieldsFormating(inputFields, pane); + + /**Textfelder an ihre Position:*/ + int yPositionInputFields = 290; + for (TextField feld : inputFields) { + feld.setLayoutX(275); + feld.setLayoutY(yPositionInputFields); + yPositionInputFields += 150; + } + + + + /**SoundSlider erstellen:*/ + + + /**SoundSlicer anpassen:*/ + soundSliderFormating(soundSlider, pane); + + + + /**ClickEvents:*/ + startButton.setOnAction(event -> { + startButtonClick(); + }); + + settingsButton.setOnAction(event -> { + settingsButtonClick(); + }); + + highscoresButton.setOnAction(event -> { + highscoresButtonClick(); + }); + + menuButton.setOnAction(event -> { + menuButtonClick(); + }); + + stage.show(); + } + + /*** + * Formatiert alle Buttons und fügt sie der Pane hinzu + * @param buttons ButtonArray mit allen Arrays + * @param pane Pane, auf der die Buttons angezeigt werden + */ + public void buttonsFormating(Button[] buttons, Pane pane) { for (Button button : buttons) { - pane.getChildren().add(button); button.setPrefSize(200, 50); - button.setLayoutX(300); - button.setLayoutY(yPosition); - yPosition += 100; button.setStyle("-fx-background-color: #e86000; " + "-fx-text-fill: #FFFFFF; " + @@ -115,33 +194,20 @@ public class HappyBirdMain extends Application { "-fx-font-weight: bold;" + "-fx-border-radius: 15px;" + "-fx-background-radius: 20px;"); + + pane.getChildren().add(button); } + } - startGame.setVisible(false); - -<<<<<<< HEAD - -======= ->>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6 - Label nameLabel = new Label("Name:"); - Label acronymLabel = new Label("Kürzel:"); - - Label startLabels[] = {nameLabel, acronymLabel}; -<<<<<<< HEAD - -======= ->>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6 - startButton.setOnAction(event -> { - headline.setText("Start"); - for (Button button : buttons) { - button.setVisible(false); - menuButton.setVisible(true); - } - }); - - int yPositionStartLabels = 225; - for (Label label : startLabels) { + /*** + * Formatiert alle kleinen Labels (keine Überschrift) und fügt sie der Pane hinzu + * @param labels LabelArray mit allen Labels + * @param pane Pane, auf der die Labels angezeigt werden + */ + public void labelsFormating(Label[] labels, Pane pane) { + for (Label label : labels) { label.setPrefSize(250, 50); + label.setStyle("-fx-background-color: #DED894; " + "-fx-text-fill: #000000; " + "-fx-font-size: 20px; " + @@ -152,122 +218,137 @@ public class HappyBirdMain extends Application { "-fx-background-radius: 20px;" + "-fx-border-radius: 15px;"); - label.setLayoutX(275); - label.setLayoutY(yPositionStartLabels); - yPositionStartLabels += 150; - pane.getChildren().add(label); + label.setVisible(false); } + } - TextField name = new TextField(); - TextField acronym = new TextField(); + /*** + * Formatiert alle Überschriften-Labels und fügt sie der Pane hinzu + * @param labels LabelArray mit Überschriften-Labels + * @param pane Pane, auf der die Labels angezeigt werden + */ + public void headlineFormating(Label[] labels, Pane pane) { + for (Label label : labels) { + label.setPrefSize(300, 75); + label.setTextAlignment(TextAlignment.CENTER); - TextField inputFields[] = {name, acronym}; + label.setStyle("-fx-background-color: #DED894; " + + "-fx-text-fill: #000000; " + + "-fx-font-size: 35px; " + + "-fx-border-width: 5px;" + + "-fx-border-color: #543847;" + + "-fx-font-weight: bold;" + + "-fx-alignment: center;" + + "-fx-background-radius: 20px;" + + "-fx-border-radius: 15px;"); - int yPositionInputFields = 290; - for (TextField feld : inputFields) { - feld.setPrefSize(250, 50); - feld.setStyle("-fx-font-size: 20px;" + + pane.getChildren().add(label); + } + } + + /*** + * Formatiert alle Textfelder und fügt sie der Pane hinzu + * @param textfields TextFieldArray mit allen Textfeldern + * @param pane Pane, auf der die Textfelder angezeigt werden + */ + public void textfieldsFormating(TextField[] textfields, Pane pane) { + for (TextField field : textfields) { + field.setPrefSize(250, 50); + field.setStyle("-fx-font-size: 20px;" + "-fx-font-weight: bold;"); - feld.setLayoutX(275); - feld.setLayoutY(yPositionInputFields); - yPositionInputFields += 150; + pane.getChildren().add(field); - pane.getChildren().add(feld); + field.setVisible(false); + } + } + + /*** + * Formatiert den soundSlider und fügt ihn der Pane hinzu + * @param slider SoundSlider + * @param pane Pane, auf der der Slider angezeigt wird + */ + public void soundSliderFormating(Slider slider, Pane pane) { + slider.setPrefSize(200, 5); + slider.setLayoutX(300); + slider.setLayoutY(295); + + pane.getChildren().add(slider); + + slider.setVisible(false); + } + + /*** + * Hauptmenü wird ausgeblendet, Nameneingabe folgt + */ + public void startButtonClick() { + headline.setText("START"); + + for(Button button : buttons) { + button.setVisible(false); + + } + + startGameButton.setVisible(true); + menuButton.setVisible(true); + startGameButton.setLayoutY(520); + + for(TextField feld : inputFields) { + feld.setVisible(true); + } + for (Label label : labels ) { + label.setVisible(true); + } + + soundLabel.setVisible(false); + } + + /*** + * Hauptmenü wird ausgeblendet, Einstellungen folgen + */ + public void settingsButtonClick() { + headline.setText("EINSTELLUNGEN"); + startButton.setVisible(false); + highscoresButton.setVisible(false); + settingsButton.setVisible(false); + menuButton.setVisible(true); + soundSlider.setVisible(true); + soundLabel.setVisible(true); + } + + /*** + * Hauptmenü wird ausgeblendet, Highscores folgen + */ + public void highscoresButtonClick() { + headline.setText("HIGHSCORES"); + startButton.setVisible(false); + highscoresButton.setVisible(false); + settingsButton.setVisible(false); + menuButton.setVisible(true); + } + + /*** + * Nameneingabe, Einstellungen und Highscores werden ausgeblendet + * Erneutes Anzeigen des Hauptmenüs + */ + public void menuButtonClick() { + headline.setText("HAPPY BIRD"); + startButton.setVisible(true); + highscoresButton.setVisible(true); + settingsButton.setVisible(true); + menuButton.setVisible(false); + soundSlider.setVisible(false); + soundLabel.setVisible(false); + startGameButton.setVisible(false); + + for(TextField feld : inputFields) { feld.setVisible(false); } - - startButton.setOnAction(event -> { - headline.setText("Start"); - for(Button button : buttons) { - button.setVisible(false); - - } - - startGame.setVisible(true); - menuButton.setVisible(true); - startGame.setLayoutY(520); - - for(TextField feld : inputFields) { - feld.setVisible(true); - } - for (Label label : startLabels ) - { - label.setVisible(true); - } - }); - - - //startGame.setOnAction(event -> {}); - //startButton.setOnAction(event -> {}); - - - - //Slider: - Slider soundSlider = new Slider(); - pane.getChildren().add(soundSlider); - soundSlider.setPrefSize(200, 5); - soundSlider.setLayoutX(300); - soundSlider.setLayoutY(295); - soundSlider.setVisible(false); - - Label soundLabel = new Label("SOUND"); - soundLabel.setPrefSize(200, 55); - soundLabel.setTextAlignment(TextAlignment.CENTER); - soundLabel.setStyle("-fx-background-color: #DED894; " + - "-fx-text-fill: #000000; " + - "-fx-font-size: 20px; " + - "-fx-border-width: 5px;" + - "-fx-border-color: #543847;" + - "-fx-font-weight: bold;" + - "-fx-alignment: center;" + - "-fx-background-radius: 20px;" + - "-fx-border-radius: 15px;"); - soundLabel.setLayoutX(300); - soundLabel.setLayoutY(225); - - pane.getChildren().add(soundLabel); - soundLabel.setVisible(false); - - settingsButton.setOnAction(event -> { - headline.setText("EINSTELLUNGEN"); - startButton.setVisible(false); - highscoresButton.setVisible(false); - settingsButton.setVisible(false); - menuButton.setVisible(true); - soundSlider.setVisible(true); - soundLabel.setVisible(true); - }); - - highscoresButton.setOnAction(event -> { - headline.setText("HIGHSCORES"); - startButton.setVisible(false); - highscoresButton.setVisible(false); - settingsButton.setVisible(false); - menuButton.setVisible(true); - }); - - menuButton.setOnAction(event -> { - headline.setText("HAPPY BIRD"); - startButton.setVisible(true); - highscoresButton.setVisible(true); - settingsButton.setVisible(true); - menuButton.setVisible(false); - soundSlider.setVisible(false); - soundLabel.setVisible(false); - startGame.setVisible(false); - for(TextField feld : inputFields) { - feld.setVisible(false); - } - for (Label label : startLabels ) - { - label.setVisible(false); - } - }); - - stage.show(); + for (Label label : labels ) { + label.setVisible(false); + } } }