Minor fix

Created DataRegistry instance for items and blocks

Author: Evyaaa

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.thehandsomeyoni</groupId>
     <artifactId>PersistentDataAPI</artifactId>
-    <version>1.8.0-ALPHA</version>
+    <version>1.8.1-ALPHA</version>
     <packaging>jar</packaging>
 
     <name>PersistentDataAPI</name>

src/main/java/me/thehandsomeyoni/persistentdataapi/PersistentDataAPI.java

@@ -1,7 +1,10 @@
 package me.thehandsomeyoni.persistentdataapi;
 
+import me.thehandsomeyoni.persistentdataapi.exceptions.UnacceptableBlockException;
 import me.thehandsomeyoni.persistentdataapi.manager.DataRegistry;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
 /**
@@ -24,13 +27,27 @@ public PersistentDataAPI(JavaPlugin plugin) {
     }
 
     /**
-     * Gets the instance of the PersistentDataAPI.
-     * @return The instance of the PersistentDataAPI.
+     * Gets the instance of the DataRegistry.
+     * @return The DataRegistry of the given player.
      */
     public DataRegistry getDataRegistry(Player player){
        return new DataRegistry(player);
     }
 
+    /**
+     * Gets the instance of the DataRegistry.
+     * @param item The DataRegistry of the given item.
+     * @return
+     */
+    public DataRegistry getDataRegistry(ItemStack item){ return new DataRegistry(item); }
+
+    /**
+     * Gets the instance of the DataRegistry.
+     * @param block The DataRegistry of the given block.
+     * @return
+     */
+    public DataRegistry getDataRegistry(Block block) throws UnacceptableBlockException { return new DataRegistry(block); }
+
 
 
     /**

src/main/java/me/thehandsomeyoni/persistentdataapi/data/DataContainerManager.java

@@ -1,17 +1,17 @@
 package me.thehandsomeyoni.persistentdataapi.data;
 
 
-import me.thehandsomeyoni.persistentdataapi.manager.DataSerializer;
 import org.bukkit.NamespacedKey;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
-import java.io.Serializable;
+import java.io.*;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
 import static me.thehandsomeyoni.persistentdataapi.PersistentDataAPI.getJavaPlugin;
+import static me.thehandsomeyoni.persistentdataapi.data.DataContainerManager.DataSerializer.deserialize;
 import static me.thehandsomeyoni.persistentdataapi.manager.DataSerializer.serialize;
 
 public class DataContainerManager  {
@@ -49,7 +49,7 @@ public byte[] getSerialized (String key) {
      * @return The data in the given type.
      */
     public Serializable getUnserialized(String key){
-        return DataSerializer.deserialize(container.get(new NamespacedKey(getJavaPlugin(), key), PersistentDataType.BYTE_ARRAY));
+        return deserialize(container.get(new NamespacedKey(getJavaPlugin(), key), PersistentDataType.BYTE_ARRAY));
     }
 
     /**
@@ -58,7 +58,7 @@ public Serializable getUnserialized(String key){
      * @return The data in the given type.
      */
     public Serializable getUnserialized(NamespacedKey key){
-        return DataSerializer.deserialize(container.get(key, PersistentDataType.BYTE_ARRAY));
+        return deserialize(container.get(key, PersistentDataType.BYTE_ARRAY));
     }
 
     public Set<String> getAllKeys(){
@@ -105,4 +105,54 @@ public boolean has(String key){
         return container.has(new NamespacedKey(getJavaPlugin(), key), PersistentDataType.BYTE_ARRAY);
     }
 
+    /**
+     * Simple serializer for serializing and deserializing data.
+     * @author TheHandsomeYoni
+     * @version 1.5.0
+     */
+    static class DataSerializer {
+        private static ByteArrayOutputStream byteArrayOutput;
+        private static ObjectOutputStream objectOutput;
+
+        private static ByteArrayInputStream byteArrayInput;
+        private static ObjectInputStream objectInput;
+
+
+        /**
+         * Turns the raw data into byte array.
+         *
+         * @param object The data.
+         * @return The data in bytes.
+         */
+        public static byte[] serialize(Object object) {
+            try {
+                byteArrayOutput = new ByteArrayOutputStream();
+                objectOutput = new ObjectOutputStream(byteArrayOutput);
+                objectOutput.writeObject(object);
+                objectOutput.flush();
+                return byteArrayOutput.toByteArray();
+            } catch (IOException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+
+        /**
+         * Turns the byte array into data.
+         *
+         * @param bytes The bytes.
+         * @return The data.
+         */
+        public static Serializable deserialize(byte[] bytes) {
+            byteArrayInput = new ByteArrayInputStream(bytes);
+            try {
+                objectInput = new ObjectInputStream(byteArrayInput);
+                return (Serializable) objectInput.readObject();
+            } catch (IOException | ClassNotFoundException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+    }
+
 }