From e0e6f822acde8d4a40fce8b6f7c5dc3b838dff39 Mon Sep 17 00:00:00 2001 From: xbony2 Date: Sun, 15 Feb 2015 10:00:19 -0500 Subject: [PATCH] closes #59, makes BR stuff craftable in GT mode (harder recipe needed tho) --- .../recipes/BigReactorsRecipesGregtech.java | 21 +++++++++++++++++- .../recipes/BigReactorsRecipesNew.java | 2 +- .../crossmod/gregtech/GregtechRecipes.java | 22 ++++++++++++++++--- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesGregtech.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesGregtech.java index 07fa690c..74f48064 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesGregtech.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesGregtech.java @@ -1,7 +1,26 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.BigReactors.recipes; +import ic2.api.item.IC2Items; +import ic2.api.recipe.Recipes; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import shedar.mods.ic2.nuclearcontrol.crossmod.BigReactors.CrossBigReactors; + public class BigReactorsRecipesGregtech { public static void addRecipes(){ - //TODO + //TODO BR doesn't have any GT recipes + Recipes.advRecipes.addRecipe(new ItemStack(CrossBigReactors.kitRFsensor), new Object[]{ + "IT ", "PD ", " R ", + 'I', "ingotYellorium", + 'T', IC2Items.getItem("frequencyTransmitter"), + 'P', Items.paper, + 'D', "dyeRed", + 'R', "dustRedstone"}); + Recipes.advRecipes.addRecipe(new ItemStack(CrossBigReactors.ReactorInfoFetch), new Object[]{ + "BRB", "YCY", "BRB", + 'B', "reactorCasing", + 'R', "dustRedstone", + 'Y', "ingotYellorium", + 'C', Items.comparator}); } } diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesNew.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesNew.java index 10ac3a59..b4a79096 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesNew.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/BigReactors/recipes/BigReactorsRecipesNew.java @@ -20,7 +20,7 @@ public static void addRecipes(){ Recipes.advRecipes.addRecipe(new ItemStack(CrossBigReactors.ReactorInfoFetch), new Object[]{ "BRB", "YCY", "BRB", 'B', "reactorCasing", - 'R', Items.redstone, + 'R', "dustRedstone", 'Y', "ingotYellorium", 'C', Items.comparator}); } diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java index ee8023cd..d2816e2e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java @@ -17,8 +17,10 @@ import shedar.mods.ic2.nuclearcontrol.utils.LightDamages; public class GregtechRecipes { - public static Item gtmeta1; - public static ItemStack gtComputerMonitor; + private static Item gtmeta1; + private static ItemStack gtComputerMonitor; + private static ItemStack gtSensor; + private static ItemStack gtEmitter; /** * Grabs all the nessary items/itemstacks from GT indirectly. @@ -28,6 +30,8 @@ public class GregtechRecipes { public static void grabItems(){ gtmeta1 = GameRegistry.findItem("gregtech", "gt.metaitem.01"); gtComputerMonitor = new ItemStack(gtmeta1, 1, 32740); + gtSensor = new ItemStack(gtmeta1, 1, 32690); + gtEmitter = new ItemStack(gtmeta1, 1, 32680); } public static void addRecipes(){ @@ -38,6 +42,7 @@ public static void addRecipes(){ 'G', "plateGlass", 'M', "cellMercury", 'I', "stickIron"}); + ItemStack digitalThermometer = new ItemStack(IC2NuclearControl.itemToolDigitalThermometer); Recipes.advRecipes.addRecipe(digitalThermometer, new Object[]{ "BG ", "CMC", " G3", @@ -55,6 +60,17 @@ public static void addRecipes(){ 'C', "circuitAdvanced", 'R', "plateRedstone"}); + ItemStack remoteThermalMonitor = new ItemStack(IC2NuclearControl.blockNuclearControlMain, 1, BlockDamages.DAMAGE_REMOTE_THERMO); + Recipes.advRecipes.addRecipe(remoteThermalMonitor, new Object[]{ + "SGE", "CMC", "BTB", + 'S', gtSensor, + 'G', "glassReinforced", + 'E', gtEmitter, + 'C', gtComputerMonitor, + 'M', IC2Items.getItem("machine"), + 'B', "circuitBasic", + 'T', thermalMonitor}); + ItemStack howler = new ItemStack(IC2NuclearControl.blockNuclearControlMain, 1, BlockDamages.DAMAGE_HOWLER_ALARM); Recipes.advRecipes.addRecipe(howler, new Object[]{ "INI", "CRC", "GMG", @@ -180,7 +196,7 @@ public static void addRecipes(){ 'P', Items.paper, 'D', StackUtil.copyWithWildCard(digitalThermometer), 'F', IC2Items.getItem("frequencyTransmitter"), - 'W', "dyeYellow" }); + 'W', "dyeYellow"}); Recipes.advRecipes.addRecipe(new ItemStack(IC2NuclearControl.itemEnergySensorKit, 1), new Object[] { "RF", "PO",