Skip to content

Use Generic Builder pattern for MachineBuilder #4422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jurrejelle wants to merge 2 commits into
base: 1.20.1
Choose a base branch
from
Open

Use Generic Builder pattern for MachineBuilder #4422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a51c5
Add second generic to MachineBuilder and reduce code duplication
jurrejelle Jan 5, 2026
6e4fb19
version bump
jurrejelle Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions docs/content/Modpacks/Changes/v7.5.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
title: "Version 7.5.0"
---


# Updating from `7.4.1` to `7.5.0`
## MachineBuilder Generics
We have added a second Generic argument to our (Multiblock)MachineBuilder. This effectively means that anywhere where you used to store a partially finished `MachineBuilder<?>`, you now need to store a `MachineBuilder<?, ?>`. The same holds for `MultiblockMachineBuilder<?,?>`.
34 changes: 17 additions & 17 deletions src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,34 +126,34 @@ public IGTFluidBuilder createFluid(String name, String langKey, Material materia
return fluid(this, material, name, langKey, stillTexture, flowingTexture);
}

public <DEFINITION extends MachineDefinition> MachineBuilder<DEFINITION> machine(String name,
Function<ResourceLocation, DEFINITION> definitionFactory,
Function<IMachineBlockEntity, MetaMachine> metaMachine,
BiFunction<BlockBehaviour.Properties, DEFINITION, IMachineBlock> blockFactory,
BiFunction<IMachineBlock, Item.Properties, MetaMachineItem> itemFactory,
TriFunction<BlockEntityType<?>, BlockPos, BlockState, IMachineBlockEntity> blockEntityFactory) {
public <DEFINITION extends MachineDefinition> MachineBuilder<DEFINITION, ?> machine(String name,
Function<ResourceLocation, DEFINITION> definitionFactory,
Function<IMachineBlockEntity, MetaMachine> metaMachine,
BiFunction<BlockBehaviour.Properties, DEFINITION, IMachineBlock> blockFactory,
BiFunction<IMachineBlock, Item.Properties, MetaMachineItem> itemFactory,
TriFunction<BlockEntityType<?>, BlockPos, BlockState, IMachineBlockEntity> blockEntityFactory) {
return new MachineBuilder<>(this, name, definitionFactory, metaMachine,
blockFactory, itemFactory, blockEntityFactory);
}

public MachineBuilder<MachineDefinition> machine(String name,
Function<IMachineBlockEntity, MetaMachine> metaMachine) {
public MachineBuilder<MachineDefinition, ?> machine(String name,
Function<IMachineBlockEntity, MetaMachine> metaMachine) {
return new MachineBuilder<>(this, name, MachineDefinition::new, metaMachine,
MetaMachineBlock::new, MetaMachineItem::new, MetaMachineBlockEntity::new);
}

public MultiblockMachineBuilder multiblock(String name,
Function<IMachineBlockEntity, ? extends MultiblockControllerMachine> metaMachine,
BiFunction<BlockBehaviour.Properties, MultiblockMachineDefinition, IMachineBlock> blockFactory,
BiFunction<IMachineBlock, Item.Properties, MetaMachineItem> itemFactory,
TriFunction<BlockEntityType<?>, BlockPos, BlockState, IMachineBlockEntity> blockEntityFactory) {
return new MultiblockMachineBuilder(this, name, metaMachine,
public MultiblockMachineBuilder<MultiblockMachineDefinition, ?> multiblock(String name,
Function<IMachineBlockEntity, ? extends MultiblockControllerMachine> metaMachine,
BiFunction<BlockBehaviour.Properties, MultiblockMachineDefinition, IMachineBlock> blockFactory,
BiFunction<IMachineBlock, Item.Properties, MetaMachineItem> itemFactory,
TriFunction<BlockEntityType<?>, BlockPos, BlockState, IMachineBlockEntity> blockEntityFactory) {
return new MultiblockMachineBuilder<>(this, name, metaMachine,
blockFactory, itemFactory, blockEntityFactory);
}

public MultiblockMachineBuilder multiblock(String name,
Function<IMachineBlockEntity, ? extends MultiblockControllerMachine> metaMachine) {
return new MultiblockMachineBuilder(this, name, metaMachine,
public MultiblockMachineBuilder<MultiblockMachineDefinition, ?> multiblock(String name,
Function<IMachineBlockEntity, ? extends MultiblockControllerMachine> metaMachine) {
return new MultiblockMachineBuilder<>(this, name, metaMachine,
MetaMachineBlock::new, MetaMachineItem::new, MetaMachineBlockEntity::new);
}

Expand Down
Loading