Fix #155: Default machine block properties are not applied in the builder (#156)

Author: Swedz

src/main/java/net/swedz/tesseract/neoforge/compat/mi/hack/HackedMachineRegistrationHelper.java

@@ -31,6 +31,7 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MapColor;
 import net.swedz.tesseract.neoforge.compat.mi.helper.MachineInventoryHelper;
@@ -107,12 +108,7 @@ public static Supplier<BlockEntityType<?>> registerMachine(MIHook hook,
 					}
 					else
 					{
-						properties
-								.mapColor(MapColor.METAL)
-								.destroyTime(4)
-								.requiresCorrectToolForDrops()
-								.isValidSpawn(MobSpawning.NO_SPAWN)
-								.isRedstoneConductor(Blocks::never);
+						applyDefaultMachineProperties(properties);
 					}
 				})
 				.withModel((holder) -> (provider) ->
@@ -173,6 +169,16 @@ public static Supplier<BlockEntityType<?>> registerMachine(MIHook hook,
 		return registerMachine(hook, englishName, name, null, null, null, factory, extraRegistrators);
 	}
 
+	public static void applyDefaultMachineProperties(BlockBehaviour.Properties properties)
+	{
+		properties
+				.mapColor(MapColor.METAL)
+				.destroyTime(4)
+				.requiresCorrectToolForDrops()
+				.isValidSpawn(MobSpawning.NO_SPAWN)
+				.isRedstoneConductor(Blocks::never);
+	}
+	
 	/**
 	 * @see MachineRegistrationHelper#addMachineModel(String, String, MachineCasing, boolean, boolean, boolean, boolean)
 	 */

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

@@ -236,7 +236,14 @@ protected void internalRegister()
 							holderModifiers.forEach((modifier) -> modifier.modify(holder));
 							holderHatchModifiers.forEach((modifier) -> modifier.modify(holder, input));
 						},
-						(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
+						(properties) ->
+						{
+							if(defaultBlockProperties)
+							{
+								HackedMachineRegistrationHelper.applyDefaultMachineProperties(properties);
+							}
+							propertiesModifiers.forEach((modifier) -> modifier.modify(properties));
+						},
 						defaultMineableTags,
 						(bep) -> blockEntityFactory.create(bep, input, hook.id(machineId)),
 						registrators.toArray(MachineBlockRegistrators[]::new)
@@ -258,7 +265,14 @@ protected void internalRegister()
 						holderModifiers.forEach((modifier) -> modifier.modify(holder));
 						holderHatchModifiers.forEach((modifier) -> modifier.modify(holder, false));
 					},
-					(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
+					(properties) ->
+					{
+						if(defaultBlockProperties)
+						{
+							HackedMachineRegistrationHelper.applyDefaultMachineProperties(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

@@ -49,6 +49,7 @@ public static HatchMachineBuilder hatch(MIHook hook,
 	protected final List<MachineBlockPropertiesModifier> propertiesModifiers = Lists.newArrayList();
 	protected final List<MachineBlockRegistrators>       registrators        = Lists.newArrayList();
 
+	protected boolean                    defaultBlockProperties = true;
 	protected boolean                    defaultMineableTags = true;
 	protected MachineBuiltinModelBuilder builtinModel;
 
@@ -91,6 +92,12 @@ public T registrator(MachineBlockRegistrators registrator)
 		return (T) this;
 	}
 
+	public T excludeDefaultBlockProperties()
+	{
+		defaultBlockProperties = false;
+		return (T) this;
+	}
+	
 	public T excludeDefaultMineableTags()
 	{
 		defaultMineableTags = false;

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

@@ -146,7 +146,14 @@ protected void internalRegister()
 					englishPrefix + englishName, id,
 					blockFactory,
 					(holder) -> holderModifiers.forEach((modifier) -> modifier.modify(holder)),
-					(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
+					(properties) ->
+					{
+						if(defaultBlockProperties)
+						{
+							HackedMachineRegistrationHelper.applyDefaultMachineProperties(properties);
+						}
+						propertiesModifiers.forEach((modifier) -> modifier.modify(properties));
+					},
 					defaultMineableTags,
 					(bet) -> new SteamCraftingMachineBlockEntity(
 							bet, recipeType,
@@ -190,7 +197,14 @@ protected void internalRegister()
 					electricEnglishName, id,
 					blockFactory,
 					(holder) -> holderModifiers.forEach((modifier) -> modifier.modify(holder)),
-					(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
+					(properties) ->
+					{
+						if(defaultBlockProperties)
+						{
+							HackedMachineRegistrationHelper.applyDefaultMachineProperties(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

@@ -78,7 +78,14 @@ protected void internalRegister()
 				englishName, name,
 				blockFactory,
 				(holder) -> holderModifiers.forEach((modifier) -> modifier.modify(holder)),
-				(properties) -> propertiesModifiers.forEach((modifier) -> modifier.modify(properties)),
+				(properties) ->
+				{
+					if(defaultBlockProperties)
+					{
+						HackedMachineRegistrationHelper.applyDefaultMachineProperties(properties);
+					}
+					propertiesModifiers.forEach((modifier) -> modifier.modify(properties));
+				},
 				defaultMineableTags,
 				blockEntityFactory,
 				registrators.toArray(MachineBlockRegistrators[]::new)