Merge pull request #14 from DeveloperDeborah/main

add ability to edit inventories that the target player doesn't currently have open

META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Class-Path: runsafe/framework.jar runsafe/joda-time-2.1.jar
+Class-Path: runsafe/framework.jar
 

RunsafeInventories.iml

@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="framework" level="project" />
-    <orderEntry type="library" name="joda-time-2.1-sources" level="project" />
     <orderEntry type="library" name="spigot" level="project" />
     <orderEntry type="library" name="RunsafeWorldGuardBridge" level="project" />
   </component>

ant.xml

@@ -34,7 +34,7 @@
         <mkdir dir="${jar.dir}"/>
         <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
             <manifest>
-                <attribute name="Class-Path" value="runsafe/framework.jar runsafe/joda-time-2.1.jar"/>
+                <attribute name="Class-Path" value="runsafe/framework.jar"/>
             </manifest>
             <fileset dir="${build.dir}" includes="plugin.yml"/>
             <fileset dir="${src.dir}" includes="defaults.yml"/>

src/no/runsafe/runsafeinventories/InventoryViewer.java

@@ -2,12 +2,16 @@
 
 import no.runsafe.framework.api.IConfiguration;
 import no.runsafe.framework.api.IServer;
+import no.runsafe.framework.api.event.inventory.IInventoryClosed;
 import no.runsafe.framework.api.event.plugin.IConfigurationChanged;
 import no.runsafe.framework.api.player.IPlayer;
+import no.runsafe.framework.minecraft.event.inventory.RunsafeInventoryCloseEvent;
 import no.runsafe.framework.minecraft.inventory.RunsafeInventory;
 import no.runsafe.runsafeinventories.repositories.InventoryRepository;
 
-public class InventoryViewer implements IConfigurationChanged
+import java.util.HashMap;
+
+public class InventoryViewer implements IConfigurationChanged, IInventoryClosed
 {
 	public InventoryViewer(IServer server, InventoryRepository repository)
 	{
@@ -37,6 +41,7 @@ public boolean viewUniverseInventory(IPlayer viewer, IPlayer owner, String unive
 		RunsafeInventory inventory = server.createInventory(null, 45, String.format("%s's Inventory", owner.getName()));
 		inventory.unserialize(inventoryData.getInventoryString());
 		viewer.openInventory(inventory);
+		inventoryEditors.put(viewer, inventoryData);
 
 		return true;
 	}
@@ -46,6 +51,18 @@ public boolean hasDefaultUniverse()
 		return (this.defaultUniverse != null);
 	}
 
+	@Override
+	public void OnInventoryClosed(RunsafeInventoryCloseEvent event)
+	{
+		if (inventoryEditors.isEmpty() || !inventoryEditors.containsKey(event.getPlayer()))
+			return;
+
+		PlayerInventory inventory = inventoryEditors.get(event.getPlayer());
+		inventory.setInventory(event.getInventory());
+		repository.saveInventory(inventory);
+		inventoryEditors.remove(event.getPlayer());
+	}
+
 	@Override
 	public void OnConfigurationChanged(IConfiguration configuration)
 	{
@@ -54,5 +71,6 @@ public void OnConfigurationChanged(IConfiguration configuration)
 
 	private final IServer server;
 	private final InventoryRepository repository;
+	private static final HashMap<IPlayer, PlayerInventory> inventoryEditors = new HashMap<>();
 	private String defaultUniverse;
 }

src/no/runsafe/runsafeinventories/PlayerInventory.java

@@ -1,6 +1,7 @@
 package no.runsafe.runsafeinventories;
 
 import no.runsafe.framework.api.player.IPlayer;
+import no.runsafe.framework.minecraft.inventory.RunsafeInventory;
 
 public class PlayerInventory
 {
@@ -39,6 +40,11 @@ public String getInventoryString()
 		return this.inventoryString;
 	}
 
+	public void setInventory(RunsafeInventory inventory)
+	{
+		inventoryString = inventory.serialize();
+	}
+
 	public int getLevel()
 	{
 		return this.level;
@@ -56,7 +62,7 @@ public int getFoodLevel()
 
 	private final String inventoryName;
 	private final IPlayer owner;
-	private final String inventoryString;
+	private String inventoryString;
 	private final int level;
 	private final float experience;
 	private final int foodLevel;