From f706a7e91a0906dfda6c9abd01007d90ff95c48d Mon Sep 17 00:00:00 2001
From: unurled <unurled@unurled.me>
Date: Mon, 18 Mar 2024 22:26:42 +0100
Subject: [PATCH] code refactoring

---
 .../sr/data/gson/InventoryDeserializer.java        |  5 ++++-
 .../sr/data/gson/InventorySerializer.java          |  6 +++---
 .../sr/gui/entitytype/EntityTypeGUI.java           | 14 +++++++-------
 .../me/unurled/sacredrealms/sr/utils/Logger.java   |  2 ++
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java b/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java
index 55b8d2c..0362d8e 100644
--- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java
+++ b/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java
@@ -11,12 +11,15 @@ import org.bukkit.Bukkit;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 
 public class InventoryDeserializer implements JsonDeserializer<Inventory> {
 
   @Override
   public Inventory deserialize(
-      JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext)
+      @NotNull JsonElement jsonElement,
+      Type type,
+      JsonDeserializationContext jsonDeserializationContext)
       throws JsonParseException {
     Inventory inv = Bukkit.createInventory(null, InventoryType.PLAYER);
     // parse from a string, to a list of string
diff --git a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java b/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java
index 2b3381a..142892e 100644
--- a/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java
+++ b/src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java
@@ -7,18 +7,18 @@ import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.bukkit.inventory.Inventory;
+import org.jetbrains.annotations.NotNull;
 
 public class InventorySerializer implements JsonSerializer<Inventory> {
 
   @Override
   public JsonElement serialize(
-      Inventory itemStacks, Type type, JsonSerializationContext jsonSerializationContext) {
+      @NotNull Inventory itemStacks, Type type, JsonSerializationContext jsonSerializationContext) {
     List<String> collect =
         Arrays.stream(itemStacks.getContents())
             .map(item -> item == null ? "null" : Arrays.toString(item.serializeAsBytes()))
-            .collect(Collectors.toList());
+            .toList();
 
     String s = String.join(";", collect);
     return new JsonPrimitive(s);
diff --git a/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java b/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java
index b3d5260..e94d0a7 100644
--- a/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java
+++ b/src/main/java/me/unurled/sacredrealms/sr/gui/entitytype/EntityTypeGUI.java
@@ -1,7 +1,7 @@
 package me.unurled.sacredrealms.sr.gui.entitytype;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 import me.unurled.sacredrealms.sr.components.entity.EntityManager;
 import me.unurled.sacredrealms.sr.components.entity.SREntityType;
 import me.unurled.sacredrealms.sr.gui.BackItem;
@@ -21,11 +21,11 @@ public class EntityTypeGUI {
 
   public static @NotNull Gui listGui() {
     EntityManager em = Manager.getInstance(EntityManager.class);
-    List<Item> items =
-        em.getTypes().stream()
-            .map(type -> new SimpleItem(new ItemBuilder(type.getItem())))
-            .collect(Collectors.toList());
-
+    List<Item> list = new ArrayList<>();
+    for (SREntityType type : em.getTypes()) {
+      SimpleItem simpleItem = new SimpleItem(new ItemBuilder(type.getItem()));
+      list.add(simpleItem);
+    }
     return PagedGui.items()
         .setStructure(
             "# # # # # # # # #",
@@ -36,7 +36,7 @@ public class EntityTypeGUI {
         .addIngredient('X', Markers.CONTENT_LIST_SLOT_HORIZONTAL)
         .addIngredient('<', new BackItem())
         .addIngredient('>', new ForwardItem())
-        .setContent(items)
+        .setContent(list)
         .build();
   }
 
diff --git a/src/main/java/me/unurled/sacredrealms/sr/utils/Logger.java b/src/main/java/me/unurled/sacredrealms/sr/utils/Logger.java
index 0fc0319..6f0ceaf 100644
--- a/src/main/java/me/unurled/sacredrealms/sr/utils/Logger.java
+++ b/src/main/java/me/unurled/sacredrealms/sr/utils/Logger.java
@@ -5,6 +5,8 @@ import net.kyori.adventure.text.Component;
 
 public class Logger {
 
+  private Logger() {}
+
   public static void log(String message) {
     SR.getInstance().getLogger().info(message);
   }