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

Change namespace to uk.mgrove.ac.soton.comp1206

Browse Source
This commit is contained in:
Matthew Grove
2023-03-25 22:57:10 +00:00
parent 0cccefdb9c
commit ab1c38cb2c
18 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>uk.ac.soton.comp1206</groupId>
<groupId>uk.mgrove.ac.soton.comp1206</groupId>
<artifactId>tetrecs</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -68,7 +68,7 @@
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>uk.ac.soton.comp1206.Launcher</mainClass>
<mainClass>uk.mgrove.ac.soton.comp1206.Launcher</mainClass>
</transformer>
</transformers>
</configuration>
@@ -134,7 +134,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>uk.ac.soton.comp1206/uk.ac.soton.comp1206.App</mainClass>
<mainClass>uk.mgrove.ac.soton.comp1206/uk.mgrove.ac.soton.comp1206.App</mainClass>
</configuration>
</plugin>
</plugins>

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

@@ -1,16 +1,16 @@
module uk.ac.soton.comp1206 {
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;
opens uk.ac.soton.comp1206.ui to javafx.fxml;
exports uk.ac.soton.comp1206;
exports uk.ac.soton.comp1206.ui;
exports uk.ac.soton.comp1206.network;
exports uk.ac.soton.comp1206.scene;
exports uk.ac.soton.comp1206.event;
exports uk.ac.soton.comp1206.component;
exports uk.ac.soton.comp1206.game;
opens uk.mgrove.ac.soton.comp1206.ui to javafx.fxml;
exports uk.mgrove.ac.soton.comp1206;
exports uk.mgrove.ac.soton.comp1206.ui;
exports uk.mgrove.ac.soton.comp1206.network;
exports uk.mgrove.ac.soton.comp1206.scene;
exports uk.mgrove.ac.soton.comp1206.event;
exports uk.mgrove.ac.soton.comp1206.component;
exports uk.mgrove.ac.soton.comp1206.game;
}

4
src/main/java/uk/ac/soton/comp1206/App.java → src/main/java/uk/mgrove/ac/soton/comp1206/App.java
View File

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206;
package uk.mgrove.ac.soton.comp1206;
import javafx.application.Application;
import javafx.stage.Stage;
@@ -6,7 +6,7 @@ import javafx.stage.Stage;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import uk.ac.soton.comp1206.ui.GameWindow;
import uk.mgrove.ac.soton.comp1206.ui.GameWindow;
/**
* JavaFX Application class

6
src/main/java/uk/ac/soton/comp1206/Launcher.java → src/main/java/uk/mgrove/ac/soton/comp1206/Launcher.java
View File

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206;
package uk.mgrove.ac.soton.comp1206;
/**
* This Launcher class is used to allow the game to be built into a shaded jar file which then loads JavaFX. This
@@ -12,6 +12,4 @@ public class Launcher {
*/
public static void main(String[] args) {
App.main(args);
}
}
}

2
src/main/java/uk/ac/soton/comp1206/component/GameBlock.java → src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlock.java
View File

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.component;
package uk.mgrove.ac.soton.comp1206.component;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty;

2
src/main/java/uk/ac/soton/comp1206/component/GameBlockCoordinate.java → src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java
View File

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.component;
package uk.mgrove.ac.soton.comp1206.component;
import javafx.beans.NamedArg;

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

@@ -1,11 +1,11 @@
package uk.ac.soton.comp1206.component;
package uk.mgrove.ac.soton.comp1206.component;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.GridPane;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import uk.ac.soton.comp1206.event.BlockClickedListener;
import uk.ac.soton.comp1206.game.Grid;
import uk.mgrove.ac.soton.comp1206.event.BlockClickedListener;
import uk.mgrove.ac.soton.comp1206.game.Grid;
/**
* A GameBoard is a visual component to represent the visual GameBoard.

4
src/main/java/uk/ac/soton/comp1206/event/BlockClickedListener.java → src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java
View File

@@ -1,6 +1,6 @@
package uk.ac.soton.comp1206.event;
package uk.mgrove.ac.soton.comp1206.event;
import uk.ac.soton.comp1206.component.GameBlock;
import uk.mgrove.ac.soton.comp1206.component.GameBlock;
/**
* The Block Clicked listener is used to handle the event when a block in a GameBoard is clicked. It passes the

2
src/main/java/uk/ac/soton/comp1206/event/CommunicationsListener.java → src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java
View File

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.event;
package uk.mgrove.ac.soton.comp1206.event;
/**
* The Communications Listener is used for listening to messages received by the communicator.

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

@@ -1,8 +1,8 @@
package uk.ac.soton.comp1206.game;
package uk.mgrove.ac.soton.comp1206.game;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import uk.ac.soton.comp1206.component.GameBlock;
import uk.mgrove.ac.soton.comp1206.component.GameBlock;
/**
* The Game class handles the main logic, state and properties of the TetrECS game. Methods to manipulate the game state

2
src/main/java/uk/ac/soton/comp1206/game/GamePiece.java → src/main/java/uk/mgrove/ac/soton/comp1206/game/GamePiece.java
View File

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.game;
package uk.mgrove.ac.soton.comp1206.game;
/**
* Instances of GamePiece Represents the model of a specific Game Piece with it's block makeup.

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

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.game;
package uk.mgrove.ac.soton.comp1206.game;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty;

4
src/main/java/uk/ac/soton/comp1206/network/Communicator.java → src/main/java/uk/mgrove/ac/soton/comp1206/network/Communicator.java
View File

@@ -1,10 +1,10 @@
package uk.ac.soton.comp1206.network;
package uk.mgrove.ac.soton.comp1206.network;
import com.neovisionaries.ws.client.*;
import javafx.scene.control.Alert;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import uk.ac.soton.comp1206.event.CommunicationsListener;
import uk.mgrove.ac.soton.comp1206.event.CommunicationsListener;
import java.util.ArrayList;
import java.util.List;

6
src/main/java/uk/ac/soton/comp1206/scene/BaseScene.java → src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java
View File

@@ -1,9 +1,9 @@
package uk.ac.soton.comp1206.scene;
package uk.mgrove.ac.soton.comp1206.scene;
import javafx.scene.Scene;
import javafx.scene.paint.Color;
import uk.ac.soton.comp1206.ui.GamePane;
import uk.ac.soton.comp1206.ui.GameWindow;
import uk.mgrove.ac.soton.comp1206.ui.GamePane;
import uk.mgrove.ac.soton.comp1206.ui.GameWindow;
/**
* A Base Scene used in the game. Handles common functionality between all scenes.

12
src/main/java/uk/ac/soton/comp1206/scene/ChallengeScene.java → src/main/java/uk/mgrove/ac/soton/comp1206/scene/ChallengeScene.java
View File

@@ -1,13 +1,13 @@
package uk.ac.soton.comp1206.scene;
package uk.mgrove.ac.soton.comp1206.scene;
import javafx.scene.layout.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import uk.ac.soton.comp1206.component.GameBlock;
import uk.ac.soton.comp1206.component.GameBoard;
import uk.ac.soton.comp1206.game.Game;
import uk.ac.soton.comp1206.ui.GamePane;
import uk.ac.soton.comp1206.ui.GameWindow;
import uk.mgrove.ac.soton.comp1206.component.GameBlock;
import uk.mgrove.ac.soton.comp1206.component.GameBoard;
import uk.mgrove.ac.soton.comp1206.game.Game;
import uk.mgrove.ac.soton.comp1206.ui.GamePane;
import uk.mgrove.ac.soton.comp1206.ui.GameWindow;
/**
* The Single Player challenge scene. Holds the UI for the single player challenge mode in the game.

6
src/main/java/uk/ac/soton/comp1206/scene/MenuScene.java → src/main/java/uk/mgrove/ac/soton/comp1206/scene/MenuScene.java
View File

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.scene;
package uk.mgrove.ac.soton.comp1206.scene;
import javafx.event.ActionEvent;
import javafx.scene.control.Button;
@@ -6,8 +6,8 @@ import javafx.scene.layout.*;
import javafx.scene.text.Text;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import uk.ac.soton.comp1206.ui.GamePane;
import uk.ac.soton.comp1206.ui.GameWindow;
import uk.mgrove.ac.soton.comp1206.ui.GamePane;
import uk.mgrove.ac.soton.comp1206.ui.GameWindow;
/**
* The main menu of the game. Provides a gateway to the rest of the game.

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

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.ui;
package uk.mgrove.ac.soton.comp1206.ui;
import javafx.geometry.Pos;
import javafx.scene.layout.*;

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

@@ -1,4 +1,4 @@
package uk.ac.soton.comp1206.ui;
package uk.mgrove.ac.soton.comp1206.ui;
import javafx.application.Platform;
import javafx.scene.Scene;
@@ -8,9 +8,12 @@ import javafx.scene.text.Font;
import javafx.stage.Stage;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import uk.ac.soton.comp1206.App;
import uk.ac.soton.comp1206.network.Communicator;
import uk.ac.soton.comp1206.scene.*;
import uk.mgrove.ac.soton.comp1206.App;
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,