Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Potential fix windows TUI

Browse Source
This commit is contained in:
aleandro
2026-06-14 18:47:54 +02:00
parent da4c725822
commit 3dfd265e9f
9 changed files with 10 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -1,4 +1,5 @@
target/ target/
dependency-reduced-pom.xml
!.mvn/wrapper/maven-wrapper.jar !.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/ !**/src/main/**/target/
!**/src/test/**/target/ !**/src/test/**/target/
dependency-reduced-pom.xml
-174
View File
@@ -1,174 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>it.polimi.ingsw</groupId>
<artifactId>GC14</artifactId>
<name>ing-sw-2026-pirrera-radice-pagani-pellegrino</name>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>25</source>
<target>25</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<executions>
<execution>
<id>default-cli</id>
<configuration>
<mainClass>it.polimi.ingsw.gc14.HelloApplication</mainClass>
<launcher>app</launcher>
<jlinkZipName>app</jlinkZipName>
<jlinkImageName>app</jlinkImageName>
<noManPages>true</noManPages>
<stripDebug>true</stripDebug>
<noHeaderFiles>true</noHeaderFiles>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.2</version>
<executions>
<execution>
<id>server</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>Server</finalName>
<transformers>
<transformer>
<mainClass>it.polimi.ingsw.gc14.ServerLauncher</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
<execution>
<id>client-tui</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>ClientTUI</finalName>
<transformers>
<transformer>
<mainClass>it.polimi.ingsw.gc14.ClientLauncherTUI</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
<execution>
<id>client-gui</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>ClientGUI</finalName>
<transformers>
<transformer>
<mainClass>it.polimi.ingsw.gc14.ClientLauncherGUI</mainClass>
</transformer>
<transformer />
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/versions/9/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.12.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>opentest4j</artifactId>
<groupId>org.opentest4j</groupId>
</exclusion>
<exclusion>
<artifactId>junit-platform-commons</artifactId>
<groupId>org.junit.platform</groupId>
</exclusion>
<exclusion>
<artifactId>apiguardian-api</artifactId>
<groupId>org.apiguardian</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.12.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit-platform-engine</artifactId>
<groupId>org.junit.platform</groupId>
</exclusion>
<exclusion>
<artifactId>apiguardian-api</artifactId>
<groupId>org.apiguardian</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.12.1</junit.version>
</properties>
</project>
pom.xml
+2 -2
View File
@@ -15,7 +15,7 @@
<javafx.version>26</javafx.version> <javafx.version>26</javafx.version>
<gson.version>2.14.0</gson.version> <gson.version>2.14.0</gson.version>
<controlsfx.version>11.2.3</controlsfx.version> <controlsfx.version>11.2.3</controlsfx.version>
<jline.version>3.30.13</jline.version> <jline.version>3.26.3</jline.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -107,7 +107,7 @@
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>
<configuration> <configuration>
<mainClass>it.polimi.ingsw.gc14.HelloApplication</mainClass> <mainClass>it.polimi.ingsw.gc14.ClientLauncherGUI</mainClass>
<launcher>app</launcher> <launcher>app</launcher>
<jlinkZipName>app</jlinkZipName> <jlinkZipName>app</jlinkZipName>
<jlinkImageName>app</jlinkImageName> <jlinkImageName>app</jlinkImageName>
src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java
+1 -1
View File
@@ -107,6 +107,6 @@ public class Building11 extends BuildingCard {
@Override @Override
public String toStringPlayer() { 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 + ")";
} }
} }
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class Artist extends Character {
@Override @Override
public String toStringPlayer() { public String toStringPlayer() {
return "🎨"; return "\uD83C\uDFA8";
} }
@Override @Override
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class Gatherer extends Character {
@Override @Override
public String toStringPlayer() { public String toStringPlayer() {
return "-🥗"; return "-\uD83C\uDF56";
} }
@Override @Override
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java
+2 -2
View File
@@ -81,12 +81,12 @@ public class Shaman extends Character {
@Override @Override
public String toStringPlayer() { public String toStringPlayer() {
return "🌟:" + icon; return "\uD83C\uDF1F:" + icon;
} }
@Override @Override
public String toStringBoard() { public String toStringBoard() {
return "SHAMAN 🌟:" + icon; return "SHAMAN \uD83C\uDF1F:" + icon;
} }
/** /**
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class Hunt extends EventCard {
@Override @Override
public String toStringBoard() { public String toStringBoard() {
return "HUNT 1🍖+" + prestigeMultiplier + "🏅×🏹"; return "HUNT 1\uD83C\uDF56+" + prestigeMultiplier + "\uD83C\uDFC5×\uD83C\uDFF9";
} }
} }
src/main/java/it/polimi/ingsw/gc14/Model/Player.java
+1 -1
View File
@@ -341,7 +341,7 @@ public class Player implements Serializable {
table.addSeparator(); table.addSeparator();
table.addRow("BUILDING CARDS" + table.addRow("BUILDING CARDS" +
(this.buildingCards.stream().mapToInt(BuildingCard::getPrestigeValue).sum() != 0 (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()){ if(!this.buildingCards.isEmpty()){
table.addRow(this.buildingCards.size() + " Buildings: " + this.buildingCards.stream().map(BuildingCard::toStringPlayer).collect(Collectors.joining(", "))); table.addRow(this.buildingCards.size() + " Buildings: " + this.buildingCards.stream().map(BuildingCard::toStringPlayer).collect(Collectors.joining(", ")));