Skip to content

Commit

Permalink
Recipes for 2.7 (#1921)
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss authored Jul 11, 2023
1 parent 5f3a0f9 commit 5e05b33
Show file tree
Hide file tree
Showing 18 changed files with 542 additions and 45 deletions.
16 changes: 11 additions & 5 deletions src/main/java/gregtech/api/recipes/builders/AssemblyLineRecipeBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@

public class AssemblyLineRecipeBuilder extends RecipeBuilder<AssemblyLineRecipeBuilder> {

public static final int DEFAULT_DURATION = 144000;
public static final int DEFAULT_EUT = GTValues.VA[GTValues.LV];
public static final int DEFAULT_SCANNER_DURATION = 1200; // 60 secs
public static final int DEFAULT_SCANNER_EUT = GTValues.VA[GTValues.HV];
public static final int DEFAULT_STATION_DURATION = 4000; // 200 secs
public static final int DEFAULT_STATION_EUT = GTValues.VA[GTValues.LuV];

private final Collection<ResearchRecipeEntry> recipeEntries = new ArrayList<>();

Expand Down Expand Up @@ -250,7 +252,7 @@ private ResearchRecipeEntry build() {

if (dataStack == null) {
dataStack = cwut > 0
? AssemblyLineManager.getDefaultResearchStationItem()
? AssemblyLineManager.getDefaultResearchStationItem(cwut)
: AssemblyLineManager.getDefaultScannerItem();
}

Expand All @@ -270,11 +272,15 @@ private ResearchRecipeEntry build() {
}

if (duration <= 0) {
duration = DEFAULT_DURATION;
duration = cwut > 0
? DEFAULT_STATION_DURATION
: DEFAULT_SCANNER_DURATION;
}

if (eut <= 0) {
eut = DEFAULT_EUT;
eut = cwut > 0
? DEFAULT_STATION_EUT
: DEFAULT_SCANNER_EUT;
}
return new ResearchRecipeEntry(researchId, researchStack, dataStack, duration, eut, cwut);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public static void register() {
Cobalt = new Material.Builder(23, gregtechId("cobalt"))
.ingot().fluid().ore() // leave for TiCon ore processing
.color(0x5050FA).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_DOUBLE_PLATE)
.flags(EXT_METAL, GENERATE_DOUBLE_PLATE, GENERATE_FINE_WIRE)
.element(Elements.Co)
.cableProperties(GTValues.V[1], 2, 2)
.itemPipeProperties(2560, 2.0f)
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/gregtech/api/util/AssemblyLineManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ public static ItemStack getDefaultScannerItem() {
}

@Nonnull
public static ItemStack getDefaultResearchStationItem() {
public static ItemStack getDefaultResearchStationItem(int cwut) {
if (cwut > 32) {
return MetaItems.TOOL_DATA_MODULE.getStackForm();
}
return MetaItems.TOOL_DATA_ORB.getStackForm();
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/common/metatileentities/MetaTileEntities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,8 @@ public static void init() {
PASSTHROUGH_HATCH_ITEM = registerMetaTileEntity(1402, new MetaTileEntityPassthroughHatchItem(gregtechId("passthrough_hatch_item"), 3));
PASSTHROUGH_HATCH_FLUID = registerMetaTileEntity(1403, new MetaTileEntityPassthroughHatchFluid(gregtechId("passthrough_hatch_fluid"), 3));

DATA_ACCESS_HATCH = registerMetaTileEntity(1404, new MetaTileEntityDataAccessHatch(gregtechId("data_access_hatch"), GTValues.IV, false));
ADVANCED_DATA_ACCESS_HATCH = registerMetaTileEntity(1405, new MetaTileEntityDataAccessHatch(gregtechId("data_access_hatch.advanced"), GTValues.ZPM, false));
DATA_ACCESS_HATCH = registerMetaTileEntity(1404, new MetaTileEntityDataAccessHatch(gregtechId("data_access_hatch"), GTValues.EV, false));
ADVANCED_DATA_ACCESS_HATCH = registerMetaTileEntity(1405, new MetaTileEntityDataAccessHatch(gregtechId("data_access_hatch.advanced"), GTValues.LuV, false));
CREATIVE_DATA_HATCH = registerMetaTileEntity(1406, new MetaTileEntityDataAccessHatch(gregtechId("data_access_hatch.creative"), GTValues.MAX, true));
OPTICAL_DATA_HATCH_RECEIVER = registerMetaTileEntity(1407, new MetaTileEntityOpticalDataHatch(gregtechId("data_access_hatch.optical.receiver"), false));
OPTICAL_DATA_HATCH_TRANSMITTER = registerMetaTileEntity(1408, new MetaTileEntityOpticalDataHatch(gregtechId("data_access_hatch.optical.transmitter"), true));
Expand Down
2 changes: 1 addition & 1 deletion .../java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityLaserHatch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class MetaTileEntityLaserHatch extends MetaTileEntityMultiblockPart imple
private LaserHatchWrapper wrapper;

public MetaTileEntityLaserHatch(ResourceLocation metaTileEntityId, boolean isOutput) {
super(metaTileEntityId, GTValues.ZPM);
super(metaTileEntityId, GTValues.LuV);
this.isOutput = isOutput;
this.wrapper = new LaserHatchWrapper(this, null, isOutput);
}
Expand Down
2 changes: 1 addition & 1 deletion ...gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityOpticalDataHatch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class MetaTileEntityOpticalDataHatch extends MetaTileEntityMultiblockNoti
private final boolean isTransmitter;

public MetaTileEntityOpticalDataHatch(ResourceLocation metaTileEntityId, boolean isTransmitter) {
super(metaTileEntityId, GTValues.ZPM, false);
super(metaTileEntityId, GTValues.LuV, false);
this.isTransmitter = isTransmitter;
}

Expand Down
17 changes: 13 additions & 4 deletions src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gregtech.loaders.recipe;

import gregtech.api.recipes.builders.AssemblyLineRecipeBuilder;
import gregtech.api.unification.OreDictUnifier;
import gregtech.api.unification.material.MarkerMaterials.Tier;

import static gregtech.api.GTValues.*;
Expand Down Expand Up @@ -28,6 +28,10 @@ public static void init() {
.fluidInputs(SolderingAlloy.getFluid(L * 8))
.fluidInputs(NiobiumTitanium.getFluid(L * 8))
.outputs(FUSION_REACTOR[0].getStackForm())
.research(b -> b
.researchStack(OreDictUnifier.get(wireGtSingle, IndiumTinBariumTitaniumCuprate))
.duration(1200)
.EUt(VA[IV]))
.duration(800).EUt(VA[LuV]).buildAndRegister();

ASSEMBLY_LINE_RECIPES.recipeBuilder()
Expand All @@ -42,9 +46,10 @@ public static void init() {
.fluidInputs(SolderingAlloy.getFluid(L * 8))
.fluidInputs(VanadiumGallium.getFluid(L * 8))
.outputs(FUSION_REACTOR[1].getStackForm())
.research(b -> b.researchStack(FUSION_REACTOR[0].getStackForm())
.CWUt(4)
.duration(100).EUt(VA[UV])) // todo testing
.research(b -> b
.researchStack(FUSION_REACTOR[0].getStackForm())
.CWUt(16)
.EUt(VA[ZPM]))
.duration(1000).EUt(61440).buildAndRegister();

ASSEMBLY_LINE_RECIPES.recipeBuilder()
Expand All @@ -59,6 +64,10 @@ public static void init() {
.fluidInputs(SolderingAlloy.getFluid(L * 8))
.fluidInputs(YttriumBariumCuprate.getFluid(L * 8))
.outputs(FUSION_REACTOR[2].getStackForm())
.research(b -> b
.researchStack(FUSION_REACTOR[1].getStackForm())
.CWUt(96)
.EUt(VA[UV]))
.duration(1000).EUt(VA[ZPM]).buildAndRegister();
}
}
12 changes: 12 additions & 0 deletions src/main/java/gregtech/loaders/recipe/BatteryRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ private static void gemBatteries() {
.input(bolt, Naquadah, 16)
.fluidInputs(SolderingAlloy.getFluid(L * 5))
.output(ENERGY_LAPOTRONIC_ORB_CLUSTER)
.research(ENERGY_LAPOTRONIC_ORB.getStackForm())
.buildAndRegister();

// Energy Module
Expand All @@ -368,6 +369,9 @@ private static void gemBatteries() {
.input(bolt, Trinium, 16)
.fluidInputs(SolderingAlloy.getFluid(L * 10))
.output(ENERGY_MODULE)
.research(b -> b
.researchStack(ENERGY_LAPOTRONIC_ORB_CLUSTER.getStackForm())
.CWUt(16))
.buildAndRegister();

// Energy Cluster
Expand All @@ -388,6 +392,10 @@ private static void gemBatteries() {
.fluidInputs(SolderingAlloy.getFluid(L * 20))
.fluidInputs(Polybenzimidazole.getFluid(L * 4))
.output(ENERGY_CLUSTER)
.research(b -> b
.researchStack(ENERGY_MODULE.getStackForm())
.CWUt(96)
.EUt(VA[ZPM]))
.buildAndRegister();

// Ultimate Battery
Expand All @@ -409,6 +417,10 @@ private static void gemBatteries() {
.fluidInputs(Polybenzimidazole.getFluid(2304))
.fluidInputs(Naquadria.getFluid(L * 18))
.output(ULTIMATE_BATTERY)
.research(b -> b
.researchStack(ENERGY_CLUSTER.getStackForm())
.CWUt(128)
.EUt(VA[UHV]))
.buildAndRegister();
}

Expand Down
48 changes: 36 additions & 12 deletions src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ private static void waferRecipes() {
BLAST_RECIPES.recipeBuilder()
.input(dust, Silicon, 32)
.input(dustSmall, GalliumArsenide)
.circuitMeta(2)
.output(SILICON_BOULE)
.blastFurnaceTemp(1784)
.duration(9000).EUt(VA[MV]).buildAndRegister();
Expand Down Expand Up @@ -1364,6 +1365,9 @@ private static void circuitRecipes() {
.input(ADVANCED_SMD_DIODE, 8)
.fluidInputs(SolderingAlloy.getFluid(L * 10))
.output(CRYSTAL_MAINFRAME_UV)
.research(b -> b
.researchStack(CRYSTAL_COMPUTER_ZPM.getStackForm())
.CWUt(16))
.buildAndRegister();

// T7: Wetware =================================================================================================
Expand Down Expand Up @@ -1428,6 +1432,9 @@ private static void circuitRecipes() {
.input(plate, Europium, 4)
.fluidInputs(SolderingAlloy.getFluid(1152))
.output(WETWARE_SUPER_COMPUTER_UV)
.research(b -> b
.researchStack(WETWARE_PROCESSOR_ASSEMBLY_ZPM.getStackForm())
.CWUt(16))
.buildAndRegister();

// UHV
Expand All @@ -1446,34 +1453,51 @@ private static void circuitRecipes() {
.fluidInputs(SolderingAlloy.getFluid(L * 20))
.fluidInputs(Polybenzimidazole.getFluid(L * 8))
.output(WETWARE_MAINFRAME_UHV)
.research(b -> b
.researchStack(WETWARE_SUPER_COMPUTER_UV.getStackForm())
.CWUt(96)
.EUt(VA[UV]))
.EUt(300000).duration(2000).buildAndRegister();

// Misc ========================================================================================================

// Data Stick
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder()
.input(PLASTIC_CIRCUIT_BOARD)
.input(CENTRAL_PROCESSING_UNIT, 2)
.input(NAND_MEMORY_CHIP, 32)
.input(ADVANCED_CIRCUIT_BOARD)
.input(circuit, Tier.HV, 2)
.input(RANDOM_ACCESS_MEMORY, 4)
.input(wireFine, RedAlloy, 16)
.input(plate, Polyethylene, 4)
.input(NOR_MEMORY_CHIP, 16)
.input(NAND_MEMORY_CHIP, 32)
.input(wireFine, Platinum, 32)
.output(TOOL_DATA_STICK)
.solderMultiplier(2)
.cleanroom(CleanroomType.CLEANROOM)
.duration(400).EUt(90).buildAndRegister();
.duration(400).EUt(1200).buildAndRegister();

// Data Orb
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder()
.input(ADVANCED_CIRCUIT_BOARD)
.input(circuit, Tier.HV, 2)
.input(RANDOM_ACCESS_MEMORY, 4)
.input(EXTREME_CIRCUIT_BOARD)
.input(circuit, Tier.IV, 2)
.input(RANDOM_ACCESS_MEMORY, 8)
.input(NOR_MEMORY_CHIP, 32)
.input(NAND_MEMORY_CHIP, 64)
.input(wireFine, Platinum, 32)
.input(NAND_MEMORY_CHIP, 48)
.input(wireFine, NiobiumTitanium, 32)
.output(TOOL_DATA_ORB)
.solderMultiplier(2)
.cleanroom(CleanroomType.CLEANROOM)
.duration(400).EUt(1200).buildAndRegister();
.duration(400).EUt(9600).buildAndRegister();

// Data Module
CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder()
.input(WETWARE_CIRCUIT_BOARD)
.input(circuit, Tier.ZPM, 2)
.input(RANDOM_ACCESS_MEMORY, 32)
.input(NOR_MEMORY_CHIP, 64)
.input(NAND_MEMORY_CHIP, 64)
.input(wireFine, YttriumBariumCuprate, 32)
.output(TOOL_DATA_MODULE)
.solderMultiplier(2)
.cleanroom(CleanroomType.STERILE_CLEANROOM)
.duration(400).EUt(38400).buildAndRegister();
}
}
Loading

0 comments on commit 5e05b33

Please sign in to comment.