Skip to content

Commit 6fc8095

Browse files
authored
Fix Central Monitor loading machines too early (GregTechCEu#3623)
1 parent 79bdfcf commit 6fc8095

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,7 @@ public class CentralMonitorMachine extends WorkableElectricMultiblockMachine
6969
public static final ManagedFieldHolder MANAGED_FIELD_HOLDER = new ManagedFieldHolder(CentralMonitorMachine.class,
7070
WorkableMultiblockMachine.MANAGED_FIELD_HOLDER);
7171

72-
public static final TraceabilityPredicate BLOCK_PREDICATE = Predicates.abilities(PartAbility.INPUT_ENERGY)
73-
.setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)
74-
.or(Predicates.abilities(PartAbility.DATA_ACCESS).setPreviewCount(1)
75-
.or(Predicates.machines(GTMachines.BATTERY_BUFFER_4).setPreviewCount(0))
76-
.or(Predicates.machines(GTMachines.BATTERY_BUFFER_16).setPreviewCount(0))
77-
.setMaxGlobalLimited(4))
78-
.or(Predicates.machines(GTMachines.HULL))
79-
.or(Predicates.machines(GTMachines.MONITOR))
80-
.or(Predicates.blocks(GTBlocks.CASING_ALUMINIUM_FROSTPROOF.get()));
72+
public static TraceabilityPredicate BLOCK_PREDICATE;
8173

8274
@Persisted
8375
@DescSynced
@@ -95,6 +87,17 @@ public class CentralMonitorMachine extends WorkableElectricMultiblockMachine
9587

9688
public CentralMonitorMachine(IMachineBlockEntity holder) {
9789
super(holder);
90+
if (BLOCK_PREDICATE == null) {
91+
BLOCK_PREDICATE = Predicates.abilities(PartAbility.INPUT_ENERGY)
92+
.setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)
93+
.or(Predicates.abilities(PartAbility.DATA_ACCESS).setPreviewCount(1)
94+
.or(Predicates.machines(GTMachines.BATTERY_BUFFER_4).setPreviewCount(0))
95+
.or(Predicates.machines(GTMachines.BATTERY_BUFFER_16).setPreviewCount(0))
96+
.setMaxGlobalLimited(4))
97+
.or(Predicates.machines(GTMachines.HULL))
98+
.or(Predicates.machines(GTMachines.MONITOR))
99+
.or(Predicates.blocks(GTBlocks.CASING_ALUMINIUM_FROSTPROOF.get()));
100+
}
98101
}
99102

100103
@Override

0 commit comments

Comments
 (0)