Skip to content

Commit

Permalink
fix more max energy hatch amounts
Browse files Browse the repository at this point in the history
  • Loading branch information
@screret
screret committed Apr 1, 2024
1 parent 8fd369e commit 6cd3378
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ public static void init() {}
.aisle("#####", "#ZZZ#", "#ZCZ#", "#ZZZ#", "#####")
.where('S', controller(blocks(definition.get())))
.where('Y', casingPredicate.or(abilities(IMPORT_ITEMS))
.or(abilities(INPUT_ENERGY).setMinGlobalLimited(1))
.or(abilities(INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))
.or(abilities(IMPORT_FLUIDS).setMinGlobalLimited(1))
.or(abilities(EXPORT_ITEMS))
.or(autoAbilities(true, false, true)))
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n
.where('S', Predicates.controller(blocks(definition.getBlock())))
.where('Y', blocks(CASING_STAINLESS_CLEAN.get())
.or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1))
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(3))
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setExactLimit(1)))
.where('X', blocks(CASING_STAINLESS_CLEAN.get())
.or(Predicates.abilities(PartAbility.EXPORT_FLUIDS_1X).setMinLayerLimited(1).setMaxLayerLimited(1)))
Expand Down Expand Up @@ -1266,7 +1266,7 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n
.where('F', blocks(CASING_STEEL_SOLID.get())
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(4)))
.where('O', Predicates.abilities(PartAbility.EXPORT_ITEMS).addTooltips(Component.translatable("gtceu.multiblock.pattern.location_end")))
.where('Y', blocks(CASING_STEEL_SOLID.get()).or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(3)))
.where('Y', blocks(CASING_STEEL_SOLID.get()).or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2)))
.where('I', blocks(ITEM_IMPORT_BUS[0].getBlock()))
.where('G', blocks(CASING_GRATE.get()))
.where('A', blocks(CASING_ASSEMBLY_CONTROL.get()))
Expand Down Expand Up @@ -1451,7 +1451,7 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n
.aisle("XSX", "#F#", "#F#", "#F#", "###", "###", "###")
.where('S', controller(blocks(definition.get())))
.where('X', blocks(FluidDrillMachine.getCasingState(tier)).setMinGlobalLimited(3)
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(3))
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))
.or(abilities(PartAbility.EXPORT_FLUIDS).setMaxGlobalLimited(1)))
.where('C', blocks(FluidDrillMachine.getCasingState(tier)))
.where('F', blocks(FluidDrillMachine.getFrameState(tier)))
Expand All @@ -1477,7 +1477,7 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n
.where('X', blocks(LargeMinerMachine.getCasingState(tier))
.or(abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1))
.or(abilities(PartAbility.IMPORT_FLUIDS).setExactLimit(1).setPreviewCount(1))
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(3).setPreviewCount(1)))
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)))
.where('C', blocks(LargeMinerMachine.getCasingState(tier)))
.where('F', frames(LargeMinerMachine.getMaterial(tier)))
.where('#', any())
Expand Down Expand Up @@ -2087,7 +2087,7 @@ public static void init() {
.aisle("XSX", "#F#", "#F#", "#F#", "###", "###", "###")
.where('S', controller(blocks(definition.get())))
.where('X', blocks(BedrockOreMinerMachine.getCasingState(tier)).setMinGlobalLimited(3)
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(3))
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))
.or(abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1)))
.where('C', blocks(BedrockOreMinerMachine.getCasingState(tier)))
.where('F', blocks(BedrockOreMinerMachine.getFrameState(tier)))
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ public BlockPattern getPattern() {

TraceabilityPredicate wallPredicate = states(getCasingState(), getGlassState());
TraceabilityPredicate basePredicate = Predicates.autoAbilities(true, false, false)
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(3));
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2));

// layer the slices one behind the next
return FactoryBlockPattern.start()
Expand Down

0 comments on commit 6cd3378

Please sign in to comment.