Small cleanup & optimize imports

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 {

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;

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;
 

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);
-			URL url = classLoader.getResource(baseLocation + "/" + location);
+		if (url != null) {
-			if (url != null) {
+			return new CallbackResource(Util.pathToId(id, location), () -> classLoader.getResourceAsStream(baseLocation + "/" + location));
-				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();
 		}
 		return null;
 	}

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;
 

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;

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 {

src/main/resources/assets/jfx/balance.fxml

@@ -3,15 +3,10 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.LineChart?>
 <?import javafx.scene.chart.NumberAxis?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.*?>
-<?import javafx.scene.control.Tab?>
-<?import javafx.scene.control.TabPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-
 <TabPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/9.0.1">
   <tabs>
       <Tab text="%game.balance.history">

src/main/resources/assets/jfx/game.fxml

@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
+<?import javafx.geometry.*?>
-<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.*?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.control.ToolBar?>
 <?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-
 <VBox maxHeight="1.7976931348623157E308" minHeight="500.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <AnchorPane>

src/main/resources/assets/jfx/quest_widget.fxml

@@ -4,12 +4,8 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.*?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-
 <GridPane fx:id="questContainer" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="250.0" onDragDetected="#onDragDetected" onDragDropped="#onDragDropped" onDragEntered="#onDragEntered" onDragExited="#onDragExited" onDragOver="#onDragOver" prefHeight="80.0" styleClass="quest-container" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="-Infinity" prefWidth="80.0" />