diff --git a/.idea/libraries/Maven__org_openjfx_javafx_fxml_11_0_1.xml b/.idea/libraries/Maven__org_openjfx_javafx_fxml_11_0_1.xml
new file mode 100644
index 0000000..6d78152
--- /dev/null
+++ b/.idea/libraries/Maven__org_openjfx_javafx_fxml_11_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openjfx_javafx_fxml_win_11_0_1.xml b/.idea/libraries/Maven__org_openjfx_javafx_fxml_win_11_0_1.xml
new file mode 100644
index 0000000..8813147
--- /dev/null
+++ b/.idea/libraries/Maven__org_openjfx_javafx_fxml_win_11_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/osci-render.iml b/.idea/osci-render.iml
index 5ed4bd8..1271071 100644
--- a/.idea/osci-render.iml
+++ b/.idea/osci-render.iml
@@ -1,14 +1,13 @@
-
-
+
+
-
-
-
+
+
@@ -25,6 +24,8 @@
+
+
diff --git a/lib/com.mokiat.data.front-2.0.0.jar b/lib/com.mokiat.data.front-2.0.0.jar
deleted file mode 100644
index 90aa9d8..0000000
Binary files a/lib/com.mokiat.data.front-2.0.0.jar and /dev/null differ
diff --git a/lib/com.xt-audio.xt-1.0.6.jar b/lib/com.xt-audio.xt-1.0.6.jar
deleted file mode 100644
index 47b70d9..0000000
Binary files a/lib/com.xt-audio.xt-1.0.6.jar and /dev/null differ
diff --git a/lib/javafx-swt.jar b/lib/javafx-swt.jar
deleted file mode 100644
index 81f1646..0000000
Binary files a/lib/javafx-swt.jar and /dev/null differ
diff --git a/lib/javafx.base.jar b/lib/javafx.base.jar
deleted file mode 100644
index b45fae4..0000000
Binary files a/lib/javafx.base.jar and /dev/null differ
diff --git a/lib/javafx.controls.jar b/lib/javafx.controls.jar
deleted file mode 100644
index d78a436..0000000
Binary files a/lib/javafx.controls.jar and /dev/null differ
diff --git a/lib/javafx.fxml.jar b/lib/javafx.fxml.jar
deleted file mode 100644
index 0eefe6b..0000000
Binary files a/lib/javafx.fxml.jar and /dev/null differ
diff --git a/lib/javafx.graphics.jar b/lib/javafx.graphics.jar
deleted file mode 100644
index e06e695..0000000
Binary files a/lib/javafx.graphics.jar and /dev/null differ
diff --git a/lib/javafx.media.jar b/lib/javafx.media.jar
deleted file mode 100644
index 9defa67..0000000
Binary files a/lib/javafx.media.jar and /dev/null differ
diff --git a/lib/javafx.properties b/lib/javafx.properties
deleted file mode 100644
index ad39df9..0000000
--- a/lib/javafx.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javafx.version=15.0.1
-javafx.runtime.version=15.0.1+1
-javafx.runtime.build=1
diff --git a/lib/javafx.swing.jar b/lib/javafx.swing.jar
deleted file mode 100644
index 1def818..0000000
Binary files a/lib/javafx.swing.jar and /dev/null differ
diff --git a/lib/javafx.web.jar b/lib/javafx.web.jar
deleted file mode 100644
index efef4e4..0000000
Binary files a/lib/javafx.web.jar and /dev/null differ
diff --git a/lib/jgrapht-core-1.5.0.jar b/lib/jgrapht-core-1.5.0.jar
deleted file mode 100644
index 2a766eb..0000000
Binary files a/lib/jgrapht-core-1.5.0.jar and /dev/null differ
diff --git a/lib/jheaps-0.13.jar b/lib/jheaps-0.13.jar
deleted file mode 100644
index 5698c48..0000000
Binary files a/lib/jheaps-0.13.jar and /dev/null differ
diff --git a/lib/jna-5.6.0.jar b/lib/jna-5.6.0.jar
deleted file mode 100644
index fda5aa4..0000000
Binary files a/lib/jna-5.6.0.jar and /dev/null differ
diff --git a/lib/jsoup-1.13.1.jar b/lib/jsoup-1.13.1.jar
deleted file mode 100644
index bb1237c..0000000
Binary files a/lib/jsoup-1.13.1.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 0dc3084..920d1e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,22 @@
osci-render
1.0
+ src
+ test
+ out
+ out
+
+
+ resources
+
+
org.openjfx
javafx-maven-plugin
0.0.5
- osci-render/gui.Gui
+ Gui
@@ -36,6 +45,12 @@
+
+
+ org.openjfx
+ javafx-fxml
+ 11.0.1
+
org.openjfx
javafx-controls
diff --git a/src/gui/osci-render.fxml b/resources/fxml/osci-render.fxml
similarity index 100%
rename from src/gui/osci-render.fxml
rename to resources/fxml/osci-render.fxml
diff --git a/src/engine/WorldObject.java b/src/engine/WorldObject.java
index 743b57c..de650b4 100644
--- a/src/engine/WorldObject.java
+++ b/src/engine/WorldObject.java
@@ -1,10 +1,8 @@
package engine;
-import com.mokiat.data.front.error.WFException;
import com.mokiat.data.front.parser.*;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
diff --git a/src/gui/Gui.java b/src/gui/Gui.java
index 7bcb1db..95c2072 100644
--- a/src/gui/Gui.java
+++ b/src/gui/Gui.java
@@ -1,5 +1,6 @@
package gui;
+
import javafx.application.Application;
import javafx.application.Platform;
import javafx.fxml.FXMLLoader;
@@ -11,7 +12,7 @@ public class Gui extends Application {
@Override
public void start(Stage primaryStage) throws Exception {
- FXMLLoader loader = new FXMLLoader(getClass().getResource("osci-render.fxml"));
+ FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/osci-render.fxml"));
Parent root = loader.load();
Controller controller = loader.getController();
controller.setStage(primaryStage);