From 21903e4a3f6eda3740de34c9e2ba637eaee08369 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Thu, 28 Feb 2019 21:17:17 +0000 Subject: + Added some new dummy items for Assembly Line research, so as not to conflict with existing recipes. % Rewrote some of ItemGenericToken.java to allow other classes to extend it. $ Fixed recipe overlap. Closes #431. --- src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 6210f9726c..6e9cb11cd2 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -17,6 +17,8 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.IonParticles; +import gtPlusPlus.core.item.crafting.ItemDummyResearch; +import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; @@ -137,7 +139,7 @@ public class RECIPES_GREGTECH { //Containment Casings CORE.RA.addAssemblylineRecipe( - ItemList.Field_Generator_IV.get(1), + ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), 20 * 60 * 30, new ItemStack[] { ItemList.Field_Generator_IV.get(GTNH ? 32 : 16), @@ -424,6 +426,15 @@ public class RECIPES_GREGTECH { ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1), 20 * 60 * 5, MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.vTier)); + + + GT_Values.RA.addLaserEngraverRecipe( + CI.getFieldGenerator(6, 1), + CI.getEmitter(7, 2), + ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5)); + } -- cgit