diff --git a/.gitignore b/.gitignore index 68fb67b..f7f52d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ target/ +dependency-reduced-pom.xml !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml deleted file mode 100644 index 7d36641..0000000 --- a/dependency-reduced-pom.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - 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 - META-INF/versions/9/module-info.class - - - - - - - - - - - - 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 7553b93..5060b03 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 26 2.14.0 11.2.3 - 3.30.13 + 3.26.3 @@ -107,7 +107,7 @@ default-cli - it.polimi.ingsw.gc14.HelloApplication + it.polimi.ingsw.gc14.ClientLauncherGUI app app app diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java index 07dc8b7..bc9c861 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java @@ -107,6 +107,6 @@ public class Building11 extends BuildingCard { @Override public String toStringPlayer() { - return super.toStringPlayer() + " (🏅:" + this.characterType.toString().substring(0, 3) + "×" + this.prestigeMul + ")"; + return super.toStringPlayer() + " (\uD83C\uDFC5:" + this.characterType.toString().substring(0, 3) + "×" + this.prestigeMul + ")"; } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java index 9831ae5..ffb18c2 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java @@ -77,7 +77,7 @@ public class Artist extends Character { @Override public String toStringPlayer() { - return "🎨"; + return "\uD83C\uDFA8"; } @Override diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java index 04620cd..43f9128 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java @@ -77,7 +77,7 @@ public class Gatherer extends Character { @Override public String toStringPlayer() { - return "-🥗"; + return "-\uD83C\uDF56"; } @Override diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java index 5cb9ae4..86489eb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java @@ -81,12 +81,12 @@ public class Shaman extends Character { @Override public String toStringPlayer() { - return "🌟:" + icon; + return "\uD83C\uDF1F:" + icon; } @Override public String toStringBoard() { - return "SHAMAN 🌟:" + icon; + return "SHAMAN \uD83C\uDF1F:" + icon; } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java index c16513e..4bdf028 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java @@ -91,7 +91,7 @@ public class Hunt extends EventCard { @Override public String toStringBoard() { - return "HUNT 1🍖+" + prestigeMultiplier + "🏅×🏹"; + return "HUNT 1\uD83C\uDF56+" + prestigeMultiplier + "\uD83C\uDFC5×\uD83C\uDFF9"; } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index 0e2a181..081b2d5 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -341,7 +341,7 @@ public class Player implements Serializable { table.addSeparator(); table.addRow("BUILDING CARDS" + (this.buildingCards.stream().mapToInt(BuildingCard::getPrestigeValue).sum() != 0 - ? " 🏅:" + this.buildingCards.stream().mapToInt(BuildingCard::getPrestigeValue).sum() + ? " \uD83C\uDFC5:" + this.buildingCards.stream().mapToInt(BuildingCard::getPrestigeValue).sum() : "")); if(!this.buildingCards.isEmpty()){ table.addRow(this.buildingCards.size() + " Buildings: " + this.buildingCards.stream().map(BuildingCard::toStringPlayer).collect(Collectors.joining(", ")));