Fix Portable Shower research name (#44)

Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Maya <[email protected]>
Co-authored-by: boubou19 <[email protected]>

Author: 4 people

src/main/java/shukaro/warptheory/items/WarpItems.java

@@ -16,12 +16,14 @@ public static void initItems() {
         itemCleanser = new ItemCleanser();
         itemAmulet = new ItemAmulet();
         itemWarpWardAmulet = new ItemWarpWardAmulet();
+
         itemSomething = new ItemSomething();
         itemPaper = new ItemPaper();
         GameRegistry.registerItem(itemCleanserMinor, itemCleanserMinor.getUnlocalizedName());
         GameRegistry.registerItem(itemCleanser, itemCleanser.getUnlocalizedName());
         GameRegistry.registerItem(itemAmulet, itemAmulet.getUnlocalizedName());
         GameRegistry.registerItem(itemWarpWardAmulet, itemWarpWardAmulet.getUnlocalizedName());
+
         GameRegistry.registerItem(itemSomething, itemSomething.getUnlocalizedName());
         GameRegistry.registerItem(itemPaper, itemPaper.getUnlocalizedName());
     }

src/main/java/shukaro/warptheory/recipe/WarpRecipes.java

@@ -5,6 +5,7 @@
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
+import cpw.mods.fml.common.Loader;
 import shukaro.warptheory.handlers.ConfigHandler;
 import shukaro.warptheory.items.WarpItems;
 import shukaro.warptheory.research.WarpResearch;
@@ -67,7 +68,36 @@ public static void init() {
                                     new ItemStack(Items.diamond), ItemApi.getItem("itemResource", 14),
                                     new ItemStack(WarpItems.itemCleanser), new ItemStack(Items.gold_ingot),
                                     new ItemStack(Items.diamond), ItemApi.getItem("itemResource", 14) }));
-
+            if (Loader.isModLoaded("dreamcraft")) {
+                WarpResearch.recipes.put(
+                        "WarpWardAmulet",
+                        ThaumcraftApi.addInfusionCraftingRecipe(
+                                Constants.ITEM_PORTABLE_SHOWER,
+                                new ItemStack(WarpItems.itemWarpWardAmulet),
+                                10,
+                                new AspectList().add(Aspect.ELDRITCH, 32).add(Aspect.EXCHANGE, 32)
+                                        .add(Aspect.MAGIC, 64),
+                                ItemApi.getItem("itemBaubleBlanks", 0),
+                                new ItemStack[] { new ItemStack(WarpItems.itemCleanser),
+                                        new ItemStack(Items.gold_ingot), new ItemStack(Items.diamond),
+                                        ItemApi.getItem("itemResource", 14), new ItemStack(WarpItems.itemCleanser),
+                                        new ItemStack(Items.gold_ingot), new ItemStack(Items.diamond),
+                                        ItemApi.getItem("itemResource", 14) }));
+            } else {
+                // to define the recipe
+                WarpResearch.recipes.put(
+                        "WarpWardAmulet",
+                        ThaumcraftApi.addInfusionCraftingRecipe(
+                                Constants.ITEM_PURE_TALISMAN,
+                                new ItemStack(WarpItems.itemAmulet),
+                                10,
+                                new AspectList().add(Aspect.ELDRITCH, 32).add(Aspect.EXCHANGE, 32)
+                                        .add(Aspect.MAGIC, 64),
+                                ItemApi.getItem("itemBaubleBlanks", 0),
+                                new ItemStack[] { new ItemStack(WarpItems.itemCleanser),
+                                        new ItemStack(Items.gold_ingot), new ItemStack(WarpItems.itemCleanser),
+                                        new ItemStack(Items.gold_ingot) }));
+            }
             for (ItemStack meat : meats) WarpResearch.recipes.put(
                     "WarpChunk" + meat,
                     ThaumcraftApi.addCrucibleRecipe(
@@ -120,6 +150,17 @@ public static void init() {
                             new ItemStack[] { new ItemStack(WarpItems.itemCleanser), new ItemStack(Items.gold_ingot),
                                     new ItemStack(WarpItems.itemCleanser), new ItemStack(Items.gold_ingot) }));
 
+            WarpResearch.recipes.put(
+                    "WarpWardAmulet",
+                    ThaumcraftApi.addInfusionCraftingRecipe(
+                            Constants.ITEM_PURE_TALISMAN,
+                            new ItemStack(WarpItems.itemAmulet),
+                            10,
+                            new AspectList().add(Aspect.ELDRITCH, 32).add(Aspect.EXCHANGE, 32).add(Aspect.MAGIC, 64),
+                            ItemApi.getItem("itemBaubleBlanks", 0),
+                            new ItemStack[] { new ItemStack(WarpItems.itemCleanser), new ItemStack(Items.gold_ingot),
+                                    new ItemStack(WarpItems.itemCleanser), new ItemStack(Items.gold_ingot) }));
+
             for (ItemStack meat : meats) WarpResearch.recipes.put(
                     "WarpChunk" + meat,
                     ThaumcraftApi.addCrucibleRecipe(

src/main/java/shukaro/warptheory/research/WarpResearch.java

@@ -75,6 +75,18 @@ public static void init() {
                                         new ResearchPage((InfusionRecipe) recipes.get("PureAmulet")) })
                         .setParents(Constants.ITEM_WARPCLEANSER).setConcealed().registerResearchItem();
 
+        new WTResearchItem(
+                Constants.ITEM_PORTABLE_SHOWER,
+                new AspectList().add(Aspect.ELDRITCH, 6).add(Aspect.EXCHANGE, 3).add(Aspect.MAGIC, 3),
+                5,
+                5,
+                3,
+                new ItemStack(WarpItems.itemWarpWardAmulet)).setPages(
+                        new ResearchPage[] {
+                                new ResearchPage(StatCollector.translateToLocal("research.warptheory.portableshower")),
+                                new ResearchPage((InfusionRecipe) recipes.get("WarpWardAmulet")) })
+                        .setParents(Constants.ITEM_PURE_TALISMAN).setConcealed().registerResearchItem();
+
         ResearchPage[] somethingPages = new ResearchPage[WarpRecipes.meats.size() + 1];
         somethingPages[0] = new ResearchPage(StatCollector.translateToLocal("research.warptheory.warpsomething"));
         int i = 1;

src/main/resources/assets/warptheory/lang/en_US.lang

@@ -22,7 +22,7 @@ item.warptheory.cleanser.name=Pure Tear
 item.warptheory.amulet.name=Purification Talisman
 item.warptheory.something.name=Hunk of Something
 item.warptheory.paper.name=Arcane Litmus Paper
-item.warptheory.portableshower.name=Portable Shower
+
 # << entity names >>
 entity.WarpTheory.taintSheepSafe.name=Tainted Sheep
 entity.WarpTheory.creeperFake.name=Fake Creeper
@@ -38,6 +38,11 @@ tooltip.warptheory.something=Probably edible...
 tooltip.warptheory.paper=Reacts to Warp
 tooltip.warptheory.portableshower=Showers off your filth
 
+# << portable shower >>
+tc.research_name.warptheory.portableshower=Portable Shower
+tc.research_text.warptheory.portableshower=A more mundane way to clean your mind
+research.warptheory.portableshower=You realized you still feel crazy when wearing your favorite armor. So you have thought long and hard about the solution for that.....when you were tinkering with your spa, you suddenly had a revelation to yourself, "Why would I not just bath permanently to feel fresh the whole time?" and so, you created this simple amulet, it brews arcane spa water for you, using natural essentia with some vis from the environment.
+
 # << hunk of something >>
 tc.research_name.warptheory.something=Hunk of Something
 tc.research_text.warptheory.something=Definitely not something pleasant