From 8b1824db644f0aad8071ce733e71104b046d404a Mon Sep 17 00:00:00 2001 From: Adam Procio Date: Thu, 2 May 2019 23:30:57 +0200 Subject: [PATCH] retrieve port from server --- src/main/java/Main.java | 11 ++-- src/main/java/client/GUI/BoardGUI.java | 6 ++ src/main/java/client/Runner.java | 53 ++++++++++-------- src/main/java/client/communication/Utils.java | 23 +++++--- src/main/java/{server => logic}/Board.java | 37 ++++++------ src/main/java/logic/Player.java | 6 -- src/main/java/server/Runner.java | 32 ++++++++--- target/classes/Main.class | Bin 961 -> 1593 bytes target/classes/client/GUI/BoardGUI.class | Bin 1766 -> 1845 bytes target/classes/client/Runner$1.class | Bin 1334 -> 1334 bytes target/classes/client/Runner$2.class | Bin 1332 -> 1332 bytes target/classes/client/Runner$3.class | Bin 1179 -> 1179 bytes target/classes/client/Runner.class | Bin 3550 -> 3876 bytes .../classes/client/communication/Utils.class | Bin 2144 -> 2367 bytes target/classes/logic/Board.class | Bin 0 -> 1796 bytes target/classes/logic/Player.class | Bin 2487 -> 2487 bytes target/classes/server/Board.class | Bin 1245 -> 0 bytes target/classes/server/Runner.class | Bin 2195 -> 2253 bytes .../compile/default-compile/createdFiles.lst | 2 +- .../compile/default-compile/inputFiles.lst | 2 +- 20 files changed, 102 insertions(+), 70 deletions(-) rename src/main/java/{server => logic}/Board.java (58%) create mode 100644 target/classes/logic/Board.class delete mode 100644 target/classes/server/Board.class diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 58fdd26..e3205ea 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,3 +1,5 @@ +import java.util.concurrent.LinkedBlockingQueue; + public class Main { public static void main(String[] args) throws Exception { if(args == null || args.length == 0){ @@ -12,11 +14,10 @@ public static void main(String[] args) throws Exception { } else if (args[0].equals("server")) { /* run server */ System.out.println("Running server"); - try { - server.Runner.main(args); - } catch (Exception e) { - e.printStackTrace(); - } + server.Runner srv = new server.Runner(); + Integer port = srv.getPort(); + System.out.println("server port: " + port.toString()); + srv.run(); } } } diff --git a/src/main/java/client/GUI/BoardGUI.java b/src/main/java/client/GUI/BoardGUI.java index 5908e48..e8d129b 100644 --- a/src/main/java/client/GUI/BoardGUI.java +++ b/src/main/java/client/GUI/BoardGUI.java @@ -38,4 +38,10 @@ public void start(Stage stage) throws Exception { this.scene = new Scene(this.pane); stage.setScene(this.scene); } + + public void updateGUI(Integer[][] state){ + /*TODO poll each square and for each piece that doesn't + *TODO correspond update button + */ + } } diff --git a/src/main/java/client/Runner.java b/src/main/java/client/Runner.java index 168d285..b8bcf2d 100644 --- a/src/main/java/client/Runner.java +++ b/src/main/java/client/Runner.java @@ -10,12 +10,43 @@ import javafx.scene.control.TextField; import javafx.scene.input.MouseEvent; import javafx.stage.Stage; +import logic.Board; + +import java.util.concurrent.LinkedBlockingQueue; public class Runner extends Application{ private Integer port; private MenuScreen ms; private BoardGUI boardGUI; + private Board board; + private Thread logicThread, + cliThread, + servThread; + + private void runGame(Stage stage, Boolean remote, Boolean computer){ + /* Garbage collector should clean ms */ + this.ms = null; + this.boardGUI = new BoardGUI(null); + try { + this.boardGUI.start(stage); + }catch (Exception e){ + e.printStackTrace(); + } + if(!remote) { + /* queue for server port */ + LinkedBlockingQueue queue = new LinkedBlockingQueue(); + /* run server */ + server.Runner server = new server.Runner(); + this.port = server.getPort(); + this.servThread = new Thread(server); + this.servThread.start(); + } + this.cliThread = new Thread(new Utils(this.port)); + this.cliThread.start(); + this.logicThread = new Thread(new Board()); + this.logicThread.start(); + } public static void main(String[] args) throws Exception { launch(); @@ -62,26 +93,4 @@ private void setPort(final Stage stage){ this.ms.getTf().setOnAction(this.ms.getEh()); } } - - private void runGame(Stage stage, Boolean remote, Boolean computer){ - /* Garbage collector should clean ms */ - this.ms = null; - this.boardGUI = new BoardGUI(null); - try { - this.boardGUI.start(stage); - }catch (Exception e){ - e.printStackTrace(); - } - if(remote) { - /* TODO connect to server */ - System.out.println(this.port.toString()); - new Thread(new Utils(this.port)).start(); - }else{ - /* run server */ - new Thread(new server.Runner()).start(); - /* TODO get server port and connect to it */ - this.port = 8888; - new Thread(new Utils(this.port)).start(); - } - } } diff --git a/src/main/java/client/communication/Utils.java b/src/main/java/client/communication/Utils.java index d4daaa6..947d3cb 100644 --- a/src/main/java/client/communication/Utils.java +++ b/src/main/java/client/communication/Utils.java @@ -7,20 +7,29 @@ public class Utils implements Runnable{ private int port; + private Socket clientSocket; + private BufferedReader inFromServer; + private DataOutputStream outToServer; + + public void sendState(Integer[][] state){ + System.out.println(state.toString()); + //outToServer.writeBytes(state.toString()); + } public void connect() throws Exception { - /**TODO - * if game selected is on 1 machine, create thread with server running in background - */ BufferedReader inFromUser = new BufferedReader(new InputStreamReader(System.in)); - Socket clientSocket = new Socket("localhost", this.port); - DataOutputStream outToServer = new DataOutputStream(clientSocket.getOutputStream()); - BufferedReader inFromServer = new BufferedReader(new InputStreamReader(clientSocket.getInputStream())); + this.clientSocket = new Socket("localhost", this.port); + this.outToServer = new DataOutputStream( + this.clientSocket.getOutputStream() + ); + this.inFromServer = new BufferedReader( + new InputStreamReader(this.clientSocket.getInputStream()) + ); String sentence = inFromUser.readLine(); outToServer.writeBytes(sentence + '\n'); - String modifiedSentence = inFromServer.readLine(); + String modifiedSentence = this.inFromServer.readLine(); System.out.println(modifiedSentence); clientSocket.close(); } diff --git a/src/main/java/server/Board.java b/src/main/java/logic/Board.java similarity index 58% rename from src/main/java/server/Board.java rename to src/main/java/logic/Board.java index 9d8b916..27bc9f4 100644 --- a/src/main/java/server/Board.java +++ b/src/main/java/logic/Board.java @@ -1,27 +1,11 @@ -package server; +package logic; -import logic.Player; - -class Board { - /* solution - Player implements PlayerIF - color - pieces - time - PlayerIF - move(piece, pos) - move(pos, pos) - - Piece (abstract class) implements PieceIF - posX, posY - toString() and move(x,y) - abstract class that is extended by (rook, bishop, queen, knight, pawn, king) - */ +public class Board implements Runnable{ private Player whitePlayer; private Player blackPlayer; private Integer[][] state; - Board(){ + public Board(){ /* default setup */ this.state = new Integer[][]{ {-4,-2,-3,-5,-6,-3,-2,-4}, @@ -36,4 +20,19 @@ abstract class that is extended by (rook, bishop, queen, knight, pawn, king) this.whitePlayer = new Player(true, this.state); this.blackPlayer = new Player(false, this.state); } + public Board(Integer[][] state){ + this.state = state; + } + + public Integer[][] getState() { + return state; + } + + public void setState(Integer[][] state) { + this.state = state; + } + + public void run() { + System.out.println("Running Board logic"); + } } diff --git a/src/main/java/logic/Player.java b/src/main/java/logic/Player.java index 38c0cce..9efdf64 100644 --- a/src/main/java/logic/Player.java +++ b/src/main/java/logic/Player.java @@ -39,27 +39,21 @@ public Player(Boolean color, Integer[][] state){ if(!color) state[i][j] *= -1; switch (state[i][j]){ case 1: - /* pawns */ this.pieces.add(new Pawn(color, i, j)); break; case 2: - /* knights */ this.pieces.add(new Knight(color, i, j)); break; case 3: - /* bishops */ this.pieces.add(new Bishop(color, i, j)); break; case 4: - /* rooks */ this.pieces.add(new Rook(color, i, j)); break; case 5: - /* queen */ this.pieces.add(new Queen(color, i, j)); break; case 6: - /* king */ this.pieces.add(new King(color, i, j)); break; } diff --git a/src/main/java/server/Runner.java b/src/main/java/server/Runner.java index 70ca8c9..f6096ae 100644 --- a/src/main/java/server/Runner.java +++ b/src/main/java/server/Runner.java @@ -1,5 +1,7 @@ package server; +import logic.Board; + import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.InputStreamReader; @@ -7,25 +9,37 @@ import java.net.Socket; public class Runner implements Runnable{ - public static void main(String[] args) throws Exception { - ServerSocket welcomeSocket = new ServerSocket(8888); - System.out.println(welcomeSocket.getLocalPort()); + private ServerSocket serverSocket; + private Socket conSocket; + private Board board; + private Thread logicThread; - Socket connectionSocket = welcomeSocket.accept(); + public Runner(){ + try { + this.serverSocket = new ServerSocket(8888); + }catch(Exception e){ + e.printStackTrace(); + } + } + public int getPort(){ + return this.serverSocket.getLocalPort(); + } + private void setup() throws Exception{ + this.conSocket = this.serverSocket.accept(); BufferedReader inFromClient = new BufferedReader( - new InputStreamReader(connectionSocket.getInputStream())); + new InputStreamReader(this.conSocket.getInputStream())); DataOutputStream outToClient = new DataOutputStream( - connectionSocket.getOutputStream()); + this.conSocket.getOutputStream()); String clientSentence = inFromClient.readLine(); String capitalizedSentence = clientSentence.toUpperCase() + '\n'; outToClient.writeBytes(capitalizedSentence); } public void run() { - try{ - main(null); - }catch (Exception e){ + try { + setup(); + }catch(Exception e){ e.printStackTrace(); } } diff --git a/target/classes/Main.class b/target/classes/Main.class index 892d570f7db25a7dceeaec095d8e0860895a3b64..1627c6dc61ec5d8dd69cfc48aff017d89c8623e9 100644 GIT binary patch literal 1593 zcmaJ>TUQ%Z7~O}2OfpWm1Zb@nN|m-rT8XXJwxm{VEEY`)Hb|xQb_mBXFwDf6lPvis z>XUCi>jUkoYw_rV|D}JS%YB$26Ja@P&AEKny}$39`TNDQeE`=XZ4_`ZhayT@lx>sRT$!(HH1@o{}i z_GHDAe!J4tq3gG+CVDCgdnS0K!k!8%54yguLgUv7LMYR5_$wwYw&gqQ;P zrk1VkhV1ka*>`_zsg8C7KeF(lfZYtbVM{HzhC|N4oHNKAOkmQ&M-J|wCNN@<5adkD zbCs_xeC*&Z7A$!Bb&K+eHus9R__xQ`_V%lKSi>`oBq zNQbi1P7qk!WE)u0+3ggNY9s&Dy9Ry3%9I24ckc ztEETG(pGx;pyM36MS<}nO8vIerYF6wTKe8h(_$%st6JcUB4G> ztNzT#ITmC~2jQ-TZ_Sqy1l!$?fU{^uzvjs(QcV0)GI2jfJRJ9=zu~E9Hg>EY2a}Kt zIIiq=)CuOvujsHP$3xVl=QUlesusQzIDd@aN!SFY|KAShFwTFMd4|9V#3a`#-YVP$ z_u=vrh~E#?r?_Sggejcn*@+GCGS2XpGhZcx80Y8QQ{02{U&xmCe?j373>8v)NSB{t z_&2PT_tU?kSx#LoWcFbF{9pY|qsbm<=8R{Ko`1q#dxDqhm-gU1MZQ7#Bzt|E%UqK!>sIOs+KZ0>I$^S8#Z;`uCVusob<1|U< zHM~xeMmvqOBt=Tpo#Xxn-we{Zk+awECeLZw&C=^U&qKI?uejTkJ;FEiKZBdRXL+CJ GTm1*Q$%(80 delta 573 zcmZvZJ8u&~6otQ8?|OFE8^;)u;1KK(9)S(mBs>z5fKU)L35sMR2<2+EiWaPOv^Wu6 zegQ?~3M#r(6rnJW!V(PyzkokMO^3Mah>nqF&fK}@&N+AHi}y{h{rK~B04#FPrO33y zIc99myIkO+%Oz%QF1uX8x0$oK>T-=)P2HtHLvvj-fAF+ZQITS7<3+F+G}=M3-FWyq zjCQ(lCpq}NvZZiao!vBy9>s0pIgf)lsb^e|QA(Nxj~m=n6q~zA5+~c!VLOhJuI84< zZ5B049^*_X^8XTdJeFDMy-|}@&8p($f0RA$QtJIuQ@xt;VSnURl!nx_Yiwy zu8(&lGV5&8l&8;;nOGh=&WWTYa(Papsbb4-xy%b|Nvu5(&boB7DOQ`pYDwiYv6vYj n7jrF4sjHysnNKD;BRD0~#d3K2?%lH!mWvy zVCN-F)NWbSm-_0jTGUtMHCp`qd3y(jxN~V_)FH;0V%(*sDiaQqOj(__*^KRG6?0+c zU0jk53#2U478yHRv^z^-mhHicV%4RdH7n~b8*D1J6x)K@hrC}ZzKBRx;5^+Ia*uv0 zn+f8wUF-x&*%#Z@?6I#o;84>-v*w6nf%p9FB?M^VoG4B;XXG^J3~2He1$@l~m%)eZ zjb3S*@D$gY8*asLbI~h-sij}e+IjsfA1eaj*e%9*^puKjyX@zm-&zd7FCyYD`;AFti)OM zc#0uwtSd^24ed7drW~iD4_l6HPl~F_j%SyeW6!Z~h&?r1uiY184x%YLZVscGogAtQ zM;r?$oC;%Pgfq^gXFHK;I4*=su7qo*g&ReaTcO2W^kuWjwlGTCaW6dZ*h>W8#st0J K0c&GmnfV76X(fLE diff --git a/target/classes/client/Runner$1.class b/target/classes/client/Runner$1.class index d9891da6472dc8158ffdb964726ac9574b61e692..c4acc4b94a274ab99bba28ee93bb7e0d5ca520b5 100644 GIT binary patch delta 33 ncmdnSwT)|o9Sft?WP6raP8$Xe23rPc2D`~iS-gN^A6VP~jqV6i delta 33 ncmdnSwT)|o9SfuMWP6raPFV&H1~~?42KmWLS-gN^A6VP~gxLqT diff --git a/target/classes/client/Runner$2.class b/target/classes/client/Runner$2.class index 504cafe22eb21eb3bf2db6e032c148ec8b992ec7..15c8c04342d284a709b5659ea3176798823d6589 100644 GIT binary patch delta 33 ncmdnOwS{Yg4GW{=WLuV4PG<%V1{Vft2G_}pS-gN^?^xUbj{OK} delta 33 ncmdnOwS{Yg4GW{vWLuV4P89|Y22}=W2DQnHS-gN^?^xUbh3E&) diff --git a/target/classes/client/Runner$3.class b/target/classes/client/Runner$3.class index 4bbc070dc0d99cc484b134bb5194d6a3e9fda6ce..468c4190e666e9b865b46c052ad033d5525aa87b 100644 GIT binary patch delta 33 ncmbQuIh%9CYGy`{$!nNHIlUM-7`z#T8GI&lv3LQ+LRs7Zm^=sa delta 33 ncmbQuIh%9CYGy{w$!nNHIkg!$7<3qf8FVLev3LQ+LRs7Zk0%FL diff --git a/target/classes/client/Runner.class b/target/classes/client/Runner.class index e08dabe54e2378d3a411ac79763ea49d568afe61..c4f64c378af54a6891f3d8b7d2ac7c5dbf5b93dc 100644 GIT binary patch literal 3876 zcma)82~!-`5&ni*#U+t0>v)R+9gi7!9B7!Y(Jyp{RUct>pr04iowmRIzDKiP5gc+f)5*r z;v=&DsE%h1?88z7&&m3E9Un6g!;+2{BKWw0cwqMl9iKFC1WRJ{DS3Qa9-k3|&x-Up zart?Xz95e;isDNW*fmM(%M!y^BKWH4zGmR-_=b*e>iCuhbI5UQuP9PDDiaNxhBIy|olGbd_Z!r5V%D>*84XPpw+DMPspqvt10!pDi^WAvMTotwo3SmY+Li>Q(MNNIdHOq(mv|S{0&(TdRf4 zlb${A`n<2QzQyoaz@$6Bkn_cL%X+XbFBAbg^{ON7smQs=p_2@M69G)ljaUoC63km^ zhd0J9R2&%hJ!agk3Tk;NmS}4gwFaYvCQT%JVehu86%$_#i`hQr*y}s}vl@05QL+~W z?S6Ry|^B^JeV550Sl}*}?ok%-`F)`xivbJ*CEqUu%+dr$i z%NTcaUeZ337Fsq0#XBMm$JMBv^+#->ZPvsn#!TFYer8|Mbj5xW{kKh=!GMW}F-N0v z)0SW{aUEkizGLFMxS=7YOkM@gSf_R5GO>)jjujKD_@0Sg^l8{qzAtD-iReWWBe-88 z8q=_&5H^W5pL5blOL(6+N18LcHRR>M_e~7r{^AS>MuLgg%2ve%0U=Dhgo|va3N*?i zhy|5^q)}BB*hs$TW)i(Q-*?Hdrl6Y9#cWhaAVin@UpDar{E*#La2nKO-%-*1h%uB; z1(Jy$S1~`Pp{?re6ZR$lOxn(HuC?}alzLINvz3{3vwl>DZFJW5Y!g4hPd9|nY2s)2 zxrtxkmnMFNS4{j`mcPMoP5e%z-;4AI%$fKj{v?(8vpoJ{;v7i!`U&rH)Jn0tO#Bsp z)A4r`|G+<4*>#zg1Gg3yGQ}F5F3TFW$1YTMU$L8|qc$(FQGM0Y6P}eMp&QGrD2x_< zWu}7}Ica5N+;LK$XG5fl4Z$@(8Wjf%H_&ELPK>eUEwQ146$7FeL#f+?kChZp#=Dvv z5k^+HG0fA9wk~7koFrSnIT#Vap^9O%g-trCW`xj#jjthEo+edjr7k)UyXpH;94u-a z7rqz@ExMnm7%MWfxWn}J{-0Y)^idaywM?$IlJ&+}6c`d)aoZ6KK-^Zb|`Njb519viP;!DbrV#3$_}cvActV1a-k+;AGyY_8!05Qt^*|^p9E>_fFu$t zzi9>M>uRRqwrZ8EN|ct^`APJ#8F%HJg2L!=JgPV6D&Mux zIGM)yJj+#rZ%uaNE6}bhvj_OBQ=3hAkg^#VU>p-l&*8uw9@b`PSI51jxVDU%_!>e} z+6uzU^mYTahw`Yq2BRz78qOo~nmp=X!0|O0Q!8lb3a`PWu&Jvy-ddZ-EvwkPj4gE0 zIMrIaf~I9`rH`$7+^Y80&^*QUmONTkuubW=bG^N+Z>6^#O0koQom5XbR~?l0@i*@Qbn@qO4-R6Gt8+Mnhj17<{&aqvP+h_8cos($ zDueXeMo+K9>*>9dC#GV zx1LX_-yTL8rsgU!ZX49CvxewYQ~L@!^4PnEeN*v6E7(6$(i~8l+tv_MnuDW( zCO*|fJJ$Jdus))+i9BwXbsk59*Rec01L+Rh9uLGj4;Ms|<}OJpqzZP7zyK%EfV;61 zUD!|VAIE9-zyKLMNGM0KKK;Z<~n_@77jH4G`FHsreo0@PCmD35yz zjzXb4P8Q_gB^U{PL5j7rXaO1rNCl8^jig)~>C{fjb&zzOBwQaUH_0qh#6%E?@=OQk zg3wdQHe14Cwt$6@tR6KMN%kKahVTeCYTzNuH`zzd$Ji66x!R#t6!;elUeu_+{{eCI B+^GNn literal 3550 zcmZ`+30oW26+MFlBZhG>IN&u{#@LZXV#PSIlVCeB7-JH^)L>HVbQ#36kS)!qqY*Jp z+q7vzm!wJeHeJ)z-CL)zprJ|kEnWUWe@VZuU(cNxEfCrMH1poO_uY5zx#!+Dy!F4= z-vn?R|28m)1s%%3!?>a&V<3u!R!$amWMjB$K*u#%%<0G*XoDStBlCie_Zeu1t;3C> zXrLp|^K_I9bio#-C3!q0kL#kaETi{}$){!X0eO5-1RpZ+3_dK!e#F4D_^5dEF&)pv zup&AiH}DC3QpcwZB=Eeby&$7c8|cG}vf-sxd0DOXUTXB>SZYGqrRlV*ludDL-m%;TE^FwjR~ibJsnT*HYiGSv8X}29 zvpj9sSx_3<$FsJYEam5wJ7dk~xY9Z9q^;bnwu$*&wes9?vLPCEW`-Omr!0H0!II$L;;Ovk(NI0DDtpMAG!ZL#%4IU9osyeYXR|_r zwjjZWg^HX_s-iccgd{~1!#Ja1YmKBqwoQBsk2AuC3^nlx9%W8slO)#1EA7~x>*P{H zCC_unq0S&7@ugy1@+e-(VXv6@Hoimdg_Z-)`i_X~yL6tn7!v965=*6WVE9CT`$|CVqq;oA?QSYT{=y{W*SN z;+HbIDWg|0W#U(OO~)-0WvrSwiBme(Wb$hhPvTunP7Tc}Ei|;wxXW=X!vZt$I@Wdk z#>5+Vlj?OKS1MfK_^pZ47&38Qj{F_YnD{;ZpyQ7w{)9i9_=`C4R}+83D;p9xv*;>| z@$U-Fk`wuoolRR(nW>9jHpi_09dF4I|B%N&qQV&26Qf z=4a~KfwUs7T+y)qHm6iM6SgJgNyq7_YBy*(Qj5)*z-({gP}P?W-q-8~%3}4dnsNiP ztWElQ-aeg{TrsOWViQz*YX%zC9lKA5Z^Ca}!%WdNMJ}|9uNy##NvD@fhfPg{tQ)rC z(D;U&(PE9y;T6VBOIEI=&J)(V8|AsKf7NciIy+&{lB?!Y0AFxst(S>cQ0o1ir<=6}qa1LXfwc;^6PNTB_&rh}8BQ z)Br#4badC*h+!NPT%Y7G%DsL3vG?&wYuaAA7Nz8+#ExzQAb+r4Et&@SIW3IDv72C?VGnjYz((W?0%e;&o!E0w3yMoc~ zd&<}o4DY%(9QK#dBSA$VpbQWSU?;zBcVRdGA0XNfpqKb27{(#IhiDdXAD-qHN+5fpDtp4u=sPQ5;Xkw)q3&Wb z45y5}Ylz>%zGQ!N4ZRWm%GiGcV?I)Ei+3Fa=s*piG7g4@B9Sug4#&YuFuF;9fgVQO z7ou^HQ~)02XZb^1f5c~AFS&OVC&;gpjN}wDWS&qc&ONo_vEj)A#g<>)HzU&RAu9J_&If#^8N_F%AZQz}(MWJ^TqU!u^#hFe@Q2 zvi5FLOX_I_@8u|h0IcYf1gqun02eF@n=nuFK#cP){>9bCJb+Ahg_Y1DFu%GQVK*w? zT4BKpoi!&Y-j~--#TyZ1@P82+%&PBsPL&*D`RNr6Rz%@SLvCol4x0Evpo*G+gSv?| zfpxgj(obdtZsJRUA~uxSlo$1}^vf7ijwkR64#~Uvfu@fw6}craiB|;zGz7*mArPXj zp>NLj!$ufXww9c5-LEw=32Y~^BXApc1n$BW_zE)uuVF^RKv#_JfamU1ovqOI+39PQ zFRFa5y5TxrSg87&o7r8CoSmou`sDZMQM<8%HPo+ye#`+9Wu}E=tfi?G$4+qj@A*EXZL`>?AX9 z;#9XT{hZHRtT3UU=PhcLMZ8VhP)+CAQZ=>g4o2llk`{kyZSE;GtIC7 delta 1007 zcmYLIO-~b16g_V`(`kn(U_qpcrT7U2M8!`OMHCbTzluuzuEU5`n5pfEx~l)ckhe5( zrEzH>+9s0d(rAqS1s5(%T=)-+=Yhn1e)f)HA$(p#7$hZaS0PPdXZJzW%*u9Mb@E3fh+Qtw!VB7 z*A%#J;|6Zp$l;bi{h;p$rJ$HAjJd%bf3j2;h7-Z04Hvg6O-9?D(BDCxR zLRIKh7^8~_XX9r24I))U#};8_yDF%u!alviC5|nV`}EEVYWs}tgz*k_Kn3*)ot|=E zcmb;t;R@m;H_Wq=h7|WS9}38fV-;~6U1-1nAILD8a1LuQ!AEnG+9#>Kjm#6vDzO0@ ziQ>p$6E?Gx6o#+`TbZ?sudW>(>~DaPG?$LyGMnsV$Y8=4x@m>6jR|yKUCq_QL5QV6 z+~%n<5=&Rm_zICxHqZBM aldEA50+o%PB4$xSqLw8Tbp5aJJ^hgsjj8nAl?YFNUsaBoIi}V1ttp%t7(wkC(XU}vBk8$ z+Y9qHJK9rkj18lp?Lkl}>n8$UJMCxP@LHsuc&5xLeHb6}*ds7E{%AA*JFiby@Pm&z z)CBy|wn<#ndzZA}ijNsoeaxaNaoNX@pzh4x>L*E*^cGC<1(PfBlaHTqm0HePW=}v3 z>#lD;3cERVZ%An&ZmE0{#QkvnfxvwIdSmSEj2vM#P2(`2X3W>`j0P7xwSBohqOn7d zZLz+I5tr>}+j+P}BarsVYmHT+v~@F!61uG{47Nyq)|}yMT0lP5K{5HNjh3e@>efnQ z1B*1u)1Z1Z?w0N>Jp@ZP*C1U5p-uaAll0w7n=jzfU$EAj?;)DX{T)`Pq@hIc-)|_l zJ7x9RpshX`bkx5FrTWL9Tky&$0+r-Uoytm<2`n?%3=V^2a2Zs=DyG{VyHF^x0)x%q zFh~ZMK^3fGy4`Vhtsr-;;O<(1n#-*$b0ZjR28Tg1xD2Xb71QkwT?XCJx{rt@PM_!()qUG}abzo*CO^ z@-?hDMZ*so@G=c}1^bNBJVzHwl&61}NK4=l4i}m&v!(~4Pxg`|EJ_Cbo1phW1_p-c z1??DG7#O-z7;>6loAFHH1gTZ$ MLzRJ{BgXd8F9gzN3IG5A literal 0 HcmV?d00001 diff --git a/target/classes/logic/Player.class b/target/classes/logic/Player.class index c6ef04d02808e61803cad6e0ba0708a468cf9854..ca7557800c89cf255e71e4eaaf8a01b0c192b1d2 100644 GIT binary patch delta 75 zcmV-R0JQ(N6Sotv#|Skl0GR+Q0Gt3V0JQ)v0Js1!0MP(30Mr080PO%Y0Pp}d0SN#% h0So{+0VMz?0V@C{0WknRll%yf1wjA>078?I2`0FI5VimS delta 75 zcmV-R0JQ(N6Sotv#|Skm0GR+R0Gt3X0JQ)x0Js1%0MP(60Mr0C0PO%c0Pp}i0SN#+ h0So{?0VMz?0V@C{0WknXll%yf1xEk{07#RO2`0Yn5bOW| diff --git a/target/classes/server/Board.class b/target/classes/server/Board.class deleted file mode 100644 index 43069d441e8467b85efac203cfc9f1f4b69722b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1245 zcmbu7-%iv(6vn^lww+Qc3<#+F2N&F3)VozH6jc?;E zmnIU7Mjyb(@Y*Nv5An>L5;l=LE;_%?H|KnF=FEIQ|NITWV?6K?U`k?IV#Y@avjZ5! zoW#731uXh-aaSv4JuFEqOWYF}e0vb*(TgN}7i9uNjU?TVJ9VC~(sDZqJFhR6oufR= zBZ2XqoyK9<3+qYP-LJ2A^JqWHDB67zcjNr2K&evQ60o18yA(a#h`Z6o@tby(y$st4 zDWi?F6DC_>7VCK-+WA3zq)Rx8vR;(c*U~WCB~!nd9%r5Cd8{*iqdwG|2N=aofw8Mg z8Tqfi02NdND2xaM{l}E3>9rMYct5}m3tFgcDk_XH*? z>(wiJ(pSh@nkG@$)xq2S!G%s|U8(eWT*y~8ySjyWy2pTSz647bO@EfI+mKF46!cM( zh-0*P0#7T}X6+23ro6APS|yDV;m;@7&6cgs4ITB@&{e+;rTS&)6}obZKqWa-r?Qh} z0&RxFa2b-}F;t-{mYXf7a44|@!(q4#$?zDeP!-F~mV0dnd2I*p+78rQZl%qQU^ony zAsHS+6{=#n*`jM<3&|Faf#VvuiYYxa^?0US4pP$OG*98wzQAqK4zl(U&KbN@3>b;J ze<}GN%!3=J@ew^k;5KYbVjNR=g=xIU41Qo%lrbmvFfUH9Abw)es-SGGV#(UTGA1Z1 R;HQaOl&>G|9U3i6{sZ5A4MP9` diff --git a/target/classes/server/Runner.class b/target/classes/server/Runner.class index 212bf4c728ab73d1c23607adfdfee2692ac1274b..e392f31035d731c149c7ab664de62aaa82aa1d6a 100644 GIT binary patch delta 1129 zcmYjQT~`xV6y0||GRZJ81T@IEgkm9rQ4~>816ZZhU@6iM#8!teKs09JWI%n&^3g}v zJo;{5`ocnzR@Ul!yH?lgkLd4cyYCQeAMQOl`<{<|_L&69Ka#cI|NihRfJwYGaS~Sz zOqoz{Ert$UH*mv*j+{iMd}iVnZkuSqoCy=38<>~K7bX(8Bays`1>9|8 z?InrbGnu+<;A;cl82DDesyg0|BfQ|aNGq{IkQ04Z^flM^)&=7ElDkB(vSR-A}FS?#Dpbn4B3+PqH->w9!;$1MNbgO9$26vRMi8Q{m(1mV+_Wyd`dQosH ze$g#kSizu$`xvvZiU$^Y&?}G%$|4oKRr*@Lx9|fVT1exOyzJmNrT4}f3es7(;9$eR zriCqR2(-?+u3z;%yRzW;Tkd)_5kWDE#}=NTWZ@~;?JQa4)S3Q7#VeNmaH3_;E^r)+ z|d?MFoOXX=RTGE_qwPVnPV zF~s05M0h8Owi8eB<#>2^q1J)Zd`huqiqD^7n8~b;5oBo3@U%kthZ(})7sN}Kd`2m?`DZc_u%u zXoH?yQ9M&e>i}v8Q%KBOdt9Sd?7i1IdoLaRoe46VuitLH0x*eR z4fJ4A;;4Zbj-_B?D)f#U_zGW#-Zv5_Bu*Nb#wi0SoHmfe8HsPh$c%wBX2ZywfwMUG z5jih}u>}LW@SVg(16dR$79}o8Toy>=6X+bf6t2vK<8yfDkJyP0! z#dC|Ez2f)+nHHt%`1w|7D)?PI2~082o-X>9y)tjDE?T#$PH-$XX!fCBAR9FiA)-cG zIE6l3k+`Z*!Zn5KxFPYq!cAOJ_yIo#f5axcEQMRJ!^)*_aRhpTe?-qNh1)2Hkvj?% zEK95?RIwcF)^ZcIBwPg#s|r7%uJAF2IO>iLXYSd~YB-U?8v277?c`GDPPTY|&39@7 znzznjv#nt(UVee%`IOMHY7|(N9lzk&R&~LvvrHQqoqK=AhqVH7HAGh37f-c*q4`)3 z{?coG{Ay7=Qf#qq*^b0U*!6?JjE{<6f~EMM`a^-?;8A=ym`;ps0vZG-?&mtdTau?0 zwDEmSh-Y+S804CWf+_5#uUZAzgT36PLM2!gg5MwxNxQg>SSd5~vI(v59QytS;teEd z*(&8n$pCVb{xVdMMR65Vj zk~S1FM=B7cvnz>#5?Kd1#-6Cj92t^K9mJssn0}}6VL~KgGo;bUbA;O%zQlc6gN1kT QGwz|6ErM`?dA{fW1)s;qu>b%7 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 bfee32f..e1f0118 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 @@ -6,6 +6,7 @@ client/Runner$3.class client/Runner$2.class Main.class client/GUI/MenuScreen$3.class +logic/Board.class logic/PieceIF.class logic/PosXY.class logic/pieces/Queen.class @@ -19,7 +20,6 @@ logic/pieces/Bishop.class client/communication/Utils.class logic/Piece.class client/GUI/BoardGUI.class -server/Board.class client/GUI/MenuScreen$4.class logic/pieces/Rook.class client/GUI/MenuScreen.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 6996f4f..c743a81 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -14,6 +14,6 @@ /home/adam_procio/School/PJV/prociada/src/main/java/logic/pieces/Knight.java /home/adam_procio/School/PJV/prociada/src/main/java/logic/pieces/Rook.java /home/adam_procio/School/PJV/prociada/src/main/java/Main.java -/home/adam_procio/School/PJV/prociada/src/main/java/server/Board.java /home/adam_procio/School/PJV/prociada/src/main/java/client/GUI/MenuScreen.java +/home/adam_procio/School/PJV/prociada/src/main/java/logic/Board.java /home/adam_procio/School/PJV/prociada/src/main/java/client/Runner.java