From d321e30a5dbc8a6d7fe4246743d73b7ab444a399 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Wed, 26 Aug 2020 20:52:09 -0400 Subject: [PATCH] Add a fluid ingredient deserialize method using a JsonElement --- .../slimeknights/mantle/recipe/FluidIngredient.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/slimeknights/mantle/recipe/FluidIngredient.java b/src/main/java/slimeknights/mantle/recipe/FluidIngredient.java index fdba4c7..c249b80 100644 --- a/src/main/java/slimeknights/mantle/recipe/FluidIngredient.java +++ b/src/main/java/slimeknights/mantle/recipe/FluidIngredient.java @@ -18,6 +18,7 @@ import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistries; +import slimeknights.mantle.util.JsonHelper; import java.util.Arrays; import java.util.Collection; @@ -136,8 +137,17 @@ public abstract class FluidIngredient { * @throws JsonSyntaxException if syntax is invalid */ public static FluidIngredient deserialize(JsonObject parent, String name) { - JsonElement json = parent.get(name); + return deserialize(JsonHelper.getElement(parent, name), name); + } + /** + * Deserializes the fluid ingredient from JSON + * @param json Json element instance + * @param name Name of the object for error messages + * @return Fluid ingredient instance + * @throws JsonSyntaxException if syntax is invalid + */ + public static FluidIngredient deserialize(JsonElement json, String name) { // single ingredient object if (json.isJsonObject()) { return deserializeObject(json.getAsJsonObject());