Skip to content

Commit

Permalink
Purge circuit 0
Browse files Browse the repository at this point in the history
  • Loading branch information
@TechLord22
TechLord22 committed Jul 4, 2021
1 parent e8202dc commit 2a920e2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 32 deletions.
7 changes: 3 additions & 4 deletions src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import static gregtech.api.unification.material.type.SolidMaterial.MatFlags.GENERATE_ROD;
import static gregtech.api.unification.material.type.SolidMaterial.MatFlags.MORTAR_GRINDABLE;
import static gregtech.api.unification.ore.OrePrefix.*;
import static gregtech.api.unification.ore.OrePrefix.block;

public class MaterialRecipeHandler {

Expand Down Expand Up @@ -111,7 +110,7 @@ public static void processDust(OrePrefix dustPrefix, IMaterial<?> mat) {
.blastFurnaceTemp(metalMaterial.blastFurnaceTemperature)
.duration(duration).EUt(120);
if (circuitRequiringMaterials.contains(metalMaterial)) {
ingotSmeltingBuilder.inputs(new CountableIngredient(new IntCircuitIngredient(0), 0));
ingotSmeltingBuilder.inputs(new CountableIngredient(new IntCircuitIngredient(1), 0));
}
ingotSmeltingBuilder.buildAndRegister();

Expand All @@ -122,7 +121,7 @@ public static void processDust(OrePrefix dustPrefix, IMaterial<?> mat) {
.blastFurnaceTemp(metalMaterial.blastFurnaceTemperature)
.duration(Math.max(1, duration / 9)).EUt(120);
if (circuitRequiringMaterials.contains(metalMaterial)) {
nuggetSmeltingBuilder.inputs(IntCircuitIngredient.getIntegratedCircuit(0));
nuggetSmeltingBuilder.inputs(IntCircuitIngredient.getIntegratedCircuit(1));
}
nuggetSmeltingBuilder.buildAndRegister();
}
Expand Down Expand Up @@ -259,7 +258,7 @@ public static void processIngot(OrePrefix ingotPrefix, IngotMaterial material) {
if (!material.hasFlag(NO_SMASHING)) {
ItemStack plateStack = OreDictUnifier.get(OrePrefix.plate, material);
RecipeMaps.BENDER_RECIPES.recipeBuilder()
.circuitMeta(0)
.circuitMeta(1)
.input(ingotPrefix, material)
.outputs(plateStack)
.EUt(24).duration((int) (material.getAverageMass()))
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package gregtech.loaders.recipe;

import gregtech.api.recipes.ModHandler;
import gregtech.api.recipes.ingredients.IntCircuitIngredient;
import gregtech.api.unification.material.MarkerMaterials.Tier;
import gregtech.api.unification.material.MarkerMaterials.Color;
import gregtech.api.unification.material.MarkerMaterials.Tier;
import gregtech.api.unification.material.type.IngotMaterial;
import gregtech.api.unification.stack.MaterialStack;
import gregtech.api.unification.stack.UnificationEntry;
Expand Down Expand Up @@ -40,15 +39,13 @@ private static void waferRecipes() {
BLAST_RECIPES.recipeBuilder().duration(9000).EUt(120)
.input(dust, Silicon, 32)
.input(dustSmall, GalliumArsenide)
.notConsumable(new IntCircuitIngredient(1))
.output(SILICON_BOULE)
.blastFurnaceTemp(1784)
.buildAndRegister();

BLAST_RECIPES.recipeBuilder().duration(12000).EUt(480)
.input(dust, Silicon, 64)
.input(dust, Glowstone, 8)
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Nitrogen.getFluid(8000))
.output(GLOWSTONE_BOULE)
.blastFurnaceTemp(2484)
Expand All @@ -57,7 +54,6 @@ private static void waferRecipes() {
BLAST_RECIPES.recipeBuilder().duration(1500).EUt(1920)
.input(block, Silicon, 9)
.input(ingot, Naquadah)
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Argon.getFluid(8000))
.output(NAQUADAH_BOULE)
.blastFurnaceTemp(5400)
Expand Down
46 changes: 23 additions & 23 deletions src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static void init() {
.duration(120).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.input(dust, Carbon)
.fluidInputs(Hydrogen.getFluid(4000))
.fluidOutputs(Methane.getFluid(1000))
Expand Down Expand Up @@ -88,59 +88,59 @@ public static void init() {
.duration(240).EUt(360).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Air.getFluid(1000))
.fluidInputs(Ethylene.getFluid(144))
.fluidOutputs(Polyethylene.getFluid(144))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Oxygen.getFluid(1000))
.fluidInputs(Ethylene.getFluid(144))
.fluidOutputs(Polyethylene.getFluid(216))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Air.getFluid(7500))
.fluidInputs(Ethylene.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
.fluidOutputs(Polyethylene.getFluid(3240))
.duration(800).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Oxygen.getFluid(7500))
.fluidInputs(Ethylene.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
.fluidOutputs(Polyethylene.getFluid(4320))
.duration(800).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Air.getFluid(1000))
.fluidInputs(VinylChloride.getFluid(144))
.fluidOutputs(PolyvinylChloride.getFluid(144))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Oxygen.getFluid(1000))
.fluidInputs(VinylChloride.getFluid(144))
.fluidOutputs(PolyvinylChloride.getFluid(216))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Air.getFluid(7500))
.fluidInputs(VinylChloride.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
.fluidOutputs(PolyvinylChloride.getFluid(3240))
.duration(800).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Oxygen.getFluid(7500))
.fluidInputs(VinylChloride.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
Expand Down Expand Up @@ -168,29 +168,29 @@ public static void init() {
.duration(320).EUt(8).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Air.getFluid(1000))
.fluidInputs(Tetrafluoroethylene.getFluid(144))
.fluidOutputs(Polytetrafluoroethylene.getFluid(144))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Oxygen.getFluid(1000))
.fluidInputs(Tetrafluoroethylene.getFluid(144))
.fluidOutputs(Polytetrafluoroethylene.getFluid(216))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Air.getFluid(7500))
.fluidInputs(Tetrafluoroethylene.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
.fluidOutputs(Polytetrafluoroethylene.getFluid(3240))
.duration(800).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Oxygen.getFluid(7500))
.fluidInputs(Tetrafluoroethylene.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
Expand Down Expand Up @@ -328,29 +328,29 @@ public static void init() {
.duration(40).EUt(8).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Air.getFluid(1000))
.fluidInputs(Styrene.getFluid(144))
.fluidOutputs(Polystyrene.getFluid(144))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Oxygen.getFluid(1000))
.fluidInputs(Styrene.getFluid(144))
.fluidOutputs(Polystyrene.getFluid(216))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Air.getFluid(7500))
.fluidInputs(Styrene.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
.fluidOutputs(Polystyrene.getFluid(3240))
.duration(800).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Oxygen.getFluid(7500))
.fluidInputs(Styrene.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
Expand Down Expand Up @@ -485,29 +485,29 @@ public static void init() {
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Air.getFluid(1000))
.fluidInputs(VinylAcetate.getFluid(144))
.fluidOutputs(PolyvinylAcetate.getFluid(144))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Oxygen.getFluid(1000))
.fluidInputs(VinylAcetate.getFluid(144))
.fluidOutputs(PolyvinylAcetate.getFluid(216))
.duration(160).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Air.getFluid(7500))
.fluidInputs(VinylAcetate.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
.fluidOutputs(PolyvinylAcetate.getFluid(3240))
.duration(800).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Oxygen.getFluid(7500))
.fluidInputs(VinylAcetate.getFluid(2160))
.fluidInputs(TitaniumTetrachloride.getFluid(100))
Expand All @@ -522,7 +522,7 @@ public static void init() {
.duration(120).EUt(96).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(0))
.notConsumable(new IntCircuitIngredient(1))
.fluidInputs(Hydrogen.getFluid(4000))
.fluidInputs(CarbonMonoxide.getFluid(1000))
.fluidOutputs(Methanol.getFluid(1000))
Expand Down Expand Up @@ -621,7 +621,7 @@ public static void init() {
.duration(300).EUt(30).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(1))
.notConsumable(new IntCircuitIngredient(2))
.fluidInputs(Hydrogen.getFluid(4000))
.fluidInputs(CarbonMonoxide.getFluid(2000))
.fluidOutputs(AceticAcid.getFluid(1000))
Expand Down

0 comments on commit 2a920e2

Please sign in to comment.