Coalesce Base Predicate counts + information into record and make MultiPredicate have counts by ghzdude · Pull Request #5342 · GregTechCEu/GregTech-Modern

ghzdude · 2026-08-24T03:35:02Z

What

Multipredicates should now be able to be treated like base predicates for testing min/max counts

Implementation Details

Added record PredicateSettings which combines several of BasePredicate's fields
MultiPredicate also has a settings field, though it is nullable unlike in BasePredicate
For MultiPredicates, if settings == null they behave exactly as before.
When settings is nonnull, it also gets checked along with children predicates
both must be true to pass
Lang has also been introduced for the to-be-used recipe view tooltips

AI Usage

No AI driven tools were used for this pull request.
Yes AI driven tools were used for this pull request.

Outcome

you should be able to do a.or(b).setMinCount(4) to mean "4 combined of either predicates" now

How Was This Tested

ran client, only check the assembly line which formed as expected

PredicateSettings codec (unused) update xorpred nonvalid global/slice count key to PredicateSettings

add set settings copy settings

count with new interface instead of PredicateSettings organize methods in MultiPredicate

…ed to the MultiPredicate instead of its children javadoc

add builder pattern generic to SettingsHolder

improve nonevalid in xor

jurrejelle · 2026-09-05T10:24:06Z

+    }
+
+    default int getMaxCount() {
+        return getSettings().maxCount();


All of these directly reference getSettings() but settings is nullable, so these should have guards for that then

jurrejelle · 2026-09-05T11:02:13Z

-        if (testGlobalMin(ctx)) return true;
+        boolean passed = testGlobalMin(ctx);
+        if (this.settings != null) {
+            passed &= SettingsHolder.super.testGlobalMin(ctx.getGlobalCount(this));


This specific SettingsHolder.super.testGlobalMin(int count) doesnt' seem to be tested for any children in the recursive steps, only in the top level predicates (e.g. the AndPredicate etc' testGlobalMin doesnt' call anything that calls testGlobalMin(int count) on the children)

jurrejelle · 2026-09-05T11:04:47Z

-        return passedPredicate.testSliceMax(context);
+        boolean passed = passedPredicate.testGlobalMax(context);
+        if (this.settings != null) {
+            passed &= this.testGlobalMax(context.incrementGlobalCount(this));


This only increments the count itself, not of ancestors, so a predicate whose count requirements are satisfied through only its children will never match

jurrejelle · 2026-09-05T11:05:26Z

    @Override
    public List<Component> getRecipeViewerTooltips(MultiPredicate root) {
-        List<Component> tooltips = new ArrayList<>(this.getAdditionalTooltips());
+        List<Component> tooltips = new ArrayList<>();


Why was the getAdditionalTooltips call removed?

jurrejelle · 2026-09-05T11:13:22Z

+    public MultiPredicate withSettings(UnaryOperator<PredicateSettings> configurator) {
+        return copyWith(p -> {
+            // is this (the current reference being copied) have their settings set to null?
+            if (this.settings == null) {


in this case with the XorPredicate, nothing actually recomputes isNoneValid after this happened and its children have a potentially now valid predicate

jurrejelle · 2026-09-05T11:19:36Z

-    @CheckReturnValue
-    public MultiPredicate setMaxSliceCount(int max) {
-        return mutatedCopy(p -> p.setMaxSliceCount(max));
+    public void updateSettings(UnaryOperator<PredicateSettings> configurator, boolean shouldCreate) {


This means any non-single recursive (settings = null) predicate who gets any e.g. .setMinCount() applied to it actually no-ops right?

jurrejelle · 2026-09-05T11:22:10Z


-    @CheckReturnValue
-    public MultiPredicate setMaxGlobalLimited(int max) {
-        return this.setMaxCount(max);


because e.g. setMinCount and setMaxCount now just call SettingsHolder.setMinCount() which doesn't make a mutated copy anymore, doing stuff like Predicates.AIR.setMinCount(4) mutates the global air predicate. This is why we did all those mutatedCopy things

jurrejelle · 2026-09-05T11:33:42Z

-        if (multiPredicate.isSingle() || multiPredicate.isType(type)) {
+                                         List<BasePredicate> predicates, List<MultiPredicate> children,
+                                         boolean equalSettings) {
+        if (multiPredicate.isSingle() || (multiPredicate.isType(type) && equalSettings)) {


I don't think we wanna merge on equalSettings, since then blocks(a,b).setMax(2).or(blocks(c,d).setMax(2)) would collapse into the equivalent of blocks(a,b,c,d).setMax(2) which is bad, since the original semantically should match aacc

jurrejelle · 2026-09-05T11:34:38Z

-    @CheckReturnValue
-    public MultiPredicate setMinLayerLimited(int min, int previewCount) {
-        return this.setMinSliceCount(min).setPreviewCount(previewCount);
+    /// Sets the setting of this multipredicate to its children, then makes {@code this.settings} null


This seems unused

jurrejelle · 2026-09-05T11:45:27Z

Edit to add: review assisted by opus

ghzdude added type: refactor Suggestion to refactor a section of code 1.20.1 labels Aug 24, 2026

YoungOnionMC requested changes Aug 24, 2026

View reviewed changes

Comment thread src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiPredicate.java Outdated

ghzdude commented Aug 29, 2026

View reviewed changes

Comment thread src/main/java/com/gregtechceu/gtceu/api/multiblock/MultiPredicate.java

ghzdude force-pushed the gh/predicate-settings branch 2 times, most recently from 644713d to da9a8e9 Compare September 4, 2026 06:21

ghzdude added 24 commits September 3, 2026 23:23

initial work

49b1924

work 2

68f14a4

PredicateSettings codec (unused) update xorpred nonvalid global/slice count key to PredicateSettings

lang

7f8c8a9

reduce changes

39e2e81

fix none valid in xor

45d8863

add set settings copy settings

check return value

82fa0eb

simplify methods

f27bdde

add SettingsHolder interface with shortcut methods

155ee81

count with new interface instead of PredicateSettings organize methods in MultiPredicate

attempt to retain settings when combining MultiPredicates

2c7aa73

organize BasePredicate methods

3adab43

update method usages

ab8b0d5

spotless

e3e69ef

revert these methods back

a471f64

settings is nonnull by defualt, meaning changes to settings are appli…

60eea0e

…ed to the MultiPredicate instead of its children javadoc

default methods and remove redundancy

6471a83

add builder pattern generic to SettingsHolder

return

34d3688

update usages

4804a96

make settings a constructor param

db1415f

improve nonevalid in xor

fix rebase

145f400

move if check inside lambda

8ba7dda

remove comment

42402f2

get rid of additional tooltips for MultiPredicates

5e277db

forgot this

ec1e69f

wtf

1dcbd26

ghzdude force-pushed the gh/predicate-settings branch from da9a8e9 to 1dcbd26 Compare September 4, 2026 06:45

ghzdude marked this pull request as ready for review September 4, 2026 06:59

ghzdude requested a review from a team as a code owner September 4, 2026 06:59

ghzdude added 2 commits September 4, 2026 02:34

better null check on set settings

cf0c812

improve multi predicate settings on copy

a236bf1

jurrejelle requested changes Sep 5, 2026

View reviewed changes

Navigation Menu

Uh oh!

Coalesce Base Predicate counts + information into record and make MultiPredicate have counts - #5342

Coalesce Base Predicate counts + information into record and make MultiPredicate have counts#5342
ghzdude wants to merge 26 commits into
GregTechCEu:1.20.1from
ghzdude:gh/predicate-settings

ghzdude commented Aug 24, 2026

Uh oh!

Uh oh!

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle Sep 5, 2026

Uh oh!

jurrejelle commented Sep 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

ghzdude commented Aug 24, 2026

What

Implementation Details

AI Usage

Outcome

How Was This Tested

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jurrejelle commented Sep 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants