From 3722f161ec0417e22e0acf22c0c068f2bc49bc00 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Mon, 11 May 2020 12:28:49 +0200 Subject: Adding proposed fix to make jar research work --- src/main/java/common/Recipes.java | 2 +- src/main/java/kekztech/KekzCore.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'src/main') diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 202f6186a0..1d2fb6058c 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -467,7 +467,7 @@ public class Recipes { } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.Energy_Cluster.get(1L))) { // UV Lapo Orb lapoCapacitorRecipeAdder(ar, Materials.Neutronium, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)); - } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList..get(1L))) { + } else if(GT_Utility.areStacksEqual(ar.mOutput, ItemList.get(1L))) { // Ultimate Battery // TODO change material to Cosmic Neutronium lapoCapacitorRecipeAdder(ar, Materials.Neutronium, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)); diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 98bba989f0..b37591ae82 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -16,6 +16,7 @@ import items.MetaItem_ReactorComponent; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; @@ -98,6 +99,11 @@ public class KekzCore { Recipes.init(); // Thaumcraft research + final AspectList aspects_jarthaumiumreinforced = new AspectList() + .add(Aspect.ARMOR, 3) + .add(Aspect.WATER, 3) + .add(Aspect.GREED, 3) + .add(Aspect.VOID, 3) final ResearchItem jar_thaumiumreinforced = new ResearchItem("THAUMIUMREINFORCEDJAR", "ALCHEMY", new AspectList(), 3, -4, 2, new ItemStack(Blocks.jarThaumiumReinforced, 1)) .setPages( new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"), @@ -107,8 +113,14 @@ public class KekzCore { .setConcealed() .setParents("JARLABEL") .registerResearchItem(); - - final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", new AspectList(), 2, -5, 3, new ItemStack(Blocks.jarIchor, 1)) + + final AspectList aspects_jarichor = new AspectList() + .add(Aspect.ARMOR, 3) + .add(Aspect.ELDRITCH, 3) + .add(Aspect.WATER, 3) + .add(Aspect.GREED, 5) + .add(Aspect.VOID, 5); + final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", aspects_jarichor, 2, -5, 3, new ItemStack(Blocks.jarIchor, 1)) .setPages( new ResearchPage("kekztech.research_page.ICHORJAR"), new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")) -- cgit