logging and integration stuff

4 files changed, 12 insertions, 5 deletions

diff --git a/core/src/main/java/dev/figboot/launcher/core/config/PropertyLauncherDirectories.java b/core/src/main/java/dev/figboot/launcher/core/config/PropertyLauncherDirectories.java
index a9a0358..53d82eb 100644
--- a/core/src/main/java/dev/figboot/launcher/core/config/PropertyLauncherDirectories.java
+++ b/core/src/main/java/dev/figboot/launcher/core/config/PropertyLauncherDirectories.java
@@ -12,7 +12,7 @@ class PropertyLauncherDirectories implements LauncherDirectories {
 
     @Override
     public Path getDirectory(LauncherDirectory dir) {
-        String prop = System.getProperty(root + dir.name());
+        String prop = System.getProperty(root + "." + dir.name());
 
         if (prop != null) {
             return FileSystems.getDefault().getPath(prop);
diff --git a/core/src/main/java/dev/figboot/launcher/core/config/SimpleLauncherConfiguration.java b/core/src/main/java/dev/figboot/launcher/core/config/SimpleLauncherConfiguration.java
index 0dda8ff..c5260bb 100644
--- a/core/src/main/java/dev/figboot/launcher/core/config/SimpleLauncherConfiguration.java
+++ b/core/src/main/java/dev/figboot/launcher/core/config/SimpleLauncherConfiguration.java
@@ -8,14 +8,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.file.Path;
-import java.util.EnumMap;
-import java.util.Map;
 import java.util.Objects;
 
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public class SimpleLauncherConfiguration implements LauncherConfiguration {
     private static final Logger LOGGER = LoggerFactory.getLogger(SimpleLauncherConfiguration.class);
-    private static final String DIR_PROP_ROOT = "dev.figboot.launcher.core.directories.";
+    private static final String DIR_PROP_ROOT = "dev.figboot.launcher.core.directories";
 
     private final LauncherDirectories directories;
 
diff --git a/gui/build.gradle.kts b/gui/build.gradle.kts
index 16b7bf3..93397e6 100644
--- a/gui/build.gradle.kts
+++ b/gui/build.gradle.kts
@@ -16,6 +16,10 @@ repositories {
 }
 
 dependencies {
+    implementation(project(":core"))
+
+    runtimeOnly("org.slf4j:slf4j-jdk14:2.0.17")
+
     testImplementation(platform("org.junit:junit-bom:5.10.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")
 }
diff --git a/gui/src/main/java/dev/figboot/launcher/gui/GUIMain.java b/gui/src/main/java/dev/figboot/launcher/gui/GUIMain.java
index dc5b2ed..65e506a 100644
--- a/gui/src/main/java/dev/figboot/launcher/gui/GUIMain.java
+++ b/gui/src/main/java/dev/figboot/launcher/gui/GUIMain.java
@@ -1,5 +1,8 @@
 package dev.figboot.launcher.gui;
 
+import dev.figboot.launcher.core.config.SimpleLauncherConfiguration;
+import dev.figboot.launcher.core.system.SystemInfo;
+
 import javax.swing.*;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
@@ -7,7 +10,9 @@ import javax.swing.border.MatteBorder;
 import java.awt.*;
 
 public class GUIMain {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
+        SimpleLauncherConfiguration config = SimpleLauncherConfiguration.forOS(SystemInfo.current().getOperatingSystem());
+
         JFrame mainFrame = new JFrame("amogus");
         mainFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         mainFrame.setMinimumSize(new Dimension(480, 360));