Support multiple machine modifiers on the MachineBuilder (#150)

Author: Swedz

src/main/java/net/swedz/tesseract/neoforge/compat/mi/machine/builder/HatchMachineBuilder.java

@@ -28,7 +28,8 @@ public final class HatchMachineBuilder extends MachineBuilder<HatchMachineBuilde
 	private boolean          registerIO;
 
 	private MachineBlockHatchBlockEntityFactory blockEntityFactory;
-	private MachineBlockHolderHatchModifier     holderHatchModifier;
+	
+	private final List<MachineBlockHolderHatchModifier> holderHatchModifiers = Lists.newArrayList();
 
 	private CableTier energyCableTier;
 
@@ -40,8 +41,9 @@ public final class HatchMachineBuilder extends MachineBuilder<HatchMachineBuilde
 
 	public HatchMachineBuilder modify(MachineBlockHolderHatchModifier modifier)
 	{
-		this.holderHatchModifier = modifier;
-		return super.modify(null);
+		Assert.notNull(modifier);
+		this.holderHatchModifiers.add(modifier);
+		return this;
 	}
 
 	public HatchMachineBuilder item(int rows, int columns, int startX, int startY)
@@ -229,8 +231,12 @@ protected void internalRegister()
 						hook,
 						machineEnglishName, machineId,
 						blockFactory,
-						holderModifier != null ? holderModifier : (holderHatchModifier != null ? (holder) -> holderHatchModifier.modify(holder, input) : null),
-						propertiesModifier,
+						(holder) ->
+						{
+							holderModifiers.forEach((modifier) -> modifier.modify(holder));
+							holderHatchModifiers.forEach((modifier) -> modifier.modify(holder, input));
+						},
+						(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
 						defaultMineableTags,
 						(bep) -> blockEntityFactory.create(bep, input, hook.id(machineId)),
 						registrators.toArray(MachineBlockRegistrators[]::new)
@@ -247,8 +253,12 @@ protected void internalRegister()
 					hook,
 					englishName, name,
 					blockFactory,
-					holderModifier != null ? holderModifier : (holderHatchModifier != null ? (holder) -> holderHatchModifier.modify(holder, false) : null),
-					propertiesModifier,
+					(holder) ->
+					{
+						holderModifiers.forEach((modifier) -> modifier.modify(holder));
+						holderHatchModifiers.forEach((modifier) -> modifier.modify(holder, false));
+					},
+					(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
 					defaultMineableTags,
 					(bep) -> blockEntityFactory.create(bep, false, hook.id(name)),
 					registrators.toArray(MachineBlockRegistrators[]::new)

src/main/java/net/swedz/tesseract/neoforge/compat/mi/machine/builder/MachineBuilder.java

@@ -43,11 +43,11 @@ public static HatchMachineBuilder hatch(MIHook hook,
 	protected final String name;
 	protected final String englishName;
 
-	protected MachineBlockFactory            blockFactory = MachineBlock::new;
-	protected MachineBlockHolderModifier     holderModifier;
-	protected MachineBlockPropertiesModifier propertiesModifier;
+	protected MachineBlockFactory blockFactory = MachineBlock::new;
 
-	protected final List<MachineBlockRegistrators> registrators = Lists.newArrayList();
+	protected final List<MachineBlockHolderModifier>     holderModifiers     = Lists.newArrayList();
+	protected final List<MachineBlockPropertiesModifier> propertiesModifiers = Lists.newArrayList();
+	protected final List<MachineBlockRegistrators>       registrators        = Lists.newArrayList();
 
 	protected boolean                    defaultMineableTags = true;
 	protected MachineBuiltinModelBuilder builtinModel;
@@ -72,13 +72,15 @@ public T creator(MachineBlockFactory blockFactory)
 
 	public T modify(MachineBlockHolderModifier modifier)
 	{
-		this.holderModifier = modifier;
+		Assert.notNull(modifier);
+		this.holderModifiers.add(modifier);
 		return (T) this;
 	}
 
 	public T properties(MachineBlockPropertiesModifier properties)
 	{
-		this.propertiesModifier = properties;
+		Assert.notNull(properties);
+		this.propertiesModifiers.add(properties);
 		return (T) this;
 	}
 

src/main/java/net/swedz/tesseract/neoforge/compat/mi/machine/builder/SingleBlockCraftingMachineBuilder.java

@@ -144,7 +144,9 @@ protected void internalRegister()
 			HackedMachineRegistrationHelper.registerMachine(
 					hook,
 					englishPrefix + englishName, id,
-					blockFactory, holderModifier, propertiesModifier,
+					blockFactory,
+					(holder) -> holderModifiers.forEach((modifier) -> modifier.modify(holder)),
+					(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
 					defaultMineableTags,
 					(bet) -> new SteamCraftingMachineBlockEntity(
 							bet, recipeType,
@@ -186,7 +188,9 @@ protected void internalRegister()
 			HackedMachineRegistrationHelper.registerMachine(
 					hook,
 					electricEnglishName, id,
-					blockFactory, holderModifier, propertiesModifier,
+					blockFactory,
+					(holder) -> holderModifiers.forEach((modifier) -> modifier.modify(holder)),
+					(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
 					defaultMineableTags,
 					(bet) -> new ElectricCraftingMachineBlockEntity(
 							bet, recipeType,

src/main/java/net/swedz/tesseract/neoforge/compat/mi/machine/builder/SpecialMachineBuilder.java

@@ -76,7 +76,9 @@ protected void internalRegister()
 		HackedMachineRegistrationHelper.registerMachine(
 				hook,
 				englishName, name,
-				blockFactory, holderModifier, propertiesModifier,
+				blockFactory,
+				(holder) -> holderModifiers.forEach((modifier) -> modifier.modify(holder)),
+				(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
 				defaultMineableTags,
 				blockEntityFactory,
 				registrators.toArray(MachineBlockRegistrators[]::new)