Corrections
Some checks failed
EpicKnarvik97/Rogue101/master There was a failure building this commit

Moves fonts to correct directory
Adds missing dependencies
Adds a launcher for better stability
This commit is contained in:
Kristian Knarvik 2020-02-14 21:30:48 +01:00
parent de0924845d
commit 38de5952ad
11 changed files with 25 additions and 4 deletions

14
pom.xml
View File

@ -26,6 +26,16 @@
<version>4.11</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>12</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>12</version>
</dependency>
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId> <artifactId>javafx-controls</artifactId>
@ -58,7 +68,7 @@
<manifest> <manifest>
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix> <classpathPrefix>lib/</classpathPrefix>
<mainClass>inf101.v18.rogue101.Main</mainClass> <mainClass>inf101.v18.rogue101.Launcher</mainClass>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
@ -70,7 +80,7 @@
<archive> <archive>
<manifest> <manifest>
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
<mainClass>inf101.v18.rogue101.Main</mainClass> <mainClass>inf101.v18.rogue101.Launcher</mainClass>
</manifest> </manifest>
</archive> </archive>
<descriptorRefs> <descriptorRefs>

View File

@ -18,6 +18,7 @@ import javafx.scene.paint.Color;
import javafx.scene.paint.Paint; import javafx.scene.paint.Paint;
import javafx.scene.shape.StrokeLineCap; import javafx.scene.shape.StrokeLineCap;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import javafx.scene.text.Text;
import javafx.scene.transform.Affine; import javafx.scene.transform.Affine;
import javafx.scene.transform.Transform; 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_FAINT = 0x400; // NOT IMPLEMENTED
public static final int ATTR_BRIGHT = 0x800; public static final int ATTR_BRIGHT = 0x800;
private static final String[] searchPath = { "", "../", "../fonts/" }; private static final String[] searchPath = { "", "../", "fonts/" };
private static final Map<String, String> loadedFonts = new HashMap<>(); private static final Map<String, String> loadedFonts = new HashMap<>();
private static final double thin = 2.0, thick = 4.0; private static final double thin = 2.0, thick = 4.0;
private static final String[] boxDrawingShapes = { // lines private static final String[] boxDrawingShapes = { // lines
@ -202,7 +203,8 @@ public class TextFont {
return Font.font(loadedFonts.get(name), size); return Font.font(loadedFonts.get(name), size);
for (String path : searchPath) { 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); Font font = Font.loadFont(stream, size);
if (font != null) { if (font != null) {
loadedFonts.put(name, font.getName()); loadedFonts.put(name, font.getName());

View File

@ -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);
}
}