diff --git a/pom.xml b/pom.xml index 0132729..00b9140 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - uk.ac.soton.comp1206 + uk.mgrove.ac.soton.comp1206 tetrecs 1.0-SNAPSHOT @@ -68,7 +68,7 @@ true - uk.ac.soton.comp1206.Launcher + uk.mgrove.ac.soton.comp1206.Launcher @@ -134,7 +134,7 @@ javafx-maven-plugin 0.0.8 - uk.ac.soton.comp1206/uk.ac.soton.comp1206.App + uk.mgrove.ac.soton.comp1206/uk.mgrove.ac.soton.comp1206.App diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 5829f72..e4fa93e 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -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; } \ No newline at end of file diff --git a/src/main/java/uk/ac/soton/comp1206/App.java b/src/main/java/uk/mgrove/ac/soton/comp1206/App.java similarity index 95% rename from src/main/java/uk/ac/soton/comp1206/App.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/App.java index aa83486..10f0b21 100644 --- a/src/main/java/uk/ac/soton/comp1206/App.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/App.java @@ -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 diff --git a/src/main/java/uk/ac/soton/comp1206/Launcher.java b/src/main/java/uk/mgrove/ac/soton/comp1206/Launcher.java similarity index 90% rename from src/main/java/uk/ac/soton/comp1206/Launcher.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/Launcher.java index 4fd4e21..94522b5 100644 --- a/src/main/java/uk/ac/soton/comp1206/Launcher.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/Launcher.java @@ -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); - } - -} + } \ No newline at end of file diff --git a/src/main/java/uk/ac/soton/comp1206/component/GameBlock.java b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlock.java similarity index 99% rename from src/main/java/uk/ac/soton/comp1206/component/GameBlock.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlock.java index e6c5c78..e0a06a5 100644 --- a/src/main/java/uk/ac/soton/comp1206/component/GameBlock.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlock.java @@ -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; diff --git a/src/main/java/uk/ac/soton/comp1206/component/GameBlockCoordinate.java b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java similarity index 98% rename from src/main/java/uk/ac/soton/comp1206/component/GameBlockCoordinate.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java index 62d52b6..a47568a 100644 --- a/src/main/java/uk/ac/soton/comp1206/component/GameBlockCoordinate.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java @@ -1,4 +1,4 @@ -package uk.ac.soton.comp1206.component; +package uk.mgrove.ac.soton.comp1206.component; import javafx.beans.NamedArg; diff --git a/src/main/java/uk/ac/soton/comp1206/component/GameBoard.java b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBoard.java similarity index 96% rename from src/main/java/uk/ac/soton/comp1206/component/GameBoard.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBoard.java index b587148..6fc2c78 100644 --- a/src/main/java/uk/ac/soton/comp1206/component/GameBoard.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBoard.java @@ -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. diff --git a/src/main/java/uk/ac/soton/comp1206/event/BlockClickedListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java similarity index 78% rename from src/main/java/uk/ac/soton/comp1206/event/BlockClickedListener.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java index 0e1001a..dae48b7 100644 --- a/src/main/java/uk/ac/soton/comp1206/event/BlockClickedListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java @@ -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 diff --git a/src/main/java/uk/ac/soton/comp1206/event/CommunicationsListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java similarity index 88% rename from src/main/java/uk/ac/soton/comp1206/event/CommunicationsListener.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java index 89c532e..53abb8a 100644 --- a/src/main/java/uk/ac/soton/comp1206/event/CommunicationsListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java @@ -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. diff --git a/src/main/java/uk/ac/soton/comp1206/game/Game.java b/src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java similarity index 96% rename from src/main/java/uk/ac/soton/comp1206/game/Game.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java index a379daf..95176e3 100644 --- a/src/main/java/uk/ac/soton/comp1206/game/Game.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java @@ -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 diff --git a/src/main/java/uk/ac/soton/comp1206/game/GamePiece.java b/src/main/java/uk/mgrove/ac/soton/comp1206/game/GamePiece.java similarity index 99% rename from src/main/java/uk/ac/soton/comp1206/game/GamePiece.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/game/GamePiece.java index 763897a..1bcd054 100644 --- a/src/main/java/uk/ac/soton/comp1206/game/GamePiece.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/game/GamePiece.java @@ -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. diff --git a/src/main/java/uk/ac/soton/comp1206/game/Grid.java b/src/main/java/uk/mgrove/ac/soton/comp1206/game/Grid.java similarity index 98% rename from src/main/java/uk/ac/soton/comp1206/game/Grid.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/game/Grid.java index 4924c99..b47717a 100644 --- a/src/main/java/uk/ac/soton/comp1206/game/Grid.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/game/Grid.java @@ -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; diff --git a/src/main/java/uk/ac/soton/comp1206/network/Communicator.java b/src/main/java/uk/mgrove/ac/soton/comp1206/network/Communicator.java similarity index 97% rename from src/main/java/uk/ac/soton/comp1206/network/Communicator.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/network/Communicator.java index 5af9474..bd5d292 100644 --- a/src/main/java/uk/ac/soton/comp1206/network/Communicator.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/network/Communicator.java @@ -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; diff --git a/src/main/java/uk/ac/soton/comp1206/scene/BaseScene.java b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java similarity index 90% rename from src/main/java/uk/ac/soton/comp1206/scene/BaseScene.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java index 3c3156f..ab94661 100644 --- a/src/main/java/uk/ac/soton/comp1206/scene/BaseScene.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java @@ -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. diff --git a/src/main/java/uk/ac/soton/comp1206/scene/ChallengeScene.java b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/ChallengeScene.java similarity index 87% rename from src/main/java/uk/ac/soton/comp1206/scene/ChallengeScene.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/scene/ChallengeScene.java index fd6c21b..a7a8fc2 100644 --- a/src/main/java/uk/ac/soton/comp1206/scene/ChallengeScene.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/ChallengeScene.java @@ -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. diff --git a/src/main/java/uk/ac/soton/comp1206/scene/MenuScene.java b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/MenuScene.java similarity index 93% rename from src/main/java/uk/ac/soton/comp1206/scene/MenuScene.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/scene/MenuScene.java index 4bcc9d8..9d4260c 100644 --- a/src/main/java/uk/ac/soton/comp1206/scene/MenuScene.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/MenuScene.java @@ -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. diff --git a/src/main/java/uk/ac/soton/comp1206/ui/GamePane.java b/src/main/java/uk/mgrove/ac/soton/comp1206/ui/GamePane.java similarity index 98% rename from src/main/java/uk/ac/soton/comp1206/ui/GamePane.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/ui/GamePane.java index ef42b4f..18b7cf0 100644 --- a/src/main/java/uk/ac/soton/comp1206/ui/GamePane.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/ui/GamePane.java @@ -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.*; diff --git a/src/main/java/uk/ac/soton/comp1206/ui/GameWindow.java b/src/main/java/uk/mgrove/ac/soton/comp1206/ui/GameWindow.java similarity index 92% rename from src/main/java/uk/ac/soton/comp1206/ui/GameWindow.java rename to src/main/java/uk/mgrove/ac/soton/comp1206/ui/GameWindow.java index 772a244..38583a2 100644 --- a/src/main/java/uk/ac/soton/comp1206/ui/GameWindow.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/ui/GameWindow.java @@ -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,