Refactor updated code

2 files changed, 16 insertions, 18 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
index 18a5a9bf..50772789 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java
@@ -3,7 +3,6 @@ package de.hysky.skyblocker.skyblock.item.tooltip;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.item.ItemProtection;
@@ -119,7 +118,7 @@ public class BackpackPreview {
         String title = handledScreen.getTitle().getString();
         int index = getStorageIndexFromTitle(title);
         if (index != -1) {
-            storages[index] = new Storage(handledScreen.getScreenHandler().slots.get(0).inventory, title, true);
+            storages[index] = new Storage(handledScreen.getScreenHandler().slots.getFirst().inventory, title, true);
         }
     }
 
@@ -181,8 +180,8 @@ public class BackpackPreview {
     static class Storage {
         private static final Codec<Storage> CODEC = RecordCodecBuilder.create(instance -> instance.group(
                 Codec.STRING.fieldOf("name").forGetter(Storage::name),
-                ItemUtils.EMPTY_ALLOWING_ITEMSTACK_CODEC.listOf().fieldOf("items").forGetter(Storage::getItemList))
-                .apply(instance, (name, items) -> Storage.create(name, items)));
+                ItemUtils.EMPTY_ALLOWING_ITEMSTACK_CODEC.listOf().fieldOf("items").forGetter(Storage::getItemList)
+        ).apply(instance, Storage::create));
         private final Inventory inventory;
         private final String name;
         private boolean dirty;
@@ -192,7 +191,7 @@ public class BackpackPreview {
             this.name = name;
             this.dirty = dirty;
         }
-        
+
         private String name() {
             return name;
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index d5f2d035..265d276a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -22,7 +22,6 @@ import net.minecraft.nbt.NbtElement;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import net.minecraft.util.Util;
 
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -127,18 +126,18 @@ public class ItemTooltip {
             }
         }
 
-        final Map<Integer, String> itemTierFloors = Util.make(new HashMap<>(), map -> {
-        	map.put(1, "F1");
-        	map.put(2, "F2");
-        	map.put(3, "F3");
-        	map.put(4, "F4/M1");
-        	map.put(5, "F5/M2");
-        	map.put(6, "F6/M3");
-        	map.put(7, "F7/M4");
-        	map.put(8, "M5");
-        	map.put(9, "M6");
-        	map.put(10, "M7");
-        });
+        final Map<Integer, String> itemTierFloors = Map.of(
+        	1, "F1",
+        	2, "F2",
+        	3, "F3",
+        	4, "F4/M1",
+        	5, "F5/M2",
+        	6, "F6/M3",
+        	7, "F7/M4",
+        	8, "M5",
+        	9, "M6",
+        	10, "M7"
+        );
 
         if (SkyblockerConfigManager.get().general.dungeonQuality) {
             NbtCompound customData = ItemUtils.getCustomData(stack);