From 12ae7ed3d111dd9618b59e48241a6157720182b0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 10:01:04 -0600 Subject: [PATCH] Fix thaumcraft integration crashing --- .../java/vazkii/botania/common/crafting/ModBrewRecipes.java | 4 ++-- .../botania/common/crafting/ModManaInfusionRecipes.java | 2 +- .../botania/common/crafting/recipe/HelmRevealingRecipe.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 86333757b..f805f8644 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -71,8 +71,8 @@ public class ModBrewRecipes { } public static void initTC() { - Item resource = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemResource")); - Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemBathSalts")); + Item resource = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "salis_mundus")); + Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "bath_salts")); warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 7f1877a3b..832358cc9 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -75,7 +75,7 @@ public final class ModManaInfusionRecipes { tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.potato), 1337); if(Botania.thaumcraftLoaded) { - Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft:ItemInkwell")); + Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "scribing_tools")); manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000); } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index c6afe01d0..3cd25b65a 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -25,7 +25,7 @@ public class HelmRevealingRecipe implements IRecipe { @Override public boolean matches(InventoryCrafting var1, World var2) { - Item goggles = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemGoggles")); + Item goggles = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "goggles")); if(goggles == null) return false; // NO TC loaded