update to java10 + fix mvn clean install

Leg0shii · Apr 22, 2023 · ffa81c6 · ffa81c6
1 parent e674286
commit ffa81c6
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 53 deletions.
diff --git a/.idea/artifacts/ParkourCalculator_jar.xml b/.idea/artifacts/ParkourCalculator_jar.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/pom.xml b/pom.xml
@@ -18,14 +18,13 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>18</version>
+            <version>20.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>18</version>
+            <artifactId>javafx-swing</artifactId>
+            <version>20.0.1</version>
         </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -38,26 +37,17 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.fxyz3d</groupId>
-            <artifactId>fxyz3d</artifactId>
-            <version>0.5.4</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.20</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.gotson</groupId>
             <artifactId>webp-imageio</artifactId>
             <version>0.2.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-swing</artifactId>
-            <version>11-ea+24</version>
-        </dependency>
     </dependencies>
 
     <packaging>jar</packaging>
@@ -82,10 +72,37 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>20</source>
+                    <target>20</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.20</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <transformers>
+                                <transformer implementation=
+                                                     "org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>de.legoshi.parkourcalculator.Main</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/src/main/java/de/legoshi/parkourcalculator/Main.java b/src/main/java/de/legoshi/parkourcalculator/Main.java
@@ -1,6 +1,6 @@
 package de.legoshi.parkourcalculator;
 
-public class Main extends Application {
+public class Main {
 
     public static void main(String[] args) {
         Application.main(args);

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,6 +1,5 @@
 module de.legoshi.parkourcalculator {
     requires javafx.controls;
-    requires javafx.fxml;
     requires lombok;
     requires java.desktop;
     requires javafx.swing;

diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -14,3 +14,4 @@ mouseSpeed=0.02
 # default settings for the screen options
 previewBlock=true
 pathCollision=true
+coordinatePrecision=5