Refactor Multiblock Predicates to add XOR/AND predicate logic - #5131

Open

ghzdude wants to merge 109 commits into

GregTechCEu:1.20.1from

ghzdude:gh/predicate-refactor

Commits on Aug 7, 2026

move to proper package
ghzdude
committed
31d1642
must return new instances for or/and
ghzdude
committed
cbe054e
mark debug name as nullable
ghzdude
committed
c2ec261
rename getDebugName() -> getTypeName()
ghzdude
committed
1288015
use method
ghzdude
committed
8968dce
add toString to BlockInfo
ghzdude
committed
bd15d4d
fix MultiPredicate list and sort
ghzdude
committed
c5b3e57
cleanup
ghzdude
committed
cdfd4a3
replace expand with visitor method
ghzdude
committed
6aa8f81
wrap unmodifiable
ghzdude
committed
4f5c03e
fix air predicate
ghzdude
committed
5f52ffe
use string builder for type name and contents
ghzdude
committed
1b0c995
move methods
ghzdude
committed
afd05da
small work
ghzdude
committed
1b280e2
method rename
ghzdude
committed
ba51dde
simplify or/and methods
ghzdude
committed
038fede
make everything go through customPredicate
ghzdude
committed
7029f47
add and use simple type name
ghzdude
committed
1f1caef
use custom predicate for rotor holder
ghzdude
committed
eb8dcd1
delete unused tooltips
ghzdude
committed
0ee673a
move test layer/global methods out to MultiPredicate
ghzdude
committed
69e3657
refactor string and type name
ghzdude
committed
752a1e6
implement xor
ghzdude
committed
8923dbb
pull out is single check for is valid
ghzdude
committed
5759f6d
fully implement xor
ghzdude
committed
b65f87d
move test global/slice max back into BasePredicate
ghzdude
committed
665931b
move global/layer min check to base predicate
ghzdude
committed
23d4c90
remove more stream suppliers
ghzdude
committed
6000440
list -> iterable
ghzdude
committed
93c690b
clean up or/and/xor methods
ghzdude
committed
686f3d2
give PredicateContext list instead of consumer reference
ghzdude
committed
fd145a7
unsure if this is cooking
ghzdude
committed
e952387
change basically everything
ghzdude
committed
4f29e1b
woah that's a lot more changes
ghzdude
committed
c573ad0
use new error methods in PredicateContext
ghzdude
committed
aecc54e
add check flip method in failure reason (unused)
ghzdude
committed
4b95942
fix more error usages
ghzdude
committed
3c4948e
commit and clear some errors
ghzdude
committed
e19fc37
on error method
ghzdude
committed
e30d80c
add stats to BasePredicate string
ghzdude
committed
1be75a8
more notes
ghzdude
committed
2f060f4
dumb shit
ghzdude
committed
57be770
go back
ghzdude
committed
0d7c9f3
spotless
ghzdude
committed
4ba124e
remove special error methods
ghzdude
committed
ddc8d45
errors are not null anymore
ghzdude
committed
912ea08
PatternStringError helper methods
ghzdude
committed
b364710
handle errors better
ghzdude
committed
b29ed6e
another attempt at logic handling
ghzdude
committed
d2c0204
spotless
ghzdude
committed
49b038b
only test visited predicates for slice check
ghzdude
committed
02bade2
notes
ghzdude
committed
833c0e4
move logic out into own classes
ghzdude
committed
841810f
fix rebase
ghzdude
committed
90e6700
add libs as flatdir
ghzdude
committed
85c2414
improve MultiPredicate constructors
ghzdude
committed
4b68c27
spotless
ghzdude
committed
9b803c2
almost working, but not quite
ghzdude
committed
a75771e
more work on logics
ghzdude
committed
85f24cb
make predicate list immutable
ghzdude
committed
54d05fe
actually fix errors
ghzdude
committed
b9f197f
fix predicates
ghzdude
committed
97b188d
move CompactedPredicate out
ghzdude
committed
226c7f8
spotless
ghzdude
committed
4118b9d
improve xor errors
ghzdude
committed
b4a19eb
simplify logic
ghzdude
committed
19e67dd
move MultiPredicate to proper package
ghzdude
committed
f696379
use lombok lazy getter for candidates
ghzdude
committed
9ba0a21
use first candidate optional
ghzdude
committed
bd91c76
simplify block info stack form getter
ghzdude
committed
f4494c5
clean up a bit
ghzdude
committed
45c9cbd
address todo
ghzdude
committed
c7a703c
add new helper method to PatternStringError
ghzdude
committed
e41ec4b
spotless
ghzdude
committed
84ac690
commit errors outside BlockPattern directly
ghzdude
committed
8319d06
fix ExpandablePattern
ghzdude
committed
19f4331
fix AndLogic
ghzdude
committed
c9b04ae
split PatternState and PredicateContext
ghzdude
committed
f65d2e5
improve and fix the pattern helpers
ghzdude
committed
41f7679
split PatternState and PredicateContext apart
ghzdude
committed
cda5506
set parent for base predicates
ghzdude
committed
04102e2
select innermost BasePredicate for testing
ghzdude
committed
d13e5e4
replace SinglePredicate.java with BasePredicate builder
ghzdude
committed
d55a684
move slice related fields around
ghzdude
committed
a1e66d9
update multiblock saved data for valid pattern state
ghzdude
committed
f492bd9
simplify logic
ghzdude
committed
fe68f6a
remove redundant testing methods to reflect recent refactor
ghzdude
committed
33d0d24
add missing append error calls
ghzdude
committed
5b0403f
add additional tooltips back
ghzdude
committed
c3b5c5d
cleanup comments and rename local variables
ghzdude
committed
23fc47f
more cleanup, move slice methods
ghzdude
committed
dbb62b6
move MultiPredicate error call inside
ghzdude
committed
f52abe8
remove last few usages of the boolean error method
ghzdude
committed
4741711
just move shit around tbh
ghzdude
committed
7adb2e8
mmmm yes 15 changed files...
ghzdude
committed
6899da6
move builder class out
ghzdude
committed
b185e22
move sort out of constructor
ghzdude
committed
868582f
mark other predicate params nullable
ghzdude
committed
be844c6
fix lang
ghzdude
committed
a5a9572
minor fixes and cleanup
ghzdude
committed
7998deb
spotless
ghzdude
committed
360d354
test max count is effectively the same across all logic types
ghzdude
committed
b2b9131
finally implement that global thing for XOR
ghzdude
committed
c239036
fix pattern helpers
ghzdude
committed
02dfeaf
spotless
ghzdude
committed
00c56de
check flip on error commit instead of append
ghzdude
committed
805b9d6
spotless
ghzdude
committed
a012136
update/fix cm
ghzdude
committed
4459b2c
actually use passed predicate in xor correctly
ghzdude
committed
f2a7c8b

Uh oh!

Commits

Commits on Aug 7, 2026