Skip to content

Commit 2e1d7ac

Browse files
tier940tier940
authored
Added a recipe using Fluid Solidifier to the AE2 circuit. (#332)
1 parent 2dccdb2 commit 2e1d7ac

File tree

6 files changed

+95
-58
lines changed

6 files changed

+95
-58
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 2.4.11
2+
- Added a recipe using Fluid Solidifier to the AE2 circuit. [#332](https://github.com/GTModpackTeam/GTExpert-Core/pull/332)
3+
4+
* * *
5+
16
# 2.4.10
27
- Fix Tiered Hatch tooltip [#330](https://github.com/GTModpackTeam/GTExpert-Core/pull/330)
38

‎src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ public static void init() {
1414
// Iron
1515
Materials.Iron.addFlags(GENERATE_DOUBLE_PLATE);
1616

17+
// Diamond
18+
FluidProperty diamondProp = new FluidProperty();
19+
diamondProp.enqueueRegistration(FluidStorageKeys.LIQUID, new FluidBuilder());
20+
Materials.Diamond.setProperty(PropertyKey.FLUID, diamondProp);
21+
1722
// Ender Peral
1823
FluidProperty enderPeralProp = new FluidProperty();
1924
enderPeralProp.enqueueRegistration(FluidStorageKeys.LIQUID, new FluidBuilder());

‎src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.github.gtexpert.core.api.GTEValues;
66

7+
@Config.LangKey(GTEValues.MODID + ".config." + GTEValues.MODID)
78
@Config(modid = GTEValues.MODID,
89
name = GTEValues.MODID + "/" + GTEValues.MODID,
910
category = "GTExpert-Core")
@@ -22,8 +23,6 @@ public static class ModpackFlag {
2223
@Config.Comment({ "Activate changes in the replacement schedule.",
2324
"1. When enabled, the following structure and mte name changes: ",
2425
"Large Cracking Unit",
25-
"2. When enabled, the recipe of the following items will be changed: ",
26-
"Logic Processor, Calc Processor, Engineer Processor",
2726
"Default: false" })
2827
public boolean featureFlag = false;
2928

‎src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java‎

Lines changed: 59 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -431,64 +431,35 @@ public static void init() {
431431
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
432432
.buildAndRegister();
433433

434-
if (GTEConfigHolder.gteFlag.featureFlag) {
435-
// Logic Processor
436-
RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder()
437-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
438-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
439-
.fluidInputs(Materials.Redstone.getFluid(144))
440-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 22))
441-
.duration(200).EUt(VHA[GTEValues.ae2VoltageTier - 1])
442-
.buildAndRegister();
443-
444-
// Calc Processor
445-
RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder()
446-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
447-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
448-
.fluidInputs(Materials.Redstone.getFluid(144))
449-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 23))
450-
.duration(200).EUt(VHA[GTEValues.ae2VoltageTier - 1])
451-
.buildAndRegister();
452-
453-
// Engineer Processor
454-
RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder()
455-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
456-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
457-
.fluidInputs(Materials.Redstone.getFluid(144))
458-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 24))
459-
.duration(200).EUt(VHA[GTEValues.ae2VoltageTier - 1])
460-
.buildAndRegister();
461-
} else {
462-
// Logic Processor
463-
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
464-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
465-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
466-
.fluidInputs(Materials.Redstone.getFluid(144))
467-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 22))
468-
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
469-
.withRecycling()
470-
.buildAndRegister();
434+
// Logic Processor
435+
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
436+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
437+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
438+
.fluidInputs(Materials.Redstone.getFluid(144))
439+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 22))
440+
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
441+
.withRecycling()
442+
.buildAndRegister();
471443

472-
// Calc Processor
473-
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
474-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
475-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
476-
.fluidInputs(Materials.Redstone.getFluid(144))
477-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 23))
478-
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
479-
.withRecycling()
480-
.buildAndRegister();
444+
// Calc Processor
445+
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
446+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
447+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
448+
.fluidInputs(Materials.Redstone.getFluid(144))
449+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 23))
450+
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
451+
.withRecycling()
452+
.buildAndRegister();
481453

482-
// Engineer Processor
483-
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
484-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
485-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
486-
.fluidInputs(Materials.Redstone.getFluid(144))
487-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 24))
488-
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
489-
.withRecycling()
490-
.buildAndRegister();
491-
}
454+
// Engineer Processor
455+
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
456+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
457+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
458+
.fluidInputs(Materials.Redstone.getFluid(144))
459+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 24))
460+
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
461+
.withRecycling()
462+
.buildAndRegister();
492463

493464
if (AEConfigHolder.moveSteelShape) {
494465
// All shapes
@@ -566,6 +537,38 @@ public static void init() {
566537
GTEMetaItems.SHAPE_EXTRUDER_ENGINEERING_PROCESSOR.getStackForm(),
567538
" x ", " S", " ",
568539
'S', GTEMetaItems.SHAPE_EXTRUDER_PRINTED_SILICON);
540+
541+
// Printed Silicon
542+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
543+
.notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm())
544+
.fluidInputs(Materials.Silicon.getFluid(144))
545+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
546+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
547+
.buildAndRegister();
548+
549+
// Logic Circuit
550+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
551+
.notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm())
552+
.fluidInputs(Materials.Gold.getFluid(144))
553+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
554+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
555+
.buildAndRegister();
556+
557+
// Calc Circuit
558+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
559+
.notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm())
560+
.fluidInputs(Materials.CertusQuartz.getFluid(144))
561+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
562+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
563+
.buildAndRegister();
564+
565+
// Engineer Circuit
566+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
567+
.notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm())
568+
.fluidInputs(Materials.Diamond.getFluid(144))
569+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
570+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
571+
.buildAndRegister();
569572
} else {
570573
// Silicon Processor Press
571574
RecipeMaps.LASER_ENGRAVER_RECIPES.recipeBuilder()

‎src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,19 @@ private static void materials() {
108108
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FORGE_HAMMER_RECIPES,
109109
OreDictUnifier.get(block, Materials.EnderEye));
110110

111+
// ########################################
112+
// Diamond
113+
// ########################################
114+
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FLUID_SOLIDFICATION_RECIPES,
115+
new ItemStack[] { MetaItems.SHAPE_MOLD_PLATE.getStackForm() },
116+
new FluidStack[] { Materials.Diamond.getFluid(144) });
117+
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FLUID_SOLIDFICATION_RECIPES,
118+
new ItemStack[] { MetaItems.SHAPE_MOLD_GEAR.getStackForm() },
119+
new FluidStack[] { Materials.Diamond.getFluid(576) });
120+
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FLUID_SOLIDFICATION_RECIPES,
121+
new ItemStack[] { MetaItems.SHAPE_MOLD_BLOCK.getStackForm() },
122+
new FluidStack[] { Materials.Diamond.getFluid(1296) });
123+
111124
// ########################################
112125
// Redstone
113126
// ########################################

‎src/main/resources/assets/gtexpert/lang/en_us.lang‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,3 +251,15 @@ gtexpert.gui.needs_redstone=Needs Redstone signal to work
251251
gtexpert.multiblock.large_transformer.max_input_energy_per_tick_amps=Max Input: %s EU/t (%s) / %s A
252252
gtexpert.multiblock.large_transformer.max_output_energy_per_tick_amps=Max Output: %s EU/t (%s) / %s A
253253
gtexpert.multiblock.large_transformer.not_enough_input=Max Output exceeds Max Input!
254+
255+
#config
256+
gtexpert.config.gtexpert=GTExpert-Core
257+
gtexpert.config.integration.ae=Applied Energistics 2
258+
gtexpert.config.integration.aeadditions=AE Additions
259+
gtexpert.config.integration.chisel=Chisel
260+
gtexpert.config.integration.deda=Draconic Evolution & Draconic Additions
261+
gtexpert.config.integration.eio=Ender IO
262+
gtexpert.config.integration.extracpus=Extra CPUs
263+
gtexpert.config.integration.nae2=Neeve's AE2
264+
gtexpert.config.integration.tc=Thaumcraft
265+
gtexpert.config.integration.te=ThaumicEnergistics

0 commit comments

Comments
 (0)