From 86c43f45496d3bc30f7c115094661d7dd0bcc348 Mon Sep 17 00:00:00 2001 From: makeo Date: Sat, 31 Oct 2015 02:03:57 +0100 Subject: [PATCH] Fixed scan for Manipulation Pillar --- .../java/makeo/gadomancy/common/CommonProxy.java | 2 ++ .../common/registration/RegisteredItems.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 18fcbe0..b47aa44 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -74,6 +74,8 @@ public class CommonProxy implements IGuiHandler { RegisteredResearches.postInit(); + RegisteredItems.postInit(); + ModSubstitutions.postInit(); } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index 4bdc076..5b898a6 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -6,8 +6,12 @@ import makeo.gadomancy.common.items.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; +import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; import java.util.ArrayList; import java.util.List; @@ -50,6 +54,10 @@ public class RegisteredItems { registerDefaultStickyJars(); } + public static void postInit() { + registerItemAspects(); + } + //Items private static void registerItems() { itemFakeModIcon = registerItem(new ItemFakeModIcon()); @@ -69,6 +77,12 @@ public class RegisteredItems { return registerItem(item, item.getClass().getSimpleName()); } + private static void registerItemAspects() { + AspectList oldAspects = ThaumcraftCraftingManager.getObjectTags(new ItemStack(RegisteredBlocks.blockStoneMachine)); + + ThaumcraftApi.registerObjectTag(new ItemStack(Item.getItemFromBlock(RegisteredBlocks.blockStoneMachine)), new int[]{11, 15}, new AspectList()); + ThaumcraftApi.registerObjectTag(new ItemStack(Item.getItemFromBlock(RegisteredBlocks.blockStoneMachine)), new int[]{0}, oldAspects); + } //Sticky jars private static void registerDefaultStickyJars() {