From 70eaa9514a5c3ab09d0eb142e13a62efd34f60ac Mon Sep 17 00:00:00 2001
From: "Maurice L." <maurice.lariviere@icloud.com>
Date: Tue, 16 Dec 2025 21:07:35 +0100
Subject: [PATCH] started inventory saving

---
 src/de/miaurizius/jgame2d/core/handlers/EventHandler.java | 4 ++--
 src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java   | 1 +
 src/de/miaurizius/jgame2d/entity/Entity.java              | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java b/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java
index ea350da..10de128 100644
--- a/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java
@@ -106,8 +106,8 @@ public class EventHandler {
         panel.gameState = GameState.DIALOGUE;
         panel.player.attackCancel = true;
         panel.playSE(2);
-        panel.ui.currentDialogue = "You drank the holy water.\nYour life has been recovered!\nYou progress has been saved.";
-        panel.player.life = panel.player.maxLife;
+        panel.ui.currentDialogue = "You saved your progress!";
+        //panel.player.life = panel.player.maxLife;
         canTouchEvent = false;
         panel.assetSetter.setMonster();
         try {
diff --git a/src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java b/src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
index 959ce91..2342850 100644
--- a/src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/KeyHandler.java
@@ -39,6 +39,7 @@ public class KeyHandler implements KeyListener {
                         System.out.printf("Loading config...%n");
                         try {
                             panel.config.load();
+                            panel.saveLoad.load();
                             panel.gameState = GameState.PLAY;
                             panel.playMusic(0);
                         } catch (Exception e) {
diff --git a/src/de/miaurizius/jgame2d/entity/Entity.java b/src/de/miaurizius/jgame2d/entity/Entity.java
index 9fdcb50..96a5e07 100644
--- a/src/de/miaurizius/jgame2d/entity/Entity.java
+++ b/src/de/miaurizius/jgame2d/entity/Entity.java
@@ -14,7 +14,7 @@ import java.awt.image.BufferedImage;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Objects;
+import java.util.List;
 import java.util.Random;
 import java.util.logging.Level;
 
@@ -80,7 +80,7 @@ public class Entity {
     public Entity currentShield;
     public Entity currentLight;
     public Projectile projectile;
-    public ArrayList<Entity> inventory = new ArrayList<>();
+    public List<Entity> inventory = new ArrayList<>();
     public final int maxInvSize = 20;
 
     // ITEM ATTRIBUTES