me/comp1206-tetrecs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TIDY] Some more help from IntelliJ

Browse Source
This commit is contained in:
Matthew Grove
2023-04-22 05:48:00 +01:00
parent bc87301bac
commit 7c97ac01bc
9 changed files with 53 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/module-info.java
View File

@@ -1,7 +1,5 @@
module uk.mgrove.ac.soton.comp1206 {
requires java.scripting;
requires javafx.controls;
requires javafx.fxml;
requires javafx.media;
requires org.apache.logging.log4j;
requires nv.websocket.client;

1
src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBoard.java
View File

@@ -1,7 +1,6 @@
package uk.mgrove.ac.soton.comp1206.component;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.scene.input.MouseButton;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.GridPane;

1
src/main/java/uk/mgrove/ac/soton/comp1206/event/PlayerGameBoardListener.java
View File

@@ -1,7 +1,6 @@
package uk.mgrove.ac.soton.comp1206.event;
import javafx.beans.property.SimpleIntegerProperty;
import uk.mgrove.ac.soton.comp1206.component.GameBoard;
/**
* Listener for player game boards

56
src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java
View File

@@ -59,19 +59,19 @@ public class Game {
/**
* Player's current score
*/
protected IntegerProperty score = new SimpleIntegerProperty(0);
protected final IntegerProperty score = new SimpleIntegerProperty(0);
/**
* Player's current level
*/
protected IntegerProperty level = new SimpleIntegerProperty(0);
protected final IntegerProperty level = new SimpleIntegerProperty(0);
/**
* Player's number of remaining lives
*/
protected IntegerProperty lives = new SimpleIntegerProperty(3);
protected final IntegerProperty lives = new SimpleIntegerProperty(3);
/**
* Player's current multiplier
*/
protected IntegerProperty multiplier = new SimpleIntegerProperty(1);
protected final IntegerProperty multiplier = new SimpleIntegerProperty(1);
/**
* Listener for when new piece is received by the game
@@ -370,22 +370,6 @@ public class Game {
return grid;
}
/**
* Get the number of columns in this game
* @return number of columns
*/
public int getCols() {
return cols;
}
/**
* Get the number of rows in this game
* @return number of rows
*/
public int getRows() {
return rows;
}
/**
* Get the player's current level
* @return current level
@@ -394,13 +378,6 @@ public class Game {
return level.get();
}
/**
* Set the player's current level
*/
public void setLevel(int level) {
this.level.set(level);
}
/**
* Get the player's current level property
* @return player's current level property
@@ -432,14 +409,6 @@ public class Game {
return lives;
}
/**
* Get the player's current multiplier
* @return current multiplier
*/
public int getMultiplier() {
return multiplier.get();
}
/**
* Set the player's current multiplier
*/
@@ -463,13 +432,6 @@ public class Game {
return score.get();
}
/**
* Set the player's current score
*/
public void setScore(int score) {
this.score.set(score);
}
/**
* Get the player's current score property
* @return player's current score property
@@ -518,17 +480,9 @@ public class Game {
return null;
}
/**
* Get the player boards property - always null in this class
* @return property for player boards
*/
public SimpleMapProperty<String, SimpleIntegerProperty[][]> playerBoardsProperty() {
return null;
}
/**
* Set listener for when new player board is added
* @param listener
* @param listener listener to set
*/
public void setOnPlayerBoardAdded(PlayerGameBoardListener listener) {
this.playerBoardAddedListener = listener;

6
src/main/java/uk/mgrove/ac/soton/comp1206/game/Grid.java
View File

@@ -226,9 +226,9 @@ public class Grid {
* Clear previewed blocks from the grid
*/
public void clearPreview() {
for (var resetX = 0; resetX < previewGrid.length; resetX++) {
for (var resetY = 0; resetY < previewGrid[0].length; resetY++) {
previewGrid[resetX][resetY].set(0);
for (SimpleIntegerProperty[] simpleIntegerProperties : previewGrid) {
for (SimpleIntegerProperty simpleIntegerProperty : simpleIntegerProperties) {
simpleIntegerProperty.set(0);
}
}
}

7
src/main/java/uk/mgrove/ac/soton/comp1206/game/MultiplayerGame.java
View File

@@ -5,11 +5,7 @@ import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleListProperty;
import javafx.beans.property.SimpleMapProperty;
import javafx.collections.FXCollections;
import javafx.geometry.Pos;
import javafx.scene.control.Alert;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
import javafx.scene.text.TextAlignment;
import javafx.util.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -17,9 +13,6 @@ import uk.mgrove.ac.soton.comp1206.event.GameFailureListener;
import uk.mgrove.ac.soton.comp1206.network.Communicator;
import uk.mgrove.ac.soton.comp1206.util.Multimedia;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;

101
src/main/java/uk/mgrove/ac/soton/comp1206/scene/MultiplayerScene.java
View File

@@ -27,16 +27,6 @@ public class MultiplayerScene extends ChallengeScene {
*/
private static final Logger logger = LogManager.getLogger(MultiplayerScene.class);
/**
* Chat container
*/
private Chat chat;
/**
* Live leaderboard
*/
private Leaderboard leaderboard;
/**
* Other players' live boards
*/
@@ -67,35 +57,33 @@ public class MultiplayerScene extends ChallengeScene {
game = new MultiplayerGame(5, 5, gameWindow.getCommunicator());
game.setOnGameFail(() -> Platform.runLater(gameWindow::startMenu));
game.setOnPlayerBoardAdded((username, gridProperties) -> {
Platform.runLater(() -> {
var newGameBoard = new GameBoard(gridProperties.length, gridProperties[0].length, 100, 100);
newGameBoard.enableFocus(false);
for (var x = 0; x < gridProperties.length; x++) {
for (var y = 0; y < gridProperties[0].length; y++) {
newGameBoard.getGridProperty(x,y).bindBidirectional(gridProperties[x][y]);
}
game.setOnPlayerBoardAdded((username, gridProperties) -> Platform.runLater(() -> {
var newGameBoard = new GameBoard(gridProperties.length, gridProperties[0].length, 100, 100);
newGameBoard.enableFocus(false);
for (var x = 0; x < gridProperties.length; x++) {
for (var y = 0; y < gridProperties[0].length; y++) {
newGameBoard.getGridProperty(x,y).bindBidirectional(gridProperties[x][y]);
}
var leaderboardScores = game.leaderboardScoresProperty();
}
var leaderboardScores = game.leaderboardScoresProperty();
var boardGridDimensions = (int) Math.sqrt(leaderboardScores.size());
var playerIndex = -1;
for (var player : leaderboardScores) {
playerIndex++;
if (player.getKey().equals(username)) break;
}
var rowIndex = playerIndex / boardGridDimensions;
var columnIndex = playerIndex - rowIndex * boardGridDimensions;
var newBoardTitle = new Text(username);
newBoardTitle.setTextAlignment(TextAlignment.CENTER);
newBoardTitle.getStyleClass().add("heading");
logger.debug("Creating board for: {} at row index: {}, column index: {}", username, rowIndex, columnIndex);
var newBoardContainer = new VBox(newBoardTitle, newGameBoard);
newBoardContainer.setAlignment(Pos.CENTER);
newBoardContainer.setSpacing(4);
playerBoardGrid.add(newBoardContainer, 1, 1);
});
});
var boardGridDimensions = (int) Math.sqrt(leaderboardScores.size());
var playerIndex = -1;
for (var player : leaderboardScores) {
playerIndex++;
if (player.getKey().equals(username)) break;
}
var rowIndex = playerIndex / boardGridDimensions;
var columnIndex = playerIndex - rowIndex * boardGridDimensions;
var newBoardTitle = new Text(username);
newBoardTitle.setTextAlignment(TextAlignment.CENTER);
newBoardTitle.getStyleClass().add("heading");
logger.debug("Creating board for: {} at row index: {}, column index: {}", username, rowIndex, columnIndex);
var newBoardContainer = new VBox(newBoardTitle, newGameBoard);
newBoardContainer.setAlignment(Pos.CENTER);
newBoardContainer.setSpacing(4);
playerBoardGrid.add(newBoardContainer, 1, 1);
}));
gameWindow.getCommunicator().send("SCORES");
}
@@ -112,27 +100,26 @@ public class MultiplayerScene extends ChallengeScene {
leftMenu.setPrefWidth(200);
var viewOtherBoards = new Text("See others");
viewOtherBoards.getStyleClass().add("channelItem");
viewOtherBoards.setOnMouseClicked((event) -> {
Platform.runLater(() -> {
var returnButton = new Text("Back");
returnButton.getStyleClass().add("channelItem");
var playerBoardTitle = new Text("All Boards");
playerBoardTitle.getStyleClass().add("title");
playerBoardTitle.setTextAlignment(TextAlignment.CENTER);
var playerBoardGridContainer = new VBox(returnButton, playerBoardTitle, playerBoardGrid);
playerBoardGridContainer.setAlignment(Pos.CENTER);
playerBoardGridContainer.setFillWidth(true);
playerBoardGridContainer.setPrefHeight(Double.MAX_VALUE);
playerBoardGridContainer.setSpacing(12);
playerBoardGridContainer.getStyleClass().add("overlay");
returnButton.setOnMouseClicked((returnEvent) -> Platform.runLater(() -> challengePane.getChildren().remove(playerBoardGridContainer)));
playerBoardGrid.setAlignment(Pos.CENTER);
challengePane.getChildren().add(playerBoardGridContainer);
});
});
chat = new Chat(gameWindow.getCommunicator(), true);
viewOtherBoards.setOnMouseClicked((event) -> Platform.runLater(() -> {
var returnButton = new Text("Back");
returnButton.getStyleClass().add("channelItem");
var playerBoardTitle = new Text("All Boards");
playerBoardTitle.getStyleClass().add("title");
playerBoardTitle.setTextAlignment(TextAlignment.CENTER);
var playerBoardGridContainer = new VBox(returnButton, playerBoardTitle, playerBoardGrid);
playerBoardGridContainer.setAlignment(Pos.CENTER);
playerBoardGridContainer.setFillWidth(true);
playerBoardGridContainer.setPrefHeight(Double.MAX_VALUE);
playerBoardGridContainer.setSpacing(12);
playerBoardGridContainer.getStyleClass().add("overlay");
returnButton.setOnMouseClicked((returnEvent) -> Platform.runLater(() -> challengePane.getChildren().remove(playerBoardGridContainer)));
playerBoardGrid.setAlignment(Pos.CENTER);
challengePane.getChildren().add(playerBoardGridContainer);
}));
Chat chat = new Chat(gameWindow.getCommunicator(), true);
chat.setChatFocusTraversable(false);
leaderboard = new Leaderboard("Leaderboard");
Leaderboard leaderboard = new Leaderboard("Leaderboard");
var chatTitle = new Text("Chat");
chatTitle.getStyleClass().add("heading");
leftMenu.getChildren().addAll(viewOtherBoards, leaderboard, new Separator(), chatTitle, chat);

6
src/main/java/uk/mgrove/ac/soton/comp1206/ui/GamePane.java
View File

@@ -67,11 +67,7 @@ public class GamePane extends StackPane {
var scaleFactorWidth = getWidth() / width;
//Work out whether to scale by width or height
if (scaleFactorHeight > scaleFactorWidth) {
setScalar(scaleFactorWidth);
} else {
setScalar(scaleFactorHeight);
}
setScalar(Math.min(scaleFactorHeight, scaleFactorWidth));
//Set up the scale
Scale scale = new Scale(scalar,scalar);

3
src/main/java/uk/mgrove/ac/soton/comp1206/ui/GameWindow.java
View File

@@ -14,9 +14,6 @@ import uk.mgrove.ac.soton.comp1206.App;
import uk.mgrove.ac.soton.comp1206.game.Game;
import uk.mgrove.ac.soton.comp1206.network.Communicator;
import uk.mgrove.ac.soton.comp1206.scene.*;
import uk.mgrove.ac.soton.comp1206.scene.BaseScene;
import uk.mgrove.ac.soton.comp1206.scene.ChallengeScene;
import uk.mgrove.ac.soton.comp1206.scene.MenuScene;
/**
* The GameWindow is the single window for the game where everything takes place. To move between screens in the game,