Merge pull request #150 from einaskoi/per/msi

adds msi installer in dist
einaskoi · May 27, 2026 · 39e85f9 · 39e85f9
2 parents 6c84687 + 7f4afa2
commit 39e85f9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Millions-1.1.0-installer.exe b/Millions-1.1.0-installer.exe
diff --git a/Millions.exe b/Millions.exe
diff --git a/pom.xml b/pom.xml
@@ -96,6 +96,8 @@
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/versions/*/module-info.class</exclude>
                                     </excludes>
                                 </filter>
                             </filters>
@@ -111,17 +113,27 @@
                 <version>1.6.0</version>
                 <configuration>
                     <name>Millions</name>
-                    <appVersion>1.0.0</appVersion>
+                    <appVersion>1.2.0</appVersion>
                     <vendor>edu.ntnu.idi.idatt2003.gruppe42</vendor>
                     <input>target</input>
                     <destination>target/dist</destination>
                     <mainJar>Millions-1.0-SNAPSHOT.jar</mainJar>
                     <mainClass>edu.ntnu.idi.idatt2003.gruppe42.Launcher</mainClass>
-                    <type>DMG</type>
-                    <icon>src/main/resources/images/app_icon.icns</icon>
+                    <type>EXE</type>
+                    <icon>src/main/resources/images/app_icon.ico</icon>
                     <javaOptions>
                         <option>-Dfile.encoding=UTF-8</option>
+                        <option>--enable-native-access=ALL-UNNAMED</option>
+                        <option>--add-opens=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED</option>
+                        <option>--add-opens=java.base/java.lang=ALL-UNNAMED</option>
                     </javaOptions>
+                    <!-- Windows installer options -->
+                    <winDirChooser>true</winDirChooser>
+                    <winShortcut>true</winShortcut>
+                    <winMenu>true</winMenu>
+                    <winShortcutPrompt>true</winShortcutPrompt>
+                    <winMenuGroup>Millions</winMenuGroup>
+                    <winPerUserInstall>true</winPerUserInstall>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/GameController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/controller/GameController.java
@@ -64,7 +64,7 @@ public void setGameState(final GameState gameState) {
   public void startGame() {
     timer = new Timer(true);
     final int delay = 0;
-    final int period = 10;
+    final int period = 1000;
 
     timer.scheduleAtFixedRate(new TimerTask() {
       @Override