diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 4919f32c9d3..b9ef360b6ac 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -238,7 +238,7 @@ public static void register() { public static DustMaterial Spessartine = new DustMaterial(195, "spessartine", 0xFF6464, DULL, 2, of(new MaterialStack(Aluminium, 2), new MaterialStack(Manganese, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)), GENERATE_ORE); public static DustMaterial Sphalerite = new DustMaterial(196, "sphalerite", 0xFFFFFF, DULL, 1, of(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT | DISABLE_DECOMPOSITION); public static IngotMaterial StainlessSteel = new IngotMaterial(197, "stainless_steel", 0xC8C8DC, SHINY, 2, of(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_FRAME | GENERATE_LONG_ROD, null, 7.0F, 4.0f, 480, 1700); - public static IngotMaterial Steel = new IngotMaterial(198, "steel", 0x505050, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_DENSE | DISABLE_DECOMPOSITION | GENERATE_FRAME | GENERATE_LONG_ROD, null, 6.0F, 3.0f, 512, 1000); + public static IngotMaterial Steel = new IngotMaterial(198, "steel", 0x808080, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_DENSE | DISABLE_DECOMPOSITION | GENERATE_FRAME | GENERATE_LONG_ROD, null, 6.0F, 3.0f, 512, 1000); public static DustMaterial Stibnite = new DustMaterial(199, "stibnite", 0x464646, METALLIC, 2, of(new MaterialStack(Antimony, 2), new MaterialStack(Sulfur, 3)), GENERATE_ORE); public static GemMaterial Tanzanite = new GemMaterial(200, "tanzanite", 0x4000C8, GEM_VERTICAL, 2, of(new MaterialStack(Calcium, 2), new MaterialStack(Aluminium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 13)), EXT_METAL | GENERATE_ORE | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, null, 7.0F, 2.0f, 256); public static DustMaterial Tetrahedrite = new DustMaterial(201, "tetrahedrite", 0xC82000, DULL, 2, of(new MaterialStack(Copper, 3), new MaterialStack(Antimony, 1), new MaterialStack(Sulfur, 3), new MaterialStack(Iron, 1)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT); @@ -534,7 +534,7 @@ public static void register() { public static IngotMaterial SteelMagnetic = new IngotMaterial(327, "steel_magnetic", 0x808080, MAGNETIC, 2, of(new MaterialStack(Steel, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | MORTAR_GRINDABLE, null, 1000); public static IngotMaterial NeodymiumMagnetic = new IngotMaterial(328, "neodymium_magnetic", 0x646464, MAGNETIC, 2, of(new MaterialStack(Neodymium, 1)), EXT2_METAL | GENERATE_LONG_ROD, null, 1297); public static IngotMaterial TungstenCarbide = new IngotMaterial(329, "tungsten_carbide", 0x330066, METALLIC, 4, of(new MaterialStack(Tungsten, 1), new MaterialStack(Carbon, 1)), EXT2_METAL, null, 12.0F, 4.0f, 1280, 2460); - public static IngotMaterial VanadiumSteel = new IngotMaterial(330, "vanadium_steel", 0x0C0C0, METALLIC, 3, of(new MaterialStack(Vanadium, 1), new MaterialStack(Chrome, 1), new MaterialStack(Steel, 7)), EXT2_METAL, null, 7.0F, 3.0f, 1920, 1453); + public static IngotMaterial VanadiumSteel = new IngotMaterial(330, "vanadium_steel", 0xc0c0c0, METALLIC, 3, of(new MaterialStack(Vanadium, 1), new MaterialStack(Chrome, 1), new MaterialStack(Steel, 7)), EXT2_METAL, null, 7.0F, 3.0f, 1920, 1453); public static IngotMaterial HSSG = new IngotMaterial(331, "hssg", 0x999900, METALLIC, 3, of(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, null, 10.0F, 5.5f, 4000, 4200); public static IngotMaterial HSSE = new IngotMaterial(332, "hsse", 0x336600, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Cobalt, 1), new MaterialStack(Manganese, 1), new MaterialStack(Silicon, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, null, 10.0F, 8.0f, 5120, 5000); public static IngotMaterial HSSS = new IngotMaterial(333, "hsss", 0x660033, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Iridium, 2), new MaterialStack(Osmium, 1)), EXT2_METAL | GENERATE_GEAR, null, 15.0F, 7.0f, 3000, 5000); diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 33087bfc37a..2d2e375bb09 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -293,7 +293,8 @@ public void registerSubItems() { public void registerRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(OrePrefix.dust, Materials.Redstone).input(OrePrefix.plate, Materials.Tin, 2) + .input(OrePrefix.dust, Materials.Redstone) + .inputs(MetaItems.FLUID_CELL.getStackForm()) .outputs(SPRAY_EMPTY.getStackForm()) .duration(200).EUt(8) .buildAndRegister(); @@ -322,25 +323,29 @@ public void registerRecipes() { // Matches/lighters recipes RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(OrePrefix.stick, Materials.Wood).input(OrePrefix.dustSmall, Materials.Phosphorus) + .input(OrePrefix.bolt, Materials.Wood) + .input(OrePrefix.dustSmall, Materials.Phosphorus) .outputs(TOOL_MATCHES.getStackForm()) .duration(16).EUt(16) .buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(OrePrefix.stick, Materials.Wood).input(OrePrefix.dustSmall, Materials.TricalciumPhosphate) + .input(OrePrefix.bolt, Materials.Wood) + .input(OrePrefix.dustSmall, Materials.TricalciumPhosphate) .outputs(TOOL_MATCHES.getStackForm()) .duration(16).EUt(16) .buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(OrePrefix.stick, Materials.Wood, 4).input(OrePrefix.dust, Materials.Phosphorus) + .input(OrePrefix.bolt, Materials.Wood, 4) + .input(OrePrefix.dust, Materials.Phosphorus) .outputs(TOOL_MATCHES.getStackForm(4)) .duration(64).EUt(16) .buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(OrePrefix.stick, Materials.Wood, 4).input(OrePrefix.dust, Materials.TricalciumPhosphate) + .input(OrePrefix.bolt, Materials.Wood, 4) + .input(OrePrefix.dust, Materials.TricalciumPhosphate) .outputs(TOOL_MATCHES.getStackForm(4)) .duration(64) .EUt(16) diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java index 1e38e70427f..1d77d8ac515 100644 --- a/src/main/java/gregtech/common/items/MetaItem2.java +++ b/src/main/java/gregtech/common/items/MetaItem2.java @@ -124,6 +124,7 @@ public void registerSubItems() { RANDOM_ACCESS_MEMORY_WAFER = addItem(471, "wafer.random_access_memory"); SYSTEM_ON_CHIP_WAFER = addItem(472, "wafer.system_on_chip"); + RAW_CRYSTAL_CHIP = addItem(473, "crystal.raw"); CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(474, "crystal.central_processing_unit"); CRYSTAL_SYSTEM_ON_CHIP = addItem(475, "crystal.system_on_chip"); ADVANCED_SYSTEM_ON_CHIP = addItem(476, "plate.advanced_system_on_chip"); @@ -178,7 +179,8 @@ public void registerSubItems() { } NEURO_PROCESSOR = addItem(523, "processor.neuro"); - STEM_CELLS = addItem(524, "stemcells"); + STEM_CELLS = addItem(524, "stem_cells"); + PETRI_DISH = addItem(525, "petri_dish"); } public void registerRecipes() { diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index a4c64d0f7e7..2c21f3f54e2 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -250,6 +250,7 @@ private MetaItems() { public static MetaItem.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem RANDOM_ACCESS_MEMORY; public static MetaItem.MetaValueItem SYSTEM_ON_CHIP; + public static MetaItem.MetaValueItem RAW_CRYSTAL_CHIP; public static MetaItem.MetaValueItem CRYSTAL_CENTRAL_PROCESSING_UNIT; public static MetaItem.MetaValueItem CRYSTAL_SYSTEM_ON_CHIP; @@ -388,6 +389,7 @@ private MetaItems() { public static MetaItem.MetaValueItem MAX_BATTERY; public static MetaItem.MetaValueItem NEURO_PROCESSOR; public static MetaItem.MetaValueItem STEM_CELLS; + public static MetaItem.MetaValueItem PETRI_DISH; public static void init() { MetaItem1 first = new MetaItem1(); diff --git a/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java index 5abe8956ad3..5fff5dc75b5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java +++ b/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java @@ -355,7 +355,7 @@ public static void processTurbine(OrePrefix toolPrefix, IngotMaterial material) RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.turbineBlade, material, 8) - .input(OrePrefix.stickLong, Materials.Titanium) + .input(OrePrefix.stickLong, Materials.Magnalium) .outputs(rotorStack) .duration(200) .EUt(400) diff --git a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java index 78321008186..4a508834337 100644 --- a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java +++ b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java @@ -59,40 +59,40 @@ public static void init() { .duration(600).EUt(10240) .buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.stickLong, Materials.NeodymiumMagnetic, 1), OreDictUnifier.get(OrePrefix.stickLong, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.ring, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.round, Materials.HSSE, 16), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.VanadiumGallium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm()).duration(600).EUt(40960).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.block, Materials.NeodymiumMagnetic, 1), OreDictUnifier.get(OrePrefix.stickLong, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.ring, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.round, Materials.Neutronium, 16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm()).duration(600).EUt(163840).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.stickLong, Materials.NeodymiumMagnetic, 2), OreDictUnifier.get(OrePrefix.stickLong, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.ring, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.round, Materials.HSSE, 16), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm()).duration(600).EUt(40960).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.block, Materials.NeodymiumMagnetic, 1), OreDictUnifier.get(OrePrefix.stickLong, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.ring, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.round, Materials.Neutronium, 16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm()).duration(600).EUt(163840).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(), OreDictUnifier.get(OrePrefix.pipeSmall, Materials.Ultimet, 2), OreDictUnifier.get(OrePrefix.screw, Materials.HSSG, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 16), OreDictUnifier.get(OrePrefix.rotor, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(144), Materials.Lubricant.getFluid(250)).outputs(MetaItems.ELECTRIC_PUMP_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(), OreDictUnifier.get(OrePrefix.pipeMedium, Materials.Ultimet, 2), OreDictUnifier.get(OrePrefix.screw, Materials.HSSE, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 16), OreDictUnifier.get(OrePrefix.rotor, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.VanadiumGallium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_PUMP_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm(), OreDictUnifier.get(OrePrefix.pipeLarge, Materials.Ultimet, 2), OreDictUnifier.get(OrePrefix.screw, Materials.Neutronium, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 16), OreDictUnifier.get(OrePrefix.rotor, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_PUMP_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.pipeSmall, Materials.Ultimet, 2), OreDictUnifier.get(OrePrefix.screw, Materials.HSSG, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 4), OreDictUnifier.get(OrePrefix.rotor, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(144), Materials.Lubricant.getFluid(250)).outputs(MetaItems.ELECTRIC_PUMP_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.pipeMedium, Materials.Ultimet, 2), OreDictUnifier.get(OrePrefix.screw, Materials.HSSE, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 16), OreDictUnifier.get(OrePrefix.rotor, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_PUMP_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.pipeLarge, Materials.Ultimet, 2), OreDictUnifier.get(OrePrefix.screw, Materials.Neutronium, 8), OreDictUnifier.get(OrePrefix.ring, Materials.SiliconeRubber, 16), OreDictUnifier.get(OrePrefix.rotor, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_PUMP_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(2), OreDictUnifier.get(OrePrefix.plate, Materials.HSSG, 8), OreDictUnifier.get(OrePrefix.gear, Materials.HSSG, 4), OreDictUnifier.get(OrePrefix.stick, Materials.HSSG, 4), OreDictUnifier.get(OrePrefix.ingot, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 2)).fluidInputs(Materials.StyreneButadieneRubber.getFluid(1440), Materials.Lubricant.getFluid(250)).outputs(MetaItems.CONVEYOR_MODULE_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(2), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 8), OreDictUnifier.get(OrePrefix.gear, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.stick, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.ingot, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.VanadiumGallium, 2)).fluidInputs(Materials.StyreneButadieneRubber.getFluid(2880), Materials.Lubricant.getFluid(750)).outputs(MetaItems.CONVEYOR_MODULE_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm(2), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 8), OreDictUnifier.get(OrePrefix.gear, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.stick, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.ingot, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.StyreneButadieneRubber.getFluid(2880), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.CONVEYOR_MODULE_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(2), OreDictUnifier.get(OrePrefix.plate, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.ring, Materials.HSSG, 4), OreDictUnifier.get(OrePrefix.round, Materials.HSSG, 32), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 2)).fluidInputs(Materials.StyreneButadieneRubber.getFluid(1440), Materials.Lubricant.getFluid(250)).outputs(MetaItems.CONVEYOR_MODULE_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(2), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.ring, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.round, Materials.HSSE, 32), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 2)).fluidInputs(Materials.StyreneButadieneRubber.getFluid(2880), Materials.Lubricant.getFluid(750)).outputs(MetaItems.CONVEYOR_MODULE_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm(2), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.ring, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.round, Materials.Neutronium, 32), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.StyreneButadieneRubber.getFluid(2880), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.CONVEYOR_MODULE_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSG, 8), OreDictUnifier.get(OrePrefix.gearSmall, Materials.HSSG, 8), OreDictUnifier.get(OrePrefix.stick, Materials.HSSG, 4), OreDictUnifier.get(OrePrefix.ingot, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(144), Materials.Lubricant.getFluid(250)).outputs(MetaItems.ELECTRIC_PISTON_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 8), OreDictUnifier.get(OrePrefix.gearSmall, Materials.HSSE, 8), OreDictUnifier.get(OrePrefix.stick, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.ingot, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.VanadiumGallium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_PISTON_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 8), OreDictUnifier.get(OrePrefix.gearSmall, Materials.Neutronium, 8), OreDictUnifier.get(OrePrefix.stick, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.ingot, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.NiobiumTitanium, 2)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_PISTON_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSG, 6), OreDictUnifier.get(OrePrefix.ring, Materials.HSSG, 4), OreDictUnifier.get(OrePrefix.round, Materials.HSSG, 32), OreDictUnifier.get(OrePrefix.stick, Materials.HSSG, 4), OreDictUnifier.get(OrePrefix.gear, Materials.HSSG), OreDictUnifier.get(OrePrefix.gearSmall, Materials.HSSG, 2), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 4)).fluidInputs(Materials.SolderingAlloy.getFluid(144), Materials.Lubricant.getFluid(250)).outputs(MetaItems.ELECTRIC_PISTON_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 6), OreDictUnifier.get(OrePrefix.ring, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.round, Materials.HSSE, 32), OreDictUnifier.get(OrePrefix.stick, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.gear, Materials.HSSE), OreDictUnifier.get(OrePrefix.gearSmall, Materials.HSSE, 2), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 4)).fluidInputs(Materials.SolderingAlloy.getFluid(288), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ELECTRIC_PISTON_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.ELECTRIC_MOTOR_UV.getStackForm(), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 6), OreDictUnifier.get(OrePrefix.ring, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.round, Materials.Neutronium, 32), OreDictUnifier.get(OrePrefix.stick, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.gear, Materials.Neutronium), OreDictUnifier.get(OrePrefix.gearSmall, Materials.Neutronium, 2), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 4)).fluidInputs(Materials.SolderingAlloy.getFluid(1296), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ELECTRIC_PISTON_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.YttriumBariumCuprate, 16), OreDictUnifier.get(OrePrefix.screw, Materials.HSSG, 16), OreDictUnifier.get(OrePrefix.stick, Materials.HSSG, 16), OreDictUnifier.get(OrePrefix.ingot, Materials.HSSG), MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(2), MetaItems.ELECTRIC_PISTON_LUV.getStackForm()).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576), Materials.Lubricant.getFluid(250)).outputs(MetaItems.ROBOT_ARM_LUV.getStackForm()).duration(600).EUt(20480).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 16), OreDictUnifier.get(OrePrefix.screw, Materials.HSSE, 16), OreDictUnifier.get(OrePrefix.stick, Materials.HSSE, 16), OreDictUnifier.get(OrePrefix.ingot, Materials.HSSE), MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(2), MetaItems.ELECTRIC_PISTON_ZPM.getStackForm()).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 8).fluidInputs(Materials.SolderingAlloy.getFluid(1152), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ROBOT_ARM_ZPM.getStackForm()).duration(600).EUt(81920).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.NiobiumTitanium, 16), OreDictUnifier.get(OrePrefix.screw, Materials.Neutronium, 16), OreDictUnifier.get(OrePrefix.stick, Materials.Neutronium, 16), OreDictUnifier.get(OrePrefix.ingot, Materials.Neutronium), MetaItems.ELECTRIC_MOTOR_UV.getStackForm(2), MetaItems.ELECTRIC_PISTON_UV.getStackForm()).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 8).fluidInputs(Materials.SolderingAlloy.getFluid(2304), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ROBOT_ARM_UV.getStackForm()).duration(600).EUt(327680).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 6), OreDictUnifier.get(OrePrefix.stickLong, Materials.HSSG, 4), OreDictUnifier.get(OrePrefix.gear, Materials.HSSG), OreDictUnifier.get(OrePrefix.gearSmall, Materials.HSSG, 3), MetaItems.ELECTRIC_MOTOR_LUV.getStackForm(2), MetaItems.ELECTRIC_PISTON_LUV.getStackForm()).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 2).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 2).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 6).fluidInputs(Materials.SolderingAlloy.getFluid(576), Materials.Lubricant.getFluid(250)).outputs(MetaItems.ROBOT_ARM_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 6), OreDictUnifier.get(OrePrefix.stickLong, Materials.HSSE, 4), OreDictUnifier.get(OrePrefix.gear, Materials.HSSE), OreDictUnifier.get(OrePrefix.gearSmall, Materials.HSSE, 3), MetaItems.ELECTRIC_MOTOR_ZPM.getStackForm(2), MetaItems.ELECTRIC_PISTON_ZPM.getStackForm()).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 4).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 4).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 12).fluidInputs(Materials.SolderingAlloy.getFluid(1152), Materials.Lubricant.getFluid(750)).outputs(MetaItems.ROBOT_ARM_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 6), OreDictUnifier.get(OrePrefix.stickLong, Materials.Neutronium, 4), OreDictUnifier.get(OrePrefix.gear, Materials.Neutronium), OreDictUnifier.get(OrePrefix.gearSmall, Materials.Neutronium, 3), MetaItems.ELECTRIC_MOTOR_UV.getStackForm(2), MetaItems.ELECTRIC_PISTON_UV.getStackForm()).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 8).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 8).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 24).fluidInputs(Materials.SolderingAlloy.getFluid(2304), Materials.Lubricant.getFluid(2000)).outputs(MetaItems.ROBOT_ARM_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSG, 1), MetaItems.EMITTER_IV.getStackForm(2), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.wireGtDouble, Materials.YttriumBariumCuprate, 8), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Ruby, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.EMITTER_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), MetaItems.EMITTER_LUV.getStackForm(2), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireGtDouble, Materials.VanadiumGallium, 8), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Emerald, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.EMITTER_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), MetaItems.EMITTER_ZPM.getStackForm(2), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.wireGtDouble, Materials.NiobiumTitanium, 8), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Diamond, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.EMITTER_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSG, 1), MetaItems.EMITTER_IV.getStackForm(1), MetaItems.EMITTER_EV.getStackForm(2), MetaItems.EMITTER_HV.getStackForm(4), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 7), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Ruby, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 7).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.EMITTER_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), MetaItems.EMITTER_LUV.getStackForm(1), MetaItems.EMITTER_IV.getStackForm(2), MetaItems.EMITTER_EV.getStackForm(4), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 7), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Emerald, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 7).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.EMITTER_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), MetaItems.EMITTER_ZPM.getStackForm(1), MetaItems.EMITTER_LUV.getStackForm(2), MetaItems.EMITTER_IV.getStackForm(4), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 7), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Diamond, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 7).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.EMITTER_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSG, 1), MetaItems.SENSOR_IV.getStackForm(2), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.wireGtDouble, Materials.YttriumBariumCuprate, 8), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Ruby, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.SENSOR_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), MetaItems.SENSOR_LUV.getStackForm(2), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.wireGtDouble, Materials.VanadiumGallium, 8), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Emerald, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.SENSOR_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), MetaItems.SENSOR_ZPM.getStackForm(2), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.wireGtDouble, Materials.NiobiumTitanium, 8), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Diamond, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.SENSOR_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSG, 1), MetaItems.SENSOR_IV.getStackForm(1), MetaItems.SENSOR_EV.getStackForm(2), MetaItems.SENSOR_HV.getStackForm(4), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Electrum, 64), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 7), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Ruby, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Extreme, 7).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.SENSOR_LUV.getStackForm()).duration(600).EUt(15360).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), MetaItems.SENSOR_LUV.getStackForm(1), MetaItems.SENSOR_IV.getStackForm(2), MetaItems.SENSOR_EV.getStackForm(4), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Platinum, 64), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.VanadiumGallium, 7), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Emerald, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Elite, 7).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.SENSOR_ZPM.getStackForm()).duration(600).EUt(61440).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), MetaItems.SENSOR_ZPM.getStackForm(1), MetaItems.SENSOR_LUV.getStackForm(2), MetaItems.SENSOR_IV.getStackForm(4), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.foil, Materials.Osmiridium, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.NiobiumTitanium, 7), OreDictUnifier.get(OrePrefix.gemExquisite, Materials.Diamond, 2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 7).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.SENSOR_UV.getStackForm()).duration(600).EUt(245760).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSG, 1), MetaItems.QUANTUM_STAR.getStackForm(), MetaItems.EMITTER_LUV.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtOctal, Materials.YttriumBariumCuprate, 4)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 16).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.FIELD_GENERATOR_LUV.getStackForm()).duration(600).EUt(30720).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), MetaItems.QUANTUM_STAR.getStackForm(), MetaItems.EMITTER_ZPM.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtOctal, Materials.YttriumBariumCuprate, 4)).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 16).fluidInputs(Materials.SolderingAlloy.getFluid(1152)).outputs(MetaItems.FIELD_GENERATOR_ZPM.getStackForm()).duration(600).EUt(245760).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), MetaItems.GRAVI_STAR.getStackForm(), MetaItems.EMITTER_UV.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtOctal, Materials.YttriumBariumCuprate, 4)).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 16).fluidInputs(Materials.SolderingAlloy.getFluid(2304)).outputs(MetaItems.FIELD_GENERATOR_UV.getStackForm()).duration(600).EUt(491520).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSG, 1), OreDictUnifier.get(OrePrefix.plate, Materials.HSSG, 6), MetaItems.QUANTUM_STAR.getStackForm(), MetaItems.EMITTER_LUV.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.YttriumBariumCuprate, 8)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 8).fluidInputs(Materials.SolderingAlloy.getFluid(576)).outputs(MetaItems.FIELD_GENERATOR_LUV.getStackForm()).duration(600).EUt(30720).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.HSSE, 1), OreDictUnifier.get(OrePrefix.plate, Materials.HSSE, 6), MetaItems.QUANTUM_STAR.getStackForm(4), MetaItems.EMITTER_ZPM.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtDouble, Materials.YttriumBariumCuprate, 8)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 16).fluidInputs(Materials.SolderingAlloy.getFluid(1152)).outputs(MetaItems.FIELD_GENERATOR_ZPM.getStackForm()).duration(600).EUt(245760).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Neutronium, 1), OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 6), MetaItems.GRAVI_STAR.getStackForm(), MetaItems.EMITTER_UV.getStackForm(4), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.wireFine, Materials.Osmium, 64), OreDictUnifier.get(OrePrefix.cableGtQuadruple, Materials.YttriumBariumCuprate, 8)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 64).fluidInputs(Materials.SolderingAlloy.getFluid(2304)).outputs(MetaItems.FIELD_GENERATOR_UV.getStackForm()).duration(600).EUt(491520).buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.frameGt, Materials.Tritanium, 4), MetaItems.WETWARE_SUPER_COMPUTER_UV.getStackForm(8), MetaItems.SMALL_COIL.getStackForm(4), MetaItems.SMD_CAPACITOR.getStackForm(32), MetaItems.SMD_RESISTOR.getStackForm(32), MetaItems.SMD_TRANSISTOR.getStackForm(32), MetaItems.SMD_DIODE.getStackForm(32), MetaItems.RANDOM_ACCESS_MEMORY.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtDouble, MarkerMaterials.Tier.Superconductor, 16), OreDictUnifier.get(OrePrefix.foil, Materials.SiliconeRubber, 64)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Water.getFluid(10000)).outputs(MetaItems.WETWARE_MAINFRAME_MAX.getStackForm()).duration(2000).EUt(300000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.WETWARE_BOARD.getStackForm(), MetaItems.STEM_CELLS.getStackForm(8), MetaItems.GLASS_TUBE.getStackForm(8), OreDictUnifier.get(OrePrefix.foil, Materials.SiliconeRubber, 64)).input(OrePrefix.plate, Materials.Gold, 8).input(OrePrefix.plate, Materials.StainlessSteel, 4).fluidInputs(Materials.SterileGrowthMedium.getFluid(100), Materials.UUMatter.getFluid(20), Materials.DistilledWater.getFluid(4000)).outputs(MetaItems.NEURO_PROCESSOR.getStackForm(8)).duration(200).EUt(20000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaItems.WETWARE_BOARD.getStackForm(), MetaItems.STEM_CELLS.getStackForm(8), MetaItems.GLASS_TUBE.getStackForm(8), OreDictUnifier.get(OrePrefix.pipeTiny, Materials.Polyethylene, 4), OreDictUnifier.get(OrePrefix.foil, Materials.SiliconeRubber, 64)).input(OrePrefix.plate, Materials.Gold, 4).input(OrePrefix.plate, Materials.StainlessSteel, 4).fluidInputs(Materials.SterileGrowthMedium.getFluid(250), Materials.UUMatter.getFluid(100), Materials.DistilledWater.getFluid(1000)).outputs(MetaItems.NEURO_PROCESSOR.getStackForm(1)).duration(200).EUt(80000).buildAndRegister(); ItemStack last_bat = (ConfigHolder.U.GT5u.replaceUVwithMAXBat ? MetaItems.MAX_BATTERY : MetaItems.ZPM2).getStackForm(); if (ConfigHolder.U.GT5u.enableZPMandUVBats) { @@ -100,13 +100,13 @@ public static void init() { RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 16), MetaItems.WETWARE_SUPER_COMPUTER_UV.getStackForm(4), MetaItems.ENERGY_MODULE.getStackForm(8), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.cableGtSingle, Materials.NaquadahAlloy, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Water.getFluid(16000)).outputs(MetaItems.ENERGY_CLUSTER.getStackForm()).duration(2000).EUt(200000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(4), MetaItems.ENERGY_CLUSTER.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Water.getFluid(16000), Materials.Naquadria.getFluid(1152)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.ENERGY_CLUSTER.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Water.getFluid(16000), Materials.Naquadria.getFluid(1152)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); } else { - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(4), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Water.getFluid(16000)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(OreDictUnifier.get(OrePrefix.plate, Materials.Neutronium, 16), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(), MetaItems.ENERGY_LAPOTRONIC_ORB2.getStackForm(8), MetaItems.FIELD_GENERATOR_UV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.SMD_DIODE.getStackForm(16), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880), Materials.Water.getFluid(16000)).outputs(last_bat).duration(2000).EUt(300000).buildAndRegister(); } - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.WIRE_COIL.getItemVariant(BlockWireCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Plutonium241), OreDictUnifier.get(OrePrefix.plate, Materials.NetherStar), MetaItems.FIELD_GENERATOR_IV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(32), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 4).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[0].getStackForm()).duration(1000).EUt(30000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.WIRE_COIL.getItemVariant(BlockWireCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Europium, 4), MetaItems.FIELD_GENERATOR_LUV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(48), OreDictUnifier.get(OrePrefix.wireGtDouble, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 4).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[1].getStackForm()).duration(1000).EUt(60000).buildAndRegister(); - RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.WIRE_COIL.getItemVariant(BlockWireCoil.CoilType.FUSION_COIL), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(4), OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 4), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64), OreDictUnifier.get(OrePrefix.wireGtQuadruple, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[2].getStackForm()).duration(1000).EUt(90000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.WIRE_COIL.getItemVariant(BlockWireCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Plutonium241), OreDictUnifier.get(OrePrefix.plate, Materials.NetherStar), MetaItems.FIELD_GENERATOR_IV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(32), OreDictUnifier.get(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate, 1).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[0].getStackForm()).duration(1000).EUt(30000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.WIRE_COIL.getItemVariant(BlockWireCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Europium, 4), MetaItems.FIELD_GENERATOR_LUV.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(48), OreDictUnifier.get(OrePrefix.wireGtDouble, MarkerMaterials.Tier.Superconductor, 32)).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).input(OrePrefix.circuit, MarkerMaterials.Tier.Superconductor, 1).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[1].getStackForm()).duration(1000).EUt(60000).buildAndRegister(); + RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder().inputs(MetaBlocks.WIRE_COIL.getItemVariant(BlockWireCoil.CoilType.FUSION_COIL), OreDictUnifier.get(OrePrefix.plate, Materials.Americium, 4), MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2), MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm(64), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), MetaItems.WETWARE_MAINFRAME_MAX.getStackForm(1), OreDictUnifier.get(OrePrefix.wireGtQuadruple, MarkerMaterials.Tier.Superconductor, 32)).fluidInputs(Materials.SolderingAlloy.getFluid(2880)).outputs(MetaTileEntities.FUSION_REACTOR[2].getStackForm()).duration(1000).EUt(90000).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java index bf5dd14c0b5..943c15610af 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java @@ -9,14 +9,15 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.type.Material; import gregtech.api.unification.ore.OrePrefix; +import gregtech.api.unification.stack.MaterialStack; import gregtech.api.unification.stack.UnificationEntry; import gregtech.api.util.GTLog; import gregtech.common.ConfigHolder; +import gregtech.common.blocks.BlockTransparentCasing; import gregtech.common.blocks.MetaBlocks; import gregtech.common.blocks.wood.BlockGregLog.LogVariant; import gregtech.common.crafting.FacadeRecipe; import gregtech.common.items.MetaItems; -import gregtech.common.metatileentities.MetaTileEntities; import gregtech.loaders.oreprocessing.ToolRecipeHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockColored; @@ -30,10 +31,11 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.OreIngredient; -import java.util.HashMap; -import java.util.Map; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.dust; import static gregtech.api.util.DyeUtil.*; +import static gregtech.common.items.MetaItems.RUBBER_DROP; public class CraftingRecipeLoader { @@ -42,9 +44,7 @@ public static void init() { } private static void loadCraftingRecipes() { - registerFacadeRecipe(Materials.Aluminium, 5); - registerFacadeRecipe(Materials.WroughtIron, 3); - registerFacadeRecipe(Materials.Iron, 2); + registerFacadeRecipe(Materials.Iron, 4); ToolRecipeHandler.registerPowerUnitRecipes(); ModHandler.addShapedRecipe("small_wooden_pipe", OreDictUnifier.get(OrePrefix.pipeSmall, Materials.Wood, 4), "WWW", "h f", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood)); @@ -77,7 +77,10 @@ private static void loadCraftingRecipes() { ModHandler.addSmeltingRecipe(MetaItems.COMPRESSED_CLAY.getStackForm(), MetaItems.COKE_OVEN_BRICK.getStackForm()); ModHandler.addSmeltingRecipe(MetaItems.COMPRESSED_FIRECLAY.getStackForm(), MetaItems.FIRECLAY_BRICK.getStackForm()); + ModHandler.addShapelessRecipe("glass_dust_handcrafting", OreDictUnifier.get(dust, Glass), "dustSand", "dustFlint"); + ModHandler.addSmeltingRecipe(new UnificationEntry(OrePrefix.nugget, Materials.Iron), OreDictUnifier.get(OrePrefix.nugget, Materials.WroughtIron)); + ModHandler.addSmeltingRecipe(new ItemStack(Items.SLIME_BALL), RUBBER_DROP.getStackForm()); for (MetaValueItem batteryItem : ToolRecipeHandler.batteryItems[0]) { ModHandler.addShapedEnergyTransferRecipe("scanner_" + batteryItem.unlocalizedName, MetaItems.SCANNER.getStackForm(), @@ -94,10 +97,16 @@ private static void loadCraftingRecipes() { String recipeName = "lapotron_crystal_" + material.toString(); ModHandler.addShapedEnergyTransferRecipeWithOverride(recipeName, MetaItems.LAPOTRON_CRYSTAL.getStackForm(), Ingredient.fromStacks(MetaItems.ENERGY_CRYSTAL.getStackForm()), false, false, - "XCX", "XEX", "XCX", + "XCX", "RER", "XCX", 'X', new UnificationEntry(OrePrefix.plate, material), - 'C', new UnificationEntry(OrePrefix.circuit, Tier.Advanced), + 'R', new UnificationEntry(OrePrefix.stick, material), + 'C', new UnificationEntry(OrePrefix.circuit, Tier.Extreme), 'E', MetaItems.ENERGY_CRYSTAL.getStackForm()); + + ModHandler.addShapelessRecipe(recipeName + "_alt", MetaItems.LAPOTRON_CRYSTAL.getStackForm(), + new UnificationEntry(OrePrefix.gemExquisite, Materials.Sapphire), + new UnificationEntry(OrePrefix.stick, material), + MetaItems.CAPACITOR.getStackForm()); } ModHandler.addShapelessRecipe("rubber_wood_planks", new ItemStack(Blocks.PLANKS, 4, EnumType.JUNGLE.getMetadata()), new ItemStack(MetaBlocks.LOG, 1, LogVariant.RUBBER_WOOD.ordinal())); @@ -219,7 +228,7 @@ private static void loadCraftingRecipes() { ModHandler.addShapedRecipe("battery_hull_lv", MetaItems.BATTERY_HULL_LV.getStackForm(), "C", "P", "P", 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin), 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy)); ModHandler.addShapedRecipe("battery_hull_mv", MetaItems.BATTERY_HULL_MV.getStackForm(), "C C", "PPP", "PPP", 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy)); - ModHandler.addShapedRecipe("carbon_mesh", MetaItems.CARBON_MESH.getStackForm(), "XX", "XX", 'X', MetaItems.CARBON_FIBERS.getStackForm()); + ModHandler.addShapedRecipe("carbon_mesh", MetaItems.CARBON_MESH.getStackForm(), "XX", 'X', MetaItems.CARBON_FIBERS.getStackForm()); ModHandler.addShapedRecipe("component_grinder_diamond", MetaItems.COMPONENT_GRINDER_DIAMOND.getStackForm(), "XSX", "SDS", "XSX", 'X', new UnificationEntry(OrePrefix.dust, Materials.Diamond), 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'D', new UnificationEntry(OrePrefix.gem, Materials.Diamond)); ModHandler.addShapedRecipe("component_grinder_tungsten", MetaItems.COMPONENT_GRINDER_TUNGSTEN.getStackForm(), "WSW", "SDS", "WSW", 'W', new UnificationEntry(OrePrefix.plate, Materials.Tungsten), 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'D', new UnificationEntry(OrePrefix.gem, Materials.Diamond)); @@ -227,14 +236,14 @@ private static void loadCraftingRecipes() { ModHandler.addShapedRecipe("energy_field_projector", MetaItems.ENERGY_FIELD_PROJECTOR.getStackForm(), "PLP", "LFL", "PLP", 'P', MetaItems.PLATE_IRIDIUM_ALLOY.getStackForm(), 'L', MetaItems.LAPOTRON_CRYSTAL.getStackForm(), 'F', MetaItems.FIELD_GENERATOR_EV); - ModHandler.addShapedRecipe("ingot_iridium_alloy", MetaItems.INGOT_IRIDIUM_ALLOY.getStackForm(), "IWI", "WDW", "IWI", 'I', new UnificationEntry(OrePrefix.plate, Materials.Iridium), 'W', new UnificationEntry(OrePrefix.plate, Materials.Tungsten), 'D', new UnificationEntry(OrePrefix.dust, Materials.Diamond)); - ModHandler.addShapedRecipe("ingot_mixed_metal", MetaItems.INGOT_MIXED_METAL.getStackForm(2), "TTT", "BBB", "III", 'T', new UnificationEntry(OrePrefix.plate, Materials.Tin), 'B', new UnificationEntry(OrePrefix.plate, Materials.Bronze), 'I', new UnificationEntry(OrePrefix.plate, Materials.Iron)); + ModHandler.addShapedRecipe("ingot_iridium_alloy", MetaItems.INGOT_IRIDIUM_ALLOY.getStackForm(), "IWI", "WDW", "IWI", 'I', new UnificationEntry(OrePrefix.plate, Materials.Iridium), 'W', MetaItems.ADVANCED_ALLOY_PLATE, 'D', new ItemStack(Items.DIAMOND)); ModHandler.addShapedRecipe("nano_saber", MetaItems.NANO_SABER.getStackForm(), "PIC", "PIC", "XEX", 'P', new UnificationEntry(OrePrefix.plate, Materials.Platinum), 'I', MetaItems.PLATE_IRIDIUM_ALLOY.getStackForm(), 'C', MetaItems.CARBON_PLATE.getStackForm(), 'X', new UnificationEntry(OrePrefix.circuit, Tier.Extreme), 'E', MetaItems.ENERGY_CRYSTAL.getStackForm()); - ModHandler.addShapedRecipe("solar_panel/solar_panel_basic", MetaItems.COVER_SOLAR_PANEL.getStackForm(), "SGS", "CXC", "AAA", 'S', new UnificationEntry(OrePrefix.plate, Materials.Silicon), 'G', "paneGlass", 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'X', new UnificationEntry(OrePrefix.circuit, Tier.Basic), 'A', new UnificationEntry(OrePrefix.plate, Materials.Aluminium)); - ModHandler.addShapedRecipe("solar_panel/solar_panel_ulv", MetaItems.COVER_SOLAR_PANEL_ULV.getStackForm(), "SSS", "SXS", "SSS", 'S', MetaItems.COVER_SOLAR_PANEL.getStackForm(), 'X', new UnificationEntry(OrePrefix.circuit, Tier.Basic)); - ModHandler.addShapedRecipe("solar_panel/solar_panel_lv", MetaItems.COVER_SOLAR_PANEL_LV.getStackForm(), "PSP", "SXS", "PSP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Silicon), 'S', MetaItems.COVER_SOLAR_PANEL_ULV.getStackForm(), 'X', new UnificationEntry(OrePrefix.circuit, Tier.Good)); + ModHandler.addShapedRecipe("solar_panel/solar_panel_basic", MetaItems.COVER_SOLAR_PANEL.getStackForm(), "WGW", "CPC", 'W', MetaItems.SILICON_WAFER.getStackForm(), 'G', "paneGlass", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Basic), 'P', MetaItems.CARBON_PLATE.getStackForm()); + ModHandler.addShapedRecipe("solar_panel/solar_panel_ulv", MetaItems.COVER_SOLAR_PANEL_ULV.getStackForm(), "WGW", "CAC", "P P", 'W', MetaItems.GLOWSTONE_WAFER.getStackForm(), 'G', "paneGlass", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Advanced), 'P', OreDictUnifier.get(OrePrefix.plate, GalliumArsenide), 'A', OreDictUnifier.get(OrePrefix.wireGtQuadruple, Graphene)); + ModHandler.addShapedRecipe("solar_panel/solar_panel_lv", MetaItems.COVER_SOLAR_PANEL_LV.getStackForm(), "WGW", "CAC", "P P", 'W', MetaItems.NAQUADAH_WAFER.getStackForm(), 'G', MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS), 'C', new UnificationEntry(OrePrefix.circuit, Tier.Master), 'P', OreDictUnifier.get(OrePrefix.plate, IndiumGalliumPhosphide), 'A', OreDictUnifier.get(OrePrefix.wireGtHex, Graphene)); + /////////////////////////////////////////////////// // Shapes and Molds // diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 62931342b1a..957cf5bb5da 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -14,6 +14,7 @@ import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.type.IngotMaterial; +import gregtech.api.unification.material.type.Material; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.MaterialStack; import gregtech.api.unification.stack.UnificationEntry; @@ -25,6 +26,7 @@ import gregtech.common.blocks.BlockMetalCasing.MetalCasingType; import gregtech.common.blocks.BlockMineral.MineralVariant; import gregtech.common.blocks.BlockMultiblockCasing.MultiblockCasingType; +import gregtech.common.blocks.BlockTransparentCasing; import gregtech.common.blocks.BlockTurbineCasing.TurbineCasingType; import gregtech.common.blocks.BlockWireCoil.CoilType; import gregtech.common.blocks.MetaBlocks; @@ -52,6 +54,7 @@ import static gregtech.api.GTValues.L; import static gregtech.api.GTValues.M; +import static gregtech.api.unification.ore.OrePrefix.*; import static gregtech.api.util.DyeUtil.getOrdictColorName; import static gregtech.common.items.MetaItems.*; @@ -65,6 +68,7 @@ public static void init() { FuelRecipes.registerFuels(); AssemblyLineLoader.init(); ComponentRecipes.register(); + MiscRecipeLoader.init(); registerCircuitRecipes(); registerCutterRecipes(); @@ -165,6 +169,16 @@ private static void registerBendingCompressingRecipes() { .outputs(MetaItems.FLUID_CELL.getStackForm()) .duration(200).EUt(30) .buildAndRegister(); + + RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().duration(400).EUt(2) + .input(OrePrefix.dust, Materials.NetherQuartz) + .output(OrePrefix.plate, Materials.NetherQuartz) + .buildAndRegister(); + + RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().duration(400).EUt(2) + .input(OrePrefix.dust, Materials.CertusQuartz) + .output(OrePrefix.plate, Materials.CertusQuartz) + .buildAndRegister(); } private static void registerPrimitiveBlastFurnaceRecipes() { @@ -202,7 +216,7 @@ private static void registerStoneBricksRecipes() { private static void registerCircuitRecipes() { //Wafer blast furnace recipes - RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(9000).EUt(120).input(OrePrefix.dust, Materials.Silicon, 32).input(OrePrefix.dustTiny, Materials.Gallium).inputs(new CountableIngredient(new IntCircuitIngredient(1), 0)).outputs(MetaItems.SILICON_BOULE.getStackForm()).blastFurnaceTemp(1784).buildAndRegister(); + RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(9000).EUt(120).input(OrePrefix.dust, Materials.Silicon, 32).input(OrePrefix.dustSmall, Materials.GalliumArsenide).inputs(new CountableIngredient(new IntCircuitIngredient(1), 0)).outputs(MetaItems.SILICON_BOULE.getStackForm()).blastFurnaceTemp(1784).buildAndRegister(); RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(12000).EUt(480).input(OrePrefix.dust, Materials.Silicon, 64).input(OrePrefix.dust, Materials.Glowstone, 8).inputs(new CountableIngredient(new IntCircuitIngredient(1), 0)).fluidInputs(Materials.Nitrogen.getFluid(8000)).outputs(MetaItems.GLOWSTONE_BOULE.getStackForm()).blastFurnaceTemp(2484).buildAndRegister(); RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(1500).EUt(1920).input(OrePrefix.block, Materials.Silicon, 9).input(OrePrefix.ingot, Materials.Naquadah).inputs(new CountableIngredient(new IntCircuitIngredient(1), 0)).fluidInputs(Materials.Argon.getFluid(8000)).outputs(MetaItems.NAQUADAH_BOULE.getStackForm()).blastFurnaceTemp(5400).buildAndRegister(); @@ -261,12 +275,12 @@ private static void registerCircuitRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8).inputs(MetaItems.PHENOLIC_BOARD.getStackForm(), MetaItems.INTEGRATED_LOGIC_CIRCUIT.getStackForm(), MetaItems.RESISTOR.getStackForm(2)).input(OrePrefix.wireFine, Materials.Copper).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.BASIC_ELECTRONIC_CIRCUIT_LV.getStackForm()).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(8).inputs(MetaItems.PHENOLIC_BOARD.getStackForm(), MetaItems.INTEGRATED_LOGIC_CIRCUIT.getStackForm(), MetaItems.SMD_RESISTOR.getStackForm(2)).input(OrePrefix.wireFine, Materials.Copper).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.BASIC_ELECTRONIC_CIRCUIT_LV.getStackForm()).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.CENTRAL_PROCESSING_UNIT.getStackForm(4), MetaItems.RESISTOR.getStackForm(4), MetaItems.CAPACITOR.getStackForm(4), MetaItems.TRANSISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Copper, 2).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.ADVANCED_CIRCUIT_PARTS_LV.getStackForm(4)).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.CENTRAL_PROCESSING_UNIT.getStackForm(4), MetaItems.SMD_RESISTOR.getStackForm(4), MetaItems.SMD_CAPACITOR.getStackForm(4), MetaItems.SMD_TRANSISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Copper, 2).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.ADVANCED_CIRCUIT_PARTS_LV.getStackForm(4)).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(600).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.SYSTEM_ON_CHIP.getStackForm(1)).input(OrePrefix.wireFine, Materials.Copper, 2).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.ADVANCED_CIRCUIT_PARTS_LV.getStackForm(4)).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.CENTRAL_PROCESSING_UNIT.getStackForm(4), MetaItems.RESISTOR.getStackForm(4), MetaItems.CAPACITOR.getStackForm(4), MetaItems.TRANSISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Copper, 2).fluidInputs(material.getFluid(L / 2 * multiplier)).outputs(ADVANCED_CIRCUIT_PARTS_LV.getStackForm(4)).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.CENTRAL_PROCESSING_UNIT.getStackForm(4), MetaItems.SMD_RESISTOR.getStackForm(4), MetaItems.SMD_CAPACITOR.getStackForm(4), MetaItems.SMD_TRANSISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Copper, 2).fluidInputs(material.getFluid(L / 2 * multiplier)).outputs(ADVANCED_CIRCUIT_PARTS_LV.getStackForm(4)).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(600).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.SYSTEM_ON_CHIP.getStackForm(4)).input(OrePrefix.wireFine, Materials.Copper, 2).fluidInputs(material.getFluid(L / 2 * multiplier)).outputs(ADVANCED_CIRCUIT_PARTS_LV.getStackForm(4)).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16).inputs(MetaItems.PHENOLIC_BOARD.getStackForm(), MetaItems.BASIC_ELECTRONIC_CIRCUIT_LV.getStackForm(3), MetaItems.RESISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Electrum, 8).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.GOOD_INTEGRATED_CIRCUIT_MV.getStackForm()).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16).inputs(MetaItems.PHENOLIC_BOARD.getStackForm(), MetaItems.BASIC_ELECTRONIC_CIRCUIT_LV.getStackForm(3), MetaItems.SMD_RESISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Electrum, 8).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.GOOD_INTEGRATED_CIRCUIT_MV.getStackForm()).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16).inputs(MetaItems.PHENOLIC_BOARD.getStackForm(), MetaItems.BASIC_ELECTRONIC_CIRCUIT_LV.getStackForm(3), MetaItems.RESISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Gold, 8).fluidInputs(material.getFluid(L / 2 * multiplier)).outputs(MetaItems.GOOD_INTEGRATED_CIRCUIT_MV.getStackForm()).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(16).inputs(MetaItems.PHENOLIC_BOARD.getStackForm(), MetaItems.BASIC_ELECTRONIC_CIRCUIT_LV.getStackForm(3), MetaItems.SMD_RESISTOR.getStackForm(4)).input(OrePrefix.wireFine, Materials.Gold, 8).fluidInputs(material.getFluid(L / 2 * multiplier)).outputs(MetaItems.GOOD_INTEGRATED_CIRCUIT_MV.getStackForm()).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.CENTRAL_PROCESSING_UNIT.getStackForm(), MetaItems.RESISTOR.getStackForm(2), MetaItems.CAPACITOR.getStackForm(2), MetaItems.TRANSISTOR.getStackForm(2)).input(OrePrefix.wireFine, Materials.RedAlloy, 2).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.ADVANCED_CIRCUIT_MV.getStackForm()).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(60).inputs(MetaItems.PLASTIC_BOARD.getStackForm(), MetaItems.CENTRAL_PROCESSING_UNIT.getStackForm(), MetaItems.SMD_RESISTOR.getStackForm(2), MetaItems.SMD_CAPACITOR.getStackForm(2), MetaItems.SMD_TRANSISTOR.getStackForm(2)).input(OrePrefix.wireFine, Materials.RedAlloy, 2).fluidInputs(material.getFluid(72 * multiplier)).outputs(MetaItems.ADVANCED_CIRCUIT_MV.getStackForm()).buildAndRegister(); @@ -310,11 +324,21 @@ private static void registerCircuitRecipes() { RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(160).EUt(8).input(OrePrefix.dust, Materials.Glass).notConsumable(MetaItems.SHAPE_MOLD_BALL).outputs(MetaItems.GLASS_TUBE.getStackForm()).buildAndRegister(); ModHandler.addShapedRecipe("resistor_wire", MetaItems.RESISTOR.getStackForm(3), " P ", "WCW", " P ", 'P', new ItemStack(Items.PAPER), 'W', new UnificationEntry(OrePrefix.wireGtSingle, Materials.Copper), 'C', new UnificationEntry(OrePrefix.dust, Materials.Coal)); ModHandler.addShapedRecipe("resistor_wire_fine", MetaItems.RESISTOR.getStackForm(3), " P ", "WCW", " P ", 'P', new ItemStack(Items.PAPER), 'W', new UnificationEntry(OrePrefix.wireFine, Materials.Copper), 'C', new UnificationEntry(OrePrefix.dust, Materials.Coal)); + ModHandler.addShapedRecipe("resistor_wire_charcoal", MetaItems.RESISTOR.getStackForm(3), " P ", "WCW", " P ", 'P', new ItemStack(Items.PAPER), 'W', new UnificationEntry(OrePrefix.wireGtSingle, Materials.Copper), 'C', new UnificationEntry(OrePrefix.dust, Materials.Charcoal)); + ModHandler.addShapedRecipe("resistor_wire_fine_charcoal", MetaItems.RESISTOR.getStackForm(3), " P ", "WCW", " P ", 'P', new ItemStack(Items.PAPER), 'W', new UnificationEntry(OrePrefix.wireFine, Materials.Copper), 'C', new UnificationEntry(OrePrefix.dust, Materials.Charcoal)); + ModHandler.addShapedRecipe("resistor_wire_carbon", MetaItems.RESISTOR.getStackForm(3), " P ", "WCW", " P ", 'P', new ItemStack(Items.PAPER), 'W', new UnificationEntry(OrePrefix.wireGtSingle, Materials.Copper), 'C', new UnificationEntry(OrePrefix.dust, Materials.Carbon)); + ModHandler.addShapedRecipe("resistor_wire_fine_carbon", MetaItems.RESISTOR.getStackForm(3), " P ", "WCW", " P ", 'P', new ItemStack(Items.PAPER), 'W', new UnificationEntry(OrePrefix.wireFine, Materials.Copper), 'C', new UnificationEntry(OrePrefix.dust, Materials.Carbon)); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6).input(OrePrefix.dust, Materials.Coal).input(OrePrefix.wireFine, Materials.Copper, 4).outputs(MetaItems.RESISTOR.getStackForm(12)).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6).input(OrePrefix.dust, Materials.Charcoal).input(OrePrefix.wireFine, Materials.Copper, 4).outputs(MetaItems.RESISTOR.getStackForm(12)).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(160).EUt(6).input(OrePrefix.dust, Materials.Carbon).input(OrePrefix.wireFine, Materials.Copper, 4).outputs(MetaItems.RESISTOR.getStackForm(12)).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(96).input(OrePrefix.plate, Materials.Polyethylene).input(OrePrefix.foil, Materials.Aluminium, 2).outputs(MetaItems.CAPACITOR.getStackForm(2)).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(24).input(OrePrefix.plate, Materials.Silicon).input(OrePrefix.foil, Materials.Tin, 6).fluidInputs(Materials.Polyethylene.getFluid(144)).outputs(MetaItems.TRANSISTOR.getStackForm(8)).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(80).EUt(24).input(OrePrefix.plate, Materials.Silicon).input(OrePrefix.wireFine, Materials.Tin, 6).fluidInputs(Materials.Polyethylene.getFluid(144)).outputs(MetaItems.TRANSISTOR.getStackForm(8)).buildAndRegister(); - ModHandler.addShapedRecipe("diode", MetaItems.DIODE.getStackForm(4), "DG ", "TWT", "DG ", 'D', "dyeBlack", 'G', "paneGlass", 'T', new UnificationEntry(OrePrefix.wireFine, Materials.Tin), 'W', new UnificationEntry(OrePrefix.dustTiny, Materials.Gallium)); + ModHandler.addShapedRecipe("diode_wafer", MetaItems.DIODE.getStackForm(1), "DG ", "TWT", "DG ", 'D', "dyeBlack", 'G', "paneGlass", 'T', new UnificationEntry(OrePrefix.wireGtSingle, Materials.Tin), 'W', MetaItems.SILICON_WAFER.getStackForm(1)); + ModHandler.addShapedRecipe("diode_wafer_fine", MetaItems.DIODE.getStackForm(1), "DG ", "TWT", "DG ", 'D', "dyeBlack", 'G', "paneGlass", 'T', new UnificationEntry(OrePrefix.wireFine, Materials.Tin), 'W', MetaItems.SILICON_WAFER.getStackForm(1)); + ModHandler.addShapedRecipe("diode", MetaItems.DIODE.getStackForm(4), "DG ", "TWT", "DG ", 'D', "dyeBlack", 'G', "paneGlass", 'T', new UnificationEntry(OrePrefix.wireGtSingle, Materials.Tin), 'W', new UnificationEntry(OrePrefix.dustTiny, Materials.Gallium)); + ModHandler.addShapedRecipe("diode_wire", MetaItems.DIODE.getStackForm(4), "DG ", "TWT", "DG ", 'D', "dyeBlack", 'G', "paneGlass", 'T', new UnificationEntry(OrePrefix.wireFine, Materials.Tin), 'W', new UnificationEntry(OrePrefix.dustTiny, Materials.Gallium)); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(48).input(OrePrefix.wireFine, Materials.AnnealedCopper, 4).input(OrePrefix.dustSmall, Materials.Gallium).fluidInputs(Materials.Polyethylene.getFluid(288)).outputs(MetaItems.DIODE.getStackForm(16)).buildAndRegister(); ModHandler.addShapedRecipe("small_coil_copper_steel", MetaItems.SMALL_COIL.getStackForm(2), "WWW", "WBW", "WWW", 'W', new UnificationEntry(OrePrefix.wireFine, Materials.Copper), 'B', new UnificationEntry(OrePrefix.bolt, Materials.Steel)); @@ -333,8 +357,9 @@ private static void registerCircuitRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(120).input(OrePrefix.foil, Materials.PolyvinylChloride, 4).input(OrePrefix.foil, Materials.Aluminium).fluidInputs(Materials.Polyethylene.getFluid(36)).outputs(MetaItems.SMD_CAPACITOR.getStackForm(16)).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(60).EUt(120).input(OrePrefix.foil, Materials.SiliconeRubber, 4).input(OrePrefix.foil, Materials.Aluminium).fluidInputs(Materials.Polyethylene.getFluid(36)).outputs(MetaItems.SMD_CAPACITOR.getStackForm(16)).buildAndRegister(); - RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(45).EUt(40).input(OrePrefix.dust, Materials.Carbon).fluidInputs(Materials.Palladium.getFluid(1)).chancedOutput(MetaItems.CARBON_FIBERS.getStackForm(2), 8500, 750).buildAndRegister(); - RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(45).EUt(40).input(OrePrefix.dust, Materials.Carbon).fluidInputs(Materials.Platinum.getFluid(1)).chancedOutput(MetaItems.CARBON_FIBERS.getStackForm(2), 8000, 750).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(150).EUt(5).input(OrePrefix.dust, Materials.Carbon, 4).fluidInputs(Materials.Palladium.getFluid(1)).chancedOutput(MetaItems.CARBON_FIBERS.getStackForm(2), 9000, 1000).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(150).EUt(5).input(OrePrefix.dust, Materials.Carbon, 4).fluidInputs(Materials.Platinum.getFluid(1)).chancedOutput(MetaItems.CARBON_FIBERS.getStackForm(2), 5000, 5000).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(150).EUt(5).input(OrePrefix.dust, Materials.Carbon, 4).fluidInputs(Materials.Lutetium.getFluid(1)).chancedOutput(MetaItems.CARBON_FIBERS.getStackForm(2), 3333, 3334).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(4000).EUt(120).inputs(MetaItems.PLATE_IRIDIUM_ALLOY.getStackForm()).input(OrePrefix.plate, Materials.Beryllium, 32).input(OrePrefix.plate, Materials.TungstenCarbide, 4).fluidInputs(Materials.TinAlloy.getFluid(L * 32)).outputs(MetaItems.NEUTRON_REFLECTOR.getStackForm()).buildAndRegister(); @@ -349,25 +374,31 @@ private static void registerCircuitRecipes() { RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10).input(OrePrefix.plate, Materials.Epoxy).input(OrePrefix.foil, Materials.Copper).fluidInputs(Materials.SulfuricAcid.getFluid(125)).outputs(MetaItems.EPOXY_BOARD.getStackForm()).buildAndRegister(); RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(500).EUt(10).input(OrePrefix.plate, Materials.ReinforcedEpoxyResin).input(OrePrefix.foil, Materials.Copper).fluidInputs(Materials.SulfuricAcid.getFluid(125)).outputs(MetaItems.FIBER_BOARD.getStackForm()).buildAndRegister(); RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(100).EUt(480).inputs(MetaItems.FIBER_BOARD.getStackForm()).input(OrePrefix.foil, Materials.Electrum, 16).fluidInputs(Materials.SulfuricAcid.getFluid(250)).outputs(MetaItems.MULTILAYER_FIBER_BOARD.getStackForm()).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480).inputs(MetaItems.MULTILAYER_FIBER_BOARD.getStackForm()).input(OrePrefix.circuit, Tier.Good).fluidInputs(Materials.Polystyrene.getFluid(144)).outputs(MetaItems.WETWARE_BOARD.getStackForm()).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(480).inputs(MetaItems.MULTILAYER_FIBER_BOARD.getStackForm()).input(OrePrefix.circuit, Tier.Good).inputs(MetaItems.ELECTRIC_PUMP_LV.getStackForm(), MetaItems.SENSOR_LV.getStackForm(), MetaItems.PETRI_DISH.getStackForm()).fluidInputs(Materials.SterileGrowthMedium.getFluid(250)).outputs(MetaItems.WETWARE_BOARD.getStackForm()).buildAndRegister(); RecipeMaps.LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(32000).inputs(MetaItems.CRYSTAL_CENTRAL_PROCESSING_UNIT.getStackForm()).notConsumable(OrePrefix.craftingLens, Color.Blue).outputs(MetaItems.CRYSTAL_SYSTEM_ON_CHIP.getStackForm()).buildAndRegister(); RecipeMaps.LASER_ENGRAVER_RECIPES.recipeBuilder().duration(100).EUt(7600).inputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm()).notConsumable(OrePrefix.craftingLens, Color.Lime).outputs(MetaItems.CRYSTAL_CENTRAL_PROCESSING_UNIT.getStackForm()).buildAndRegister(); RecipeMaps.LASER_ENGRAVER_RECIPES.recipeBuilder().duration(256).EUt(480).inputs(MetaItems.LAPOTRON_CRYSTAL.getStackForm()).notConsumable(OrePrefix.craftingLens, Color.Blue).outputs(MetaItems.ENGRAVED_LAPOTRON_CHIP.getStackForm(3)).buildAndRegister(); - ModHandler.addShapelessRecipe("reinforcing_epoxy_resin_by_glass", OreDictUnifier.get(OrePrefix.dust, Materials.ReinforcedEpoxyResin), new UnificationEntry(OrePrefix.dust, Materials.Epoxy), MetaItems.GLASS_FIBER.getStackForm()); - ModHandler.addShapelessRecipe("reinforcing_epoxy_resin_by_carbon", OreDictUnifier.get(OrePrefix.dust, Materials.ReinforcedEpoxyResin), new UnificationEntry(OrePrefix.dust, Materials.Epoxy), MetaItems.CARBON_FIBERS.getStackForm()); RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder().duration(240).EUt(16).inputs(MetaItems.GLASS_FIBER.getStackForm()).fluidInputs(Materials.Epoxy.getFluid(144)).outputs(OreDictUnifier.get(OrePrefix.plate, Materials.ReinforcedEpoxyResin)).buildAndRegister(); RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder().duration(240).EUt(16).inputs(MetaItems.CARBON_FIBERS.getStackForm()).fluidInputs(Materials.Epoxy.getFluid(144)).outputs(OreDictUnifier.get(OrePrefix.plate, Materials.ReinforcedEpoxyResin)).buildAndRegister(); RecipeMaps.EXTRUDER_RECIPES.recipeBuilder().duration(160).EUt(96).input(OrePrefix.ingot, Materials.BorosilicateGlass).notConsumable(MetaItems.SHAPE_EXTRUDER_WIRE.getStackForm()).outputs(MetaItems.GLASS_FIBER.getStackForm(8)).buildAndRegister(); - RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000).input(OrePrefix.gemExquisite, Materials.Emerald).input(OrePrefix.plate, Materials.Emerald, 10).fluidInputs(Materials.Helium.getFluid(5000)).outputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm(10)).buildAndRegister(); - RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000).input(OrePrefix.gemExquisite, Materials.Olivine).input(OrePrefix.plate, Materials.Olivine, 10).fluidInputs(Materials.Helium.getFluid(5000)).outputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm(10)).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320).input(OrePrefix.gemExquisite, Materials.Emerald).fluidInputs(Materials.Europium.getFluid(L / 9)).chancedOutput(MetaItems.RAW_CRYSTAL_CHIP.getStackForm(), 1000, 2000).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(12000).EUt(320).input(OrePrefix.gemExquisite, Materials.Olivine).fluidInputs(Materials.Europium.getFluid(L / 9)).chancedOutput(MetaItems.RAW_CRYSTAL_CHIP.getStackForm(), 1000, 2000).buildAndRegister(); + + RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000).input(OrePrefix.plate, Materials.Emerald).inputs(MetaItems.RAW_CRYSTAL_CHIP.getStackForm(1)).fluidInputs(Materials.Helium.getFluid(1000)).outputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm(1)).buildAndRegister(); + RecipeMaps.BLAST_RECIPES.recipeBuilder().duration(900).EUt(480).blastFurnaceTemp(5000).input(OrePrefix.plate, Materials.Olivine).inputs(MetaItems.RAW_CRYSTAL_CHIP.getStackForm(1)).fluidInputs(Materials.Helium.getFluid(1000)).outputs(MetaItems.ENGRAVED_CRYSTAL_CHIP.getStackForm(1)).buildAndRegister(); + + RecipeMaps.CUTTER_RECIPES.recipeBuilder().EUt(60).duration(960).inputs(MetaItems.CRYSTAL_CENTRAL_PROCESSING_UNIT.getStackForm(1)).outputs(MetaItems.RAW_CRYSTAL_CHIP.getStackForm(2)).buildAndRegister(); + + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(160).EUt(16).notConsumable(MetaItems.SHAPE_MOLD_CYLINDER).fluidInputs(Materials.Polystyrene.getFluid(L / 4)).outputs(MetaItems.PETRI_DISH.getStackForm()).buildAndRegister(); + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(160).EUt(16).notConsumable(MetaItems.SHAPE_MOLD_CYLINDER).fluidInputs(Materials.Polytetrafluoroethylene.getFluid(L / 4)).outputs(MetaItems.PETRI_DISH.getStackForm()).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(30).EUt(4).input(OrePrefix.dust, Materials.Tantalum).input(OrePrefix.foil, Materials.Manganese).fluidInputs(Materials.Polyethylene.getFluid(144)).outputs(MetaItems.BATTERY_RE_ULV_TANTALUM.getStackForm(8)).buildAndRegister(); - RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder().duration(480).EUt(384).input(OrePrefix.gem, Materials.EnderEye, 1).fluidInputs(Materials.Plutonium.getFluid(L * 2)).outputs(MetaItems.QUANTUM_EYE.getStackForm()).buildAndRegister(); - RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder().duration(1920).EUt(384).input(OrePrefix.gem, Materials.NetherStar, 1).fluidInputs(Materials.Plutonium.getFluid(L * 8)).outputs(MetaItems.QUANTUM_STAR.getStackForm()).buildAndRegister(); - RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(480).EUt(7680).input(OrePrefix.gem, Materials.NetherStar, 1).fluidInputs(Materials.Darmstadtium.getFluid(L * 2)).outputs(MetaItems.GRAVI_STAR.getStackForm()).buildAndRegister(); + RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder().duration(480).EUt(384).input(OrePrefix.gem, Materials.EnderEye, 1).fluidInputs(Materials.Radon.getFluid(250)).outputs(MetaItems.QUANTUM_EYE.getStackForm()).buildAndRegister(); + RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder().duration(1920).EUt(384).input(OrePrefix.gem, Materials.NetherStar, 1).fluidInputs(Materials.Radon.getFluid(1250)).outputs(MetaItems.QUANTUM_STAR.getStackForm()).buildAndRegister(); + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder().duration(480).EUt(7680).input(OrePrefix.gem, Materials.NetherStar, 1).fluidInputs(Materials.Neutronium.getFluid(L * 2)).outputs(MetaItems.GRAVI_STAR.getStackForm()).buildAndRegister(); } private static void registerMixingCrystallizationRecipes() { @@ -531,14 +562,19 @@ private static void registerAlloyRecipes() { RecipeMaps.MIXER_RECIPES.recipeBuilder().duration((int) (300 * prefix.materialAmount / M)).EUt(8).input(prefix, Materials.Saltpeter, 2).input(prefix, Materials.Sulfur, 1).input(prefix, Materials.Charcoal, 1).outputs(OreDictUnifier.getDust(Materials.Gunpowder, 3 * prefix.materialAmount)).buildAndRegister(); } - RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().inputs(MetaItems.INGOT_MIXED_METAL.getStackForm()).outputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).buildAndRegister(); - RecipeMaps.IMPLOSION_RECIPES.recipeBuilder().inputs(MetaItems.INGOT_IRIDIUM_ALLOY.getStackForm()).outputs(MetaItems.PLATE_IRIDIUM_ALLOY.getStackForm()).explosivesAmount(8).buildAndRegister(); + RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().inputs(MetaItems.INGOT_MIXED_METAL.getStackForm()).outputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).duration(300).EUt(2).buildAndRegister(); + RecipeMaps.BENDER_RECIPES.recipeBuilder().inputs(MetaItems.INGOT_MIXED_METAL.getStackForm()).circuitMeta(1).outputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).duration(100).EUt(8).buildAndRegister(); + RecipeMaps.IMPLOSION_RECIPES.recipeBuilder().inputs(MetaItems.INGOT_IRIDIUM_ALLOY.getStackForm()).outputs(MetaItems.PLATE_IRIDIUM_ALLOY.getStackForm()).output(OrePrefix.dustTiny, Materials.DarkAsh, 4).explosivesAmount(8).buildAndRegister(); + RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().inputs(MetaItems.CARBON_FIBERS.getStackForm(2)).outputs(MetaItems.CARBON_MESH.getStackForm()).buildAndRegister(); RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().inputs(MetaItems.CARBON_MESH.getStackForm()).outputs(MetaItems.CARBON_PLATE.getStackForm()).buildAndRegister(); + + RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(400).EUt(4).input(OrePrefix.dust, Materials.Glass, 3).inputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS, 4)).buildAndRegister(); + RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(400).EUt(4).inputs(new ItemStack(Blocks.GLASS)).inputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS, 4)).buildAndRegister(); } private static void registerAssemblerRecipes() { for (EnumDyeColor dyeColor : EnumDyeColor.values()) { - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + RecipeMaps.CANNER_RECIPES.recipeBuilder() .inputs(MetaItems.SPRAY_EMPTY.getStackForm()) .input(getOrdictColorName(dyeColor), 1) .outputs(MetaItems.SPRAY_CAN_DYES[dyeColor.getMetadata()].getStackForm()) @@ -546,11 +582,11 @@ private static void registerAssemblerRecipes() { .buildAndRegister(); } - for (IngotMaterial cableMaterial : new IngotMaterial[]{Materials.YttriumBariumCuprate, Materials.NiobiumTitanium, Materials.VanadiumGallium}) { + for (IngotMaterial cableMaterial : new IngotMaterial[]{Materials.YttriumBariumCuprate, Materials.NiobiumTitanium, Materials.VanadiumGallium, Materials.Naquadah}) { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.wireGtSingle, cableMaterial, 3) .input(OrePrefix.plate, Materials.TungstenSteel, 3) - .inputs(MetaItems.ELECTRIC_PUMP_LV.getStackForm()) + .inputs(MetaItems.ELECTRIC_PUMP_LV.getStackForm(2)) .fluidInputs(Materials.Nitrogen.getFluid(2000)) .outputs(OreDictUnifier.get(OrePrefix.wireGtSingle, Tier.Superconductor, 3)) .duration(20).EUt(512) @@ -564,19 +600,32 @@ private static void registerAssemblerRecipes() { .outputs(MetaItems.ZPM2.getStackForm()) .buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(OrePrefix.plate, Materials.Rubber, 2) - .input(OrePrefix.plate, Materials.Aluminium, 2) - .outputs(MetaItems.COVER_SHUTTER.getStackForm(4)) - .EUt(16).duration(200) - .buildAndRegister(); + Material[] coverMaterials = new Material[]{Materials.Iron, Materials.WroughtIron, Materials.Aluminium}; - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .input(OrePrefix.plate, Materials.Aluminium, 2) - .input(OrePrefix.dust, Materials.Redstone) - .outputs(MetaItems.COVER_MACHINE_CONTROLLER.getStackForm(1)) - .EUt(16).duration(200) - .buildAndRegister(); + for (Material material : coverMaterials) { + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.IRON_DOOR)) + .input(OrePrefix.plate, material, 2) + .outputs(MetaItems.COVER_SHUTTER.getStackForm(2)) + .EUt(16).duration(800) + .buildAndRegister(); + + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.LEVER)) + .input(OrePrefix.plate, material) + .fluidInputs(Materials.Tin.getFluid(L)) + .outputs(MetaItems.COVER_MACHINE_CONTROLLER.getStackForm(1)) + .EUt(16).duration(200) + .buildAndRegister(); + + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.LEVER)) + .input(OrePrefix.plate, material) + .fluidInputs(Materials.SolderingAlloy.getFluid(L / 2)) + .outputs(MetaItems.COVER_MACHINE_CONTROLLER.getStackForm(1)) + .EUt(16).duration(200) + .buildAndRegister(); + } RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(480).EUt(240).input(OrePrefix.dust, Materials.Graphite, 8).input(OrePrefix.foil, Materials.Silicon, 1).fluidInputs(Materials.Glue.getFluid(250)).outputs(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Graphene, 1)).buildAndRegister(); @@ -632,6 +681,8 @@ private static void registerAssemblerRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Materials.Titanium, 6).input(OrePrefix.frameGt, Materials.Titanium, 1).outputs(MetaBlocks.METAL_CASING.getItemVariant(MetalCasingType.TITANIUM_STABLE, 3)).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.LuV)).input(OrePrefix.plate, Materials.TungstenSteel, 6).outputs(MetaBlocks.MULTIBLOCK_CASING.getItemVariant(MultiblockCasingType.FUSION_CASING)).duration(50).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.MULTIBLOCK_CASING.getItemVariant(MultiblockCasingType.FUSION_CASING)).input(OrePrefix.plate, Materials.Americium, 6).outputs(MetaBlocks.MULTIBLOCK_CASING.getItemVariant(MultiblockCasingType.FUSION_CASING_MK2)).duration(50).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Materials.Magnalium, 6).input(OrePrefix.frameGt, Materials.BlueSteel, 1).outputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STEEL_TURBINE_CASING, 3)).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STEEL_TURBINE_CASING)).input(OrePrefix.plate, Materials.StainlessSteel, 6).outputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STAINLESS_TURBINE_CASING, 3)).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STEEL_TURBINE_CASING)).input(OrePrefix.plate, Materials.Titanium, 6).outputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.TITANIUM_TURBINE_CASING, 3)).duration(50).buildAndRegister(); @@ -780,7 +831,7 @@ private static void registerDecompositionRecipes() { RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(240).EUt(30) .input(OrePrefix.dust, Materials.Ash) - .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Quicklime, 2), 9500, 0) + .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Quicklime, 2), 9900, 0) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Potash), 6400, 0) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Magnesia), 6000, 0) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.PhosphorusPentoxide), 500, 0) @@ -788,8 +839,8 @@ private static void registerDecompositionRecipes() { .buildAndRegister(); - RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(50).EUt(30) - .input(OrePrefix.dust, Materials.DarkAsh, 2) + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(250).EUt(6) + .input(OrePrefix.dust, Materials.DarkAsh) .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Ash, 1), OreDictUnifier.get(OrePrefix.dust, Materials.Carbon, 1)) .buildAndRegister(); @@ -975,6 +1026,42 @@ private static void registerRecyclingRecipes() { .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Granite, 1)) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Stone, 1), 100, 40) .buildAndRegister(); + + RecipeMaps.MACERATOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.PORKCHOP)) + .output(dustSmall, Materials.Meat, 6) + .output(dustTiny, Materials.Bone) + .duration(102).EUt(4).buildAndRegister(); + + RecipeMaps.MACERATOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.FISH, 1, GTValues.W)) + .output(dustSmall, Materials.Meat, 6) + .output(dustTiny, Materials.Bone) + .duration(102).EUt(4).buildAndRegister(); + + RecipeMaps.MACERATOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.CHICKEN)) + .output(dust, Materials.Meat) + .output(dustTiny, Materials.Bone) + .duration(102).EUt(4).buildAndRegister(); + + RecipeMaps.MACERATOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.BEEF)) + .output(dustSmall, Materials.Meat, 6) + .output(dustTiny, Materials.Bone) + .duration(102).EUt(4).buildAndRegister(); + + RecipeMaps.MACERATOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.RABBIT)) + .output(dustSmall, Materials.Meat, 6) + .output(dustTiny, Materials.Bone) + .duration(102).EUt(4).buildAndRegister(); + + RecipeMaps.MACERATOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.MUTTON)) + .output(dust, Materials.Meat) + .output(dustTiny, Materials.Bone) + .duration(102).EUt(4).buildAndRegister(); } private static void registerFluidRecipes() { diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index f4401aabb0f..61fedc0e985 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -13,6 +13,7 @@ import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; +import gregtech.common.blocks.BlockMachineCasing; import gregtech.common.blocks.BlockMetalCasing.MetalCasingType; import gregtech.common.blocks.BlockMultiblockCasing; import gregtech.common.blocks.BlockMultiblockCasing.MultiblockCasingType; @@ -35,19 +36,13 @@ import static gregtech.common.blocks.BlockSteamCasing.SteamCasingType.*; import static gregtech.common.blocks.BlockTurbineCasing.TurbineCasingType.*; import static gregtech.common.blocks.BlockWarningSign.SignType.*; -import static gregtech.common.blocks.BlockWireCoil.CoilType.CUPRONICKEL; +import static gregtech.common.blocks.BlockWireCoil.CoilType.*; import static gregtech.loaders.recipe.CraftingComponent.*; public class MetaTileEntityLoader { public static void init() { - // TODO Move this - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(MetaItems.ROBOT_ARM_IV.getStackForm(2), OreDictUnifier.get(OrePrefix.plate, Materials.Steel, 4), OreDictUnifier.get(OrePrefix.frameGt, Materials.TungstenSteel)) - .outputs(MetaBlocks.MULTIBLOCK_CASING.getItemVariant(ASSEMBLY_LINE_CASING, 2)) - .duration(100).EUt(8000).buildAndRegister(); - ModHandler.addShapedRecipe("casing_ulv", MetaBlocks.MACHINE_CASING.getItemVariant(ULV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.WroughtIron)); ModHandler.addShapedRecipe("casing_lv", MetaBlocks.MACHINE_CASING.getItemVariant(LV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel)); ModHandler.addShapedRecipe("casing_mv", MetaBlocks.MACHINE_CASING.getItemVariant(MV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Aluminium)); @@ -93,12 +88,17 @@ public static void init() { ModHandler.addShapedRecipe("casing_bronze_gearbox", MetaBlocks.TURBINE_CASING.getItemVariant(BRONZE_GEARBOX, 3), "PhP", "GFG", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Bronze), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Bronze), 'G', new UnificationEntry(OrePrefix.gear, Materials.Bronze)); ModHandler.addShapedRecipe("casing_steel_gearbox", MetaBlocks.TURBINE_CASING.getItemVariant(STEEL_GEARBOX, 3), "PhP", "GFG", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Steel), 'G', new UnificationEntry(OrePrefix.gear, Materials.Steel)); - ModHandler.addShapedRecipe("casing_titanium_gearbox", MetaBlocks.TURBINE_CASING.getItemVariant(TITANIUM_GEARBOX, 3), "PhP", "GFG", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Titanium), 'G', new UnificationEntry(OrePrefix.gear, Materials.Titanium)); + ModHandler.addShapedRecipe("casing_titanium_gearbox", MetaBlocks.TURBINE_CASING.getItemVariant(TITANIUM_GEARBOX, 3), "PhP", "GFG", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Titanium), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Titanium), 'G', new UnificationEntry(OrePrefix.gear, Materials.Titanium)); ModHandler.addShapedRecipe("casing_grate_casing", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(GRATE_CASING, 3), "PVP", "PFP", "PMP", 'P', new ItemStack(Blocks.IRON_BARS, 1), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Steel), 'M', MetaItems.ELECTRIC_MOTOR_MV, 'V', new UnificationEntry(OrePrefix.rotor, Materials.Steel)); ModHandler.addShapedRecipe("casing_assembler_casing", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(ASSEMBLER_CASING, 3), "CCC", "CFC", "CMC", 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.TungstenSteel), 'M', MetaItems.ELECTRIC_MOTOR_IV); ModHandler.addShapedRecipe("casing_assembly_line", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(ASSEMBLY_LINE_CASING, 2), "PhP", "AFA", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'A', MetaItems.ROBOT_ARM_IV.getStackForm(), 'F', OreDictUnifier.get(OrePrefix.frameGt, Materials.TungstenSteel)); + ModHandler.addShapedRecipe("casing_fusion_mk1", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(FUSION_CASING), "PhP", "PCP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel), 'C', MetaBlocks.MACHINE_CASING.getItemVariant(LuV)); + ModHandler.addShapedRecipe("casing_fusion_mk2", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(FUSION_CASING_MK2), "PhP", "PCP", "PwP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Americium), 'C', MetaBlocks.MULTIBLOCK_CASING.getItemVariant(FUSION_CASING)); + + ModHandler.addShapedRecipe("heating_coil_fusion", MetaBlocks.WIRE_COIL.getItemVariant(FUSION_COIL), "CNC", "FKF", "CNC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Master), 'N', MetaItems.NEUTRON_REFLECTOR, 'F', MetaItems.FIELD_GENERATOR_MV, 'K', MetaBlocks.WIRE_COIL.getItemVariant(SUPERCONDUCTOR)); + ModHandler.addShapedRecipe("warning_sign_yellow_stripes", MetaBlocks.WARNING_SIGN.getItemVariant(YELLOW_STRIPES), "Y ", " M ", " B", 'M', MetaBlocks.METAL_CASING.getItemVariant(STEEL_SOLID), 'Y', "dyeYellow", 'B', "dyeBlack"); ModHandler.addShapedRecipe("warning_sign_small_yellow_stripes", MetaBlocks.WARNING_SIGN.getItemVariant(SMALL_YELLOW_STRIPES), " Y", " M ", "B ", 'M', MetaBlocks.METAL_CASING.getItemVariant(STEEL_SOLID), 'Y', "dyeYellow", 'B', "dyeBlack"); ModHandler.addShapedRecipe("warning_sign_radioactive_hazard", MetaBlocks.WARNING_SIGN.getItemVariant(RADIOACTIVE_HAZARD), " YB", " M ", " ", 'M', MetaBlocks.METAL_CASING.getItemVariant(STEEL_SOLID), 'Y', "dyeYellow", 'B', "dyeBlack"); @@ -321,7 +321,7 @@ public static void init() { ModHandler.addShapedRecipe("cracking_unit", MetaTileEntities.CRACKER.getStackForm(), "CEC", "PHP", "CEC", 'C', MetaBlocks.WIRE_COIL.getItemVariant(CUPRONICKEL), 'E', MetaItems.ELECTRIC_PUMP_HV, 'P', new UnificationEntry(OrePrefix.circuit, Tier.Advanced), 'H', MetaTileEntities.HULL[GTValues.HV].getStackForm()); ModHandler.addShapedRecipe("pyrolyse_oven", MetaTileEntities.PYROLYSE_OVEN.getStackForm(), "WEP", "EME", "WCP", 'M', MetaTileEntities.HULL[GTValues.MV].getStackForm(), 'W', MetaItems.ELECTRIC_PISTON_MV, 'P', new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Cupronickel), 'E', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Good), 'C', MetaItems.ELECTRIC_PUMP_MV); - ModHandler.addShapedRecipe("diesel_engine", MetaTileEntities.DIESEL_ENGINE.getStackForm(), "PCP", "EME", "GWG", 'M', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'P', MetaItems.ELECTRIC_PISTON_EV, 'E', MetaItems.ELECTRIC_MOTOR_EV, 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Extreme), 'W', new UnificationEntry(OrePrefix.wireGtSingle, Materials.TungstenSteel), 'G', new UnificationEntry(OrePrefix.gear, Materials.Titanium)); + ModHandler.addShapedRecipe("diesel_engine", MetaTileEntities.DIESEL_ENGINE.getStackForm(), "PCP", "EME", "GWG", 'M', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'P', MetaItems.ELECTRIC_PISTON_EV, 'E', MetaItems.ELECTRIC_MOTOR_EV, 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Extreme), 'W', new UnificationEntry(OrePrefix.cableGtSingle, Materials.TungstenSteel), 'G', new UnificationEntry(OrePrefix.gear, Materials.Titanium)); ModHandler.addShapedRecipe("engine_intake_casing", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(MultiblockCasingType.ENGINE_INTAKE_CASING), "PhP", "RFR", "PwP", 'R', new UnificationEntry(OrePrefix.pipeMedium, Materials.Titanium), 'F', MetaBlocks.METAL_CASING.getItemVariant(TITANIUM_STABLE), 'P', new UnificationEntry(OrePrefix.rotor, Materials.Titanium)); ModHandler.addShapedRecipe("multi_furnace", MetaTileEntities.MULTI_FURNACE.getStackForm(), "PPP", "ASA", "CAC", 'P', Blocks.FURNACE, 'A', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), 'S', MetaBlocks.METAL_CASING.getItemVariant(INVAR_HEATPROOF), 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.AnnealedCopper)); @@ -329,10 +329,10 @@ public static void init() { ModHandler.addShapedRecipe("large_gas_turbine", MetaTileEntities.LARGE_GAS_TURBINE.getStackForm(), "PSP", "SAS", "CSC", 'S', new UnificationEntry(OrePrefix.gear, Materials.StainlessSteel), 'P', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Extreme), 'A', MetaTileEntities.HULL[GTValues.EV].getStackForm(), 'C', new UnificationEntry(OrePrefix.pipeLarge, Materials.StainlessSteel)); ModHandler.addShapedRecipe("large_plasma_turbine", MetaTileEntities.LARGE_PLASMA_TURBINE.getStackForm(), "PSP", "SAS", "CSC", 'S', new UnificationEntry(OrePrefix.gear, Materials.TungstenSteel), 'P', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Master), 'A', MetaTileEntities.HULL[GTValues.LuV].getStackForm(), 'C', new UnificationEntry(OrePrefix.pipeLarge, Materials.TungstenSteel)); - ModHandler.addShapedRecipe("large_bronze_boiler", MetaTileEntities.LARGE_BRONZE_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), 'A', MetaBlocks.METAL_CASING.getItemVariant(BRONZE_BRICKS)); - ModHandler.addShapedRecipe("large_steel_boiler", MetaTileEntities.LARGE_STEEL_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), 'A', MetaBlocks.METAL_CASING.getItemVariant(STEEL_SOLID)); - ModHandler.addShapedRecipe("large_titanium_boiler", MetaTileEntities.LARGE_TITANIUM_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Extreme), 'A', MetaBlocks.METAL_CASING.getItemVariant(TITANIUM_STABLE)); - ModHandler.addShapedRecipe("large_tungstensteel_boiler", MetaTileEntities.LARGE_TUNGSTENSTEEL_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), 'A', MetaBlocks.METAL_CASING.getItemVariant(TUNGSTENSTEEL_ROBUST)); + ModHandler.addShapedRecipe("large_bronze_boiler", MetaTileEntities.LARGE_BRONZE_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic), 'A', MetaBlocks.BOILER_FIREBOX_CASING.getItemVariant(BRONZE_FIREBOX)); + ModHandler.addShapedRecipe("large_steel_boiler", MetaTileEntities.LARGE_STEEL_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Advanced), 'A', MetaBlocks.BOILER_FIREBOX_CASING.getItemVariant(STEEL_FIREBOX)); + ModHandler.addShapedRecipe("large_titanium_boiler", MetaTileEntities.LARGE_TITANIUM_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Gold), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Extreme), 'A', MetaBlocks.BOILER_FIREBOX_CASING.getItemVariant(TITANIUM_FIREBOX)); + ModHandler.addShapedRecipe("large_tungstensteel_boiler", MetaTileEntities.LARGE_TUNGSTENSTEEL_BOILER.getStackForm(), "PSP", "SAS", "PSP", 'P', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Aluminium), 'S', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Elite), 'A', MetaBlocks.BOILER_FIREBOX_CASING.getItemVariant(TUNGSTENSTEEL_FIREBOX)); ModHandler.addShapedRecipe("assembly_line", MetaTileEntities.ASSEMBLY_LINE.getStackForm(), "CRC", "SAS", "CRC", 'A', MetaTileEntities.HULL[GTValues.IV].getStackForm(), 'R', MetaItems.ROBOT_ARM_IV, 'C', MetaBlocks.MULTIBLOCK_CASING.getItemVariant(BlockMultiblockCasing.MultiblockCasingType.ASSEMBLER_CASING), 'S', new UnificationEntry(OrePrefix.circuit, Tier.Elite)); diff --git a/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java new file mode 100644 index 00000000000..3b17d58f531 --- /dev/null +++ b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java @@ -0,0 +1,94 @@ +package gregtech.loaders.recipe; + +import gregtech.api.recipes.ModHandler; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.material.type.IngotMaterial; +import gregtech.api.unification.ore.OrePrefix; +import gregtech.api.unification.stack.MaterialStack; +import gregtech.api.unification.stack.UnificationEntry; +import gregtech.common.items.MetaItems; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +import static gregtech.api.recipes.RecipeMaps.FORMING_PRESS_RECIPES; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtech.common.items.MetaItems.SHAPE_MOLD_BLOCK; + +public class MiscRecipeLoader { + + public static void init() { + + // Mixed Metal Ingots + final MaterialStack[] firstMetal = { + new MaterialStack(Materials.Iron, 1), + new MaterialStack(Materials.Nickel, 1), + new MaterialStack(Materials.Invar, 2), + new MaterialStack(Materials.Steel, 2), + new MaterialStack(Materials.StainlessSteel, 3), + new MaterialStack(Materials.Titanium, 3), + new MaterialStack(Materials.Tungsten, 4), + new MaterialStack(Materials.TungstenSteel, 5) + }; + + final MaterialStack[] lastMetal = { + new MaterialStack(Materials.Tin, 0), + new MaterialStack(Materials.Zinc, 0), + new MaterialStack(Materials.Aluminium, 1) + }; + + int multiplier; + for (MaterialStack metal1 : firstMetal) { + IngotMaterial material1 = (IngotMaterial) metal1.material; + int multiplier1 = (int) metal1.amount; + for (MaterialStack metal2 : lastMetal) { + IngotMaterial material2 = (IngotMaterial) metal2.material; + if ((int) metal1.amount == 1) multiplier = 0; + else multiplier = (int) metal2.amount; + ModHandler.addShapedRecipe("mixed_metal_1_" + material1.toString() + "_" + material2.toString(), MetaItems.INGOT_MIXED_METAL.getStackForm(multiplier1 + multiplier), + "F", "M", "L", + 'F', new UnificationEntry(OrePrefix.plate, material1), + 'M', new UnificationEntry(OrePrefix.plate, Bronze), + 'L', new UnificationEntry(OrePrefix.plate, material2)); + + ModHandler.addShapedRecipe("mixed_metal_2_" + material1.toString() + "_" + material2.toString(), MetaItems.INGOT_MIXED_METAL.getStackForm(multiplier1 + multiplier), + "F", "M", "L", + 'F', new UnificationEntry(OrePrefix.plate, material1), + 'M', new UnificationEntry(OrePrefix.plate, Brass), + 'L', new UnificationEntry(OrePrefix.plate, material2)); + + FORMING_PRESS_RECIPES.recipeBuilder().duration(40 * multiplier1 + multiplier * 40).EUt(8) + .input(OrePrefix.plate, material1) + .input(OrePrefix.plank, Bronze) + .input(OrePrefix.plate, material2) + .outputs(MetaItems.INGOT_MIXED_METAL.getStackForm(multiplier1 + multiplier)) + .buildAndRegister(); + + FORMING_PRESS_RECIPES.recipeBuilder().duration(40 * multiplier1 + multiplier * 40).EUt(8) + .input(OrePrefix.plate, material1) + .input(OrePrefix.plate, Brass) + .input(OrePrefix.plate, material2) + .outputs(MetaItems.INGOT_MIXED_METAL.getStackForm(multiplier1 + multiplier)) + .buildAndRegister(); + } + } + + RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(160).EUt(8) + .input(dust, Materials.Flint) + .input(dust, Materials.Quartzite, 4) + .output(dust, Materials.Glass, 4) + .buildAndRegister(); + + RecipeMaps.ARC_FURNACE_RECIPES.recipeBuilder().duration(20).EUt(30) + .inputs(new ItemStack(Blocks.SAND, 1)) + .outputs(new ItemStack(Blocks.GLASS, 2)) + .buildAndRegister(); + + RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder().duration(100).EUt(30) + .input(dust, Materials.Glass) + .notConsumable(SHAPE_MOLD_BLOCK.getStackForm()) + .outputs(new ItemStack(Blocks.GLASS, 1)) + .buildAndRegister(); + } +} diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/AssemblerRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/chemistry/AssemblerRecipeLoader.java new file mode 100644 index 00000000000..2ca396416fb --- /dev/null +++ b/src/main/java/gregtech/loaders/recipe/chemistry/AssemblerRecipeLoader.java @@ -0,0 +1,60 @@ +package gregtech.loaders.recipe.chemistry; + +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.ore.OrePrefix; +import gregtech.common.blocks.*; +import gregtech.common.items.MetaItems; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.*; + +public class AssemblerRecipeLoader { + + public static void init() { + + // Gearbox-like + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .input(plate, Bronze, 4) + .input(gear, Bronze, 2) + .input(frameGt, Bronze) + .outputs(MetaBlocks.TURBINE_CASING.getItemVariant(BlockTurbineCasing.TurbineCasingType.BRONZE_GEARBOX)) + .duration(100).EUt(30).buildAndRegister(); + + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .input(plate, Steel, 4) + .input(gear, Steel, 2) + .input(frameGt, Steel) + .outputs(MetaBlocks.TURBINE_CASING.getItemVariant(BlockTurbineCasing.TurbineCasingType.STEEL_GEARBOX)) + .duration(100).EUt(30).buildAndRegister(); + + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .input(plate, Titanium, 4) + .input(gear, Titanium, 2) + .input(frameGt, Titanium) + .outputs(MetaBlocks.TURBINE_CASING.getItemVariant(BlockTurbineCasing.TurbineCasingType.TITANIUM_GEARBOX)) + .duration(100).EUt(30).buildAndRegister(); + + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(MetaItems.ROBOT_ARM_IV.getStackForm(2), OreDictUnifier.get(plate, Materials.Steel, 4), OreDictUnifier.get(OrePrefix.frameGt, Materials.TungstenSteel)) + .outputs(MetaBlocks.MULTIBLOCK_CASING.getItemVariant(BlockMultiblockCasing.MultiblockCasingType.ASSEMBLY_LINE_CASING, 2)) + .duration(100).EUt(30).buildAndRegister(); + + // Other + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .input(rotor, Titanium, 4) + .input(pipeMedium, Titanium, 2) + .inputs(MetaBlocks.METAL_CASING.getItemVariant(BlockMetalCasing.MetalCasingType.TITANIUM_STABLE)) + .outputs(MetaBlocks.MULTIBLOCK_CASING.getItemVariant(BlockMultiblockCasing.MultiblockCasingType.ENGINE_INTAKE_CASING)) + .duration(100).EUt(30).buildAndRegister(); + + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .input(plate, Bronze, 6) + .inputs(new ItemStack(Blocks.BRICK_BLOCK, 1)) + .outputs(MetaBlocks.METAL_CASING.getItemVariant(BlockMetalCasing.MetalCasingType.BRONZE_BRICKS)) + .duration(100).EUt(30).buildAndRegister(); + } +} diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/BrewingRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/BrewingRecipes.java index 8b6130a8d6e..028bafc2d2c 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/BrewingRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/BrewingRecipes.java @@ -1,5 +1,6 @@ package gregtech.loaders.recipe.chemistry; +import gregtech.api.unification.material.type.DustMaterial; import gregtech.common.items.MetaItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -7,6 +8,7 @@ import static gregtech.api.recipes.RecipeMaps.BREWING_RECIPES; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.material.Materials.Biomass; +import static gregtech.api.unification.ore.OrePrefix.dust; public class BrewingRecipes { @@ -118,5 +120,25 @@ public static void init() { .fluidInputs(Juice.getFluid(20)) .fluidOutputs(Biomass.getFluid(30)) .duration(160).EUt(3).buildAndRegister(); + + for (DustMaterial dustMaterial : new DustMaterial[]{Talc, Soapstone, Redstone}) { + BREWING_RECIPES.recipeBuilder() + .input(dust, dustMaterial) + .fluidInputs(Oil.getFluid(750)) + .fluidOutputs(Lubricant.getFluid(750)) + .duration(128).EUt(4).buildAndRegister(); + + BREWING_RECIPES.recipeBuilder() + .input(dust, dustMaterial) + .fluidInputs(Creosote.getFluid(750)) + .fluidOutputs(Lubricant.getFluid(750)) + .duration(128).EUt(4).buildAndRegister(); + + BREWING_RECIPES.recipeBuilder() + .input(dust, dustMaterial) + .fluidInputs(SeedOil.getFluid(750)) + .fluidOutputs(Lubricant.getFluid(750)) + .duration(128).EUt(4).buildAndRegister(); + } } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java index 1bbc8f2bd88..b8d53298dfb 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ChemistryRecipes.java @@ -1,6 +1,8 @@ package gregtech.loaders.recipe.chemistry; +import gregtech.common.items.MetaItems; import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import static gregtech.api.unification.ore.OrePrefix.*; import static gregtech.api.unification.material.Materials.*; @@ -72,5 +74,16 @@ public static void init() { .output(ingot, RedAlloy, 2) .blastFurnaceTemp(1200) .duration(884).EUt(120).buildAndRegister(); + + FLUID_HEATER_RECIPES.recipeBuilder() + .fluidInputs(RawGrowthMedium.getFluid(500)) + .circuitMeta(1) + .fluidOutputs(SterileGrowthMedium.getFluid(500)) + .duration(30).EUt(24).buildAndRegister(); + + EXTRACTOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.EGG)) + .chancedOutput(MetaItems.STEM_CELLS.getStackForm(), 1500, 500) + .duration(600).EUt(480).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java index 44026d8f98c..cf876502270 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/MixerRecipes.java @@ -3,9 +3,11 @@ import gregtech.api.unification.material.type.DustMaterial; import net.minecraft.init.Items; +import static gregtech.api.recipes.RecipeMaps.BREWING_RECIPES; import static gregtech.api.recipes.RecipeMaps.MIXER_RECIPES; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtech.api.unification.ore.OrePrefix.dustTiny; public class MixerRecipes { @@ -98,24 +100,12 @@ public static void init() { .output(dust, YttriumBariumCuprate, 13) .EUt(8).duration(8000).buildAndRegister(); - for (DustMaterial dustMaterial : new DustMaterial[]{Talc, Soapstone, Redstone}) { - MIXER_RECIPES.recipeBuilder() - .input(dust, dustMaterial) - .fluidInputs(Oil.getFluid(750)) - .fluidOutputs(Lubricant.getFluid(750)) - .duration(128).EUt(4).buildAndRegister(); - - MIXER_RECIPES.recipeBuilder() - .input(dust, dustMaterial) - .fluidInputs(Creosote.getFluid(750)) - .fluidOutputs(Lubricant.getFluid(750)) - .duration(128).EUt(4).buildAndRegister(); - - MIXER_RECIPES.recipeBuilder() - .input(dust, dustMaterial) - .fluidInputs(SeedOil.getFluid(750)) - .fluidOutputs(Lubricant.getFluid(750)) - .duration(128).EUt(4).buildAndRegister(); - } + MIXER_RECIPES.recipeBuilder() + .input(dust, Sugar, 4) + .input(dust, Meat) + .input(dustTiny, Salt) + .fluidInputs(DistilledWater.getFluid(4000)) + .fluidOutputs(RawGrowthMedium.getFluid(4000)) + .duration(160).EUt(16).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index c85ad3ccfb1..3227420652d 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -586,7 +586,7 @@ public static void init() { .duration(120).EUt(30).buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder() - .fluidInputs(PhosphoricAcid.getFluid(1000)) + .notConsumable(PhosphoricAcid.getFluid(0)) .fluidInputs(Benzene.getFluid(8000)) .fluidInputs(Propene.getFluid(8000)) .fluidOutputs(Cumene.getFluid(8000)) diff --git a/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json b/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json index 421fb2501af..eb0348bf5d4 100644 --- a/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json +++ b/src/main/resources/assets/gregtech/blockstates/multiblock_casing.json @@ -37,12 +37,12 @@ "fusion": { "textures": { - "all": "gregtech:blocks/multiblock/fusion/machine_casing_fusion" + "all": "gregtech:blocks/casings/fusion/machine_casing_fusion" } }, "fusion_mk2": { "textures": { - "all": "gregtech:blocks/multiblock/fusion/machine_casing_fusion_2" + "all": "gregtech:blocks/casings/fusion/machine_casing_fusion_2" } } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index b3770044c21..c552e752c90 100755 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -242,10 +242,10 @@ metaitem.paper.punch.card.encoded.name=Punched Card metaitem.battery.hull.lv.name=Small Battery Hull metaitem.battery.hull.lv.tooltip=An empty LV Battery Hull -metaitem.battery.hull.hv.name=Medium Battery Hull -metaitem.battery.hull.hv.tooltip=An empty MV Battery Hull -metaitem.battery.hull.mv.name=Large Battery Hull -metaitem.battery.hull.mv.tooltip=An empty HV Battery Hull +metaitem.battery.hull.mv.name=Medium Battery Hull +metaitem.battery.hull.mv.tooltip=An empty MV Battery Hull +metaitem.battery.hull.hv.name=Large Battery Hull +metaitem.battery.hull.hv.tooltip=An empty HV Battery Hull metaitem.battery.re.ulv.tantalum.name=Tantalum Capacitor metaitem.battery.re.ulv.tantalum.tooltip=Reusable @@ -434,26 +434,44 @@ metaitem.component.glass.fiber.name=Glass Fibers metaitem.component.glass.tube.name=Glass Tube metaitem.component.small_coil.name=Small Coil metaitem.component.smd.diode.name=SMD Diode +metaitem.component.smd.diode.tooltip=Electronic Component metaitem.component.smd.capacitor.name=SMD Capacitor +metaitem.component.smd.capacitor.tooltip=Electronic Component metaitem.component.smd.transistor.name=SMD Transistor +metaitem.component.smd.transistor.tooltip=Electronic Component metaitem.component.smd.resistor.name=SMD Resistor +metaitem.component.smd.resistor.tooltip=Electronic Component metaitem.wafer.advanced_system_on_chip.name=ASoC Wafer +metaitem.wafer.advanced_system_on_chip.tooltip=Raw Circuit metaitem.wafer.integrated_logic_circuit.name=Integrated Circuit Wafer +metaitem.wafer.integrated_logic_circuit.tooltip=Raw Circuit metaitem.wafer.central_processing_unit.name=CPU Wafer +metaitem.wafer.central_processing_unit.tooltip=Raw Circuit metaitem.wafer.high_power_integrated_circuit.name=High-Power IC Wafer +metaitem.wafer.high_power_integrated_circuit.tooltip=Raw Circuit metaitem.wafer.nand_memory_chip.name=NAND Wafer +metaitem.wafer.nand_memory_chip.tooltip=Raw Circuit metaitem.wafer.power_integrated_circuit.name=Power IC Wafer +metaitem.wafer.power_integrated_circuit.tooltip=Raw Circuit metaitem.wafer.nano_central_processing_unit.name=Nano CPU Wafer +metaitem.wafer.nano_central_processing_unit.tooltip=Raw Circuit metaitem.wafer.nor_memory_chip.name=NOR Wafer +metaitem.wafer.nor_memory_chip.tooltip=Raw Circuit metaitem.wafer.qbit_central_processing_unit.name=QBit CPU Wafer +metaitem.wafer.qbit_central_processing_unit.tooltip=Raw Circuit metaitem.wafer.random_access_memory.name=RAM Wafer +metaitem.wafer.random_access_memory.tooltip=Raw Circuit metaitem.wafer.system_on_chip.name=SoC Wafer +metaitem.wafer.system_on_chip.tooltip=Raw Circuit metaitem.engraved.crystal_chip.name=Engraved Crystal Chip +metaitem.engraved.crystal_chip.tooltip=Needed for Circuits +metaitem.crystal.raw.name=Raw Crystal Chip +metaitem.crystal.raw.tooltip=Raw Crystal Processor metaitem.engraved.lapotron_chip.name=Engraved Lapotron Crystal Chip metaitem.crystal.central_processing_unit.name=Crystal CPU -metaitem.crystal.central_processing_unit.tooltip=Engraved on a crystal +metaitem.crystal.central_processing_unit.tooltip=Crystal Processing Unit metaitem.crystal.system_on_chip.name=Crystal SoC metaitem.crystal.system_on_chip.tooltip=Engraved on a crystal metaitem.plate.advanced_system_on_chip.name=ASoC @@ -476,10 +494,15 @@ metaitem.plate.system_on_chip.tooltip=System on Chip metaitem.circuit.basic.name=Basic Circuit metaitem.circuit.basic_electronic.name=Basic Electronic Circuit +metaitem.circuit.basic_electronic.tooltip=A Basic Circuit metaitem.circuit.advanced_parts.name=Advanced Circuit Parts +metaitem.circuit.advanced_parts.tooltip=A Basic Circuit metaitem.circuit.good.name=Good Electronic Circuit +metaitem.circuit.good.tooltip=A Good Circuit metaitem.circuit.advanced.name=Advanced Circuit +metaitem.circuit.advanced.tooltip=A Good Circuit metaitem.circuit.processor_assembly.name=Processor Assembly +metaitem.circuit.processor_assembly.tooltip=An Advanced Circuit metaitem.circuit.nano_processor.name=Nanoprocessor metaitem.circuit.nano_processor.tooltip=Smaller than ever metaitem.circuit.nano_processor_assembly.name=Nano Processor Assembly @@ -496,19 +519,21 @@ metaitem.circuit.wetware_assembly.tooltip=Can run Minecraft metaitem.circuit.wetware_super_computer.name=Wetware Supercomputer metaitem.circuit.wetware_mainframe.name=Wetware Mainframe -metaitem.stemcells.name=Stemcells -metaitem.stemcells.tooltip=Raw Intelligence +metaitem.stem_cells.name=Stem Cells +metaitem.stem_cells.tooltip=Raw Intelligence metaitem.processor.neuro.name=Neuro Processing Unit +metaitem.petri_dish.name=Petri Dish metaitem.carbon.fibers.name=Raw Carbon Fibers -metaitem.carbon.mesh.name=Carbon Mesh -metaitem.carbon.plate.name=Carbon Plate -metaitem.carbon_fiber.name=Carbon Fiber Plate +metaitem.carbon.mesh.name=Carbon Fiber Mesh +metaitem.carbon.plate.name=Carbon Fiber Plate metaitem.ingot.mixed_metal=Mixed Metal Ingot metaitem.plate.advanced_alloy=Advanced Alloy Plate metaitem.ingot.iridium_alloy=Iridium Alloy Ingot +metaitem.ingot.iridium_alloy.tooltip=Used to make Iridium Alloy Plates metaitem.plate.iridium_alloy=Iridium Alloy Plate metaitem.neutron_reflector=Neutron Reflector +metaitem.neutron_reflector.tooltip=Indestructible metaitem.component.sawblade.diamond.name=Diamond Sawblade metaitem.component.grinder.diamond.name=Diamond Grinding Head @@ -613,7 +638,7 @@ metaitem.sfmixture.tooltip=Raw Material metaitem.msfmixture.name=Magic Super Fuel Binder metaitem.msfmixture.tooltip=Raw Material -metaitem.rubber_drop.name=Rubber +metaitem.rubber_drop.name=Sticky Resin metaitem.plant_ball.name=Plant Ball metaitem.tool_parts_box.name=Tool Parts Box metaitem.tool_parts_box.tooltip=Contains some tool parts/nRight click to open @@ -1162,10 +1187,10 @@ material.nitrogen_dioxide=Nitrogen Dioxide material.obsidian=Obsidian material.phosphate=Phosphate material.pig_iron=Pig Iron -material.plastic=Polyethylene +material.plastic=Polyethylene (PE) material.polysiloxane=Polysiloxane material.polycaprolactam=Polycaprolactam -material.polytetrafluoroethylene=Polytetrafluoroethylene +material.polytetrafluoroethylene=Polytetrafluoroethylene (PTFE) material.powellite=Powellite material.pumice=Pumice material.pyrite=Pyrite @@ -1194,7 +1219,7 @@ material.bisphenol_a=Bisphenol A material.epoxy=Epoxy Resin material.reinforced_epoxy_resin=Fiber-Reinforced Epoxy Resin material.borosilicate_glass=Borosilicate Glass -material.polyvinyl_chloride=Polyvinyl Chloride +material.polyvinyl_chloride=Polyvinyl Chloride (PVC) material.vinyl_chloride=Vinyl Chloride material.ethylene=Ethylene material.charcoal_byproducts=Charcoal Byproducts @@ -1467,6 +1492,7 @@ material.juice=Fruit Juice material.cocoa=Cocoa material.coffee=Coffee material.wheat=Wheat +material.meat=Mince Meat item.nether_quartz.oreNetherrack=Nether Quartz Ore item.gunpowder.dustTiny=Tiny Pile of Gunpowder @@ -1497,18 +1523,28 @@ item.dark_ash.dust=Dark Ashes item.ice.dustTiny=Tiny Pile of Crushed Ice item.ice.dustSmall=Small Pile of Crushed Ice item.ice.dust=Crushed Ice -item.plastic.dustTiny=Tiny Pile of Polyethylene Pulp -item.plastic.dustSmall=Small Pile of Polyethylene Pulp -item.plastic.dust=Polyethylene Pulp -item.plastic.plate=Polyethylene Sheet -item.epoxid.ingot=Epoxid Bar -item.epoxid.dustTiny=Tiny Pile of Epoxid Pulp -item.epoxid.dustSmall=Small Pile of Epoxid Pulp -item.epoxid.dust=Epoxid Pulp -item.epoxid.nugget=Epoxid Chip -item.epoxid.plateDense=Dense Epoxid Sheet -item.epoxid.plate=Epoxid Sheet -item.epoxid.foil=Thin Epoxid Sheet +item.plastic.dustTiny=Tiny Pile of Polyethylene (PE) Pulp +item.plastic.dustSmall=Small Pile of Polyethylene (PE) Pulp +item.plastic.dust=Polyethylene (PE) Pulp +item.plastic.plate=Polyethylene (PE) Sheet +item.plastic.nugget=Polyethylene (PE) Chip +item.plastic.ingot=Polyethylene (PE) Bar +item.epoxy.ingot=Epoxy Bar +item.epoxy.dustTiny=Tiny Pile of Epoxy Pulp +item.epoxy.dustSmall=Small Pile of Epoxy Pulp +item.epoxy.dust=Epoxy Pulp +item.epoxy.nugget=Epoxy Chip +item.epoxy.plateDense=Dense Epoxy Sheet +item.epoxy.plate=Epoxy Sheet +item.epoxy.foil=Thin Epoxy Sheet +item.reinforced_epoxy_resin.ingot=Fiber-Reinforced Epoxy Resin Bar +item.reinforced_epoxy_resin.dustTiny=Tiny Pile of Fiber-Reinforced Epoxy Resin Pulp +item.reinforced_epoxy_resin.dustSmall=Small Pile of Fiber-Reinforced Epoxy Resin Pulp +item.reinforced_epoxy_resin.dust=Fiber-Reinforced Epoxy Resin Pulp +item.reinforced_epoxy_resin.nugget=Fiber-Reinforced Epoxy Resin Chip +item.reinforced_epoxy_resin.plateDense=Dense Fiber-Reinforced Epoxy Resin Sheet +item.reinforced_epoxy_resin.plate=Fiber-Reinforced Epoxy Resin Sheet +item.reinforced_epoxy_resin.foil=Thin Fiber-Reinforced Epoxy Resin Sheet item.polysiloxane.dustTiny=Tiny Pile of Polysiloxane Pulp item.polysiloxane.dustSmall=Small Pile of Polysiloxane Pulp item.polysiloxane.dust=Polysiloxane Pulp @@ -1518,11 +1554,36 @@ item.polycaprolactam.dustSmall=Small Pile of Polycaprolactam Pulp item.polycaprolactam.dust=Polycaprolactam Pulp item.polycaprolactam.plateDense=Dense Polycaprolactam Sheet item.polycaprolactam.plate=Polycaprolactam Sheet -item.polytetrafluoroethylene.dustTiny=Tiny Pile of Polytetrafluoroethylene Pulp -item.polytetrafluoroethylene.dustSmall=Small Pile of Polytetrafluoroethylene Pulp -item.polytetrafluoroethylene.dust=Polytetrafluoroethylene Pulp -item.polytetrafluoroethylene.plateDense=Dense Polytetrafluoroethylene Sheet -item.polytetrafluoroethylene.plate=Polytetrafluoroethylene Sheet +item.polycaprolactam.nugget=Polycaprolactam Nugget +item.polycaprolactam.ingot=Polycaprolactam Bar +item.polytetrafluoroethylene.dustTiny=Tiny Pile of Polytetrafluoroethylene (PTFE) Pulp +item.polytetrafluoroethylene.dustSmall=Small Pile of Polytetrafluoroethylene (PTFE) Pulp +item.polytetrafluoroethylene.dust=Polytetrafluoroethylene (PTFE) Pulp +item.polytetrafluoroethylene.plateDense=Dense Polytetrafluoroethylene (PTFE) Sheet +item.polytetrafluoroethylene.plate=Polytetrafluoroethylene (PTFE) Sheet +item.polytetrafluoroethylene.nugget=Polytetrafluoroethylene (PTFE) Chip +item.polytetrafluoroethylene.ingot=Polytetrafluoroethylene (PTFE) Bar +item.polyvinyl_chloride.dustTiny=Tiny Pile of Polyvinyl Chloride (PVC) Pulp +item.polyvinyl_chloride.dustSmall=Small Pile of Polyvinyl Chloride (PVC) Pulp +item.polyvinyl_chloride.dust=Polyvinyl Chloride (PVC) Pulp +item.polyvinyl_chloride.nugget=Polyvinyl Chloride (PVC) Chip +item.polyvinyl_chloride.ingot=Polyvinyl Chloride (PVC) Bar +item.polyvinyl_chloride.plate=Polyvinyl Chloride (PVC) Sheet +item.polyvinyl_chloride.foil=Thin Polyvinyl Chloride (PVC) Sheet +item.polystyrene.dustTiny=Tiny Pile of Polystyrene Pulp +item.polystyrene.dustSmall=Small Pile of Polystyrene Pulp +item.polystyrene.dust=Polystyrene Pulp +item.polystyrene.nugget=Polystyrene Chip +item.polystyrene.ingot=Polystyrene Bar +item.polystyrene.plate=Polystyrene Sheet +item.polystyrene.foil=Thin Polystyrene Sheet +item.polyphenylene_sulfide.dustTiny=Tiny Pile of Polyphenylene Sulfide Pulp +item.polyphenylene_sulfide.dustSmall=Small Pile of Polyphenylene Sulfide Pulp +item.polyphenylene_sulfide.dust=Polyphenylene Sulfide Pulp +item.polyphenylene_sulfide.nugget=Polyphenylene Sulfide Chip +item.polyphenylene_sulfide.ingot=Polyphenylene Sulfide Bar +item.polyphenylene_sulfide.plate=Polyphenylene Sulfide Sheet +item.polyphenylene_sulfide.foil=Thin Polyphenylene Sulfide Sheet item.rock_salt.dustTiny=Tiny Pile of Rock Salt item.rock_salt.dustSmall=Small Pile of Rock Salt item.rock_salt.dustImpure=Impure Pile of Rock Salt @@ -1542,6 +1603,19 @@ item.salt.dustSmall=Small Pile of Salt item.salt.dustImpure=Impure Pile of Salt item.salt.dustPure=Purified Pile of Salt item.salt.dust=Salt +item.silicon_rubber.dustTiny=Tiny Pile of Silicone Rubber Pulp +item.silicon_rubber.dustSmall=Small Pile of Silicone Rubber Pulp +item.silicon_rubber.dust=Silicone Rubber Pulp +item.silicon_rubber.nugget=Silicone Rubber Chip +item.silicon_rubber.ingot=Silicone Rubber Bar +item.silicon_rubber.plate=Silicone Rubber Sheet +item.silicon_rubber.foil=Thin Silicone Rubber Sheet +item.styrene_butadiene_rubber.dustTiny=Tiny Pile of Styrene-Butadiene Rubber Pulp +item.styrene_butadiene_rubber.dustSmall=Small Pile of Styrene-Butadiene Rubber Pulp +item.styrene_butadiene_rubber.dust=Styrene-Butadiene Rubber Pulp +item.styrene_butadiene_rubber.nugget=Styrene-Butadiene Rubber Chip +item.styrene_butadiene_rubber.ingot=Styrene-Butadiene Rubber Bar +item.styrene_butadiene_rubber.plate=Styrene-Butadiene Rubber Sheet item.wood.dustTiny=Tiny Pile of Wood Pulp item.wood.dustSmall=Small Pile of Wood Pulp item.wood.dust=Wood Pulp @@ -1616,6 +1690,9 @@ item.talc.dust=Talc item.wheat.dustTiny=Tiny Pile of Flour item.wheat.dustSmall=Small Pile of Flour item.wheat.dust=Flour +item.meat.dustTiny=Tiny Pile of Mince Meat +item.meat.dustSmall=Small Pile of Mince Meat +item.meat.dust=Mince Meat recipemap.orewasher.name=Ore Washer recipemap.thermal_centrifuge.name=Thermal Centrifuge diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/petri_dish.json b/src/main/resources/assets/gregtech/models/item/metaitems/petri_dish.json new file mode 100644 index 00000000000..d9d813ff586 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/petri_dish.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/petri_dish" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/stem_cells.json b/src/main/resources/assets/gregtech/models/item/metaitems/stem_cells.json new file mode 100644 index 00000000000..3a1e55d6d01 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/stem_cells.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/stem_cells" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.hv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.hv.png index a45674e81c9..4ef2abdd87c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.hv.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.hv.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.mv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.mv.png index 4ef2abdd87c..a45674e81c9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.mv.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.mv.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.system_on_chip.png b/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.system_on_chip.png index cd3f90822df..e986427c19a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.system_on_chip.png and b/src/main/resources/assets/gregtech/textures/items/metaitems/crystal.system_on_chip.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/petri_dish.png b/src/main/resources/assets/gregtech/textures/items/metaitems/petri_dish.png new file mode 100644 index 00000000000..f2b5be4adb3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/petri_dish.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/stemcells.png b/src/main/resources/assets/gregtech/textures/items/metaitems/stem_cells.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/stemcells.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/stem_cells.png