From 962e4efe61e0b38c63fc4e26c8472a49d04f0088 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 1 Dec 2021 22:19:33 +0100 Subject: [PATCH] Some Error Catching or Preventing --- lib/Conway-Game-Of-Live.mv.db | Bin 24576 -> 24576 bytes lib/Conway-Game-Of-Live.trace.db | 42 +++++++++++++++++++++++++++++ src/data/database/DataBase.java | 4 --- src/game/Control.java | 7 ++--- src/game/StartMode.java | 7 ----- src/gui/ControlWindow.java | 44 +++++++++++++++++++++---------- src/gui/GUI.java | 2 -- src/gui/MenuWindow.java | 37 ++++++-------------------- src/main/Main.java | 40 ++++++++++++++-------------- 9 files changed, 104 insertions(+), 79 deletions(-) delete mode 100644 src/game/StartMode.java diff --git a/lib/Conway-Game-Of-Live.mv.db b/lib/Conway-Game-Of-Live.mv.db index 83119facdb7721ad485100f79cdf44469c3adabd..51cb2f4a55eccb0703420d508fe76bf0e4ad4ad6 100644 GIT binary patch literal 24576 zcmeHOO>^2t7>2+mjU79st<n#77j7Q%B&GaCHFw9__fJmG}hmnMcJ+Z+xIL-9j zKhaZ9?SE)Hz2?&Y(M#_=w3qJc+mJemLq3?kK1fqnQqmv_ZLcoX4$@pM2 zbT1ejIum=}IZ^wAzGL-Gdno~bzyL4+3;+Yb05AXy00Y1PFaQhy1Hb?<@Y)!tL;U~R zxQ7P=1Hb?<01N;FzyL4+3;+Yb05AXy00XazfuP7Q`6>Xuc<9hl|B-pD@}@=hkJOUG z7KhHGi7FJ2&HK)nNCi$tBhqBcA`uF(oKWJ#;^g4SQ6)tzStUCr29S!!2gAzfbU0C2 zJm){6D!BA`^{W(0aJ(Q&iA*|+*Y`TQfh%oYGxXk8x6!O(o@Fy>1~V()CB5^w+tJ&& zQNyiW1M7Q@j?uwPM`LhDYZ`cilT1alMMdHVHeVjd8@R4@>Ucv@$^%Pw6vY{sDXM^;Rnuu6UlESOX`~nr%0UWh@xYgiqhv~hh_VHR16TE$)+JW9^gRRL(VATy z*LK^n3p@8ZhQ8D5=(oFitD^TRrLwGRvfk5b)k;q+^HQ%Qlxw{$S*)>2wN$H=$*n09 zt!}gFZhFRUFL+LHpBH^X(R+;+c`b(6-LBNNwtwz!qiWRMxARZb^~QGHh@aWkTY6hF z8oMp`?9vyRbROqcj(iU1WhCwxTHC;P8%7;VcuQ~YwzfNz4YzkP=>qAv+fVPes%B_Y z{pP>fUi_u*`R_vh*SD|#@k=u84&y`yWp}FG@#J9mU_40|(_87i3}Wiv?2pX#b$Xm@ z96Q5<@%nl;gYxy($lRyDT2CaBYpehKn%waI8)OB&g|4C{w2ZEy6|{=3qqk88y@TFG z@1Zqx1HF$vKp&!y(8uT#^eMWDK0_E~5rc9lj|ylVZ6q?OY%Z5cF&Jl3WXxt#d2f@Y zM-1H%G>`LiQy`lx{YjRhS&C*Unx$x#q6|eDiZT>sD9TWjp=gexIf~{eN}rq0Q8Y)< zJVo;q%~Lc_(L6=-6fID+K+yt43luF-v`|PSQmf0qC)N^I-I;FF=7sP`L}ZrRHth*f zMvc8oC#H4iY_jo&5N}AU?!~9W{-`;+zsX&ubM2;Z#obw^zqfu$22-~X3b?$f`|#kQ zvqPqBwn&d|xidEFPw3{^302>nP|4T`h66n&!@=!ddQ8X6P4|}G6~fdFd4Y?=(kz^mlVVaza!KKm zWnQwZ6dAZH!9q;=;G>qqv2xTJ@V4`+yb5>@FaQhy1Hb?<01TYRK;Xnh@pq)7mx`f| z-YlD@C|PrkpD|tvp0D^$r0|6JUkKbV;xD=0WaNgq?xO2<#N4oQ{9^#(x`n>ryv?Wa z|KF>2+`E@T?_OSH@BaJHyN?FOS?^vXNtwvM7hW`BGwaYxF^4{$#Q7mKP4>r(^vn)D zNf*rwp;F+c@02lxUfB|3t7yt$?%D`;=9mW6TOw@``0h{)+|_|v5d z7s!!67m@Ka`eG+IJ)a>+zWFUb`R2DE`F2rv60QRVfB|3t7+4Sng7`m*zoYoS6vh97 zP2ztdFrRw_9Xx-!mK%@%pQmaYSsyRS&f9GNex&}N`tkagaqm8+?hURJ{r_M42KeFt literal 24576 zcmeI3OLN*r9Ka#4cH_ipY3uZzE&}X!hVe*355!Fd*)W4~VnpJcm=&yIPi*kmI8A$P zzeGVtw^FM7JIuV19sUU#oj(8gNjt_9Z@o({feabby-u&)X9;M+3m@OtF7R=*{8hkqMWH>S>wQV1qS)_?x+9fWuvyz|v@+=&#*4pQ3))gOt97e} zZF8+@Vc~9Pt=XswtHOr4X*F8wTf!F$oSM+63AoX+am`vcJFJy0Ysbd-&1T2K>s#Bg z8`}@twzb)9TlYFvt7>(tWka(}&FY%#wQ5%}WVKr^8SC9OO<5Q9T6w){ut#$etxmJ) z6YiQI*)UU2LZ#&Y9wyk=C+L=H0(N7@tW1#YHhSR4R3TZ=>i+Ld(R)YnrWL8;}-O6 zC*G-tL0{N!ePiDKC7Jf7aUz4Vo3+mIXm9ZNc$6-t*U~!~B-Fp!9g^i`ex7R_(!t*G z@^UtV^7Yn`?DB6dClbk}xyG-_75~?u>F6zV9W9_6=q6f3x6s?@9h5=uqW94IXbIg$ zAD|D>N9bep3HlU$hVG!x5k^@gpd8Ah0$N5ZiA*Y+%Vkmm#+ekGvzb)hFS7hh;02TB zah?|iR%H2CvRs}l%8SE^pA&2hOy{DX6IKo02Y{?MtB5xEgoHp$`me4DyU-t{3HCi{pCj!AFCGNX?D zTSvs%r>kPTQi@m9Ti(qlgZ{8Ne6%Xf@wIlfH18c85*(eMlHt;=juW{2rF(zx3EgDN zwpiq6cfA!`3>I{HdO_Ew7IbBLK_`8U7EcBz$1L+JT;KhwIl4bi`qE-+z8YKeqjqXR zJGEeoIjf!i#-p(;G;iZ!n~2v9X}s~2c{@efHMH@@)6+=r<=V-*Ki-?XA*)Od8RlbA z8IMJf0T=aJ^+v7|jHx#TDr|0q(}AC}>EM4Um@{|0NBVb^CLSo4q_|j}7ALi&l2nsY zvUJTM*BmFsHtEH1Bj!Bhs757Gi)yaiqpwPBpocMnY;{TKJ|DRL8CvHda z|Conx>?<^8*;g1v*#FB{821#0nE>Zb?TTjtu$6w=acIQ+ax>*Pj6hC$!=In3a1I~& zOM#5L(P!Ji>FW$(szOi;oNqx5oNwnfa^v>@%S3IX*2hD#mu>h5&tv)jsUPRRjcfO@?B20pFtwm s(); modeBox.setBounds(180, 257, 200, 20); addComboBoxEntry(modeBox, "Randomized"); + addComboBoxEntry(modeBox, "Manuel"); addComboBoxEntry(modeBox, "Task1"); addComboBoxEntry(modeBox, "Blinker"); addComboBoxEntry(modeBox, "Toad"); @@ -323,7 +323,7 @@ public class MenuWindow { startButton.setBorderPainted(true); startButton.setFocusPainted(false); startButton.setContentAreaFilled(false); - startButton.setBounds(50, 310, 150, 50); + startButton.setBounds(50, 310, 330, 50); startButton.setVisible(true); startButton.addMouseListener(hover); startButton.setBorder(new RoundedBorder(25)); @@ -338,26 +338,6 @@ public class MenuWindow { }); } - private void initManuelStart(){ - manuelStart = new JButton(); - manuelStart.setText("Manuel Start"); - manuelStart.setFont(text); - manuelStart.setForeground(Color.decode("#121212")); - manuelStart.setBorderPainted(true); - manuelStart.setFocusPainted(false); - manuelStart.setContentAreaFilled(false); - manuelStart.setBounds(225, 310, 150, 50); - manuelStart.setVisible(true); - manuelStart.addMouseListener(hover); - manuelStart.setBorder(new RoundedBorder(25)); - manuelStart.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - gui.buildGameWindow(xAxisSize, yAxisSize, cellCount, "Manuel"); - menuWindow.setVisible(false); - } - }); - } private void initIMG(){ preview = new ImageIcon("src/data/pictures/Preview.png"); @@ -389,7 +369,6 @@ public class MenuWindow { menuWindow.add(startCellsName); menuWindow.add(startCellsLabel); menuWindow.add(startButton); - menuWindow.add(manuelStart); menuWindow.add(previewLabel); menuWindow.add(modeName); menuWindow.add(modeBox); diff --git a/src/main/Main.java b/src/main/Main.java index 363bb4c..9adca5d 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -15,31 +15,31 @@ public class Main { Control control = new Control(); control.start(); - // DataBase dataBase = new DataBase(); +// DataBase dataBase = new DataBase(); // dataBase.deleteTables(); // dataBase.createTables(); - - - // boolean[][] cells = new boolean[44][66]; - - //for (int x = 0; x < 6; x++) { - // for (int y = 0; y < 6; y++) { - // } - // } - - - // for (int x = 0; x < 6; x++) { - // for (int y = 0; y < 6; y++) { +// +// +// boolean[][] cells = new boolean[44][66]; +// +// for (int x = 0; x < 6; x++) { +// for (int y = 0; y < 6; y++) { +// } +// } +// +// +// for (int x = 0; x < 6; x++) { +// for (int y = 0; y < 6; y++) { // cells[x][y] = true; - // } - // } - - // dataBase.saveGrid(cells, "Noah", 1012); - +// } +// } +// +// dataBase.saveGrid(cells, "Noah", 1012); +// // System.out.println(dataBase.getAllGrids()); - +// // boolean[][] x = dataBase.getGrid("penis"); - +// }