Skip to content

Remove some unnecessary forge capabilities, and move cleanroom behaviour to a machine trait#4500

Merged
gustovafing merged 44 commits into1.20.1-v8.0.0from
gus/machine-refactor-pt2
Feb 4, 2026
Merged

Remove some unnecessary forge capabilities, and move cleanroom behaviour to a machine trait#4500
gustovafing merged 44 commits into1.20.1-v8.0.0from
gus/machine-refactor-pt2

Conversation

@gustovafing
Copy link
Copy Markdown
Member

@gustovafing gustovafing commented Jan 26, 2026 •
edited
Loading

  • Move cleanroom functionality to be stored in cleanroom receiver/provider machine traits.
  • Remove unnecessary forge capabilities
  • Switch some computer craft and jade compatibility to use the machine BE/machine traits directly instead of implementing compatibility via a forge capability

gustovafing and others added 30 commits January 16, 2026 11:03
@gustovafing
add trait type logic
2ae6445
@gustovafing
add missing type param
12d52f4
@gustovafing
rename trait onMachineUnload
68bc679
@gustovafing
change the way trait types work
346c193
@gustovafing
machine trait probe providers
0cbb6d9
@gustovafing
impl trait ifaces
b7177de
@gustovafing
spotless, minor changes
4845469
@gustovafing
annotation changes
f7a1272
@gustovafing
remove Optional<T>
a8afcef
@gustovafing
add trait type method to all traits
951dc38
@gustovafing
change comments to jdoc
c65a06a
@gustovafing
move trait logic to seperate class
a7444e3
@gustovafing
rename some methods and add comments
bf4cd0e
@gustovafing
jdoc
b71bd03
@gustovafing
spotless
2db65da
@gustovafing
small code order change
493c8ea
@gustovafing
apply review changes
cf806d5
@gustovafing @TechLord22
Update MachineTraitHolder.java
b051d63 
Co-authored-by: TechLord22 <37029404+TechLord22@users.noreply.github.com>
@gustovafing
small organisation changes
5be7a03
@gustovafing
Merge branch 'gus/machine-refactor-pt2' of https://github.com/GregTec…
e510118 
…hCEu/GregTech-Modern into gus/machine-refactor-pt2
@gustovafing
fix type bound
ce2fc60
@gustovafing
spotless
b1d4180
@gustovafing
fix trait onUse handling
c18b3b2
@gustovafing
Merge branch '1.20.1-v8.0.0' into gus/machine-refactor-pt2
cf34d3c
@gustovafing
add some package files
a4c4e41
@gustovafing
source retention
64f71d2
@gustovafing
documented
a799f81
@gustovafing
switch to the jetbrains annotation
d819bec
@gustovafing
spotless
bf7ab19
@gustovafing
remove recipe logic capability
9532417
@gustovafing gustovafing requested a review from a team as a code owner January 26, 2026 07:31
@github-actions github-actions bot added the Tests: Passed Game Tests have passed on this PR label Jan 26, 2026
screret
screret reviewed Jan 29, 2026
View reviewed changes
TechLord22
TechLord22 reviewed Jan 29, 2026
View reviewed changes
src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java Outdated
@Getter
@Setter
private ICleanroomProvider cleanroom;
protected final CleanroomRecieverTrait cleanroomReciever;
Copy link
Copy Markdown
Member

@TechLord22 TechLord22 Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to support this?

Copy link
Copy Markdown
Member Author

@gustovafing gustovafing Jan 29, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We supported it beforehand, I say we just leave it.

@gustovafing gustovafing merged commit 1667e5b into 1.20.1-v8.0.0 Feb 4, 2026
4 checks passed
@gustovafing gustovafing deleted the gus/machine-refactor-pt2 branch February 4, 2026 13:08
screret pushed a commit to screret/GregTech-Modern that referenced this pull request Feb 8, 2026
@gustovafing @screret
Remove some unnecessary forge capabilities, and move cleanroom behavi…
735b2f1 
…our to a machine trait (GregTechCEu#4500)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TechLord22 TechLord22 TechLord22 left review comments

@jurrejelle jurrejelle jurrejelle approved these changes

@YoungOnionMC YoungOnionMC YoungOnionMC approved these changes

+1 more reviewer

@screret screret screret left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

1.20.1 Tests: Passed Game Tests have passed on this PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@gustovafing @jurrejelle @TechLord22 @YoungOnionMC @screret