Skip to content

Commit

Permalink
recipe updates and some unification info
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechLord22
TechLord22 committed May 9, 2022
1 parent d4d96d2 commit c04737b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
14 changes: 14 additions & 0 deletions src/main/java/gregtech/loaders/MaterialInfoLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import gregtech.api.unification.stack.ItemMaterialInfo;
import gregtech.api.unification.stack.MaterialStack;
import gregtech.common.ConfigHolder;
import gregtech.common.blocks.BlockCleanroomCasing;
import gregtech.common.blocks.BlockGlassCasing;
import gregtech.common.blocks.BlockWireCoil.CoilType;
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.metatileentities.MetaTileEntities;
Expand Down Expand Up @@ -158,6 +160,18 @@ public static void init() {
new MaterialStack(Materials.NeodymiumMagnetic, M / 2) // rod
));

OreDictUnifier.registerOre(MetaBlocks.CLEANROOM_CASING.getItemVariant(BlockCleanroomCasing.CasingType.PLASCRETE), new ItemMaterialInfo(
new MaterialStack(Materials.Steel, M * 2), // frame / 2
new MaterialStack(Materials.Polyethylene, M * 3), // 6 sheets / 2
new MaterialStack(Materials.Concrete, M / 2) // 1 block / 2
));

OreDictUnifier.registerOre(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockGlassCasing.CasingType.CLEANROOM_GLASS), new ItemMaterialInfo(
new MaterialStack(Materials.Steel, M * 2), // frame / 2
new MaterialStack(Materials.Polyethylene, M * 3), // 6 sheets / 2
new MaterialStack(Materials.Glass, M / 2) // 1 block / 2
));

if (ConfigHolder.recipes.hardWoodRecipes) {
OreDictUnifier.registerOre(new ItemStack(Items.ACACIA_DOOR, 1), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M * 2), new MaterialStack(Materials.Iron, M / 9))); // screw
OreDictUnifier.registerOre(new ItemStack(Items.BIRCH_DOOR, 1), new ItemMaterialInfo(new MaterialStack(Materials.Wood, M * 2), new MaterialStack(Materials.Iron, M / 9))); // screw
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,6 @@ private static void circuitRecipes() {
.input(bolt, RedAlloy, 2)
.input(wireFine, Tin, 2)
.output(NAND_CHIP_ULV, 8)
.cleanroom(CleanroomType.CLEANROOM)
.buildAndRegister();

CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[MV]).duration(300)
Expand All @@ -999,7 +998,6 @@ private static void circuitRecipes() {
.input(bolt, RedAlloy, 2)
.input(wireFine, Tin, 2)
.output(NAND_CHIP_ULV, 12)
.cleanroom(CleanroomType.CLEANROOM)
.buildAndRegister();

// Microprocessor LV
Expand All @@ -1011,7 +1009,6 @@ private static void circuitRecipes() {
.input(component, Component.Transistor, 2)
.input(wireFine, Copper, 2)
.output(MICROPROCESSOR_LV, 3)
.cleanroom(CleanroomType.CLEANROOM)
.buildAndRegister();

// Microprocessor LV SoC
Expand All @@ -1035,7 +1032,6 @@ private static void circuitRecipes() {
.input(component, Component.Transistor, 4)
.input(wireFine, RedAlloy, 4)
.output(PROCESSOR_MV, 2)
.cleanroom(CleanroomType.CLEANROOM)
.buildAndRegister();

// MV SoC
Expand All @@ -1058,7 +1054,6 @@ private static void circuitRecipes() {
.input(wireFine, RedAlloy, 8)
.output(PROCESSOR_ASSEMBLY_HV, 2)
.solderMultiplier(2)
.cleanroom(CleanroomType.CLEANROOM)
.buildAndRegister();

// EV
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ private static void loadCraftingRecipes() {
ModHandler.addShapedRecipe("universal_fluid_cell", FLUID_CELL_UNIVERSAL.getStackForm(), "C ", " ", 'C', FLUID_CELL);
ModHandler.addShapedRecipe("universal_fluid_cell_revert", FLUID_CELL.getStackForm(), "C ", " ", 'C', FLUID_CELL_UNIVERSAL);

ModHandler.addShapedRecipe("blacklight", BLACKLIGHT.getStackForm(), "SPS", "GRG", "CPK", 'S', new UnificationEntry(OrePrefix.screw, TungstenCarbide), 'P', new UnificationEntry(OrePrefix.plate, TungstenCarbide), 'G', MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockGlassCasing.CasingType.TEMPERED_GLASS), 'R', new UnificationEntry(OrePrefix.spring, Europium), 'C', new UnificationEntry(OrePrefix.circuit, Tier.IV), 'K', new UnificationEntry(OrePrefix.cableGtSingle, Platinum));
ModHandler.addShapedRecipe("blacklight", BLACKLIGHT.getStackForm(), "SPS", "GRG", "CPK", 'S', new UnificationEntry(OrePrefix.screw, TungstenCarbide), 'P', new UnificationEntry(OrePrefix.plate, TungstenCarbide), 'G', MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockGlassCasing.CasingType.LAMINATED_GLASS), 'R', new UnificationEntry(OrePrefix.spring, Europium), 'C', new UnificationEntry(OrePrefix.circuit, Tier.IV), 'K', new UnificationEntry(OrePrefix.cableGtSingle, Platinum));

ModHandler.addShapedRecipe("filter_casing", MetaBlocks.CLEANROOM_CASING.getItemVariant(BlockCleanroomCasing.CasingType.FILTER_CASING, 2), "BBB", "III", "MFR", 'B', new ItemStack(Blocks.IRON_BARS), 'I', ITEM_FILTER.getStackForm(), 'M', ELECTRIC_MOTOR_MV.getStackForm(), 'F', new UnificationEntry(OrePrefix.frameGt, Steel), 'R', new UnificationEntry(OrePrefix.rotor, Steel));
ModHandler.addShapedRecipe("filter_casing_sterile", MetaBlocks.CLEANROOM_CASING.getItemVariant(BlockCleanroomCasing.CasingType.FILTER_CASING_STERILE, 2), "BEB", "ISI", "MFR", 'B', new UnificationEntry(OrePrefix.pipeLargeFluid, Polybenzimidazole), 'E', EMITTER_ZPM.getStackForm(), 'I', ITEM_FILTER.getStackForm(), 'S', BLACKLIGHT.getStackForm(), 'M', ELECTRIC_MOTOR_ZPM.getStackForm(), 'F', new UnificationEntry(OrePrefix.frameGt, Tritanium), 'R', new UnificationEntry(OrePrefix.rotor, NaquadahAlloy));
ModHandler.addShapedRecipe(true, "filter_casing", MetaBlocks.CLEANROOM_CASING.getItemVariant(BlockCleanroomCasing.CasingType.FILTER_CASING, 2), "BBB", "III", "MFR", 'B', new ItemStack(Blocks.IRON_BARS), 'I', ITEM_FILTER.getStackForm(), 'M', ELECTRIC_MOTOR_MV.getStackForm(), 'F', new UnificationEntry(OrePrefix.frameGt, Steel), 'R', new UnificationEntry(OrePrefix.rotor, Steel));
ModHandler.addShapedRecipe(true, "filter_casing_sterile", MetaBlocks.CLEANROOM_CASING.getItemVariant(BlockCleanroomCasing.CasingType.FILTER_CASING_STERILE, 2), "BEB", "ISI", "MFR", 'B', new UnificationEntry(OrePrefix.pipeLargeFluid, Polybenzimidazole), 'E', EMITTER_ZPM.getStackForm(), 'I', ITEM_FILTER.getStackForm(), 'S', BLACKLIGHT.getStackForm(), 'M', ELECTRIC_MOTOR_ZPM.getStackForm(), 'F', new UnificationEntry(OrePrefix.frameGt, Tritanium), 'R', new UnificationEntry(OrePrefix.rotor, NaquadahAlloy));

///////////////////////////////////////////////////
// Shapes and Molds //
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,8 @@ private static void registerAssemblerRecipes() {
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STEEL_TURBINE_CASING)).input(OrePrefix.plate, Materials.Titanium, 6).notConsumable(new IntCircuitIngredient(6)).outputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.TITANIUM_TURBINE_CASING, 2)).duration(50).buildAndRegister();
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STEEL_TURBINE_CASING)).input(OrePrefix.plate, Materials.TungstenSteel, 6).notConsumable(new IntCircuitIngredient(6)).outputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.TUNGSTENSTEEL_TURBINE_CASING, 2)).duration(50).buildAndRegister();

RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(48).input(OrePrefix.frameGt, Materials.BlackSteel).input(OrePrefix.plate, Materials.Polyethylene, 6).fluidInputs(Concrete.getFluid(L)).outputs(MetaBlocks.CLEANROOM_CASING.getItemVariant(BlockCleanroomCasing.CasingType.PLASCRETE, 2)).duration(200).buildAndRegister();
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(48).input(OrePrefix.frameGt, Materials.BlackSteel).input(OrePrefix.plate, Materials.Polyethylene, 6).fluidInputs(Glass.getFluid(L)).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockGlassCasing.CasingType.CLEANROOM_GLASS, 2)).duration(200).buildAndRegister();
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(48).input(OrePrefix.frameGt, Materials.Steel).input(OrePrefix.plate, Materials.Polyethylene, 6).fluidInputs(Concrete.getFluid(L)).outputs(MetaBlocks.CLEANROOM_CASING.getItemVariant(BlockCleanroomCasing.CasingType.PLASCRETE, 2)).duration(200).buildAndRegister();
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(48).input(OrePrefix.frameGt, Materials.Steel).input(OrePrefix.plate, Materials.Polyethylene, 6).fluidInputs(Glass.getFluid(L)).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockGlassCasing.CasingType.CLEANROOM_GLASS, 2)).duration(200).buildAndRegister();

// If these recipes are changed, change the values in MaterialInfoLoader.java

Expand Down

0 comments on commit c04737b

Please sign in to comment.