Skip to content

Commit

Permalink
Multiplayer added #11
Browse files Browse the repository at this point in the history
it works using: Player > Sql Base < Player synchronization;
Using sql, because I couldn't do it using Sockets (nat/ports problem)
  • Loading branch information
LiquidSelf committed Jul 7, 2017
1 parent 23227cd commit ad1a01b
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 17 deletions.
3 changes: 2 additions & 1 deletion XoXo.iml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
Expand All @@ -10,6 +10,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="sqljdbc42" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
</component>
Expand Down
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@
<failsOnError>true</failsOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
1 change: 1 addition & 0 deletions src/mainapp/ConsolePsvm.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public static void main(final String[] args) {

static void play() {


Field game = Field.setEmptyField(new Field());
GameStatus gameStatus = new GameStatus();

Expand Down
1 change: 1 addition & 0 deletions src/mainapp/FXPsvm.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class FXPsvm extends Application {
public static StringProperty title = new SimpleStringProperty("XoXo Gaming");



@Override
public void start(Stage primaryStage) throws Exception {
this.primaryStage = primaryStage;
Expand Down
20 changes: 10 additions & 10 deletions src/mainapp/Field.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,75 +18,75 @@ public char getField1() {
return field1;
}

void setField1(char field1) {
public void setField1(char field1) {
this.field1 = field1;
}

public char getField2() {
return field2;
}

void setField2(char field2) {
public void setField2(char field2) {
this.field2 = field2;
}

public char getField3() {
return field3;
}

void setField3(char field3) {
public void setField3(char field3) {
this.field3 = field3;
}

public char getField4() {
return field4;
}

void setField4(char field4) {
public void setField4(char field4) {
this.field4 = field4;
}

public char getField5() {
return field5;
}

void setField5(char field5) {
public void setField5(char field5) {
this.field5 = field5;
}

public char getField6() {
return field6;
}

void setField6(char field6) {
public void setField6(char field6) {
this.field6 = field6;
}

public char getField7() {
return field7;
}

void setField7(char field7) {
public void setField7(char field7) {
this.field7 = field7;
}

public char getField8() {
return field8;
}

void setField8(char field8) {
public void setField8(char field8) {
this.field8 = field8;
}

public char getField9() {
return field9;
}

void setField9(char field9) {
public void setField9(char field9) {
this.field9 = field9;
}

final void showField() {
public void showField() {
char s1 = getField1();
char s2 = getField2();
char s3 = getField3();
Expand Down
7 changes: 6 additions & 1 deletion src/mainapp/GameStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,10 @@ public Field move(Field game, GameStatus gameStatus) throws InputMismatchExcepti
public int getVec(){return vec;}


}
public void setWhosturn(char c){
this.whosturn = c;
}
}



10 changes: 5 additions & 5 deletions src/mainapp/view/Controller.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
import javafx.scene.paint.Color;
import javafx.scene.shape.Line;
import javafx.scene.shape.StrokeType;
import mainapp.FXPsvm;
import mainapp.Field;
import mainapp.Figures;
import mainapp.GameStatus;
import mainapp.*;

import java.util.LinkedList;
import java.util.List;
Expand All @@ -24,6 +21,7 @@ public class Controller {
private List<Image> setO = new LinkedList<Image>();
private Random r = new Random(System.currentTimeMillis());
private FXPsvm fxPsvm;
private SqlPsvm sqlPsvm;

@FXML
private ImageView img1;
Expand Down Expand Up @@ -53,7 +51,6 @@ private void click(Event event) {

FXPsvm.title.set("'" + fxGameStatus.getReversWhosTurn() + "' turn");


switch (Integer.parseInt(String.valueOf(event.getTarget().toString().charAt(16)))) {

case 1:
Expand Down Expand Up @@ -307,5 +304,8 @@ private void addRedline(int vec) {
public void setFxPsvm(FXPsvm fxPsvm) {
this.fxPsvm = fxPsvm;
}
public void setSqlPsvm(SqlPsvm sqlPsvm) {
this.sqlPsvm = sqlPsvm;
}
}

0 comments on commit ad1a01b

Please sign in to comment.