Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
/build
.gradle
/gameCache
JavaCheckers.jar
JavaCheckers.jar
.classpath
.project
.settings/
bin/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: java
dist: trusty

jdk:
- oraclejdk8
- oraclejdk14

script:
- ./gradlew build
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@ R and N keys - restart game

## Author
Dawid "Sloenthran" Nogacz


## Running

```
gradle build

gradle run
```
49 changes: 46 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
plugins {
id 'java'
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.9'

// https://imperceptiblethoughts.com/shadow/getting-started/#default-java-groovy-tasks
id 'com.github.johnrengelman.shadow' version '6.1.0'

id 'jacoco'
}

group 'pl.nogacz'
Expand All @@ -12,7 +18,25 @@ repositories {
}

dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'junit', name: 'junit', version: '4.12'
implementation 'javax.xml.bind:jaxb-api:2.3.1'

implementation 'commons-cli:commons-cli:1.4'

implementation 'com.fasterxml.jackson.core:jackson-databind:2.6.6'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.3'

implementation 'commons-io:commons-io:2.6'

implementation 'org.apache.commons:commons-lang3:3.11'

implementation 'com.h2database:h2:1.4.200'

implementation 'org.slf4j:slf4j-log4j12:1.7.30'

implementation 'org.apache.commons:commons-collections4:4.4'

testImplementation 'org.mockito:mockito-core:2.22.0'
}

jar {
Expand All @@ -21,4 +45,23 @@ jar {
'Main-Class': 'pl.nogacz.checkers.Checkers',
)
}
}
}

mainClassName = 'pl.nogacz.checkers.Checkers'

javafx {
version = "15.0.1"
modules = [ 'javafx.controls' ]
}

test {
testLogging {
showStandardStreams = true
}

finalizedBy jacocoTestReport
}

jacocoTestReport {
dependsOn test
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
11 changes: 5 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sat May 18 21:40:07 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
53 changes: 33 additions & 20 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 21 additions & 1 deletion gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/main/java/pl/nogacz/checkers/Checkers.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javafx.stage.Stage;
import pl.nogacz.checkers.application.Design;
import pl.nogacz.checkers.board.Board;
import pl.nogacz.checkers.application.Menu;

/**
* @author Dawid Nogacz on 17.05.2019
Expand All @@ -28,5 +29,6 @@ public void start(Stage primaryStage) {
primaryStage.setScene(scene);
primaryStage.setResizable(false);
primaryStage.show();
Menu menu = new Menu(board);
}
}
80 changes: 80 additions & 0 deletions src/main/java/pl/nogacz/checkers/application/Menu.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package pl.nogacz.checkers.application;

import pl.nogacz.checkers.board.Board;
import java.awt.Color;
import javax.swing.JFrame;
import javax.swing.JButton;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;

public class Menu extends JFrame implements ActionListener {
private static final int WIDTH = 500;
private static final int HEIGHT = 500;
private Board startBoard;
private JButton startGameButton = new JButton(Board.Commands.START.name());
private JButton quitButton = new JButton(Board.Commands.EXIT.name());
private boolean menuOpen;

public JButton getStartGameButton() {
return startGameButton;
}

public void setStartGameButton(JButton startGameButton) {
this.startGameButton = startGameButton;
}

public Board getStartBoard() {
return startBoard;
}

public boolean isMenuOpen() {
return menuOpen;
}

public void setStartBoard(Board startBoard) {
this.startBoard = startBoard;
}

public JButton getquitButton() {
return quitButton;
}

public void setQuitButton(JButton quitButton) {
this.quitButton = quitButton;
}

public Menu(Board board) {
super("Menu");
startBoard = board;
startBoard.setMenuActive(true);
menuOpen = true;
setSize(WIDTH, HEIGHT);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
this.setUndecorated(true);
this.setBackground(new Color(102, 51, 0, 200));
this.add(startGameButton);
this.add(quitButton);
startGameButton.setIcon(board.getImageIconForFileName("start-game.png"));
quitButton.setIcon(board.getImageIconForFileName("quit-game.png"));
startGameButton.setBounds(150, 125, 190, 50);
quitButton.setBounds(150, 300, 180, 50);
startGameButton.addActionListener(this);
quitButton.addActionListener(this);
setLocationRelativeTo(null);
setLayout(null);
setVisible(true);
}

@Override
public void actionPerformed(ActionEvent actionEvent) {
String command = actionEvent.getActionCommand();
if (command.equalsIgnoreCase(Board.Commands.START.name())) {
startBoard.setMenuActive(false);
menuOpen = false;
this.dispatchEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
} else if (command.equalsIgnoreCase(Board.Commands.EXIT.name())) {
System.exit(7777);
}
}
}
Loading