Skip to content

Commit 14ba5ce

Browse files
tier940tier940
committed
AE2回路にFluid Solidifierを使ったレシピを追加
1 parent 2dccdb2 commit 14ba5ce

4 files changed

Lines changed: 76 additions & 57 deletions

File tree

‎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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public static class ModpackFlag {
2222
@Config.Comment({ "Activate changes in the replacement schedule.",
2323
"1. When enabled, the following structure and mte name changes: ",
2424
"Large Cracking Unit",
25-
"2. When enabled, the recipe of the following items will be changed: ",
26-
"Logic Processor, Calc Processor, Engineer Processor",
2725
"Default: false" })
2826
public boolean featureFlag = false;
2927

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

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,14 @@ public static void init() {
400400
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
401401
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
402402
.buildAndRegister();
403+
if (AEConfigHolder.moveSteelShape) {
404+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
405+
.notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm())
406+
.fluidInputs(Materials.Silicon.getFluid(144))
407+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
408+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
409+
.buildAndRegister();
410+
}
403411

404412
// Logic Circuit
405413
RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder()
@@ -410,6 +418,14 @@ public static void init() {
410418
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
411419
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
412420
.buildAndRegister();
421+
if (AEConfigHolder.moveSteelShape) {
422+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
423+
.notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm())
424+
.fluidInputs(Materials.Gold.getFluid(144))
425+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
426+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
427+
.buildAndRegister();
428+
}
413429

414430
// Calc Circuit
415431
RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder()
@@ -420,6 +436,14 @@ public static void init() {
420436
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
421437
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
422438
.buildAndRegister();
439+
if (AEConfigHolder.moveSteelShape) {
440+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
441+
.notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm())
442+
.fluidInputs(Materials.CertusQuartz.getFluid(144))
443+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
444+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
445+
.buildAndRegister();
446+
}
423447

424448
// Engineer Circuit
425449
RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder()
@@ -430,65 +454,44 @@ public static void init() {
430454
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
431455
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
432456
.buildAndRegister();
433-
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])
457+
if (AEConfigHolder.moveSteelShape) {
458+
RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
459+
.notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm())
460+
.fluidInputs(Materials.Diamond.getFluid(144))
461+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
462+
.duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
451463
.buildAndRegister();
464+
}
452465

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();
466+
// Logic Processor
467+
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
468+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
469+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
470+
.fluidInputs(Materials.Redstone.getFluid(144))
471+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 22))
472+
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
473+
.withRecycling()
474+
.buildAndRegister();
471475

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();
476+
// Calc Processor
477+
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
478+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
479+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
480+
.fluidInputs(Materials.Redstone.getFluid(144))
481+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 23))
482+
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
483+
.withRecycling()
484+
.buildAndRegister();
481485

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-
}
486+
// Engineer Processor
487+
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
488+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
489+
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
490+
.fluidInputs(Materials.Redstone.getFluid(144))
491+
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 24))
492+
.duration(20).EUt(VA[GTEValues.ae2VoltageTier])
493+
.withRecycling()
494+
.buildAndRegister();
492495

493496
if (AEConfigHolder.moveSteelShape) {
494497
// All shapes

‎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
// ########################################

0 commit comments

Comments
 (0)