Siphalor/what-a-storage
1
0
Fork 0
Code Issues Releases Activity

Small cleanup & optimize imports

Browse Source
This commit is contained in:
Siphalor
2020-07-17 23:05:33 +02:00
parent 0b1ab6faa3
commit 23b6dcd715
10 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/siphalor/was/assets/AssetsManager.java
View File

@@ -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 {

4
src/main/java/de/siphalor/was/content/ContentManager.java
View File

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

2
src/main/java/de/siphalor/was/content/lang/Lang.java
View File

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

12
src/main/java/de/siphalor/was/content/pack/JarContentPack.java
View File

@@ -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,18 +86,10 @@ 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();
}
return null;
}

2
src/main/java/de/siphalor/was/content/product/ProductManager.java
View File

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

1
src/main/java/de/siphalor/was/content/quest/QuestManager.java
View File

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

4
src/main/java/de/siphalor/was/visual/JFXVisual.java
View File

@@ -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 {

7
src/main/resources/assets/jfx/balance.fxml
View File

@@ -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.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.*?>
<?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">

15
src/main/resources/assets/jfx/game.fxml
View File

@@ -1,19 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.control.ToolBar?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.layout.*?>
<?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>

6
src/main/resources/assets/jfx/quest_widget.fxml
View File

@@ -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.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.layout.*?>
<?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" />