From 28ad5d121780f0cc5378f4bd8a7729a3e8ac7f7c Mon Sep 17 00:00:00 2001 From: makeo Date: Sat, 24 Oct 2015 18:03:14 +0200 Subject: [PATCH] added research and recipe for mirrored jar --- .../gadomancy/common/registration/RegisteredRecipes.java | 4 ++-- .../common/registration/RegisteredResearches.java | 7 +++++++ src/main/resources/assets/gadomancy/lang/en_US.lang | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index 7bd8fc6..aa44739 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -37,8 +37,8 @@ public class RegisteredRecipes { public static InfusionRecipe recipeInfusionClaw; public static IArcaneRecipe recipeStickyJar; - public static IArcaneRecipe recipeArcaneDropper; + public static IArcaneRecipe recipeRemoteJar; public static void init() { AdditionalGolemType typeSilverwood = RegisteredGolemStuff.typeSilverwood; @@ -69,7 +69,7 @@ public class RegisteredRecipes { 10, new AspectList().add(Aspect.ELDRITCH, 25).add(Aspect.MECHANISM, 20).add(Aspect.MAGIC, 16).add(Aspect.ORDER, 20).add(Aspect.DARKNESS, 12), new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{new ItemStack(ConfigItems.itemFocusPrimal), /*new ItemStack(Items.redstone),*/ new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemGolemCore, 1, 8), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 15), /*new ItemStack(Items.redstone),*/ new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6)}); - + recipeRemoteJar = ThaumcraftApi.addArcaneCraftingRecipe(SimpleResearchItem.getFullName("REMOTEJAR"), new ItemStack(RegisteredBlocks.blockRemoteJar), new AspectList().add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10), "GJG", "GMG", 'G', new ItemStack(ConfigBlocks.blockMagicalLog), 'J', new ItemStack(ConfigBlocks.blockJar), 'M', new ItemStack(ConfigBlocks.blockMirror, 1, 6)); } private static IArcaneRecipe[] stickyJarRecipes = null; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 6e5eddc..34d351d 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -33,6 +33,7 @@ public class RegisteredResearches { public static ResearchItem researchArcaneDropper; public static ResearchItem researchGolemCoreBreak; public static ResearchItem researchInfusionClaw; + public static ResearchItem researchRemoteJar; public static void init() { ResearchCategories.registerCategory(Gadomancy.MODID, CATEGORY_ICON, CATEGORY_BACKGROUND); @@ -79,5 +80,11 @@ public class RegisteredResearches { RegisteredItems.getStickyJarStacks()) .setParents(researchVoidJar.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.STICKYJAR.1"), new ResearchPage(RegisteredRecipes.getVisualStickyJarRecipes())).registerResearchItem(); + + researchRemoteJar = new SimpleResearchItem("REMOTEJAR", -2, 2, 3, + RegisteredRecipes.recipeRemoteJar.getRecipeOutput(), + new AspectList().add(Aspect.WATER, 4).add(Aspect.MECHANISM, 8).add(Aspect.EARTH, 4).add(Aspect.ORDER, 8)) + .setParents(researchVoidJar.key).setConcealed() + .setPages(new ResearchPage("gadomancy.research_page.REMOTEJAR.1"), new ResearchPage(RegisteredRecipes.recipeRemoteJar)).registerResearchItem(); } } diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 44e9900..5841f2b 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -28,6 +28,10 @@ tc.research_name.GADOMANCY.INFUSIONCLAW=Automated Infusion tc.research_text.GADOMANCY.INFUSIONCLAW=Floating stuff! gadomancy.research_page.INFUSIONCLAW.1=Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr. +tc.research_name.GADOMANCY.REMOTEJAR=Mirrored Jars +tc.research_text.GADOMANCY.REMOTEJAR=Mirrored transportation +gadomancy.research_page.REMOTEJAR.1=Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr. + gadomancy.golemblurb.default=?? gadomancy.golemblurb.breakcore=Master, should I break everything, or something specific? gadomancy.golem.breakcore=Break