Fix adjacency count being incorrect due to underlying grid structure in GridWrapper

Fix bombs on initial click

.github/workflows/maven-publish.yml

@@ -1,34 +0,0 @@
-# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
-
-name: Maven Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v3
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    - name: Publish to GitHub Packages Apache Maven
-      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
-      env:
-        GITHUB_TOKEN: ${{ github.token }}

.gitignore

@@ -41,4 +41,9 @@ bin/
 ### Mac OS ###
 .DS_Store
 .idea
-lib
+lib
+target
+.mvn
+src/main/resources/META-INF
+mvnw
+mvnw.cmd

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/checkstyle-idea.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.15.0</checkstyleVersion>
-    <scanScope>JavaOnly</scanScope>
-    <option name="thirdPartyClasspath" />
-    <option name="activeLocationIds" />
-    <option name="locations">
-      <list>
-        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
-        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
-      </list>
-    </option>
-  </component>
-</project>

.idea/gradle.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/intellij-javadocs-4.0.1.xml

@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaDocConfiguration">
-    <GENERAL>
-      <MODE>UPDATE</MODE>
-      <OVERRIDDEN_METHODS>false</OVERRIDDEN_METHODS>
-      <SPLITTED_CLASS_NAME>true</SPLITTED_CLASS_NAME>
-      <LEVELS>
-        <LEVEL>METHOD</LEVEL>
-        <LEVEL>TYPE</LEVEL>
-        <LEVEL>FIELD</LEVEL>
-      </LEVELS>
-      <VISIBILITIES>
-        <VISIBILITY>DEFAULT</VISIBILITY>
-        <VISIBILITY>PROTECTED</VISIBILITY>
-        <VISIBILITY>PUBLIC</VISIBILITY>
-      </VISIBILITIES>
-    </GENERAL>
-    <TEMPLATES>
-      <CLASSES>
-        <CLASS>
-          <KEY>^.*(public|protected|private)*.+interface\s+\w+.*</KEY>
-          <VALUE>/**\n
- * The interface ${name}.\n
-&lt;#if element.typeParameters?has_content&gt;        * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-        * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
- */</VALUE>
-        </CLASS>
-        <CLASS>
-          <KEY>^.*(public|protected|private)*.+enum\s+\w+.*</KEY>
-          <VALUE>/**\n
- * The enum ${name}.\n
- */</VALUE>
-        </CLASS>
-        <CLASS>
-          <KEY>^.*(public|protected|private)*.+class\s+\w+.*</KEY>
-          <VALUE>/**\n
- * The type ${name}.\n
-&lt;#if element.typeParameters?has_content&gt;        * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-        * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
- */</VALUE>
-        </CLASS>
-        <CLASS>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
- * The type ${name}.\n
- */</VALUE>
-        </CLASS>
-      </CLASSES>
-      <CONSTRUCTORS>
-        <CONSTRUCTOR>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
- * Instantiates a new ${name}.\n
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </CONSTRUCTOR>
-      </CONSTRUCTORS>
-      <METHODS>
-        <METHOD>
-          <KEY>^.*(public|protected|private)*\s*.*(\w(\s*&lt;.+&gt;)*)+\s+get\w+\s*\(.*\).+</KEY>
-          <VALUE>/**\n
- * Gets ${partName}.\n
-&lt;#if element.typeParameters?has_content&gt;         * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-         * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if isNotVoid&gt;
-         *\n
-         * @return the ${partName}\n
-&lt;/#if&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-        <METHOD>
-          <KEY>^.*(public|protected|private)*\s*.*(void|\w(\s*&lt;.+&gt;)*)+\s+set\w+\s*\(.*\).+</KEY>
-          <VALUE>/**\n
- * Sets ${partName}.\n
-&lt;#if element.typeParameters?has_content&gt;         * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-         * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if isNotVoid&gt;
-         *\n
-         * @return the ${partName}\n
-&lt;/#if&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-        <METHOD>
-          <KEY>^.*((public\s+static)|(static\s+public))\s+void\s+main\s*\(\s*String\s*(\[\s*\]|\.\.\.)\s+\w+\s*\).+</KEY>
-          <VALUE>/**\n
- * The entry point of application.\n
-
-     &lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-     * @param ${element.parameterList.parameters[0].name} the input arguments\n
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-        <METHOD>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
- * ${name}&lt;#if isNotVoid&gt; ${return}&lt;/#if&gt;.\n
-&lt;#if element.typeParameters?has_content&gt;         * \n
-&lt;/#if&gt;
-&lt;#list element.typeParameters as typeParameter&gt;
-         * @param &lt;${typeParameter.name}&gt; the type parameter\n
-&lt;/#list&gt;
-&lt;#if element.parameterList.parameters?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.parameterList.parameters as parameter&gt;
-         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
-&lt;/#list&gt;
-&lt;#if isNotVoid&gt;
-         *\n
-         * @return the ${return}\n
-&lt;/#if&gt;
-&lt;#if element.throwsList.referenceElements?has_content&gt;
-         *\n
-&lt;/#if&gt;
-&lt;#list element.throwsList.referenceElements as exception&gt;
-         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
-&lt;/#list&gt;
- */</VALUE>
-        </METHOD>
-      </METHODS>
-      <FIELDS>
-        <FIELD>
-          <KEY>^.*(public|protected|private)*.+static.*(\w\s\w)+.+</KEY>
-          <VALUE>/**\n
- * The constant ${element.getName()}.\n
- */</VALUE>
-        </FIELD>
-        <FIELD>
-          <KEY>^.*(public|protected|private)*.*(\w\s\w)+.+</KEY>
-          <VALUE>/**\n
-    &lt;#if element.parent.isInterface()&gt;
-        * The constant ${element.getName()}.\n
-&lt;#else&gt;
-        * The ${name}.\n
-&lt;/#if&gt; */</VALUE>
-        </FIELD>
-        <FIELD>
-          <KEY>.+</KEY>
-          <VALUE>/**\n
-    &lt;#if element.parent.isEnum()&gt;
-        *${name} ${typeName}.\n
-&lt;#else&gt;
-        * The ${name}.\n
-&lt;/#if&gt;*/</VALUE>
-        </FIELD>
-      </FIELDS>
-    </TEMPLATES>
-  </component>
-</project>

.idea/misc.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

README.md

@@ -1 +1,34 @@
-[![Maven Package](https://github.com/shrapnelnet/libremines/actions/workflows/maven-publish.yml/badge.svg?event=page_build)](https://github.com/shrapnelnet/libremines/actions/workflows/maven-publish.yml)
+# Libremines
+
+"named this way because i didn't realise there was another libremines!"
+
+## Building
+
+### Requirements:
+- Java 21 or newer (openjdk-21-jdk)
+- Maven 3.8.8 (note: some versions cause gluon to freak out)
+- GraalVM 21
+
+### Instructions:
+
+Optional, create maven wrapper:
+
+```shell
+mvn wrapper:wrapper
+```
+
+This is helpful for version management, in case you have an incompatible version of maven installed, but most people will not need this.
+
+Install dependencies:
+
+```shell
+./mvnw install
+```
+
+Build and run:
+
+```shell
+GRAALVM_HOME=/path/to/graalvm ./mvnw gluonfx:build
+```
+
+A native binary should be placed at `target/gluonfx/<your architecture>/libremines`

pom.xml

@@ -13,6 +13,14 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <profiles>
+        <profile>
+            <id>web</id>
+            <properties>
+                <gluonfx.target>web</gluonfx.target>
+            </properties>
+        </profile>
+    </profiles>
     <dependencies>
         <dependency>
             <groupId>org.openjfx</groupId>
@@ -46,6 +54,9 @@
                 <version>1.0.22</version>
                 <configuration>
                     <mainClass>com.shr4pnel.minesweeper.Main</mainClass>
+                    <reflectionList>
+                        com.shr4pnel.minesweeper.Controller
+                    </reflectionList>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/com/shr4pnel/minesweeper/Controller.java

@@ -3,6 +3,7 @@ package com.shr4pnel.minesweeper;
 import java.net.URL;
 import java.util.Timer;
 import java.util.TimerTask;
+
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
@@ -28,6 +29,7 @@ public class Controller {
     private long startTime;
     private int bombCount = 99;
     private boolean[][] expandedTiles;
+    private boolean isFirstClick = true;
 
     @FXML
     private void initialize() {
@@ -35,7 +37,6 @@ public class Controller {
         gridHandler = new Grid();
         wrapper = gridHandler.grid;
         expandedTiles = new boolean[30][16];
-
     }
 
     private void setupGrid() {
@@ -49,15 +50,29 @@ public class Controller {
 
     private Button createBlankButton() {
         Image blank =
-            new Image(String.valueOf(getClass().getResource("img/blank.png")), 16, 16, true, true);
+                new Image(String.valueOf(getClass().getResource("img/blank.png")), 16, 16, true, true);
         ImageView blankImage = new ImageView(blank);
         Button blankButton = new Button();
         blankButton.setGraphic(blankImage);
         blankButton.setMinSize(16, 16);
         blankButton.setOnMouseClicked(this::buttonClicked);
+        blankButton.setOnMousePressed(this::mouseHeld);
+        blankButton.setOnMouseReleased(this::mouseReleased);
         return blankButton;
     }
 
+    private void mouseHeld(MouseEvent mouseEvent) {
+        if (gameOver)
+            return;
+        setImage(smiley, "img/face_ooh.png");
+    }
+
+    private void mouseReleased(MouseEvent mouseEvent) {
+        if (gameOver)
+            return;
+        setImage(smiley, "img/face_smile.png");
+    }
+
     private void buttonClicked(MouseEvent e) {
         if (gameOver) {
             return;
@@ -81,11 +96,34 @@ public class Controller {
         handlePrimaryClick(clicked, column, row);
     }
 
+    private int[] setBombIfFirstTileIsBomb(int column, int row) {
+        for (int c = 0; c < 30; ++c) {
+            for (int r = 0; r < 16; ++r) {
+                if (!wrapper.atColumn(c).atRow(r).isBomb()) {
+                    wrapper.setBomb();
+                    wrapper.updateGrid(column, row, c, r);
+                    return new int[]{c, r};
+                }
+            }
+        }
+        return null;
+    }
+
     private void handlePrimaryClick(Button clicked, int column, int row) {
-        if (wrapper.atColumn(column).atRow(row).isBomb()) {
+        if (wrapper.atColumn(column).atRow(row).isBomb() && !isFirstClick) {
             gameOver(clicked);
             return;
         }
+        if (wrapper.isBomb() && isFirstClick) {
+            int[] chosenColumnAndRow = setBombIfFirstTileIsBomb(column, row);
+            // assertions are evil but i dont care
+            assert chosenColumnAndRow != null;
+            int columnMovedTo = chosenColumnAndRow[0];
+            int rowMovedTo = chosenColumnAndRow[1];
+            wrapper.atColumn(column).atRow(row).switchBomb(columnMovedTo, rowMovedTo);
+            recursiveExpandTiles(column, row);
+            isFirstClick = false;
+        }
         int adjacentBombs = wrapper.adjacentBombCount();
         setAdjacentCount(clicked, adjacentBombs);
         if (adjacentBombs == 0) {
@@ -96,7 +134,7 @@ public class Controller {
 
     private void recursiveExpandTiles(int column, int row) {
         if (column < 0 || column >= 30 || row < 0 || row >= 16 ||
-            expandedTiles[column][row] && !wrapper.atColumn(column).atRow(row).isBomb()) {
+                expandedTiles[column][row] && !wrapper.atColumn(column).atRow(row).isBomb()) {
             return;
         }
         expandTile(column, row);
@@ -138,6 +176,7 @@ public class Controller {
 
     @FXML
     private void reinitialize() {
+        gameOver = false;
         bombCount = 99;
         updateBombCounter();
         resetTimer();
@@ -145,6 +184,7 @@ public class Controller {
         gridHandler = new Grid();
         wrapper = gridHandler.grid;
         expandedTiles = new boolean[30][16];
+        isFirstClick = true;
     }
 
     private void resetTimer() {
@@ -178,7 +218,7 @@ public class Controller {
         ImageView tileGraphic = (ImageView) tileAsButton.getGraphic();
         Image tileGraphicImage = tileGraphic.getImage();
         if (!tileGraphicImage.getUrl().contains("blank.png") &&
-            !tileGraphicImage.getUrl().contains("flagged.png")) {
+                !tileGraphicImage.getUrl().contains("flagged.png")) {
             return;
         }
         boolean flagged = tileGraphicImage.getUrl().contains("flagged.png");
@@ -241,7 +281,7 @@ public class Controller {
             int column = GridPane.getColumnIndex(node);
             int row = GridPane.getRowIndex(node);
             if (!(column == clickedColumn && row == clickedRow) &&
-                wrapper.atColumn(column).atRow(row).isBomb()) {
+                    wrapper.atColumn(column).atRow(row).isBomb()) {
                 setImage((Button) node, "img/bomb_revealed.png");
             }
             if (buttonURL.contains("flagged.png") && !wrapper.atColumn(column).atRow(row).isBomb()) {
@@ -267,7 +307,6 @@ public class Controller {
 
     @FXML
     private void smileyReleased() {
-        gameOver = false;
         setImage(smiley, "img/face_smile.png");
         reinitialize();
     }

src/main/java/com/shr4pnel/minesweeper/GridWrapper.java

@@ -28,6 +28,13 @@ public class GridWrapper {
         }
     }
 
+    public void switchBomb(int destinationColumn, int destinationRow) {
+        if (isValid(currentColumn, currentRow) && isValid(destinationColumn, destinationRow)) {
+            grid[destinationColumn][destinationRow] = true;
+            grid[currentColumn][currentRow] = false;
+        }
+    }
+
     public boolean isBomb() {
         return isValid(currentColumn, currentRow) && grid[currentColumn][currentRow];
     }
@@ -62,6 +69,11 @@ public class GridWrapper {
         return count;
     }
 
+    public void updateGrid(int oldColumn, int oldRow, int newColumn, int newRow) {
+        grid[oldColumn][oldRow] = false;
+        grid[newColumn][newRow] = true;
+    }
+
     private boolean isBombAt(int column, int row) {
         return isValid(column, row) && grid[column][row];
     }