From 28080229f7a2e7d9bd277dbdf7e5e7cfa27c556a Mon Sep 17 00:00:00 2001
From: Pahimar <pahimar@gmail.com>
Date: Fri, 20 May 2016 23:05:57 -0400
Subject: [PATCH] Better protection of parsing values from json

---
 .../knowledge/PlayerKnowledgeRegistry.java    |  2 +-
 .../serialize/EnergyValueMapSerializer.java   | 39 +++++++++++++++++--
 .../serialize/PlayerKnowledgeSerializer.java  |  2 +-
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/pahimar/ee3/knowledge/PlayerKnowledgeRegistry.java b/src/main/java/com/pahimar/ee3/knowledge/PlayerKnowledgeRegistry.java
index 604d464a..3930f29c 100644
--- a/src/main/java/com/pahimar/ee3/knowledge/PlayerKnowledgeRegistry.java
+++ b/src/main/java/com/pahimar/ee3/knowledge/PlayerKnowledgeRegistry.java
@@ -117,7 +117,7 @@ public class PlayerKnowledgeRegistry {
 
         // Load template knowledge
         if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
-
+            // FIXME Priority Number 2
         }
     }
 
diff --git a/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java b/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java
index 8b58a4ca..102e1f70 100644
--- a/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java
+++ b/src/main/java/com/pahimar/ee3/util/serialize/EnergyValueMapSerializer.java
@@ -37,16 +37,47 @@ public class EnergyValueMapSerializer implements JsonSerializer<Map<WrappedStack
                     JsonObject jsonValueMapping = jsonElement.getAsJsonObject();
 
                     WrappedStack wrappedStack = null;
-                    EnergyValue energyValue = new EnergyValue(jsonValueMapping.get(ENERGY_VALUE).getAsNumber());
+                    EnergyValue energyValue = null;
+
+                    if (jsonValueMapping.get(ENERGY_VALUE).isJsonPrimitive()) {
+
+                        try {
+                            energyValue = new EnergyValue(((JsonPrimitive) jsonValueMapping.get(ENERGY_VALUE)).getAsNumber());
+                        }
+                        catch (NumberFormatException e) {
+                            // TODO Logging
+                        }
+                    }
 
                     if (jsonValueMapping.has(TYPE_ITEM_STACK)) {
-                        wrappedStack = WrappedStack.wrap(context.deserialize(jsonValueMapping.get(TYPE_ITEM_STACK), ItemStack.class));
+
+                        try {
+                            ItemStack itemStack = context.deserialize(jsonValueMapping.get(TYPE_ITEM_STACK), ItemStack.class);
+                            wrappedStack = WrappedStack.wrap(itemStack);
+                        }
+                        catch (JsonParseException e) {
+                            // TODO Logging
+                        }
                     }
                     else if (jsonValueMapping.has(TYPE_ORE_STACK)) {
-                        wrappedStack = WrappedStack.wrap(context.deserialize(jsonValueMapping.get(TYPE_ORE_STACK), OreStack.class));
+
+                        try {
+                            OreStack oreStack = context.deserialize(jsonValueMapping.get(TYPE_ORE_STACK), OreStack.class);
+                            wrappedStack = WrappedStack.wrap(oreStack);
+                        }
+                        catch (JsonParseException e) {
+                            // TODO Logging
+                        }
                     }
                     else if (jsonValueMapping.has(TYPE_FLUID_STACK)) {
-                        wrappedStack = WrappedStack.wrap(context.deserialize(jsonValueMapping.get(TYPE_FLUID_STACK), FluidStack.class));
+
+                        try {
+                            FluidStack fluidStack = context.deserialize(jsonValueMapping.get(TYPE_FLUID_STACK), FluidStack.class);
+                            wrappedStack = WrappedStack.wrap(fluidStack);
+                        }
+                        catch (JsonParseException e) {
+                            // TODO Logging
+                        }
                     }
 
                     if (wrappedStack != null && energyValue != null) {
diff --git a/src/main/java/com/pahimar/ee3/util/serialize/PlayerKnowledgeSerializer.java b/src/main/java/com/pahimar/ee3/util/serialize/PlayerKnowledgeSerializer.java
index 41b26bab..6a60916b 100644
--- a/src/main/java/com/pahimar/ee3/util/serialize/PlayerKnowledgeSerializer.java
+++ b/src/main/java/com/pahimar/ee3/util/serialize/PlayerKnowledgeSerializer.java
@@ -11,7 +11,7 @@ public class PlayerKnowledgeSerializer implements JsonSerializer<PlayerKnowledge
 
     @Override
     public PlayerKnowledge deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        // TODO Pick up here
+        // FIXME Priority Number 1
         return null;
     }