Skip to content

Commit 143f408

Browse files
Phoenixvine32908Phoenixvine32908
committed
Fixed improper use of machine registration. Added temp recipes for the expanded buffer and proxy.
1 parent fec410f commit 143f408

2 files changed

Lines changed: 57 additions & 2 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515

1616
public class UtilAEMachines {
1717

18+
public static MachineDefinition EXPANDED_ME_PATTERN_BUFFER = null;
19+
public static MachineDefinition EXPANDED_ME_PATTERN_BUFFER_PROXY = null;
20+
1821
static {
1922
if (UtilConfig.INSTANCE.features.aeMachinesEnabled || GTCEu.isDataGen()) {
20-
final MachineDefinition EXPANDED_ME_PATTERN_BUFFER = REGISTRATE
23+
EXPANDED_ME_PATTERN_BUFFER = REGISTRATE
2124
.machine("expanded_me_pattern_buffer", ExpandedPatternBufferPartMachine::new)
2225
.tier(ZPM)
2326
.rotationState(RotationState.ALL)
@@ -32,7 +35,7 @@ public class UtilAEMachines {
3235
Component.translatable("gtceu.part_sharing.enabled"))
3336
.register();
3437

35-
final MachineDefinition EXPANDED_ME_PATTERN_BUFFER_PROXY = REGISTRATE
38+
EXPANDED_ME_PATTERN_BUFFER_PROXY = REGISTRATE
3639
.machine("expanded_me_pattern_buffer_proxy", ExpandedPatternBufferProxyPartMachine::new)
3740
.tier(ZPM)
3841
.rotationState(RotationState.ALL)

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,37 @@
11
package net.neganote.gtutilities.recipe;
22

3+
import appeng.core.definitions.AEBlocks;
4+
import appeng.core.definitions.AEItems;
35
import com.gregtechceu.gtceu.api.GTCEuAPI;
46
import com.gregtechceu.gtceu.api.GTValues;
57
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
68
import com.gregtechceu.gtceu.api.machine.MachineDefinition;
79
import com.gregtechceu.gtceu.common.data.GTItems;
810
import com.gregtechceu.gtceu.common.data.GTMachines;
911
import com.gregtechceu.gtceu.common.data.GTMaterials;
12+
import com.gregtechceu.gtceu.common.data.machines.GTAEMachines;
1013
import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines;
1114
import com.gregtechceu.gtceu.config.ConfigHolder;
1215
import com.gregtechceu.gtceu.data.recipe.CustomTags;
16+
import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents;
1317
import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper;
1418

19+
import net.minecraft.Util;
1520
import net.minecraft.data.recipes.FinishedRecipe;
1621
import net.minecraft.world.item.ItemStack;
22+
import net.neganote.gtutilities.common.machine.UtilAEMachines;
1723
import net.neganote.gtutilities.common.machine.UtilMachines;
1824
import net.neganote.gtutilities.config.UtilConfig;
1925

2026
import java.util.function.Consumer;
2127

28+
import static com.gregtechceu.gtceu.api.GTValues.*;
29+
import static com.gregtechceu.gtceu.api.GTValues.ZPM;
30+
import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.wireFine;
2231
import static com.gregtechceu.gtceu.common.data.GTBlocks.LASER_PIPES;
32+
import static com.gregtechceu.gtceu.common.data.GTItems.*;
33+
import static com.gregtechceu.gtceu.common.data.GTMachines.DUAL_IMPORT_HATCH;
34+
import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
2335
import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES;
2436
import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES;
2537
import static com.gregtechceu.gtceu.data.recipe.GTCraftingComponents.*;
@@ -60,6 +72,44 @@ public static void init(Consumer<FinishedRecipe> provider) {
6072
.save(provider);
6173
}
6274

75+
if (UtilConfig.INSTANCE.features.aeMachinesEnabled) {
76+
ASSEMBLY_LINE_RECIPES.recipeBuilder("expanded_me_pattern_buffer")
77+
.inputItems(DUAL_IMPORT_HATCH[ZPM], 1)
78+
.inputItems(EMITTER_ZPM, 1)
79+
.inputItems(CustomTags.ZPM_CIRCUITS, 4)
80+
.inputItems(AEBlocks.PATTERN_PROVIDER.asItem(), 4)
81+
.inputItems(AEBlocks.INTERFACE.asItem(), 4)
82+
.inputItems(AEItems.SPEED_CARD.asItem(), 8)
83+
.inputItems(AEItems.CAPACITY_CARD.asItem(), 4)
84+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
85+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
86+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
87+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
88+
.inputFluids(SolderingAlloy, L * 8)
89+
.inputFluids(Lubricant, 4000)
90+
.outputItems(UtilAEMachines.EXPANDED_ME_PATTERN_BUFFER)
91+
.stationResearch(b -> b.researchStack(GTAEMachines.ME_PATTERN_BUFFER.asStack())
92+
.CWUt(16, 32000))
93+
.duration(4000).EUt(VA[ZPM]).save(provider);
94+
ASSEMBLY_LINE_RECIPES.recipeBuilder("me_pattern_buffer_proxy")
95+
.inputItems(GTMachines.HULL[ZPM], 1)
96+
.inputItems(SENSOR_ZPM, 4)
97+
.inputItems(CustomTags.ZPM_CIRCUITS, 2)
98+
.inputItems(AEBlocks.QUANTUM_LINK.asItem(), 2)
99+
.inputItems(AEBlocks.QUANTUM_RING.asItem(), 4)
100+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
101+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
102+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
103+
.inputItems(wireFine, UraniumRhodiumDinaquadide, 48)
104+
.inputFluids(SolderingAlloy, L * 8)
105+
.inputFluids(Lubricant, 2000)
106+
.outputItems(UtilAEMachines.EXPANDED_ME_PATTERN_BUFFER_PROXY)
107+
.stationResearch(b -> b.researchStack(UtilAEMachines.EXPANDED_ME_PATTERN_BUFFER.asStack())
108+
.CWUt(32))
109+
.duration(600).EUt(VA[ZPM]).save(provider);
110+
}
111+
112+
63113
if (UtilConfig.INSTANCE.features.autoChargersEnabled) {
64114
for (MachineDefinition autoChargerDef : AUTO_CHARGER_4) {
65115
if (autoChargerDef == null) {
@@ -75,6 +125,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
75125
}
76126
}
77127

128+
78129
public static void register64AConverterRecipes(Consumer<FinishedRecipe> provider) {
79130
for (int tier : GTValues.tiersBetween(GTValues.ULV, GTCEuAPI.isHighTier() ? GTValues.MAX : GTValues.UHV)) {
80131
ASSEMBLER_RECIPES.recipeBuilder("converter_64a_" + GTValues.VN[tier])
@@ -89,6 +140,7 @@ public static void register64AConverterRecipes(Consumer<FinishedRecipe> provider
89140
}
90141
}
91142

143+
92144
private static ItemStack getPowerUnit(int tier) {
93145
return switch (tier) {
94146
case GTValues.LV -> GTItems.POWER_UNIT_LV.asStack();

0 commit comments

Comments
 (0)