diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 345 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_General.java | 36 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 19 |
3 files changed, 213 insertions, 187 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index a333af99e7..de1812d05a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -169,201 +169,204 @@ public class RECIPES_GREGTECH { 0, MathUtils.findPercentageOfInt(30*20, 80), 120); - - //HSS-G - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(14), - ItemUtils.getItemStackOfAmountFromOreDict("dustTungstenSteel", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) - }, - FluidUtils.getFluidStack("molten.hssg", 9*144), - 0, - MathUtils.findPercentageOfInt(450*20, 80), - 120); - - //HSS-G - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(5), - ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 4), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2) - }, - FluidUtils.getFluidStack("molten.hssg", 18*144), - 0, - MathUtils.findPercentageOfInt(900*20, 80), - 120); - - //HSS-E - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(14), - ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), - ItemUtils.getItemStackOfAmountFromOreDict("dustCobalt", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1) - }, - FluidUtils.getFluidStack("molten.hsse", 9*144), - 0, - MathUtils.findPercentageOfInt(540*20, 80), - 120); - - //HSS-S - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(3), - ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 2) - }, - FluidUtils.getFluidStack("molten.hsss", 9*144), - 0, - MathUtils.findPercentageOfInt(810*20, 80), - 120); - - //Osmiridium - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1) - }, - Materials.Helium.getGas(1000), - FluidUtils.getFluidStack("molten.osmiridium", 4*144), - 0, - MathUtils.findPercentageOfInt(500*20, 80), - 1920); - - //Naq Alloy - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmiridium", 1) - }, - Materials.Argon.getGas(1000), - FluidUtils.getFluidStack("molten.naquadahalloy", 2*144), - 0, - MathUtils.findPercentageOfInt(500*20, 80), - 30720); - - //Nickel-Zinc-Ferrite - if (Materials.get("NickelZincFerrite") != null){ + if (!CORE.GTNH) { + //HSS-G CORE.RA.addBlastSmelterRecipe( new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustFerriteMixture", 6) + ItemUtils.getGregtechCircuit(14), + ItemUtils.getItemStackOfAmountFromOreDict("dustTungstenSteel", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) }, - Materials.Oxygen.getGas(2000), - FluidUtils.getFluidStack("molten.nickelzincferrite", 2*144), + FluidUtils.getFluidStack("molten.hssg", 9 * 144), 0, - MathUtils.findPercentageOfInt(600*20, 80), + MathUtils.findPercentageOfInt(450 * 20, 80), 120); - } - //Gallium-Arsenide - if (Materials.get("GalliumArsenide") != null){ + //HSS-G CORE.RA.addBlastSmelterRecipe( new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustArsenic", 1) + ItemUtils.getGregtechCircuit(5), + ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 4), + ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2) }, - FluidUtils.getFluidStack("molten.galliumarsenide", 2*144), + FluidUtils.getFluidStack("molten.hssg", 18 * 144), 0, - MathUtils.findPercentageOfInt(600*20, 80), + MathUtils.findPercentageOfInt(900 * 20, 80), 120); - } - //TungstenCarbide - if (Materials.get("TungstenCarbide") != null){ + //HSS-E CORE.RA.addBlastSmelterRecipe( new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1) + ItemUtils.getGregtechCircuit(14), + ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), + ItemUtils.getItemStackOfAmountFromOreDict("dustCobalt", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1) }, - FluidUtils.getFluidStack("molten.tungstencarbide", 2*144), + FluidUtils.getFluidStack("molten.hsse", 9 * 144), 0, - MathUtils.findPercentageOfInt((int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) * Materials.get("TungstenCarbide").mBlastFurnaceTemp, 80), - 480); - } - + MathUtils.findPercentageOfInt(540 * 20, 80), + 120); - //Vanadium-Gallium - if (Materials.get("VanadiumGallium") != null){ + //HSS-S CORE.RA.addBlastSmelterRecipe( new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3) + ItemUtils.getGregtechCircuit(3), + ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), + ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 2) }, - FluidUtils.getFluidStack("molten.vanadiumgallium", 4*144), + FluidUtils.getFluidStack("molten.hsss", 9 * 144), 0, - MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L) * Materials.VanadiumGallium.mBlastFurnaceTemp, 80), - 480); - } + MathUtils.findPercentageOfInt(810 * 20, 80), + 120); - //EIO - //Dark Steel - if (ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){ + //Osmiridium CORE.RA.addBlastSmelterRecipe( new ItemStack[]{ ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustObsidian", 1) + ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1) }, - FluidUtils.getFluidStack("molten.darksteel", 2*144), + Materials.Helium.getGas(1000), + FluidUtils.getFluidStack("molten.osmiridium", 4 * 144), 0, - MathUtils.findPercentageOfInt(200*20, 80), - 120); - } - //Pulsating Iron - if (ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){ + MathUtils.findPercentageOfInt(500 * 20, 80), + 1920); + + //Naq Alloy CORE.RA.addBlastSmelterRecipe( new ItemStack[]{ ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getSimpleStack(Items.ender_pearl) + ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustOsmiridium", 1) }, - FluidUtils.getFluidStack("molten.pulsatingiron", 2*144), + Materials.Argon.getGas(1000), + FluidUtils.getFluidStack("molten.naquadahalloy", 2 * 144), 0, - MathUtils.findPercentageOfInt(8*20, 80), - 120); - } - //Energetic Alloy - if (ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){ - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getSimpleStack(Items.glowstone_dust) - }, - FluidUtils.getFluidStack("molten.redstone", 144), - FluidUtils.getFluidStack("molten.energeticalloy", 144), - 0, - MathUtils.findPercentageOfInt(9*20, 80), - 120); - } - //Vibrant Alloy - if (ItemUtils.getItemStackOfAmountFromOreDict("dustVibrantAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)){ - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1), - ItemUtils.getSimpleStack(Items.ender_pearl) - }, - FluidUtils.getFluidStack("molten.vibrantalloy", 144), - 0, - MathUtils.findPercentageOfInt(16*20, 80), - 480); - } + MathUtils.findPercentageOfInt(500 * 20, 80), + 30720); + + //Nickel-Zinc-Ferrite + if (Materials.get("NickelZincFerrite") != null) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(2), + ItemUtils.getItemStackOfAmountFromOreDict("dustFerriteMixture", 6) + }, + Materials.Oxygen.getGas(2000), + FluidUtils.getFluidStack("molten.nickelzincferrite", 2 * 144), + 0, + MathUtils.findPercentageOfInt(600 * 20, 80), + 120); + } + //Gallium-Arsenide + if (Materials.get("GalliumArsenide") != null) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(2), + ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustArsenic", 1) + }, + FluidUtils.getFluidStack("molten.galliumarsenide", 2 * 144), + 0, + MathUtils.findPercentageOfInt(600 * 20, 80), + 120); + } + + //TungstenCarbide + if (Materials.get("TungstenCarbide") != null) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(12), + ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1) + }, + FluidUtils.getFluidStack("molten.tungstencarbide", 2 * 144), + 0, + MathUtils.findPercentageOfInt((int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) * Materials.get("TungstenCarbide").mBlastFurnaceTemp, 80), + 480); + } + + + //Vanadium-Gallium + if (Materials.get("VanadiumGallium") != null) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(12), + ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3) + }, + FluidUtils.getFluidStack("molten.vanadiumgallium", 4 * 144), + 0, + MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L) * Materials.VanadiumGallium.mBlastFurnaceTemp, 80), + 480); + } + + //EIO + //Dark Steel + if (ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(2), + ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustObsidian", 1) + }, + FluidUtils.getFluidStack("molten.darksteel", 2 * 144), + 0, + MathUtils.findPercentageOfInt(200 * 20, 80), + 120); + } + + //Pulsating Iron + if (ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(2), + ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), + ItemUtils.getSimpleStack(Items.ender_pearl) + }, + FluidUtils.getFluidStack("molten.pulsatingiron", 2 * 144), + 0, + MathUtils.findPercentageOfInt(8 * 20, 80), + 120); + } + + //Energetic Alloy + if (ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(12), + ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), + ItemUtils.getSimpleStack(Items.glowstone_dust) + }, + FluidUtils.getFluidStack("molten.redstone", 144), + FluidUtils.getFluidStack("molten.energeticalloy", 144), + 0, + MathUtils.findPercentageOfInt(9 * 20, 80), + 120); + } + + //Vibrant Alloy + if (ItemUtils.getItemStackOfAmountFromOreDict("dustVibrantAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + CORE.RA.addBlastSmelterRecipe( + new ItemStack[]{ + ItemUtils.getGregtechCircuit(12), + ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1), + ItemUtils.getSimpleStack(Items.ender_pearl) + }, + FluidUtils.getFluidStack("molten.vibrantalloy", 144), + 0, + MathUtils.findPercentageOfInt(16 * 20, 80), + 480); + } + } } private static void fluidcannerRecipes() { @@ -994,13 +997,15 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 8*20); //Ammonia - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0), - FluidUtils.getFluidStack("nitrogen", 1000), - FluidUtils.getFluidStack("ammonia", 1000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3), - 14*20); + if (!CORE.GTNH) { + GT_Values.RA.addChemicalRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0), + FluidUtils.getFluidStack("nitrogen", 1000), + FluidUtils.getFluidStack("ammonia", 1000), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3), + 14 * 20); + }//moved to GTNH core mod //Ammonium GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), @@ -1177,4 +1182,4 @@ public class RECIPES_GREGTECH { 500); } -}
\ No newline at end of file +} diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index 4304fdaff5..16cef8bc27 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -7,6 +7,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; @@ -42,7 +43,7 @@ public class RECIPES_General { } } - private static void run(){ + private static void run() { //Workbench Blueprint RecipeUtils.recipeBuilder( RECIPE_Paper, RECIPE_LapisDust, NULL, @@ -58,7 +59,7 @@ public class RECIPES_General { OUTPUT_Workbench_Bronze);*/ //Generates recipes for the Dull shard when TC is not installed. - if (!LoadedMods.Thaumcraft){ + if (!LoadedMods.Thaumcraft) { //Dull Shard to Aer RecipeUtils.recipeBuilder( RECIPE_HydrogenDust, RECIPE_HydrogenDust, RECIPE_HydrogenDust, @@ -100,15 +101,28 @@ public class RECIPES_General { Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings."); } - //Iron bars - final ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1); - //Fish Trap - if (RecipeUtils.recipeBuilder( - ironBars, ironBars, ironBars, - ironBars, "frameGtWroughtIron", ironBars, - ironBars, ironBars, ironBars, - ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){ - Utils.LOG_INFO("Added a recipe for the Fish Trap."); + if (!CORE.GTNH) { + //Iron bars + final ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1); + //Fish Trap + if (RecipeUtils.recipeBuilder( + ironBars, ironBars, ironBars, + ironBars, "frameGtWroughtIron", ironBars, + ironBars, ironBars, ironBars, + ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){ + Utils.LOG_INFO("Added a recipe for the Fish Trap."); + } + } else { + //Steel Bars + final ItemStack steelBars = ItemUtils.getItemStack("dreamcraft:item.SteelBars", 1); + //Fish Trap + if (RecipeUtils.recipeBuilder( + steelBars, steelBars, steelBars, + steelBars, "frameGtWroughtIron", steelBars, + steelBars, steelBars, steelBars, + ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))) { + Utils.LOG_INFO("Added a recipe for the Fish Trap."); + } } //Alkalus Coin diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 9e408ff7d4..f2f9135194 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -930,12 +930,19 @@ public class RECIPES_Machines { RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); //Hastelloy ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); - RecipeUtils.addShapedGregtechRecipe( - controlCircuit, "cableGt12NaquadahAlloy", controlCircuit, - "plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN", - "plateThorium232", CI.machineHull_UV, "plateThorium232", - RECIPE_LFTRController); - + if(!CORE.GTNH) { + RecipeUtils.addShapedGregtechRecipe( + controlCircuit, "cableGt12NaquadahAlloy", controlCircuit, + "plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN", + "plateThorium232", CI.machineHull_UV, "plateThorium232", + RECIPE_LFTRController); + } else { + RecipeUtils.addShapedGregtechRecipe( + controlCircuit, "cableGt12NaquadahAlloy", controlCircuit, + "plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN", + "plateThorium232", CI.machineHull_LuV, "plateThorium232", + RECIPE_LFTRController); + } RecipeUtils.addShapedGregtechRecipe( "plateDoubleZeron100", CI.craftingToolScrewdriver, "plateDoubleZeron100", "gearTalonite", CI.fieldGenerator_ULV, "gearTalonite", |