From a3de4b0adf1e688811a2fb0c707540a261b63316 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 21:39:24 +0100 Subject: [PATCH 01/16] update --- .idea/hellsgamers.iml | 12 ++++++------ ...org_junit_jupiter_junit_jupiter_5_8_1.xml} | 8 ++++---- ...junit_jupiter_junit_jupiter_api_5_8_1.xml} | 8 ++++---- ...it_jupiter_junit_jupiter_engine_5_8_1.xml} | 8 ++++---- ...it_jupiter_junit_jupiter_params_5_8_1.xml} | 8 ++++---- ...platform_junit_platform_commons_1_8_1.xml} | 8 ++++---- ..._platform_junit_platform_engine_1_8_1.xml} | 8 ++++---- pom.xml | 16 +++++++++++++++- src/main/java/PingPong/GamePanel.java | 4 ---- src/test_/java/CollisionCheckerTest.java | 2 ++ target/classes/PingPong/GamePanel$AL.class | Bin 731 -> 731 bytes target/classes/PingPong/GamePanel.class | Bin 4784 -> 4784 bytes target/hellsgamers-1.0-SNAPSHOT.jar | Bin 46089 -> 49930 bytes target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 2 ++ target/test-classes/AIGridGUITest.class | Bin 1271 -> 0 bytes 16 files changed, 50 insertions(+), 36 deletions(-) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_5_9_2.xml => Maven__org_junit_jupiter_junit_jupiter_5_8_1.xml} (58%) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_api_5_9_2.xml => Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml} (55%) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_engine_5_9_2.xml => Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml} (65%) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_params_5_9_2.xml => Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml} (65%) rename .idea/libraries/{Maven__org_junit_platform_junit_platform_commons_1_9_2.xml => Maven__org_junit_platform_junit_platform_commons_1_8_1.xml} (65%) rename .idea/libraries/{Maven__org_junit_platform_junit_platform_engine_1_9_2.xml => Maven__org_junit_platform_junit_platform_engine_1_8_1.xml} (65%) create mode 100644 src/test_/java/CollisionCheckerTest.java delete mode 100644 target/test-classes/AIGridGUITest.class diff --git a/.idea/hellsgamers.iml b/.idea/hellsgamers.iml index 72c76be..74774b6 100644 --- a/.idea/hellsgamers.iml +++ b/.idea/hellsgamers.iml @@ -14,13 +14,13 @@ - - + + - + - - - + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_9_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_1.xml similarity index 58% rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_9_2.xml rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_1.xml index 1b189a7..987e7d4 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_9_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_9_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml similarity index 55% rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_9_2.xml rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml index e5cf963..4910ca9 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_9_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_9_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml similarity index 65% rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_9_2.xml rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml index b181218..85ab9ad 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_9_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_9_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml similarity index 65% rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_9_2.xml rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml index 3ee66e9..8675273 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_9_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_9_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml similarity index 65% rename from .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_9_2.xml rename to .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml index 38b9aa2..3417208 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_9_2.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_9_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml similarity index 65% rename from .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_9_2.xml rename to .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml index ecbd84e..f19b408 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_9_2.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0acf85b..45a3e86 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,20 @@ 17 + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + false + + + + + + junit @@ -22,7 +36,7 @@ org.junit.jupiter junit-jupiter - RELEASE + 5.8.1 test diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index d731f9b..d9e8dc6 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -98,10 +98,6 @@ public class GamePanel extends JPanel implements Runnable { } } - - - - public void run() { long lastTime = System.nanoTime(); double amountOfTicks = 60.0; diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java new file mode 100644 index 0000000..78b955d --- /dev/null +++ b/src/test_/java/CollisionCheckerTest.java @@ -0,0 +1,2 @@ +public class CollisionCheckerTest { +} diff --git a/target/classes/PingPong/GamePanel$AL.class b/target/classes/PingPong/GamePanel$AL.class index 8592c1a73a224ca03e84c5628f0219fe1cddef1c..38e42d240d31e1d4ba150396f617a25fe2e26078 100644 GIT binary patch delta 27 jcmcc3dYg5FH523X$u>+8oU<6X8D=wxG0d4fm&pzQcgF|X delta 27 jcmcc3dYg5FH523P$u>+8obwpC8Rj#HF)Wxom&pzQcz*}# diff --git a/target/classes/PingPong/GamePanel.class b/target/classes/PingPong/GamePanel.class index 194c31a4f0b45fd146373c440d732d6385dd9d71..5dd0342141a5aff2c4dc250021236cffd84c9a39 100644 GIT binary patch delta 161 zcmWNJyAHun06@<`=su324cRml_ z@-5%d%WVR52-8KUhe@9V19A+>Gor|t3KObKsWYR&TuR*&OI55eSd+vh%|iSm2M;6TSA5Oa> A;Q#;t diff --git a/target/hellsgamers-1.0-SNAPSHOT.jar b/target/hellsgamers-1.0-SNAPSHOT.jar index ea3a2793c7a49987a61de2e59f4e5658ecec00aa..0adfec424c4efa8fc2388d0284c4db00ebd6c3d2 100644 GIT binary patch delta 11405 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 diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index e6bd5fe..a3f66d2 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Feb 08 20:10:52 CET 2023 +#Wed Feb 08 21:32:53 CET 2023 groupId=Hellsgamers artifactId=hellsgamers version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 3ecedd5..c11ae49 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -21,6 +21,8 @@ BattleShip\AIGridGUI$DirectionCompare.class BattleShip\AIGridGUI.class Snake\Snake$SnakeDirection.class Snake\SnakeView.class +BattleShip\BShip$IncomingGuessReader.class +BattleShip\BShip$ShipsPlacedReader.class Snake\AppleView.class Snake\Controller$3.class Snake\TextView.class diff --git a/target/test-classes/AIGridGUITest.class b/target/test-classes/AIGridGUITest.class deleted file mode 100644 index 073325ff600470d7b2f75da47b7e4737bf6dd72c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1271 zcmbVL=}r?-6#i~ox;eB%sbwphEOrs<8h=1ZK!r3J)UY)1=d_G)$uLu=Q+zHH1*3@% z;6oX|J1vD05);$(_TF>P{g!i1fB*UM3qTbwk_aIjLqx+6q5}GboZYn)n5 zUm&_J9qDffgbT%b3~_<%mg)PpwSOX8mCf3YCy#axYe~eAR4DfZh6=S>v7W#%QZb}8 z=ok?g?x!ADZQ>?O*?TIGGwy<1Q<$R~vbawfXYRRm*b;~oYDKb*VLXNj4U>v+&h?Hf zryc6#+LFHIRm_&GY_{8$=S$aV3utC=c=M@a+HD1#*D$Ss;|ln-``J;!Sq*b4m{7qz zd3@rl=mQN4{ZzyHNcE9d?vW*sHl$;{?VL3%@4#%>jARVAY1(zulj__HM*I^=4QXSb z25SOiK5MZXINNr;x@pU!n$zm2vU^s$V{;>F0uy^3$CqbTUA84rHyy|I&7QHmakqI@ zWin`249a5fs3fY_Y|7Pb;Ppm!*JVmwzqie1&}=$L?zH5E>VTV7H9DAQ(?c9B z!7tm+HOf6_i|Zm!TimO=Z0QoB^b@fUdQwkbBJmB{7sf+a;;N<+EPMnBEOV!I-{2t% zJP8zu7Ygup`KxkAN?)PrFE5Z;*H@;#BXM_z^Re z)Rll{wNK+wN`$dVr8pj^UPDh-%lQjTZRqLg0lpk90;A;1k~PQOI41Z}MoL|jKCd1W ziGARwLIojaceR9XX?fh&(jbO%G=8IcMmc(cnQAOQpd=Hp Date: Wed, 8 Feb 2023 21:54:06 +0100 Subject: [PATCH 02/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 78b955d..f262ff7 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -1,2 +1,26 @@ +import PingPong.CollisionChecker; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; + + public class CollisionCheckerTest { + CollisionChecker collisionChecker; + @BeforeEach + public void before() { + CollisionChecker collisionChecker = new CollisionChecker(); + } + @Test + void WhenBallYCoordinateIsLessOrEqualThanZero_didTouchTopOrBottomEdge_ReturnsTrue() { + // arrange + Integer ballYCoordinate = -1; + Integer maxHeight = 123; + + // act + Boolean result = collisionChecker.didTouchTopOrBottomEdge(ballYCoordinate, maxHeight); + + //assert + assertTrue(result); + } } From 6956102db875f512c54dd589c71311bbdf79f924 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 21:55:19 +0100 Subject: [PATCH 03/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index f262ff7..7e3e1c8 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -20,6 +20,18 @@ public class CollisionCheckerTest { // act Boolean result = collisionChecker.didTouchTopOrBottomEdge(ballYCoordinate, maxHeight); + //assert + assertTrue(result); + } + @Test + void WhenBallYCoordinateIsMoreOrEqualToMaxHeight_didTouchTopOrBottomEdge_ReturnsTrue() { + // arrange + Integer ballYCoordinate = 124; + Integer maxHeight = 123; + + // act + Boolean result = collisionChecker.didTouchTopOrBottomEdge(ballYCoordinate, maxHeight); + //assert assertTrue(result); } From 89fd6741babb1adfe98125bea4ee6142102a3572 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 21:57:11 +0100 Subject: [PATCH 04/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 7e3e1c8..10da0f9 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -2,6 +2,7 @@ import PingPong.CollisionChecker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -35,4 +36,16 @@ public class CollisionCheckerTest { //assert assertTrue(result); } + @Test + void WhenBallYCoordinateIsMoreThanZeroAndLessThanMaxHeight_didTouchTopOrBottomEdge_ReturnsFalse() { + // arrange + Integer ballYCoordinate = 75; + Integer maxHeight = 123; + + // act + Boolean result = collisionChecker.didTouchTopOrBottomEdge(ballYCoordinate, maxHeight); + + //assert + assertFalse(result); + } } From 8bd8ba01b141ec4c85eb8e9aa6bdfe91a8679694 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 21:57:55 +0100 Subject: [PATCH 05/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 14 ++++++++++++++ .../BattleShip/BShip$IncomingGuessReader.class | Bin 0 -> 1718 bytes .../BattleShip/BShip$ShipsPlacedReader.class | Bin 0 -> 1142 bytes target/test-classes/AIGridGUITest.class | Bin 0 -> 1606 bytes target/test-classes/CollisionCheckerTest.class | Bin 0 -> 1403 bytes target/test-classes/ShipTest.class | Bin 0 -> 816 bytes target/test-classes/SnakeTest.class | Bin 0 -> 2071 bytes 7 files changed, 14 insertions(+) create mode 100644 target/classes/BattleShip/BShip$IncomingGuessReader.class create mode 100644 target/classes/BattleShip/BShip$ShipsPlacedReader.class create mode 100644 target/test-classes/AIGridGUITest.class create mode 100644 target/test-classes/CollisionCheckerTest.class create mode 100644 target/test-classes/ShipTest.class create mode 100644 target/test-classes/SnakeTest.class diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 10da0f9..277d0e1 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -2,6 +2,8 @@ import PingPong.CollisionChecker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.awt.*; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -48,4 +50,16 @@ public class CollisionCheckerTest { //assert assertFalse(result); } + @Test + void WhenBallRectangleIntersectsWithPaddleRectangle_didTouchPaddle_ReturnsTrue() { + // arrange + Rectangle ballRectangle = new Rectangle(1,1,1,1); + Rectangle paddleRectangle = new Rectangle(1,1,5,5); + + //act + Boolean result = collisionChecker.didTouchPaddle(ballRectangle, paddleRectangle); + + //assert + assertTrue(result); + } } diff --git a/target/classes/BattleShip/BShip$IncomingGuessReader.class b/target/classes/BattleShip/BShip$IncomingGuessReader.class new file mode 100644 index 0000000000000000000000000000000000000000..a8f7d4cadf382bae1a3e067509bcb609f96246e7 GIT binary patch literal 1718 zcmZuxTW=dh6#m9>vdLzWm^c@%p@C5BIEmW=<>FFEqSSHfq#5SdlI6rYmoNXpDx>$+J?mWAUi39TS(hBkLqcSepd z^rrV3BviDcLxIZC3C<9@puMWa4b3dZ&#YV!d6%qD=%((TWN3**a~GW0e3N|G#jHkFX(eH{H5@PWq|2AYABscoo=+i{12J2~#c-4uG0Cm+I~ z7KJ-w7LwY!@WNYGF(i%dCHGDE2C3v6=D1I0syYo@X*I&}fb`R?*mFoTWAb}p8ZDLxkNpT&t-iDkqqHD$D??RL7}9jf^v*RoBU;5n~Vth1QH5PaGDot zTE7fvA0e?&`gNB6$bOP&PL}Fvj!9V)S>|a&&##Gs6d!M;VWgk(hl*23DwyR+VQ$y( zWLGJl0yWt&geXycB6HE4f;7X>PK8pYD{Q-5az$ZgBQHv>ZkZ}hV}aw0ELTs7GIBGn zmS4--)D2mMXE>ImE>N^&ELo1T+uig-RPZb{V#mu;*)+8kgC>MBZJG-2!X%S!%%~)kSFHY$)Gu2CGLIP=?7KG!@S`JMJPno8$rwz?< z1jQUa;Ca9>y(#Tr$bp4I@?D|U2I$<0=V(1gr;~IJ(5{ZgZh(z`3+1|pS*Ep(Fu7s9jvEI7IawuP=+__zKQzJUsX)RZdTAfAGr{zloQF=e z(qVY}ReX(a=nhB?s3-ljzJ)%#jS0Mi1TJG1SFnh8N&g-Scpn$>0p7qSX+FYLd`$MA z5yL0AhEK7D&+!w!!0-4Hf1-lF@fB+!?RK}WA&8gpitHf^`hC;L<1lr9oYydpfFl1i k9|~6fK``*Tg44nAFsA?u1Pnk>0&?$0k#?1+I;F%ey ziX)CP!-LQM1OJ5&;@-3~?a-Oz?r!ec-Lu=%U;mCz08C=G6%qmpWDQMdW*D5&J}?uuWQ3u6;UYYxq6MuAR1Iy=7=l~+2R&)()<*L6 z`WDZ7ls#cshBw6!h{kfQ=s>4}poT7V6Z~R5hNcb2D2y_M>U+)8xA}LOlt>S0=tW-@ zIL6Rd51h`_LoaE#j4KRnZfz(AwkFD4({LSO2HCXp+hVkf%>B^@G~5(($-BDYDY(TD zuHiD4#~r6s^mt)zFVBmfVOuJ0IE-&2if{qlSPq+&TrOWOs`(79k(e6h5%&Ycy(Sggs;>t;@O3=vm9%0eFuk%n50 zVoH$=oRY=RzU=Aw?W|t(YbYRn^wb!xY&!OCrK7rRmz+F*VTkssPjOfP8Cn*(>%FvH z(wLU9EbgRD-E}!J>1q%${fZJPmEk^EFetQ7e+P-;Haw*B5k*rJOJvn};s`AM3Ce+w zc}!fdl eg2}&-r4TWAMkoo-G40z9%#c;7jzpqPgZ&2$%K?Z0 literal 0 HcmV?d00001 diff --git a/target/test-classes/AIGridGUITest.class b/target/test-classes/AIGridGUITest.class new file mode 100644 index 0000000000000000000000000000000000000000..50abe400f8ff72bc7d3ff3debf8bbc84effcb23d GIT binary patch literal 1606 zcmbVLYi}Dx6g}fO@q-Vg0k4|JK7MR;szKVARW~#Mz23dinJvWX$d3db)R?9vJRrlbjoks?Fjq;AbY}K}F z?HuN@kU_zKiAw_Wlh7wJB5uxAL6v;4FfgcGNZgP0|)4=s24O}*`u7R@}_(AZquZ`CX zRJ1XtjgM9DIM&v84cwT7I`W6ac+0?sE?K_sxt*jKQI4@y12xo%;HfBvqOom&PL}jJp zsm_m;IN-O}^JL{X2-Wkzk6q6?(>3V0-jCO5QPwg( z)ph+$;CA(#e>4!ye_Lv8;@uCr)LC$pFTWX_9?9^Dd*snlbOLg>-B9WC*qDxw73)%P zre>lkupBe7M@gsmgRt#-s%!iGfgZz9Mgxxl* zeS|XMHIpK-5Bxl&f)t}iT4vtTvOm#sL=2tL%DL(}jkzJN?qteSN{R_vndMtY5m!0r z*Af+#(fzRsgMQsA&MrB09a3*`AN)7>^_|&^xNi{qCUI|(d*gp`e>vekVK%ze8&i1? zantNJUf}i+4JKcFpZgDA;qIIMkNQ!kk_PjRXel32iWv9F$;F1OJe1yR?VbTf7G`(Jy6U zfN0_e@Ix8r`U3GtG)-rBc4vO`o0*;a`Rm&c059=8h5&*JLMp--Vu&B{6P`D?+02(~ zN22a94871z-Fd|j%w($yA`HnL-E8hivMEW!&~06srIx6_7gh`kf-ww3RWPFB21Xgi zE+98eM>K`Spqy~S73D*QL}oLq{bf;zVhrO7CR9vfied6dYC*zu|bEC>F-P3!AA*ZDiP(t&oY=OF76Nl0w z@8qs)I(l1Fsn6uTZkp2JJsOLeKhsq30uN;4cc5b?e~mf z?wT~bM@9*heG}NC>hu$kTm4x7mP72VbgjC0t$XcB`gLH<8wq+AV>F%sqd(07$q?;n zP)Xh;El;a=7tWo5eW6VN_egrzKm-|*YS#c+3}4;Z=wn{6oHh^{!B&I+raE_Q3|3q>t_Z9Kwl~W|PS5I;C z9P=095|k1s)iB2C(=kQA8O$Ns37zW#^+Jc~CXf3Ra+qu%&@MpM5j?~r3fZUg*kgky v13D)?I_dc5|KO7%|1=e00STJR6qYXWN%!~+4fv=7J_%nw3{Qzu0MC8{x|Br) literal 0 HcmV?d00001 diff --git a/target/test-classes/ShipTest.class b/target/test-classes/ShipTest.class new file mode 100644 index 0000000000000000000000000000000000000000..2f2488427eda818c10f276932641b2477fc05521 GIT binary patch literal 816 zcmZuve^1j;6g`jq=+<>?OdJeRrl4+2sY>D>q9$NO7aK_2QX>Dojpukv*Ut9U?`2|y zNa6?ZLmBUDM@W=5x$QmgopaB<@BRMs^A~_u*fueTjDf6$9P$j+G5^YKkNYG0a4;4_ z#gKm~eW_kEWLj<4K!KsM$CdI#?^I509SSfR3VjhNotZFTX}K~(z14ND6niR^{%EJ| z>Ma!uRV)xsMjxc-iIb$jv56a4G;q^G9ZL+&ARO7_m<&*yN+m*@Po=#ZMIux(@FRv2 zPm+D^MS>yQI&Ql~(r;K;!7YZOA5RWHzn6-(vaXiDZQ%~q7_5}|_Df7uhFq)LO|9Lv za8Fw^hC%F8Nln_Ya9&MO3pF z#NklvOYNn6S#C?83z~R97eGHc(iH$hi~el-GL3AWfqhGs+Z6S(j++#%bOSngL>Xvg zc@oj&3uF_yqYD_H^0nd_N>1ko=Fd^fbiQNx9IKQzk7ii*8Z7reww|A1S9YGGOyx|J z=&g~V70hD|73!&qEkd^G;9g)6dvuxJVF?FVhKojGzn)s0*)PGtW8yICJZg=U& literal 0 HcmV?d00001 diff --git a/target/test-classes/SnakeTest.class b/target/test-classes/SnakeTest.class new file mode 100644 index 0000000000000000000000000000000000000000..1c96711727cdc4c4a6b6d95725c076325bc711d1 GIT binary patch literal 2071 zcmaJ?T~ixX7=BK&ArO|20)g^ji4;meAg#8x5{iWYZ8QZWfeKb-L)Lg`*x+WPgTKK$ zFTC+jSZ9E-GyVX_tMe zJ>uDLOUK)Ihtz07jatLe|5M5fy`$q@QSl`8HTg)PIDYF+^~=SxW=TD@Xb zhB(tX95+-~3N+_!nM=Et3+@yssje1it5t^~diFxUh8uP(Gw06xvG*dMqr)nv@kYUO z9(dLu@pW9+Bvb|@n zNTpu;nZz@yQ(1A+vP?TsP?k_ZZ~d%+Xxbwl8tS9*$72HmAMh^5Q7B~c1mY*&`0ydG zY8eP2#jEZ;fX7(nOkjaM82zUh zeu1&=!9aoE6O2#$k1=tI>2pxqRj_s$4!Cf@gPE^iW0Yd)cUjJ$mG^C&wUcEBI(c4& z(Zx5k2P3?@i(Yc>gNds+AgZdl?J=%Yp{$Y7IM2RLpqR>KoU zDjmGFkGZx@M5(mHQQ(uRCgLUYQ)1CmrwREV<0hrK?aEVAe6FD;HHu6<$K3|8+Aj6f z8b^C@MN!7jzAnCg@0zsd@%J0VH+0jDzR0~=_qlWX)E2l#9fzrFgwBo7r|THRC}(4I z?grh8(vJyhKZ&P2aLbs&cbLKVY}y}i6F=e>e&%8MJ3W1cJNSdA-=B>93-?4bW<>|$ zqMLu0%JoUlld9|DO4W5f>A4=k-xb%ZUVBKr*H5cn<1_O2Gy7$)ADm+8{9WpDU%5p- tnP9EU=;q<6I7PhJDkt`CwG*qHYJ1FwPZ{Imo}Y6JvFCbtR_{LO{}0(&wbK9q literal 0 HcmV?d00001 From ee3b0802f266b5cb5391018c972c97bd3445d21b Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 21:58:28 +0100 Subject: [PATCH 06/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 277d0e1..788700b 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -62,4 +62,16 @@ public class CollisionCheckerTest { //assert assertTrue(result); } + @Test + void WhenBallRectangleDoesNotIntersectsWithPaddleRectangle_didTouchPaddle_ReturnsFalse() { + // arrange + Rectangle ballRectangle = new Rectangle(1,1,1,1); + Rectangle paddleRectangle = new Rectangle(15,15,1,1); + + //act + Boolean result = collisionChecker.didTouchPaddle(ballRectangle, paddleRectangle); + + //assert + assertFalse(result); + } } From 5d83a85cfd906f5511ce7abbbbf865d569e64288 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 21:59:29 +0100 Subject: [PATCH 07/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 788700b..0f4dfd5 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -74,4 +74,15 @@ public class CollisionCheckerTest { //assert assertFalse(result); } + @Test + void WhenBallXCoordinateIsLessOrEqualThanZero_didTouchLeftEdge_ReturnsTrue() { + // arrange + Integer ballXCoordinate = -5; + + //act + Boolean result = collisionChecker.didTouchLeftEdge(ballXCoordinate); + + //assert + assertTrue(result); + } } From 03b7eaae44de4e94b6f0c3c9806dd4a99592b2f0 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 22:00:01 +0100 Subject: [PATCH 08/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 0f4dfd5..0fdf316 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -85,4 +85,15 @@ public class CollisionCheckerTest { //assert assertTrue(result); } + @Test + void WhenBallXCoordinateIsMoreThanZero_didTouchLeftEdge_ReturnsTrue() { + // arrange + Integer ballXCoordinate = 10; + + //act + Boolean result = collisionChecker.didTouchLeftEdge(ballXCoordinate); + + //assert + assertFalse(result); + } } From 4e10ef914d8db1f1fe38611a6ec592494e490d61 Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 22:00:18 +0100 Subject: [PATCH 09/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 0fdf316..9ba64c5 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -96,4 +96,16 @@ public class CollisionCheckerTest { //assert assertFalse(result); } + @Test + void WhenBallXCoordinateIsMoreOrEqualToMaxWidth_didTouchRightEdge_ReturnsTrue() { + // arrange + Integer ballXCoordinate = 124; + Integer maxWidth = 123; + + // act + Boolean result = collisionChecker.didTouchRightEdge(ballXCoordinate, maxWidth); + + //assert + assertTrue(result); + } } From b674f18e3e023f7c22ea81865fa54b742f4cb8ea Mon Sep 17 00:00:00 2001 From: fdai4616 Date: Wed, 8 Feb 2023 22:10:49 +0100 Subject: [PATCH 10/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 5 +++-- .../test-classes/CollisionCheckerTest.class | Bin 1403 -> 3056 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 9ba64c5..513c34d 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -8,11 +8,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -public class CollisionCheckerTest { + class CollisionCheckerTest { CollisionChecker collisionChecker; + @BeforeEach public void before() { - CollisionChecker collisionChecker = new CollisionChecker(); + collisionChecker = new CollisionChecker(); } @Test void WhenBallYCoordinateIsLessOrEqualThanZero_didTouchTopOrBottomEdge_ReturnsTrue() { diff --git a/target/test-classes/CollisionCheckerTest.class b/target/test-classes/CollisionCheckerTest.class index 357ab1139009acaf65c9e1a0cb661512229f2a17..15f75ac541d43328e231cbcd0e14b0c9d71f9b1c 100644 GIT binary patch literal 3056 zcmbtWe^V1z6g?Zz#kfj91@TvbYMUUC+G<-xt$?AVE(9?JWje!bl1H+*?9$zh?M(Yu zr(dWutvYt5AD~~UGo7Bdzer%yu{N1(UiQ6v?s?~)yDxwK{pJq<_pp&g27M~}H5|in z1-V`0g;BH&yIHK%c17J+aQv=moBn+Tefh$MiU9>d%Fn zg^IotI0;R~DGjGFsNn43MOEPuHdj9stKg#E6L>C*Aq=ZHqv0&hDHuB7S+;%A6s`jG zg<-WtWkoHtro7`kYocA@7T*Wm77Uw-rxIVS^6l9IyN7a=O{rRl|>o|cAHRL70$#8bbusoq+O2KfTh4GzVTxUsH zTuWq8z_cv-428>=`H~naiW)w`4F#uTeb$Ud!(x_ukt|&(bD=KX_tJ$?@rj0;xW&rH z(7M?1L(TJPn)kx_OvC50ghMgTy4h?+K>dqOgJcJF(-y1ky_#^VMorQm)}6XxZ5Xa8 ze@8d_{gz2JNAxs{&e8fcvE#Um9$RnQzPTqhXm*Cr+qUByQ7tC*^m;7>u_dG4B9gw@ z683^&S#rElAYRc#semT;ZzcvFXbxxFs@wrhJ~$p>rQPzuhZ zI8?!jJ>&ajA?4v_T;a7X4my{{##L~s$2MfQas!pr4XjX|cmvK#oa^oOu+=*Cx(}g3D=|jy-m|^g|1E}6UO2FZm~~Ev6H2Iprx6fp4$&PrDNga zBP1R=!drFxci|FktQ2EDeOn{NUDmy+z(E}t3ht*O%L>Q!NK{IPT!a)Xic$L#&=p3(FxBz!~FiN2NoXrHmchDEiX;Z&LefA0`ena*EL!O~PjwnMN zI9i1B1?Oaz2mA)+6U;U-`+4Vb<~4G9?gw61rhY~C`t(bTtj@f|h1VEANHW5`0Oxoe zVWKgPF7bUiNH`S&MG24bgj>KOQ=Y^y9&(i7>H(Cn#FR0eFC`l+Cv;v!bgtxn{11F4 z7(Yqju8~!qYziHGu0(u}Cw#Po&qxnG*07{fa9cgv%P9}o4oE&i+fb;0hOBX;5HR$CI2`)g3j8Vr&cQ* zWw<)McB=`upCfM5hq>hjbAtiXBkYbSS0cM5TtJzBLUdebZrKu{v!)Yv;}N?H3A?L3 z*i{mC2KUfMtkK+GvXX(vU*h8x`n=oX!-2q$8CYclZ?c3>0}|t5cw(m^tOfQSj8bO~ znOY)*eS45Po07UigD~|s4BTew8dKNbDfN1i`d|C$(_S8FGQP!1JSPL2{&hO4(AiI+ U0J5K+1pS@fPYQ*U54x}a0T4~NJpcdz delta 526 zcmb7=%}#?*5QPu7LVR;8mapAtYapi;PMib&A5FW$0Fq+zEqI+M! z#HZ-e#Kd?mkhWVxm^;G^=X`TVi$A9M@%!=y;21}Vd2XAiz$(MGFpIh5z2_L1N41Ov z3odF3+|((#$!$0J{(Afr_ey%Fwfs6~1T_@CoMN0|u0msMrX$UZH~39ffQ}ZUmE|fn z5wcRyW>=ue{Dh~}GG0->c!tq`U?Cs{%&cKi!p=mze6SGFDI?7lM4Xjo9iG4z^ElVO zM2Td8FNQGt&Nbs{_yngN4d9)123Q$lZQ|!~1#mSLRo+UC&k|O#oOy@2P~okzvyB~k zRye!MOmJGq9=f!Q5a&Sqk_QLlU9SqBz`6Mckk9`E-e4Ub8t}0`1r!uO+8D@^K#h#Z On Date: Wed, 8 Feb 2023 22:17:54 +0100 Subject: [PATCH 11/16] Unittest Pong --- src/test_/java/CollisionCheckerTest.java | 12 ++++++++++++ target/classes/classpath.index | Bin 0 -> 236 bytes target/test-classes/BShipTest.class | Bin 0 -> 737 bytes target/test-classes/classpath.index | Bin 0 -> 106 bytes 4 files changed, 12 insertions(+) create mode 100644 target/classes/classpath.index create mode 100644 target/test-classes/BShipTest.class create mode 100644 target/test-classes/classpath.index diff --git a/src/test_/java/CollisionCheckerTest.java b/src/test_/java/CollisionCheckerTest.java index 513c34d..767bda1 100644 --- a/src/test_/java/CollisionCheckerTest.java +++ b/src/test_/java/CollisionCheckerTest.java @@ -109,4 +109,16 @@ import static org.junit.jupiter.api.Assertions.assertTrue; //assert assertTrue(result); } + @Test + void WhenBallXCoordinateIsLessThanMaxWidth_didTouchRightEdge_ReturnsFalse() { + // arrange + Integer ballXCoordinate = 75; + Integer maxWidth = 123; + + // act + Boolean result = collisionChecker.didTouchRightEdge(ballXCoordinate, maxWidth); + + //assert + assertFalse(result); + } } diff --git a/target/classes/classpath.index b/target/classes/classpath.index new file mode 100644 index 0000000000000000000000000000000000000000..e5601ba6687866fe5f67169b1375ec07be4b98ca GIT binary patch literal 236 zcmb1OU}0cjU<6_qP-1^jv#RyHMPZbpSdA5L!wg;Cl{2Dqr^Dps_OE*2ciWLW94g@R z1H$N;3Zj4XgUBEc5Xr!>Jq$uKFx;5{V}a=Vg%9i)7|KsGFmxQBd>8PukSvJr!=&MBYBZz~Jt{!0$5m@u)=-cFLe?4g0sNlYZ4F{Xp5~zmJ&>bhFi*Txq zid;F>ZYz#eWONwBEFrygLeoinUtqoF{X1K;-eUpV4j$ssOu$=#%DjNq!L0-fRg#|0 zd!%9-D)%uwRsv;D2da}y`YJk-eV;t5UO13`Pez*WGiT0>G|4J@cMMGuX^5$NyA6`i z=XEl}+z!$LO5XgE1V&F(Psf^gTR{*SIh%Id`~OB*DV5sYFo_20lV*8KcMA4+BdB7B z9sz%h^b8>Im`*NP!Jgf7h|@Iugpk9GPYIoy1U$oYx(U1>e$ Date: Wed, 8 Feb 2023 22:49:49 +0100 Subject: [PATCH 12/16] update --- src/main/java/MenuPanel.java | 16 ++++++++++------ target/classes/MenuPanel$AL.class | Bin 720 -> 858 bytes target/classes/MenuPanel$GameFrame.class | Bin 412 -> 0 bytes target/classes/MenuPanel.class | Bin 1417 -> 1370 bytes 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 target/classes/MenuPanel$GameFrame.class diff --git a/src/main/java/MenuPanel.java b/src/main/java/MenuPanel.java index c685056..f8fdf9c 100644 --- a/src/main/java/MenuPanel.java +++ b/src/main/java/MenuPanel.java @@ -1,3 +1,4 @@ +import BattleShip.BShip; import PingPong.GamePanel; @@ -36,13 +37,16 @@ public class MenuPanel extends JPanel { public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_1) { - new GameFrame(); - + new PingPong.GamePanel(); } + if (e.getKeyCode() == KeyEvent.VK_2) { + BShip game = new BShip(); + game.startGame(); + } + if (e.getKeyCode() == KeyEvent.VK_3) { + new Snake.Game(); -} - } - - private class GameFrame { + } + } } } \ No newline at end of file diff --git a/target/classes/MenuPanel$AL.class b/target/classes/MenuPanel$AL.class index 7046c06524e255d3c96736107b3c3e65fcc906ea..d12278c1935e88e0aacf163075ff29bc1f40893a 100644 GIT binary patch delta 413 zcmZ8byGlbr6r9b|yGG1Iqj{(?zM_d&;aEnU}#;fSHw(nGiT>L_!*LKKQFHU4p8mOr?YsY>vS4dPRBg7F71Zp z*gc5^j46R+h1dbB$g?KlW0hE8uZ~1e&jr@7 zu3Y3EsqqtQ#Sx~WqT#;Ojh2*c(iZ=h2V>&FAK;HN z&Nilad2imEotN49{`vd@aDhV?222N*k1g1Q_N`Rwd!b~~yAmro%@_!F@e=2~Q$jtg z`eP3@xDGrYb@+r}DPF}W5$bt#w^+)k;IZ>q#l
>tkwjsCxBZCI1^iPM{5tmJIH zTFC5CEE0BFVH$~KF0xqbKhx4n5IUQX&5C1!_mHl$NKRuN(5TiN>a_^9naqppG%p;efbk2~8&oC$ diff --git a/target/classes/MenuPanel.class b/target/classes/MenuPanel.class index 2fbc45afbe702077b2cd6608a40517d1f9618d63..6d15d8a3f61976459f9b1f69230f95624137c880 100644 GIT binary patch delta 123 zcmeC=zQx6L>ff$?3=9mm43QhT`j{tgWEPoxkvUY9kAa1OpFsc!#Tf({WEg}Plo^C4 zTeCQEiZQSP#kd$GCbzN7k(FX#XOIT+Wf+tgWEqSYff$?3=9mm3^5zI`j{=*86p@Ngnd)27U%{ASuHj$e_$1G+B(riBpt; zl|hVwi$Q#HBFh|ENd|TXDWDo@1|^^>BL-OpI|exhKL&Y*C Date: Wed, 8 Feb 2023 23:02:17 +0100 Subject: [PATCH 13/16] update --- src/main/java/MenuPanel.java | 25 ++++++++++++++----------- target/classes/MenuPanel$AL.class | Bin 858 -> 858 bytes target/classes/MenuPanel.class | Bin 1370 -> 1462 bytes 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/MenuPanel.java b/src/main/java/MenuPanel.java index f8fdf9c..5c0d587 100644 --- a/src/main/java/MenuPanel.java +++ b/src/main/java/MenuPanel.java @@ -1,12 +1,12 @@ import BattleShip.BShip; -import PingPong.GamePanel; +import PingPong.*; import javax.swing.*; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; + public class MenuPanel extends JPanel { @@ -22,16 +22,19 @@ public class MenuPanel extends JPanel { super.paintComponent(g); draw(g); } - public void draw(Graphics g) { - g.setColor(Color.WHITE); - g.setFont(new Font("Consolas", Font.BOLD, 70)); - g.drawString("GAME MENU", 330, 100); - g.setFont(new Font("Consolas", Font.BOLD, 30)); - g.drawString("Press 'ENTER' to start the game", 265, 200); - g.setFont(new Font("Consolas", Font.PLAIN, 10)); - g.drawString("Created by Hells Gamers", 450, 450); + public void draw(Graphics g) { + g.setColor(Color.WHITE); + g.setFont(new Font("Consolas", Font.BOLD, 70)); + g.drawString("GAME MENU", 330, 100); + g.setFont(new Font("Consolas", Font.BOLD, 30)); + g.drawString("Press 1 to start Pong Game", 265, 200); + g.drawString("Press 2 to start BattleShip", 265, 250); + g.drawString("Press 3 to start Snake Game", 265, 300); + + g.setFont(new Font("Consolas", Font.PLAIN, 10)); + g.drawString("Created by HellsGamers", 450, 450); - } + } public class AL extends KeyAdapter { diff --git a/target/classes/MenuPanel$AL.class b/target/classes/MenuPanel$AL.class index d12278c1935e88e0aacf163075ff29bc1f40893a..9ca14ab545398e22e2815b6c13e65aaaeee47136 100644 GIT binary patch delta 47 zcmcb`c8hI80TZM8k07y#_$ B2k-y@ delta 47 zcmcb`c8hI80TZLjErk14L}0tRq5SR38hVgb7fAk$_lr1 z(^Asq(v_0Z?+hQd8N$tZyfa_ZEvsncu5a#r*lio;JBD0IzcpHfG(#|H8oFf^l#2&t z!zdQH%QiWKm@F6ULE(vI?7FbPvi7$SspKeIFBsJc?BjsCh#02nCPO*}4=up2YBi{; z=3u5uM-Q@8`yo&bq6OTvIuL&CwTChrAUoi@!nDOCC!2*HamyDf{O|jRPZ7qr6@>L(8gNppPEy|r9D)IBp07!AH!2G zQ4~CQ5-;9;nBpWYvdhf3GxM8o9ZPOGY-M-@hX z5UHrARoB1QS)4GG_XF)m`cBHzr&vOUNQt?WDZ!#zZp#}9Hb*pdpUF3w z^30FeU46$+$FA{$d_g_N-kN<}WS?|n91Lj4LSnUqtZ_5*hb|Ou=#_kLWaa%^d1EV% VcFJAglCmJ{NnDYVshY+$*dO$zG}r(D From 20f5906f7e6a25f224100e932df5ee79f781aa9b Mon Sep 17 00:00:00 2001 From: Justin Senn Date: Wed, 8 Feb 2023 23:10:17 +0100 Subject: [PATCH 14/16] Update --- src/main/java/MenuPanel.java | 2 +- src/main/java/PingPong/GameFrame.java | 2 +- target/classes/MenuPanel$AL.class | Bin 858 -> 858 bytes target/classes/PingPong/GameFrame.class | Bin 844 -> 844 bytes target/classes/classpath.index | Bin 236 -> 0 bytes .../test-classes/CollisionCheckerTest.class | Bin 3056 -> 3271 bytes target/test-classes/classpath.index | Bin 106 -> 0 bytes 7 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 target/classes/classpath.index delete mode 100644 target/test-classes/classpath.index diff --git a/src/main/java/MenuPanel.java b/src/main/java/MenuPanel.java index 5c0d587..95560f9 100644 --- a/src/main/java/MenuPanel.java +++ b/src/main/java/MenuPanel.java @@ -40,7 +40,7 @@ public class MenuPanel extends JPanel { public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_1) { - new PingPong.GamePanel(); + new PingPong.GameFrame(); } if (e.getKeyCode() == KeyEvent.VK_2) { BShip game = new BShip(); diff --git a/src/main/java/PingPong/GameFrame.java b/src/main/java/PingPong/GameFrame.java index 6f87f8e..f7c6dbd 100644 --- a/src/main/java/PingPong/GameFrame.java +++ b/src/main/java/PingPong/GameFrame.java @@ -5,7 +5,7 @@ import java.awt.*; public class GameFrame extends JFrame { GamePanel panel; - GameFrame(){ + public GameFrame(){ panel = new GamePanel(); this.add(panel); this.setTitle("2D Ping-Pong"); diff --git a/target/classes/MenuPanel$AL.class b/target/classes/MenuPanel$AL.class index 9ca14ab545398e22e2815b6c13e65aaaeee47136..c4c17e16eaa8db6f8e3886f39eee8edea96a4b08 100644 GIT binary patch delta 16 Ycmcb`c8hJoAy&7d#N5=4$0suZ06hT*5C8xG delta 16 Ycmcb`c8hJoA=ZGzywseH$0suZ06ifG6#xJL diff --git a/target/classes/PingPong/GameFrame.class b/target/classes/PingPong/GameFrame.class index bf5657e7bb0dba9d6a6217c6f5eaf0a3d1448a1f..4de88caa27957137a53692d30d108951bc388066 100644 GIT binary patch delta 13 VcmX@Zc7|=kY$is=$#a-C001MV1l0fl delta 13 VcmX@Zc7|=kY$isA$#a-C001MQ1k?Zk diff --git a/target/classes/classpath.index b/target/classes/classpath.index deleted file mode 100644 index e5601ba6687866fe5f67169b1375ec07be4b98ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmb1OU}0cjU<6_qP-1^jv#RyHMPZbpSdA5L!wg;Cl{2Dqr^Dps_OE*2ciWLW94g@R z1H$N;3Zj4XgUBEc5Xr!>Jq$uKFx;5{V}a=Vg%9i)7|KsGFmxQBd>8PukSvJr!=&MBYBZz~Jt{!0u`9YlP)W2Q(7#J9A8NxPlEo7VgiOq_UYqKspBP%B(LkLiUi6ImK9r6m9 diff --git a/target/test-classes/classpath.index b/target/test-classes/classpath.index deleted file mode 100644 index c12ec5a406bff3daf4a3c42dccde54fba71c1ffc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 ucmb1OU}QiAa{E_3@Vo8Et%fR$#@l)ZO#saG&0$~&JG49=RgTFA#0LQFtq8&Z From fe9e3df7cb0268b6344aad9f049054a67bc7a1a0 Mon Sep 17 00:00:00 2001 From: Justin Senn Date: Wed, 8 Feb 2023 23:26:41 +0100 Subject: [PATCH 15/16] Update --- src/main/java/PingPong/GamePanel.java | 13 +++++++------ target/classes/PingPong/GamePanel$AL.class | Bin 731 -> 863 bytes target/classes/PingPong/GamePanel.class | Bin 4784 -> 4633 bytes 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/PingPong/GamePanel.java b/src/main/java/PingPong/GamePanel.java index d9e8dc6..13f574c 100644 --- a/src/main/java/PingPong/GamePanel.java +++ b/src/main/java/PingPong/GamePanel.java @@ -4,6 +4,7 @@ import javax.swing.*; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; +import java.util.Random; public class GamePanel extends JPanel implements Runnable { @@ -14,7 +15,7 @@ public class GamePanel extends JPanel implements Runnable { static final int PADDLE_HEIGHT = 100; public static final Dimension SCREEN = new Dimension(FRAME_WIDTH, FRAME_HEIGHT); - + Random random; Ball ball; Paddle paddle_1; Paddle paddle_2; @@ -154,12 +155,12 @@ public class GamePanel extends JPanel implements Runnable { paddle_1.pressed(e); paddle_2.pressed(e); } - } - public void keyReleased(KeyEvent e) { - paddle_1.released(e); - paddle_2.released(e); - } + public void keyReleased(KeyEvent e) { + paddle_1.released(e); + paddle_2.released(e); + } + } diff --git a/target/classes/PingPong/GamePanel$AL.class b/target/classes/PingPong/GamePanel$AL.class index 38e42d240d31e1d4ba150396f617a25fe2e26078..1cb4eccc087c6198022beceb9fa389bc77e1fd06 100644 GIT binary patch delta 334 zcmZXOJ5B;o6o$WZCm^{zDs?cv6$EG0h8ovkw6NAVl~!6=xd<8(BvE%jf|^L;0^EXy zJ0bqVD3X|){O57cf4=jX`^x)|@!LDl=3wBLZNW3oYKb+fM&UZSO3rSQi%#9TrQ&6B zd;HrN+0ki$QDj}Zp#_IHJ@8Tdj76`^4OBTcrFqRjmo4dHHpMnIRhlO^`8VoR(_Ni& z*St$z6#{8bjC;BIGwyKe4%wk0m(k4Ja-95J5=KL8NI8CCB}j;z_Kqr|3m?x^y4=26%NQ_y7O^ delta 179 zcmYj}yA8rX5JcatWd~=;Ax1L)uOTA@$t@sJ6csoC0Zot+Pyj6uKqZLr1&Cy3S2J&3 z$ustk&+QIWEU&(B^~N3Rx7((MBc&tl)@v(PJ#`X&aG)=3VN%b4p}e``kUK`S1GTqu l*H9Ue^rW@3sLLOn|LB}C6HyUUb&VPG;2EXdD>3aXa9;?a5+(ou diff --git a/target/classes/PingPong/GamePanel.class b/target/classes/PingPong/GamePanel.class index 5dd0342141a5aff2c4dc250021236cffd84c9a39..c989c252b32e45c3d69d2aca32b927aef2708bf7 100644 GIT binary patch delta 1018 zcmZvaNla8h5Qe|%!I@!Dh5-c)iVNzfh-@kmR3NB`q8P;B5|>FZ3IdAj!Ht6&gXn=5 z7Y@dgiN*sWi6)vDJ$NxO#)AjrzOT68hP(BK3C_X8>#o16>;K)K)c@~kX_z1JK0=TiO=MSlU#{ovJBE@ zrjjQ))TYB7M~0D(%{8%~a|1s)?nB1ZuTkb=s@7+Szq#w_a_oCx;E%#VtYpsW|oCXg;a! zNM$JuDMgUS7d;bY%;hUxIFxrh-!$r_>=}I5$YtoXZh4cW!|L*87TDd6*EDR^vTek$ zT_3^@9b!XJEMA`yI?nD<+0hTKtAubOWNA%|Kg(u`RWq^d9x}9`)#udXdkcVykzB==T?I@V;&U delta 1222 zcmZ{jTWnNS6o$XGTRYR4+V-?qBrSLupp+?{77?XI3KoQ>1r!>v29yaNWh@k-ScA8k zsF9lwa@6R9K_5&Y#zZWEL=BNw6Jt#DNd>$iUaMHVq2PaJ>M#$QN%mfApS}P8U;kS3 z!sOSd#NIvs=274Viyn-%M|)yy;FB^w<+u^u>TmSZ1OA;x-L&p|(u3(#`u=Sxf6(vW zmg@4iFA9UUhE)+x8ddr43p1Pi{(;Qq{un2yitt5{iS7xiOJ8e@_xambhXd<0@uwHFHQXpDA=Rm6g=9O0eU#YFWQY) zbC|>T#nWym1U;;$kQ7j(eod?+#TJ@*gcf!%ljoVmD_qMkvpL4~oMn!c&}!AR*+k~r z4CYxY?bgYBTg{D@ro%EUv_TfxqugY>SZsS)V*BW{19aItblZC@wGUV}WFK*honeJt zV5KXf$3s#)!7xz#1;b@klllB{vpvDUS7yIag1u8VbUIqNT0=WZUWZd8R_Mn&T} z`pRmUOT1Ve~iei^ABS zD=$b@)?X8%RH+zvOf&Sj=JW~q^5jLw#PRPuoaYU_9tn0XRXREUWWrvF`m(*7(@{wcgxp1IlF%Ji|DiWjfClyh-MjUf_7B zRQHw&J@mnweu(wS!+flLN4Ou Date: Wed, 8 Feb 2023 23:58:13 +0100 Subject: [PATCH 16/16] Update --- src/main/java/BattleShip/AIGridGUI.java | 6 ++---- src/main/java/BattleShip/BShip.java | 6 +++--- .../AIGridGUI$DirectionCompare.class | Bin 1093 -> 1093 bytes .../AIGridGUI$SetShipsListener.class | Bin 3153 -> 3153 bytes target/classes/BattleShip/AIGridGUI.class | Bin 10311 -> 10311 bytes .../BShip$IncomingGuessReader.class | Bin 1718 -> 1719 bytes .../BattleShip/BShip$ShipsPlacedReader.class | Bin 1142 -> 1138 bytes 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/BattleShip/AIGridGUI.java b/src/main/java/BattleShip/AIGridGUI.java index 1cf8be4..f3d9bfe 100644 --- a/src/main/java/BattleShip/AIGridGUI.java +++ b/src/main/java/BattleShip/AIGridGUI.java @@ -1,11 +1,9 @@ package BattleShip; import javax.swing.*; -import javax.swing.border.Border; +import javax.swing.border.*; import java.awt.*; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.util.ArrayList; +import java.awt.event.*; import java.util.*; diff --git a/src/main/java/BattleShip/BShip.java b/src/main/java/BattleShip/BShip.java index 032d572..89cd601 100644 --- a/src/main/java/BattleShip/BShip.java +++ b/src/main/java/BattleShip/BShip.java @@ -150,6 +150,7 @@ public class BShip { } } else { textArea.setText(grid2.getText()); + } if(grid1.getClicked()) { textArea.setText(grid1.getText()); @@ -169,7 +170,7 @@ public class BShip { grid1.setClicked(); } - } + } } } @@ -182,8 +183,7 @@ public class BShip { synchronized (lock) { try { lock.wait(); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) {} } } grid1.enableCells(); diff --git a/target/classes/BattleShip/AIGridGUI$DirectionCompare.class b/target/classes/BattleShip/AIGridGUI$DirectionCompare.class index a2264253294d15852ab9731b2a3bf8384720dbd0..411fa71a64d76c90b53a4770e2a850951b410855 100644 GIT binary patch delta 25 fcmX@gag<|2G&AFd$uZ2qjGHEJV2%K?IazD~cQy!p delta 29 icmX@gag<|2H1p*3%xsernf(~IOy0m80p{_sm;(TxI0>@= diff --git a/target/classes/BattleShip/AIGridGUI$SetShipsListener.class b/target/classes/BattleShip/AIGridGUI$SetShipsListener.class index a43d2b181f002f901269434941a0339db4a73891..9334499daa95705982c20a0bd418708e8412a239 100644 GIT binary patch delta 160 zcmca8aZzGJDhK0^$!Q$HoVyt~822y;GVYz6%dNTjHAgIC>_MQ=AqFYN!wkxdM;M$L zk1>QZ9%sm5Ji*Y!c#@%&@ifC!#xo2{8P788U_8gL56C~lc!A+8<3)z6jF%biGG1eN z%6Nm}H{(r4DaKojN{qJ|^%(Cm8ZzEvv|@ZTc`4U^&SyXyo&zm?0kqVI@#W;d+_ICe LbE`7G0zkPg@P0B(Bi?Uj+Hp*mV;wF?UcykGMWs$<*kVDRi9AcoH?m)`B zJ^yF)RFaXhj8$Z!GE-HUsmfe6 z7HYCo$9A8!W^A-&t22AuIq1ug04GA6iE$y$l>|3a^L9NCD?BawvS^C8`ME)}b0d80 G%KQP3X*T-+ diff --git a/target/classes/BattleShip/AIGridGUI.class b/target/classes/BattleShip/AIGridGUI.class index 7c2fc5bd672961764cb2ddde77c063b5c96e8690..f16ca3f15b2b9d070bb472e852dc6a6203776d00 100644 GIT binary patch delta 1168 zcmWNQdu+~U6vsc`^Zcx+xAd~w+oIjts(alwOeZU2TW!`V#f({Xu}0jLk!3Fy_o(r@ z4l$u|8(CJj*vv?#hE0~RY%vx^Y<0h^B8)wG{y673&pFBGd%k(93#tpg-kKE2At08< zG$Mr%Su~*yN#yVxU45kwspOMJAuSe%f-BcKl3x zey0=X=}ZkTaffb#?rKaAwcurC(NpcnRTqEnkx!ob(p!b}(Fk5s8GTjGo0?6&me5~o zc}tZPXfK62NRdu5NM{(Va}?_eLv-EO?((h$46mB_>^((BdEyU9r^M5a_Ecl&$XIfj zKpvBLo5^0o6iS)O$3D*XN|yR;9W&U%Ob+uBvO{O+n-vj4E%)9^%;Rt=LDRUu&|*3Uknl`p%0wL~oBch{JyP2qXE? z%R9y=RD0B8EaWGad-M&QWGkoG?d>?gFTVSP@BEeHoZ+lL=lG2a{J~Y9)$*qocb>-) zE-2tHHRPf~)TjxUl*VOcb4Bg>TOIkwyH@L!UQ<5TRlqG3aa+aQ(TCjCIPPf*by~~= zRq#;Dc%&6P(Q2Xfk~YezQZd@8`r54qs#ZgtR;QgkF15G) z>R>-8$4;xOoz;tWS>3HxJ?x=!?WtaIaeCDyDKFwO)z7uk>#mdDaNShsdTF4`SCK2w zAU9OSZiI%qQVnzC^`0x&2scwB-2%Pu7HgE-p%S-8qun8uy5kz-YV?u2rZRU^W8EE% zb9EZ;9%-U`qRBx$O$i#QJV?~EAXU?Ybj=8|)%??-pCZ8k%?b)MCn(a~V2I`grJ5g< zX<=1m`Z5bu5Tm8U>T^O`9_^DcA+*X@R+FSPB0|Yk#g0d~CHkPGAY#>g&kj&D~KhNcy^E~^0&u6D2rz7XH<`CB` zSg^q#ewd_dJc2M4VMx~7Y(yXnk#HggOAw2E%@!g7WpH3467e>sz^&Cyn1-X6j&>yB zJZ9iWef>L9@Q40z1&?9`sRZWHA8Cw2I^*#erz3+YdQWvCiwp1smtX;lu#jbVl9kBj zHax=`EaCwyrUy%T61hB$Ja!?U7qOhZC}2NU@S4VM;(4)9)V3z{7G1>%$4iJti7GBt zb!C`|3Z!E#=3^ZeVZC~&)a(Xq(tR5?<6Ue)1GeG_-oWR&pTTx~gSYSlcHpwQ?9=lg zsxXXQ7)1?zv5SG&!!Xp+j(X0*^Z04okiE%roq*t^0y(8P+7X~~g7JmoI1M|#Qd4Kt)LCTW z9G0oXLVSyr=s-C-Rr>cTvlBbfg*tTOuwrP&PdJVX`peJysvFBQ3J=k+kzVxBo2~TWar&}@<9UHL_Ryb~7(mwmgE-7! z-e8D$GgJZ@CKEVOqG^{Y43}g^$RmuDY(_~gC(8=PNHHIla>mJ8#>;vpNDUoQ&qQh9 zR5`+Fa*WB+&Y5zKv*ZHjNDt>qALq#+(`1Yp@_>&UKW3T`X1PoppE8Mj+RUQU%w?|0 z;4b#tHVEiYDDY~1V4id}8nuaN@?;X#D)ko#(B=8hpv%C-4niCZjO+|azZh7U Lgfl1ivS|VUP0Jn( delta 106 zcmV-w0G0o@4Ym!i%me|)lg$Ko0{@bepam3@S_R52nE;Xin*gQ&o&c->p#ZM{p8&7` zpa8T0qX5AGqyWnRr2ygprvUZo?4Fl=QIVc5nX$FQA2gJCCw5yP&@d@LCN DP^}Dz delta 51 zcmeyw@r`4H8#Cj^$?nXWjE^T5GB-(UF>o<3Fl=EEVc5zb$FPk-gJB1Q5yLJ9Q-+