From 38de5952ada60c13adb5d518d0df3b62d72e9c2f Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Fri, 14 Feb 2020 21:30:48 +0100 Subject: [PATCH] Corrections Moves fonts to correct directory Adds missing dependencies Adds a launcher for better stability --- pom.xml | 14 ++++++++++++-- .../java/inf101/v18/gfx/textmode/TextFont.java | 6 ++++-- src/main/java/inf101/v18/rogue101/Launcher.java | 9 +++++++++ .../fonts/README_ZXSpectrum-7.md | 0 .../fonts/README_lmmono10-regular.md | 0 .../v18/gfx => resources}/fonts/Symbola.odt | Bin .../v18/gfx => resources}/fonts/Symbola.pdf | Bin .../v18/gfx => resources}/fonts/Symbola.ttf | Bin .../v18/gfx => resources}/fonts/ZXSpectrum-7.otf | Bin .../v18/gfx => resources}/fonts/hintedSymbola.ttf | Bin .../gfx => resources}/fonts/lmmono10-regular.otf | Bin 11 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/main/java/inf101/v18/rogue101/Launcher.java rename src/main/{java/inf101/v18/gfx => resources}/fonts/README_ZXSpectrum-7.md (100%) rename src/main/{java/inf101/v18/gfx => resources}/fonts/README_lmmono10-regular.md (100%) rename src/main/{java/inf101/v18/gfx => resources}/fonts/Symbola.odt (100%) rename src/main/{java/inf101/v18/gfx => resources}/fonts/Symbola.pdf (100%) rename src/main/{java/inf101/v18/gfx => resources}/fonts/Symbola.ttf (100%) rename src/main/{java/inf101/v18/gfx => resources}/fonts/ZXSpectrum-7.otf (100%) rename src/main/{java/inf101/v18/gfx => resources}/fonts/hintedSymbola.ttf (100%) rename src/main/{java/inf101/v18/gfx => resources}/fonts/lmmono10-regular.otf (100%) diff --git a/pom.xml b/pom.xml index df869e2..4202a34 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,16 @@ 4.11 test + + org.openjfx + javafx-base + 12 + + + org.openjfx + javafx-graphics + 12 + org.openjfx javafx-controls @@ -58,7 +68,7 @@ true lib/ - inf101.v18.rogue101.Main + inf101.v18.rogue101.Launcher @@ -70,7 +80,7 @@ true - inf101.v18.rogue101.Main + inf101.v18.rogue101.Launcher diff --git a/src/main/java/inf101/v18/gfx/textmode/TextFont.java b/src/main/java/inf101/v18/gfx/textmode/TextFont.java index 1c8e9a1..bdfa144 100644 --- a/src/main/java/inf101/v18/gfx/textmode/TextFont.java +++ b/src/main/java/inf101/v18/gfx/textmode/TextFont.java @@ -18,6 +18,7 @@ import javafx.scene.paint.Color; import javafx.scene.paint.Paint; import javafx.scene.shape.StrokeLineCap; import javafx.scene.text.Font; +import javafx.scene.text.Text; import javafx.scene.transform.Affine; import javafx.scene.transform.Transform; @@ -55,7 +56,7 @@ public class TextFont { public static final int ATTR_FAINT = 0x400; // NOT IMPLEMENTED public static final int ATTR_BRIGHT = 0x800; - private static final String[] searchPath = { "", "../", "../fonts/" }; + private static final String[] searchPath = { "", "../", "fonts/" }; private static final Map loadedFonts = new HashMap<>(); private static final double thin = 2.0, thick = 4.0; private static final String[] boxDrawingShapes = { // lines @@ -202,7 +203,8 @@ public class TextFont { return Font.font(loadedFonts.get(name), size); for (String path : searchPath) { - try (InputStream stream = clazz.getResourceAsStream(path + name)) { + ClassLoader classloader = Thread.currentThread().getContextClassLoader(); + try (InputStream stream = classloader.getResourceAsStream(path + name)) { Font font = Font.loadFont(stream, size); if (font != null) { loadedFonts.put(name, font.getName()); diff --git a/src/main/java/inf101/v18/rogue101/Launcher.java b/src/main/java/inf101/v18/rogue101/Launcher.java new file mode 100644 index 0000000..32e8d8e --- /dev/null +++ b/src/main/java/inf101/v18/rogue101/Launcher.java @@ -0,0 +1,9 @@ +package inf101.v18.rogue101; + +import javafx.application.Application; + +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} diff --git a/src/main/java/inf101/v18/gfx/fonts/README_ZXSpectrum-7.md b/src/main/resources/fonts/README_ZXSpectrum-7.md similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/README_ZXSpectrum-7.md rename to src/main/resources/fonts/README_ZXSpectrum-7.md diff --git a/src/main/java/inf101/v18/gfx/fonts/README_lmmono10-regular.md b/src/main/resources/fonts/README_lmmono10-regular.md similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/README_lmmono10-regular.md rename to src/main/resources/fonts/README_lmmono10-regular.md diff --git a/src/main/java/inf101/v18/gfx/fonts/Symbola.odt b/src/main/resources/fonts/Symbola.odt similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/Symbola.odt rename to src/main/resources/fonts/Symbola.odt diff --git a/src/main/java/inf101/v18/gfx/fonts/Symbola.pdf b/src/main/resources/fonts/Symbola.pdf similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/Symbola.pdf rename to src/main/resources/fonts/Symbola.pdf diff --git a/src/main/java/inf101/v18/gfx/fonts/Symbola.ttf b/src/main/resources/fonts/Symbola.ttf similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/Symbola.ttf rename to src/main/resources/fonts/Symbola.ttf diff --git a/src/main/java/inf101/v18/gfx/fonts/ZXSpectrum-7.otf b/src/main/resources/fonts/ZXSpectrum-7.otf similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/ZXSpectrum-7.otf rename to src/main/resources/fonts/ZXSpectrum-7.otf diff --git a/src/main/java/inf101/v18/gfx/fonts/hintedSymbola.ttf b/src/main/resources/fonts/hintedSymbola.ttf similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/hintedSymbola.ttf rename to src/main/resources/fonts/hintedSymbola.ttf diff --git a/src/main/java/inf101/v18/gfx/fonts/lmmono10-regular.otf b/src/main/resources/fonts/lmmono10-regular.otf similarity index 100% rename from src/main/java/inf101/v18/gfx/fonts/lmmono10-regular.otf rename to src/main/resources/fonts/lmmono10-regular.otf