From 23b6dcd715efc0cf197f82ae0e384d655232de71 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Fri, 17 Jul 2020 23:05:33 +0200 Subject: [PATCH] Small cleanup & optimize imports --- .../de/siphalor/was/assets/AssetsManager.java | 6 ------ .../siphalor/was/content/ContentManager.java | 4 ---- .../de/siphalor/was/content/lang/Lang.java | 2 -- .../was/content/pack/JarContentPack.java | 18 +++++------------- .../was/content/product/ProductManager.java | 2 +- .../was/content/quest/QuestManager.java | 1 - .../java/de/siphalor/was/visual/JFXVisual.java | 4 +++- src/main/resources/assets/jfx/balance.fxml | 7 +------ src/main/resources/assets/jfx/game.fxml | 15 +++------------ .../resources/assets/jfx/quest_widget.fxml | 6 +----- 10 files changed, 14 insertions(+), 51 deletions(-) diff --git a/src/main/java/de/siphalor/was/assets/AssetsManager.java b/src/main/java/de/siphalor/was/assets/AssetsManager.java index 462e2bc..4ae3c26 100644 --- a/src/main/java/de/siphalor/was/assets/AssetsManager.java +++ b/src/main/java/de/siphalor/was/assets/AssetsManager.java @@ -1,15 +1,9 @@ package de.siphalor.was.assets; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import javax.imageio.ImageIO; -import java.awt.*; -import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.HashMap; -import java.util.Map; import java.util.Optional; public class AssetsManager { diff --git a/src/main/java/de/siphalor/was/content/ContentManager.java b/src/main/java/de/siphalor/was/content/ContentManager.java index 14e23e7..43d0433 100644 --- a/src/main/java/de/siphalor/was/content/ContentManager.java +++ b/src/main/java/de/siphalor/was/content/ContentManager.java @@ -4,10 +4,6 @@ import de.siphalor.was.content.pack.ContentPack; import de.siphalor.was.content.resource.Resource; import org.jetbrains.annotations.NotNull; -import javax.imageio.ImageIO; -import java.awt.*; -import java.io.IOException; -import java.io.InputStream; import java.util.Collection; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/de/siphalor/was/content/lang/Lang.java b/src/main/java/de/siphalor/was/content/lang/Lang.java index 9526042..a385f9c 100644 --- a/src/main/java/de/siphalor/was/content/lang/Lang.java +++ b/src/main/java/de/siphalor/was/content/lang/Lang.java @@ -1,7 +1,6 @@ package de.siphalor.was.content.lang; import de.siphalor.was.content.ContentManager; -import de.siphalor.was.content.resource.Resource; import de.siphalor.was.util.Util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -9,7 +8,6 @@ import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.io.InputStream; import java.util.Enumeration; -import java.util.Optional; import java.util.Properties; import java.util.logging.Level; diff --git a/src/main/java/de/siphalor/was/content/pack/JarContentPack.java b/src/main/java/de/siphalor/was/content/pack/JarContentPack.java index 0202edf..77e9044 100644 --- a/src/main/java/de/siphalor/was/content/pack/JarContentPack.java +++ b/src/main/java/de/siphalor/was/content/pack/JarContentPack.java @@ -1,13 +1,13 @@ package de.siphalor.was.content.pack; -import de.siphalor.was.content.resource.FileResource; import de.siphalor.was.content.resource.CallbackResource; +import de.siphalor.was.content.resource.FileResource; import de.siphalor.was.content.resource.Resource; import de.siphalor.was.util.Util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.*; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.net.URLDecoder; @@ -86,17 +86,9 @@ public class JarContentPack implements ContentPack { @Override @Nullable public Resource getResource(@NotNull String location) { - try { - URL url = classLoader.getResource(baseLocation + "/" + location); - if (url != null) { - if ("file".equals(url.getProtocol())) { - return new FileResource(Util.pathToId(id, location), new File(url.toURI())); - } else if ("jar".equals(url.getProtocol())) { - return new CallbackResource(Util.pathToId(id, location), () -> classLoader.getResourceAsStream(baseLocation + "/" + location)); - } - } - } catch (URISyntaxException e) { - e.printStackTrace(); + URL url = classLoader.getResource(baseLocation + "/" + location); + if (url != null) { + return new CallbackResource(Util.pathToId(id, location), () -> classLoader.getResourceAsStream(baseLocation + "/" + location)); } return null; } diff --git a/src/main/java/de/siphalor/was/content/product/ProductManager.java b/src/main/java/de/siphalor/was/content/product/ProductManager.java index c78dc9d..2cac27b 100644 --- a/src/main/java/de/siphalor/was/content/product/ProductManager.java +++ b/src/main/java/de/siphalor/was/content/product/ProductManager.java @@ -1,8 +1,8 @@ package de.siphalor.was.content.product; import de.siphalor.was.content.ContentManager; -import de.siphalor.was.util.ResourceManager; import de.siphalor.was.content.product.dynamic.DynamicProductType; +import de.siphalor.was.util.ResourceManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/siphalor/was/content/quest/QuestManager.java b/src/main/java/de/siphalor/was/content/quest/QuestManager.java index 85bfc45..6e57257 100644 --- a/src/main/java/de/siphalor/was/content/quest/QuestManager.java +++ b/src/main/java/de/siphalor/was/content/quest/QuestManager.java @@ -1,6 +1,5 @@ package de.siphalor.was.content.quest; -import de.siphalor.was.WhatAStorage; import de.siphalor.was.content.ContentManager; import de.siphalor.was.content.product.ProductManager; import de.siphalor.was.util.ResourceManager; diff --git a/src/main/java/de/siphalor/was/visual/JFXVisual.java b/src/main/java/de/siphalor/was/visual/JFXVisual.java index d41aa7f..dbfe26b 100644 --- a/src/main/java/de/siphalor/was/visual/JFXVisual.java +++ b/src/main/java/de/siphalor/was/visual/JFXVisual.java @@ -30,7 +30,9 @@ import org.jetbrains.annotations.NotNull; import java.io.IOException; import java.io.InputStream; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import java.util.logging.Level; public class JFXVisual extends Application implements Visual { diff --git a/src/main/resources/assets/jfx/balance.fxml b/src/main/resources/assets/jfx/balance.fxml index 88f68ce..338ecdd 100644 --- a/src/main/resources/assets/jfx/balance.fxml +++ b/src/main/resources/assets/jfx/balance.fxml @@ -3,15 +3,10 @@ - - - - - + - diff --git a/src/main/resources/assets/jfx/game.fxml b/src/main/resources/assets/jfx/game.fxml index af0260b..782dd38 100644 --- a/src/main/resources/assets/jfx/game.fxml +++ b/src/main/resources/assets/jfx/game.fxml @@ -1,19 +1,10 @@ - - - - - - + + - - - - - + - diff --git a/src/main/resources/assets/jfx/quest_widget.fxml b/src/main/resources/assets/jfx/quest_widget.fxml index f4e8551..7006dbc 100644 --- a/src/main/resources/assets/jfx/quest_widget.fxml +++ b/src/main/resources/assets/jfx/quest_widget.fxml @@ -4,12 +4,8 @@ - - - - + -