From 14ba5ce4c436529447e3497166b1738fefc80aac Mon Sep 17 00:00:00 2001 From: tier940 Date: Sat, 26 Jul 2025 11:18:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?AE2=E5=9B=9E=E8=B7=AF=E3=81=ABFluid=20Solid?= =?UTF-8?q?ifier=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=9F=E3=83=AC=E3=82=B7?= =?UTF-8?q?=E3=83=94=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/GTEMaterialFlags.java | 5 + .../gtexpert/core/common/GTEConfigHolder.java | 2 - .../integration/ae/recipes/AEItemsRecipe.java | 113 +++++++++--------- .../loaders/recipe/CEUOverrideRecipe.java | 13 ++ 4 files changed, 76 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java index 17903a86..d161ba6f 100644 --- a/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java +++ b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java @@ -14,6 +14,11 @@ public static void init() { // Iron Materials.Iron.addFlags(GENERATE_DOUBLE_PLATE); + // Diamond + FluidProperty diamondProp = new FluidProperty(); + diamondProp.enqueueRegistration(FluidStorageKeys.LIQUID, new FluidBuilder()); + Materials.Diamond.setProperty(PropertyKey.FLUID, diamondProp); + // Ender Peral FluidProperty enderPeralProp = new FluidProperty(); enderPeralProp.enqueueRegistration(FluidStorageKeys.LIQUID, new FluidBuilder()); diff --git a/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java index ff305771..5c7cb574 100644 --- a/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java @@ -22,8 +22,6 @@ public static class ModpackFlag { @Config.Comment({ "Activate changes in the replacement schedule.", "1. When enabled, the following structure and mte name changes: ", "Large Cracking Unit", - "2. When enabled, the recipe of the following items will be changed: ", - "Logic Processor, Calc Processor, Engineer Processor", "Default: false" }) public boolean featureFlag = false; diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java index e9512c93..325df6c5 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java @@ -400,6 +400,14 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); + if (AEConfigHolder.moveSteelShape) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm()) + .fluidInputs(Materials.Silicon.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) + .buildAndRegister(); + } // Logic Circuit RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder() @@ -410,6 +418,14 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); + if (AEConfigHolder.moveSteelShape) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm()) + .fluidInputs(Materials.Gold.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) + .buildAndRegister(); + } // Calc Circuit RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder() @@ -420,6 +436,14 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); + if (AEConfigHolder.moveSteelShape) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm()) + .fluidInputs(Materials.CertusQuartz.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) + .buildAndRegister(); + } // Engineer Circuit RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder() @@ -430,65 +454,44 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); - - if (GTEConfigHolder.gteFlag.featureFlag) { - // Logic Processor - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) - .fluidInputs(Materials.Redstone.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 22)) - .duration(200).EUt(VHA[GTEValues.ae2VoltageTier - 1]) - .buildAndRegister(); - - // Calc Processor - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) - .fluidInputs(Materials.Redstone.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 23)) - .duration(200).EUt(VHA[GTEValues.ae2VoltageTier - 1]) + if (AEConfigHolder.moveSteelShape) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm()) + .fluidInputs(Materials.Diamond.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) .buildAndRegister(); + } - // Engineer Processor - RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) - .fluidInputs(Materials.Redstone.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 24)) - .duration(200).EUt(VHA[GTEValues.ae2VoltageTier - 1]) - .buildAndRegister(); - } else { - // Logic Processor - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) - .fluidInputs(Materials.Redstone.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 22)) - .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) - .withRecycling() - .buildAndRegister(); + // Logic Processor + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) + .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) + .fluidInputs(Materials.Redstone.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 22)) + .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) + .withRecycling() + .buildAndRegister(); - // Calc Processor - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) - .fluidInputs(Materials.Redstone.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 23)) - .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) - .withRecycling() - .buildAndRegister(); + // Calc Processor + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) + .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) + .fluidInputs(Materials.Redstone.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 23)) + .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) + .withRecycling() + .buildAndRegister(); - // Engineer Processor - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) - .fluidInputs(Materials.Redstone.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 24)) - .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) - .withRecycling() - .buildAndRegister(); - } + // Engineer Processor + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() + .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) + .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) + .fluidInputs(Materials.Redstone.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 24)) + .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) + .withRecycling() + .buildAndRegister(); if (AEConfigHolder.moveSteelShape) { // All shapes diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java index c6f087f8..0acb65c1 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java @@ -108,6 +108,19 @@ private static void materials() { GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FORGE_HAMMER_RECIPES, OreDictUnifier.get(block, Materials.EnderEye)); + // ######################################## + // Diamond + // ######################################## + GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FLUID_SOLIDFICATION_RECIPES, + new ItemStack[] { MetaItems.SHAPE_MOLD_PLATE.getStackForm() }, + new FluidStack[] { Materials.Diamond.getFluid(144) }); + GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FLUID_SOLIDFICATION_RECIPES, + new ItemStack[] { MetaItems.SHAPE_MOLD_GEAR.getStackForm() }, + new FluidStack[] { Materials.Diamond.getFluid(576) }); + GTRecipeHandler.removeRecipesByInputs(RecipeMaps.FLUID_SOLIDFICATION_RECIPES, + new ItemStack[] { MetaItems.SHAPE_MOLD_BLOCK.getStackForm() }, + new FluidStack[] { Materials.Diamond.getFluid(1296) }); + // ######################################## // Redstone // ######################################## From 00fef8b4b94a3472c323a2cf26ea41fe018fe772 Mon Sep 17 00:00:00 2001 From: tier940 Date: Sun, 17 Aug 2025 12:12:37 +0900 Subject: [PATCH 2/2] Fix cfg --- CHANGELOG.md | 5 ++ .../gtexpert/core/common/GTEConfigHolder.java | 1 + .../integration/ae/recipes/AEItemsRecipe.java | 64 +++++++++---------- .../resources/assets/gtexpert/lang/en_us.lang | 12 ++++ 4 files changed, 50 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30d4ddeb..e5485d97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.4.11 +- Added a recipe using Fluid Solidifier to the AE2 circuit. [#332](https://github.com/GTModpackTeam/GTExpert-Core/pull/332) + +* * * + # 2.4.10 - Fix Tiered Hatch tooltip [#330](https://github.com/GTModpackTeam/GTExpert-Core/pull/330) diff --git a/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java index 5c7cb574..df60270f 100644 --- a/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java @@ -4,6 +4,7 @@ import com.github.gtexpert.core.api.GTEValues; +@Config.LangKey(GTEValues.MODID + ".config." + GTEValues.MODID) @Config(modid = GTEValues.MODID, name = GTEValues.MODID + "/" + GTEValues.MODID, category = "GTExpert-Core") diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java index 325df6c5..bc306fef 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java @@ -400,14 +400,6 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); - if (AEConfigHolder.moveSteelShape) { - RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm()) - .fluidInputs(Materials.Silicon.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) - .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) - .buildAndRegister(); - } // Logic Circuit RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder() @@ -418,14 +410,6 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); - if (AEConfigHolder.moveSteelShape) { - RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm()) - .fluidInputs(Materials.Gold.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) - .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) - .buildAndRegister(); - } // Calc Circuit RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder() @@ -436,14 +420,6 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); - if (AEConfigHolder.moveSteelShape) { - RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm()) - .fluidInputs(Materials.CertusQuartz.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) - .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) - .buildAndRegister(); - } // Engineer Circuit RecipeMaps.FORMING_PRESS_RECIPES.recipeBuilder() @@ -454,14 +430,6 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) .duration(20).EUt(VA[GTEValues.ae2VoltageTier]) .buildAndRegister(); - if (AEConfigHolder.moveSteelShape) { - RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm()) - .fluidInputs(Materials.Diamond.getFluid(144)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) - .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) - .buildAndRegister(); - } // Logic Processor RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() @@ -569,6 +537,38 @@ public static void init() { GTEMetaItems.SHAPE_EXTRUDER_ENGINEERING_PROCESSOR.getStackForm(), " x ", " S", " ", 'S', GTEMetaItems.SHAPE_EXTRUDER_PRINTED_SILICON); + + // Printed Silicon + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm()) + .fluidInputs(Materials.Silicon.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) + .buildAndRegister(); + + // Logic Circuit + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm()) + .fluidInputs(Materials.Gold.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) + .buildAndRegister(); + + // Calc Circuit + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm()) + .fluidInputs(Materials.CertusQuartz.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) + .buildAndRegister(); + + // Engineer Circuit + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm()) + .fluidInputs(Materials.Diamond.getFluid(144)) + .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17)) + .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1]) + .buildAndRegister(); } else { // Silicon Processor Press RecipeMaps.LASER_ENGRAVER_RECIPES.recipeBuilder() diff --git a/src/main/resources/assets/gtexpert/lang/en_us.lang b/src/main/resources/assets/gtexpert/lang/en_us.lang index 8e554d81..354056e8 100644 --- a/src/main/resources/assets/gtexpert/lang/en_us.lang +++ b/src/main/resources/assets/gtexpert/lang/en_us.lang @@ -251,3 +251,15 @@ gtexpert.gui.needs_redstone=Needs Redstone signal to work gtexpert.multiblock.large_transformer.max_input_energy_per_tick_amps=Max Input: %s EU/t (%s) / %s A gtexpert.multiblock.large_transformer.max_output_energy_per_tick_amps=Max Output: %s EU/t (%s) / %s A gtexpert.multiblock.large_transformer.not_enough_input=Max Output exceeds Max Input! + +#config +gtexpert.config.gtexpert=GTExpert-Core +gtexpert.config.integration.ae=Applied Energistics 2 +gtexpert.config.integration.aeadditions=AE Additions +gtexpert.config.integration.chisel=Chisel +gtexpert.config.integration.deda=Draconic Evolution & Draconic Additions +gtexpert.config.integration.eio=Ender IO +gtexpert.config.integration.extracpus=Extra CPUs +gtexpert.config.integration.nae2=Neeve's AE2 +gtexpert.config.integration.tc=Thaumcraft +gtexpert.config.integration.te=ThaumicEnergistics