Add second generic to MachineBuilder and reduce code duplication

Author: jurrejelle

docs/content/Modpacks/Changes/v7.4.1.md

@@ -0,0 +1,8 @@
+---
+title: "Version 7.4.1"
+---
+
+
+# Updating from `7.4.0` to `7.4.1`
+## 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<?,?>`.

src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java

@@ -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);
     }