diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 0000000..a45c144
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,172 @@
+
+
+ 4.0.0
+ it.polimi.ingsw
+ GC14
+ ing-sw-2026-pirrera-radice-pagani-pellegrino
+ 1.0-SNAPSHOT
+
+
+
+ maven-compiler-plugin
+ 3.13.0
+
+ 25
+ 25
+
+
+
+ maven-surefire-plugin
+ 3.2.5
+
+
+ org.openjfx
+ javafx-maven-plugin
+ 0.0.8
+
+
+ default-cli
+
+ it.polimi.ingsw.gc14.HelloApplication
+ app
+ app
+ app
+ true
+ true
+ true
+
+
+
+
+
+ maven-shade-plugin
+ 3.5.2
+
+
+ server
+ package
+
+ shade
+
+
+ Server
+
+
+ it.polimi.ingsw.gc14.ServerLauncher
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+ client-tui
+ package
+
+ shade
+
+
+ ClientTUI
+
+
+ it.polimi.ingsw.gc14.ClientLauncherTUI
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+ client-gui
+ package
+
+ shade
+
+
+ ClientGUI
+
+
+ it.polimi.ingsw.gc14.ClientLauncherGUI
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ 5.12.1
+ test
+
+
+ opentest4j
+ org.opentest4j
+
+
+ junit-platform-commons
+ org.junit.platform
+
+
+ apiguardian-api
+ org.apiguardian
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.12.1
+ test
+
+
+ junit-platform-engine
+ org.junit.platform
+
+
+ apiguardian-api
+ org.apiguardian
+
+
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
+ UTF-8
+ 5.12.1
+
+
diff --git a/pom.xml b/pom.xml
index 1251add..4699c9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,89 @@
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.5.2
+
+
+
+
+ server
+ package
+ shade
+
+ Server
+
+
+ it.polimi.ingsw.gc14.ServerLauncher
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
+ client-tui
+ package
+ shade
+
+ ClientTUI
+
+
+ it.polimi.ingsw.gc14.ClientLauncherTUI
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
+ client-gui
+ package
+ shade
+
+ ClientGUI
+
+
+ it.polimi.ingsw.gc14.ClientLauncherGUI
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java
index e6f6821..3f9e93a 100644
--- a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java
+++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java
@@ -2,23 +2,23 @@ package it.polimi.ingsw.gc14;
import it.polimi.ingsw.gc14.Controller.ClientController;
import it.polimi.ingsw.gc14.View.GUI.GUI;
-import it.polimi.ingsw.gc14.View.IView;
import javafx.application.Application;
import javafx.stage.Stage;
-import static javafx.application.Application.launch;
-
-public class ClientLauncherGUI extends Application {
-
- @Override
- public void start(Stage stage) throws Exception {
- GUI view = new GUI(stage);
- ClientController controller = new ClientController(view);
- view.setController(controller);
- view.start(stage);
- }
+public class ClientLauncherGUI {
public static void main(String[] args) {
- launch();
+ System.setProperty("glass.win.uiScale", "1.0");
+ Application.launch(GUIApp.class, args);
+ }
+
+ public static class GUIApp extends Application {
+ @Override
+ public void start(Stage stage) throws Exception {
+ GUI view = new GUI(stage);
+ ClientController controller = new ClientController(view);
+ view.setController(controller);
+ view.start(stage);
+ }
}
}
\ No newline at end of file
diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
index 84ee485..aa11a74 100644
--- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
+++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
@@ -155,7 +155,7 @@ public class MainFXMLController {
// ==== ELEMENTS ====
private StackPane createOrder(String num) {
ImageView img = new ImageView(loadImage("/GUIImages/Orders/order-" + num + ".png"));
- img.setFitHeight(240);
+ img.fitHeightProperty().bind(board.heightProperty().add(-15));
img.setPreserveRatio(true);
addClip(img);
return new StackPane(img);
@@ -171,10 +171,10 @@ public class MainFXMLController {
Player player = controller.miniModel.slotPlayerMap.get(slot);
if (player != null && controller.miniModel.getPositionByUsername(player.getUserName()) != -1) {
ImageView totem = new ImageView(loadImage("/GUIImages/Totems/totem_" + player.totem.toString().toLowerCase(Locale.ROOT) + ".png"));
- totem.setFitHeight(70);
+ totem.setFitHeight(68);
totem.setPreserveRatio(true);
StackPane.setAlignment(totem, Pos.TOP_LEFT);
- StackPane.setMargin(totem, new Insets(8, 0, 0, 57));
+ StackPane.setMargin(totem, new Insets(0, 0, 0, 46));
wrapper.getChildren().add(totem);
}
@@ -433,7 +433,7 @@ public class MainFXMLController {
default -> "/GUIImages/Backs/back-001.png";
};
ImageView back = new ImageView(loadImage(path));
- back.setFitHeight(240);
+ back.fitHeightProperty().bind(board.heightProperty().add(-15));
back.setPreserveRatio(true);
addClip(back);
addShadow(back);
@@ -447,7 +447,7 @@ public class MainFXMLController {
VBox overlay = new VBox(-20);
overlay.setPickOnBounds(false);
StackPane.setAlignment(overlay, Pos.TOP_LEFT);
- StackPane.setMargin(overlay, new Insets(9, 0, 0, 57));
+ StackPane.setMargin(overlay, new Insets(9, 0, 0, 46));
for (OrderPlayer player : controller.miniModel.orderLogicCard.playerList) {
ImageView totem = new ImageView(loadImage("/GUIImages/Totems/totem_" + player.player.totem.toString().toLowerCase(Locale.ROOT) + ".png"));
diff --git a/src/main/resources/GUIScene/main.fxml b/src/main/resources/GUIScene/main.fxml
index c7cd238..ebae488 100644
--- a/src/main/resources/GUIScene/main.fxml
+++ b/src/main/resources/GUIScene/main.fxml
@@ -29,7 +29,7 @@
-
+