diff --git a/.classpath b/.classpath index ba7dd87..ce5e946 100644 --- a/.classpath +++ b/.classpath @@ -19,7 +19,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2978067..b807efd 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=9 +org.eclipse.jdt.core.compiler.source=11 diff --git a/pom.xml b/pom.xml index 466e2a5..b340728 100644 --- a/pom.xml +++ b/pom.xml @@ -1,220 +1,255 @@ - - 4.0.0 + + 4.0.0 - com - cemu_UI - 0.3.1-SNAPSHOT - jar - cemu_UI - cemu_UI is a simple, material design graphical frontend for cemu, a Wii U emulator - https://www.mosad.xyz + com + cemu_UI + 0.3.1-SNAPSHOT + jar + cemu_UI + cemu_UI is a simple, material design graphical frontend for cemu, a Wii U emulator + https://www.mosad.xyz - - UTF-8 - + + UTF-8 + - - - - junit - junit - 4.12 - test - + - - com.jfoenix - jfoenix - 9.0.6 - - - - com.eclipsesource.minimal-json - minimal-json - 0.9.5 - - - - org.xerial - sqlite-jdbc - 3.23.1 - - - - org.apache.logging.log4j - log4j-api - 2.11.1 - - - - org.apache.logging.log4j - log4j-core - 2.11.1 - - - - commons-io - commons-io - 2.6 - - - - - org.apache.commons - commons-vfs2 - 2.2 - - - - - commons-codec - commons-codec - 1.11 - + + junit + junit + 4.12 + test + - - - io.datafx - flow - 8.0.1 - + + org.openjfx + javafx-controls + 11 + + + + org.openjfx + javafx-fxml + 11 + + + + org.openjfx + javafx-media + 11 + + + + com.jfoenix + jfoenix + 9.0.6 + + + + com.eclipsesource.minimal-json + minimal-json + 0.9.5 + + + + org.xerial + sqlite-jdbc + 3.23.1 + + + + org.apache.logging.log4j + log4j-api + 2.11.1 + + + + org.apache.logging.log4j + log4j-core + 2.11.1 + + + + commons-io + commons-io + 2.6 + + + + + org.apache.commons + commons-vfs2 + 2.2 + + + + + commons-codec + commons-codec + 1.11 + + + + + io.datafx + flow + 8.0.1 + - - - net.lingala.zip4j - zip4j - 1.3.2 - + + + net.lingala.zip4j + zip4j + 1.3.2 + - - - - commons-logging - commons-logging - 1.1.1 - - - - - com.google.api-client - google-api-client - 1.25.0 - + + + + commons-logging + commons-logging + 1.1.1 + - - - com.google.apis - google-api-services-drive - v3-rev129-1.25.0 - + + + com.google.api-client + google-api-client + 1.25.0 + - - - com.google.http-client - google-http-client - 1.25.0 - - - - - com.google.http-client - google-http-client-jackson2 - 1.25.0 - + + + com.google.apis + google-api-services-drive + v3-rev129-1.25.0 + - - - com.google.oauth-client - google-oauth-client - 1.25.0 - + + + com.google.http-client + google-http-client + 1.25.0 + + + + com.google.http-client + google-http-client-jackson2 + 1.25.0 + - - - com.google.oauth-client - google-oauth-client-java6 - 1.25.0 - + + + com.google.oauth-client + google-oauth-client + 1.25.0 + - - - com.google.oauth-client - google-oauth-client-jetty - 1.25.0 - - - - - com.fasterxml.jackson.core - jackson-core - 2.9.6 - + + + com.google.oauth-client + google-oauth-client-java6 + 1.25.0 + - - - javax.servlet - javax.servlet-api - 4.0.1 - provided - + + + com.google.oauth-client + google-oauth-client-jetty + 1.25.0 + + + + + com.fasterxml.jackson.core + jackson-core + 2.9.6 + + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + + + org.mortbay.jetty + jetty + 6.1.26 + + + + + org.mortbay.jetty + jetty-util + 6.1.26 + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + 11 + true + true + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + + java + + + + + com.cemu_UI.application.Main + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + package + + shade + + + cemu_UI + true + + + com.cemu_UI.application.JavaFX11Main + + + + + + + + - - - org.mortbay.jetty - jetty - 6.1.26 - - - - - org.mortbay.jetty - jetty-util - 6.1.26 - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 9 - 9 - true - true - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - package - - shade - - - cemu_UI - true - - - com.cemu_UI.application.Main - - - - - - - - - diff --git a/src/main/java/com/cemu_UI/application/JavaFX11Main.java b/src/main/java/com/cemu_UI/application/JavaFX11Main.java new file mode 100644 index 0000000..38da587 --- /dev/null +++ b/src/main/java/com/cemu_UI/application/JavaFX11Main.java @@ -0,0 +1,8 @@ +package com.cemu_UI.application; + +public class JavaFX11Main { + + public static void main(String[] args) { + Main.main(args); + } +} diff --git a/src/main/java/com/cemu_UI/application/Main.java b/src/main/java/com/cemu_UI/application/Main.java index d0f4830..caf7a6a 100644 --- a/src/main/java/com/cemu_UI/application/Main.java +++ b/src/main/java/com/cemu_UI/application/Main.java @@ -91,7 +91,7 @@ public class Main extends Application { private void mainWindow(){ try { FXMLLoader loader = new FXMLLoader(); - loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml")); + loader.setLocation(getClass().getResource("/fxml/MainWindow.fxml")); loader.setController(mainWindowController); pane = (AnchorPane) loader.load(); primaryStage.setMinWidth(265.00);