Skip to content

Commit c71e5f2

Browse files
Requested changes.
1 parent 86d3a20 commit c71e5f2

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/main/java/net/neganote/gtutilities/common/machine/UtilAEMachines.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class UtilAEMachines {
1919
public static MachineDefinition EXPANDED_ME_PATTERN_BUFFER_PROXY = null;
2020

2121
static {
22-
if (UtilConfig.INSTANCE.features.aeMachinesEnabled || GTCEu.isDataGen()) {
22+
if (UtilConfig.INSTANCE.features.expandedBuffersEnabled & GTCEu.Mods.isAE2Loaded() || GTCEu.isDataGen()) {
2323
EXPANDED_ME_PATTERN_BUFFER = REGISTRATE
2424
.machine("expanded_me_pattern_buffer", ExpandedPatternBufferPartMachine::new)
2525
.tier(ZPM)

src/main/java/net/neganote/gtutilities/config/UtilConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public static class FeatureConfigs {
9292
public boolean autoChargersEnabled = true;
9393

9494
@Configurable
95-
@Configurable.Comment({ "Whether the Expanded Pattern Buffer and Expanded Pattern Buffer Proxy are enabled." })
96-
public boolean aeMachinesEnabled = true;
95+
@Configurable.Comment({ "Whether the Expanded Pattern Buffer and Expanded Pattern Buffer Proxy are enabled. If AE2 is not loaded, this config will not load the machines regardless. " })
96+
public boolean expandedBuffersEnabled = false;
9797
}
9898

9999
public static boolean coolantEnabled() {

src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.neganote.gtutilities.recipe;
22

3+
import com.gregtechceu.gtceu.GTCEu;
34
import com.gregtechceu.gtceu.api.GTCEuAPI;
45
import com.gregtechceu.gtceu.api.GTValues;
56
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
@@ -71,7 +72,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
7172
.save(provider);
7273
}
7374

74-
if (UtilConfig.INSTANCE.features.aeMachinesEnabled) {
75+
if (UtilConfig.INSTANCE.features.expandedBuffersEnabled & GTCEu.Mods.isAE2Loaded()) {
7576
ASSEMBLY_LINE_RECIPES.recipeBuilder("expanded_me_pattern_buffer")
7677
.inputItems(DUAL_IMPORT_HATCH[ZPM], 1)
7778
.inputItems(EMITTER_ZPM, 1)
@@ -87,7 +88,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
8788
.inputFluids(SolderingAlloy, L * 8)
8889
.inputFluids(Lubricant, 4000)
8990
.outputItems(UtilAEMachines.EXPANDED_ME_PATTERN_BUFFER)
90-
.stationResearch(b -> b.researchStack(GTAEMachines.ME_PATTERN_BUFFER.asStack())
91+
.stationResearch(b -> b.researchStack(DUAL_IMPORT_HATCH[ZPM].asStack())
9192
.CWUt(16, 32000))
9293
.duration(4000).EUt(VA[ZPM]).save(provider);
9394
ASSEMBLY_LINE_RECIPES.recipeBuilder("me_pattern_buffer_proxy")
@@ -103,7 +104,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
103104
.inputFluids(SolderingAlloy, L * 8)
104105
.inputFluids(Lubricant, 2000)
105106
.outputItems(UtilAEMachines.EXPANDED_ME_PATTERN_BUFFER_PROXY)
106-
.stationResearch(b -> b.researchStack(UtilAEMachines.EXPANDED_ME_PATTERN_BUFFER.asStack())
107+
.stationResearch(b -> b.researchStack(GTAEMachines.ME_PATTERN_BUFFER.asStack())
107108
.CWUt(32))
108109
.duration(600).EUt(VA[ZPM]).save(provider);
109110
}

0 commit comments

Comments
 (0)