From d40e8585b3011cd9565dfa0242ba7ed36bd57963 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 27 Mar 2016 15:56:06 +0200 Subject: [PATCH] Revert "change recipe i cant put all in modtweaker code." This reverts commit d179e36347e7ff114f054d23e5b46ce35f6cbb2b. --- src/main/java/thaumic/tinkerer/common/block/BlockSummon.java | 2 +- src/main/java/thaumic/tinkerer/common/item/ItemMobAspect.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/thaumic/tinkerer/common/block/BlockSummon.java b/src/main/java/thaumic/tinkerer/common/block/BlockSummon.java index 42251537..043024d8 100644 --- a/src/main/java/thaumic/tinkerer/common/block/BlockSummon.java +++ b/src/main/java/thaumic/tinkerer/common/block/BlockSummon.java @@ -128,7 +128,7 @@ public class BlockSummon extends Block implements ITTinkererBlock { @Override public IRegisterableResearch getResearchItem() { return (IRegisterableResearch) new TTResearchItem(LibResearch.KEY_SUMMON, new AspectList().add(Aspect.WEAPON, 1).add(Aspect.BEAST, 3).add(Aspect.MAGIC, 3), -5, 8, 3, new ItemStack(ThaumicTinkerer.registry.getFirstBlockFromClass(BlockSummon.class))).setWarp(3).setParents(LibResearch.KEY_BLOOD_SWORD) - .setPages(new ResearchPage("0"), ResearchHelper.arcaneRecipePage(LibResearch.KEY_SUMMON + "0"), ResearchHelper.arcaneRecipePage(LibResearch.KEY_SUMMON + "1"), ResearchHelper.infusionPage(LibResearch.KEY_SUMMON), new ResearchPage("1")); + .setPages(new ResearchPage("0"), ResearchHelper.arcaneRecipePage(LibResearch.KEY_SUMMON + "0"), ResearchHelper.recipePage(LibResearch.KEY_SUMMON + "1"), ResearchHelper.infusionPage(LibResearch.KEY_SUMMON), new ResearchPage("1")); } diff --git a/src/main/java/thaumic/tinkerer/common/item/ItemMobAspect.java b/src/main/java/thaumic/tinkerer/common/item/ItemMobAspect.java index c5de95a9..5d8731d9 100644 --- a/src/main/java/thaumic/tinkerer/common/item/ItemMobAspect.java +++ b/src/main/java/thaumic/tinkerer/common/item/ItemMobAspect.java @@ -119,11 +119,11 @@ public class ItemMobAspect extends ItemBase { for (int i = 0; i < NumericAspectHelper.values.size(); i++) { ThaumcraftApi.registerObjectTag(new ItemStack(this, 1, i), new int[]{i}, new AspectList().add(NumericAspectHelper.getAspect(i), 8)); - recipeMulti.addRecipe(new ThaumicTinkererArcaneRecipe(LibResearch.KEY_SUMMON + "1", LibResearch.KEY_SUMMON, new ItemStack(this, 1, i + 21), new AspectList().add(getAspect(new ItemStack(this, 1, i)), 8), "XXX", "XXX", "XXX", 'X', new ItemStack(this, 1, i))); + recipeMulti.addRecipe(new ThaumicTinkererCraftingBenchRecipe(LibResearch.KEY_SUMMON + "1", new ItemStack(this, 1, i + 21), "XXX", "XXX", "XXX", 'X', new ItemStack(this, 1, i))); ItemStack input = new ItemStack(this, 1, i + 21); recipeMulti.addRecipe(new ThaumicTinkererInfusionRecipe(LibResearch.KEY_SUMMON, new ItemStack(this, 1, i + 42), 4, - new AspectList().add(getAspect(new ItemStack(this, 1, i)), 20), input, + new AspectList().add(getAspect(new ItemStack(this, 1, i)), 10), input, new ItemStack[]{input, input, input, input, input, input, input, input})); }