From 31cb980a52d858e76e76d0e979c0e38f623a59c6 Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 31 Dec 2013 01:37:42 -0500 Subject: [PATCH] Another attempt at fixing the MCPC+ and EE3 gson bug --- .../com/pahimar/ee3/api/RecipeMapping.java | 2 +- .../com/pahimar/ee3/api/WrappedStack.java | 23 ++----------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/api/RecipeMapping.java b/src/main/java/com/pahimar/ee3/api/RecipeMapping.java index 3d27bf4d..6961f016 100644 --- a/src/main/java/com/pahimar/ee3/api/RecipeMapping.java +++ b/src/main/java/com/pahimar/ee3/api/RecipeMapping.java @@ -108,7 +108,7 @@ public class RecipeMapping implements JsonSerializer, JsonDeseria { JsonObject jsonRecipeMapping = new JsonObject(); - Gson gsonWrappedStack = (new GsonBuilder()).registerTypeAdapter(WrappedStack.class, new WrappedStack()).create(); + Gson gsonWrappedStack = new Gson(); JsonArray jsonArray = new JsonArray(); for (WrappedStack inputStack : recipeMapping.inputWrappedStacks) diff --git a/src/main/java/com/pahimar/ee3/api/WrappedStack.java b/src/main/java/com/pahimar/ee3/api/WrappedStack.java index 4e724708..52810dc0 100644 --- a/src/main/java/com/pahimar/ee3/api/WrappedStack.java +++ b/src/main/java/com/pahimar/ee3/api/WrappedStack.java @@ -453,14 +453,7 @@ public class WrappedStack implements Comparable, JsonDeserializer< jsonWrappedStack.addProperty("className", wrappedStack.className); jsonWrappedStack.addProperty("stackSize", wrappedStack.stackSize); - if (gsonWrappedStack != null) - { - jsonWrappedStack.add("wrappedStack", gsonWrappedStack.toJsonTree(wrappedStack.wrappedStack)); - } - else - { - jsonWrappedStack.add("wrappedStack", JsonNull.INSTANCE); - } + jsonWrappedStack.add("wrappedStack", gsonWrappedStack.toJsonTree(wrappedStack.wrappedStack)); return jsonWrappedStack; } @@ -493,19 +486,7 @@ public class WrappedStack implements Comparable, JsonDeserializer< { if (className != null) { - if (className.equalsIgnoreCase(Item.class.getSimpleName())) - { - stackObject = gsonSerializer.fromJson(jsonWrappedStack.get("wrappedStack"), Item.class); - } - else if (className.equalsIgnoreCase(Block.class.getSimpleName())) - { - stackObject = gsonSerializer.fromJson(jsonWrappedStack.get("wrappedStack"), Block.class); - } - else if (className.equalsIgnoreCase(Fluid.class.getSimpleName())) - { - stackObject = gsonSerializer.fromJson(jsonWrappedStack.get("wrappedStack"), Fluid.class); - } - else if (className.equalsIgnoreCase(ItemStack.class.getSimpleName())) + if (className.equalsIgnoreCase(ItemStack.class.getSimpleName())) { ItemStack itemStack = gsonSerializer.fromJson(jsonWrappedStack.get("wrappedStack"), ItemStack.class);