From 835e09ed345079b97d9e9cc3b41bd4df15902146 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 24 Jun 2017 17:51:21 -0500 Subject: [PATCH] Recipe fixes and bump forge --- build.properties | 4 ++-- .../botania/common/crafting/recipe/ArmorUpgradeRecipe.java | 2 +- .../botania/common/crafting/recipe/ManaUpgradeRecipe.java | 4 +++- .../common/crafting/recipe/ShapelessManaUpgradeRecipe.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index 47bb1881a..29055ca3d 100644 --- a/build.properties +++ b/build.properties @@ -2,9 +2,9 @@ #Tue Jun 13 14:30:58 BST 2017 mod_name=Botania cf_meta_version=1.12 -forge_version=14.21.0.2331 +forge_version=14.21.0.2361 dir_repo=./ -mc_mappings=snapshot_20170614 +mc_mappings=snapshot_20170624 version=r1.9 dir_output=../Build Output/Botania/ build_number=345 diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index 55ece2aa9..4fe0ec409 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -20,7 +20,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; public class ArmorUpgradeRecipe extends ShapedOreRecipe { public ArmorUpgradeRecipe(ItemStack output, Object... inputs) { - super(output, inputs); + super(null, output, inputs); } @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java index bbcc1c3d0..ed36f2017 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java @@ -12,12 +12,14 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.ShapedOreRecipe; import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.common.lib.LibMisc; public class ManaUpgradeRecipe extends ShapedOreRecipe { public ManaUpgradeRecipe(ItemStack output, Object... inputs) { - super(output, inputs); + super(null, output, inputs); } public static ItemStack output(ItemStack output, InventoryCrafting var1) { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java index 7030aa442..35d990e83 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java @@ -16,7 +16,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public class ShapelessManaUpgradeRecipe extends ShapelessOreRecipe { public ShapelessManaUpgradeRecipe(ItemStack output, Object... inputs) { - super(output, inputs); + super(null, output, inputs); } @Override