Add missing comparator outputs that were documented in the manual, also add documentation for the sawmill

Author: BluSunrize

changelog.md

@@ -2,6 +2,7 @@
 - Add some missing Concrete recipes to make crafting easier (voidsong-dragonfly)
 - Add missing potion recipes for Thick & Mundane potions (voidsong-dragonfly)
 - Add machine interface support for the Assembler (BluSunrize)
+- Add missing comparator outputs that were documented in the manual (BluSunrize)
 - Change text in the Circuit Table not being translatable (André Augusto)
 - Change Arc Furnace electrode comparator (and machine interface) output to represent the *lowest* electrode
 - Reduce damage taken from decelerating with the Skyhook by 60% (BluSunrize)

src/main/java/blusunrize/immersiveengineering/common/blocks/multiblocks/logic/AssemblerLogic.java

@@ -10,6 +10,8 @@
 
 import blusunrize.immersiveengineering.api.Lib;
 import blusunrize.immersiveengineering.api.energy.MutableEnergyStorage;
+import blusunrize.immersiveengineering.api.multiblocks.blocks.component.ComparatorManager;
+import blusunrize.immersiveengineering.api.multiblocks.blocks.component.ComparatorManager.SimpleComparatorValue;
 import blusunrize.immersiveengineering.api.multiblocks.blocks.component.IClientTickableComponent;
 import blusunrize.immersiveengineering.api.multiblocks.blocks.component.IServerTickableComponent;
 import blusunrize.immersiveengineering.api.multiblocks.blocks.component.RedstoneControl.RSState;
@@ -27,7 +29,6 @@
 import blusunrize.immersiveengineering.api.tool.assembler.RecipeQuery;
 import blusunrize.immersiveengineering.common.blocks.metal.CrafterPatternInventory;
 import blusunrize.immersiveengineering.common.blocks.multiblocks.logic.AssemblerLogic.State;
-import blusunrize.immersiveengineering.common.blocks.multiblocks.logic.arcfurnace.ArcFurnaceLogic;
 import blusunrize.immersiveengineering.common.blocks.multiblocks.shapes.AssemblerShapes;
 import blusunrize.immersiveengineering.common.config.IEServerConfig;
 import blusunrize.immersiveengineering.common.fluids.ArrayFluidHandler;
@@ -338,6 +339,13 @@ public Function<BlockPos, VoxelShape> shapeGetter(ShapeType forType)
 		return AssemblerShapes.SHAPE_GETTER;
 	}
 
+	public static ComparatorManager<State> makeComparator()
+	{
+		return ComparatorManager.makeSimple(
+				SimpleComparatorValue.inventory(State::getInventory, 0, 18), REDSTONE_PORTS
+		);
+	}
+
 	public static class State implements IMultiblockState
 	{
 		public final FluidTank[] tanks = IntStream.range(0, NUM_TANKS)

src/main/java/blusunrize/immersiveengineering/common/blocks/multiblocks/logic/mixer/MixerLogic.java

@@ -12,6 +12,8 @@
 import blusunrize.immersiveengineering.api.Lib;
 import blusunrize.immersiveengineering.api.crafting.MixerRecipe;
 import blusunrize.immersiveengineering.api.energy.AveragingEnergyStorage;
+import blusunrize.immersiveengineering.api.multiblocks.blocks.component.ComparatorManager;
+import blusunrize.immersiveengineering.api.multiblocks.blocks.component.ComparatorManager.SimpleComparatorValue;
 import blusunrize.immersiveengineering.api.multiblocks.blocks.component.IClientTickableComponent;
 import blusunrize.immersiveengineering.api.multiblocks.blocks.component.IServerTickableComponent;
 import blusunrize.immersiveengineering.api.multiblocks.blocks.component.RedstoneControl.RSState;
@@ -25,6 +27,7 @@
 import blusunrize.immersiveengineering.api.tool.MachineInterfaceHandler.IMachineInterfaceConnection;
 import blusunrize.immersiveengineering.api.tool.MachineInterfaceHandler.MachineCheckImplementation;
 import blusunrize.immersiveengineering.client.fx.FluidSplashOptions;
+import blusunrize.immersiveengineering.common.blocks.multiblocks.logic.FermenterLogic;
 import blusunrize.immersiveengineering.common.blocks.multiblocks.logic.mixer.MixerLogic.State;
 import blusunrize.immersiveengineering.common.blocks.multiblocks.process.MultiblockProcess;
 import blusunrize.immersiveengineering.common.blocks.multiblocks.process.MultiblockProcessInMachine;
@@ -249,6 +252,13 @@ public Function<BlockPos, VoxelShape> shapeGetter(ShapeType forType)
 		return MixerShapes.SHAPE_GETTER;
 	}
 
+	public static ComparatorManager<State> makeComparator()
+	{
+		return ComparatorManager.makeSimple(
+				SimpleComparatorValue.inventory(State::getInventory, 0, NUM_SLOTS), REDSTONE_POS
+		);
+	}
+
 	public static class State implements IMultiblockState, ProcessContextInMachine<MixerRecipe>
 	{
 		public final AveragingEnergyStorage energy = new AveragingEnergyStorage(ENERGY_CAPACITY);

src/main/java/blusunrize/immersiveengineering/common/register/IEMultiblockLogic.java

@@ -95,6 +95,7 @@ public class IEMultiblockLogic
 			.notMirrored()
 			.redstoneNoComputer(s -> s.rsState, AssemblerLogic.REDSTONE_PORTS)
 			.gui(IEMenuTypes.ASSEMBLER)
+			.comparator(AssemblerLogic.makeComparator())
 			.build();
 
 	public static final MultiblockRegistration<AutoWorkbenchLogic.State> AUTO_WORKBENCH = metal(new AutoWorkbenchLogic(), "auto_workbench")
@@ -127,6 +128,7 @@ public class IEMultiblockLogic
 			.structure(() -> IEMultiblocks.MIXER)
 			.redstone(s -> s.rsState, MixerLogic.REDSTONE_POS)
 			.gui(IEMenuTypes.MIXER)
+			.comparator(MixerLogic.makeComparator())
 			.build();
 
 	public static final MultiblockRegistration<RefineryLogic.State> REFINERY = metal(new RefineryLogic(), "refinery")

src/main/resources/assets/immersiveengineering/manual/en_us/redstone_probe.txt

@@ -7,12 +7,14 @@ Note that many multiblocks feature comparator-support, as described on the follo
 §lTank: §rAs detailed in its <link;tank;manual entry>
 §lSilo: §rAs detailed in its <link;silo;manual entry>
 §lAssembler: §rOutputs a signal relative to the fill of the inventory.
-§lAutoWorkbench: §rOutputs a signal relative to the fill of the inventory.
+§lAutomated Workbench: §rOutputs a signal relative to the fill of the inventory.
 §lCrusher: §rOutputs a signal relative to the fill of the inventory.
+§lSawmill: §rOutputs a signal relative to the integrity of the sawblade.<np>
+§lArc Furnace: §rOutputs a signal relative to the fill of the inventory.
+A comparator at the electrodes at the top will send a signal reflecting the integrity of the most damaged electrode.
 §lSqueezer: §rOutputs a signal relative to the fill of the inventory.
 §lFermenter: §rOutputs a signal relative to the fill of the inventory.
-§lExcavator: §rOutputs a signal relative to the remaining ore in the vein.
-§lArcFurnace: §rOutputs a signal relative to the fill of the inventory.
-Additionally, connecting a comparator to the electrodes at the top will send a signal based on their integrity.
 §lMixer: §rOutputs a signal relative to the fill of the inventory.<np>
+§lExcavator: §rOutputs a signal relative to the remaining ore in the vein.<br>
+<br>
 For more detailed analysis of the various multiblocks, their inventories, energy- and fluid storages, consider using the <link;machine_interface;Machine Interface> instead.