From 125e1d567f17650587882e7dc6484015e736ebfa Mon Sep 17 00:00:00 2001
From: Siphalor <info@siphalor.de>
Date: Fri, 17 Jul 2020 22:39:06 +0200
Subject: [PATCH] Some cleanup

---
 .../java/de/siphalor/was/WhatAStorage.java    |  3 +--
 .../siphalor/was/content/ContentManager.java  | 21 -------------------
 .../was/content/product/ProductManager.java   |  1 -
 .../was/content/quest/QuestManager.java       |  5 +++--
 .../de/siphalor/was/util/ResourceManager.java |  4 ----
 5 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/src/main/java/de/siphalor/was/WhatAStorage.java b/src/main/java/de/siphalor/was/WhatAStorage.java
index 35e7e09..d65af37 100644
--- a/src/main/java/de/siphalor/was/WhatAStorage.java
+++ b/src/main/java/de/siphalor/was/WhatAStorage.java
@@ -22,7 +22,6 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class WhatAStorage {
 	private static final int MAX_QUESTS = 3;
@@ -88,7 +87,7 @@ public class WhatAStorage {
 		productManager.clear();
 		questManager.clear();
 		productManager.reload(contentManager);
-		questManager.reload(contentManager);
+		questManager.reload(contentManager, productManager);
 
 		Util.LOGGER.log(Level.INFO, "Reloaded game content");
 	}
diff --git a/src/main/java/de/siphalor/was/content/ContentManager.java b/src/main/java/de/siphalor/was/content/ContentManager.java
index 41b16f1..14e23e7 100644
--- a/src/main/java/de/siphalor/was/content/ContentManager.java
+++ b/src/main/java/de/siphalor/was/content/ContentManager.java
@@ -53,25 +53,4 @@ public class ContentManager {
 	public Stream<Resource> getAllOfResource(@NotNull String location) {
 		return packs.stream().flatMap(pack -> Stream.ofNullable(pack.getResource(location)));
 	}
-
-	@NotNull
-	public Optional<Image> getImage(@NotNull String location) {
-		return getResource(location).map(resource -> {
-			InputStream inputStream = resource.getInputStream();
-			if (inputStream != null) {
-				try {
-					return ImageIO.read(inputStream);
-				} catch (IOException e) {
-					e.printStackTrace();
-				} finally {
-					try {
-						inputStream.close();
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-			}
-			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 db0e1f9..c78dc9d 100644
--- a/src/main/java/de/siphalor/was/content/product/ProductManager.java
+++ b/src/main/java/de/siphalor/was/content/product/ProductManager.java
@@ -18,7 +18,6 @@ public class ProductManager implements ResourceManager<ProductType<?>> {
 		productTypes.clear();
 	}
 
-	@Override
 	public void reload(@NotNull ContentManager contentManager) {
 		contentManager.getResources("products", "properties").forEach(resource -> {
 			InputStream inputStream = resource.getInputStream();
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 55c92d2..85bfc45 100644
--- a/src/main/java/de/siphalor/was/content/quest/QuestManager.java
+++ b/src/main/java/de/siphalor/was/content/quest/QuestManager.java
@@ -2,6 +2,7 @@ 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;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,11 +19,11 @@ public class QuestManager implements ResourceManager<QuestGenerator> {
 		questGenerators.clear();
 	}
 
-	public void reload(@NotNull ContentManager contentManager) {
+	public void reload(@NotNull ContentManager contentManager, @NotNull ProductManager productManager) {
 		contentManager.getResources("quests", "csv").forEach(resource -> {
 			InputStream inputStream = resource.getInputStream();
 			if (inputStream != null) {
-				questGenerators.put(resource.getId(), StaticQuestGenerator.fromCsv(inputStream, WhatAStorage.getInstance().getProductManager()));
+				questGenerators.put(resource.getId(), StaticQuestGenerator.fromCsv(inputStream, productManager));
 				try {
 					inputStream.close();
 				} catch (IOException e) {
diff --git a/src/main/java/de/siphalor/was/util/ResourceManager.java b/src/main/java/de/siphalor/was/util/ResourceManager.java
index 6102b78..aecbffb 100644
--- a/src/main/java/de/siphalor/was/util/ResourceManager.java
+++ b/src/main/java/de/siphalor/was/util/ResourceManager.java
@@ -1,11 +1,7 @@
 package de.siphalor.was.util;
 
-import de.siphalor.was.content.ContentManager;
-import org.jetbrains.annotations.NotNull;
-
 public interface ResourceManager<T> {
 	void clear();
-	void reload(@NotNull ContentManager contentManager);
 
 	T get(String id);
 }