Allow crafting jobs to be requested from conversion monitors

src/main/java/appeng/api/networking/crafting/ICraftingWatcherNode.java

@@ -44,8 +44,9 @@ public interface ICraftingWatcherNode extends IGridNodeService {
     /**
      * Called when a crafting status changes.
      *
-     * @param craftingGrid current crafting grid
-     * @param what         changed key
+     * @param what changed key
      */
-    void onRequestChange(ICraftingService craftingGrid, AEKey what);
+    void onRequestChange(AEKey what);
+
+    void onCraftableChange(AEKey what);
 }

src/main/java/appeng/me/service/CraftingService.java

@@ -122,6 +122,7 @@ public class CraftingService implements ICraftingService, IGridServiceProvider {
             this.interests);
     private final IEnergyService energyGrid;
     private final Set<AEKey> currentlyCrafting = new HashSet<>();
+    private final Set<AEKey> currentlyCraftable = new HashSet<>();
     private boolean updateList = false;
 
     public CraftingService(IGrid grid, IStorageService storageGrid, IEnergyService energyGrid) {
@@ -141,23 +142,39 @@ public void onServerEndTick() {
         this.craftingLinks.values().removeIf(nexus -> nexus.isDead(this.grid, this));
 
         var previouslyCrafting = new HashSet<>(currentlyCrafting);
+        var previouslyCraftable = new HashSet<>(currentlyCraftable);
         this.currentlyCrafting.clear();
+        this.currentlyCraftable.clear();
+
         for (CraftingCPUCluster cpu : this.craftingCPUClusters) {
             cpu.craftingLogic.tickCraftingLogic(energyGrid, this);
-
             cpu.craftingLogic.getAllWaitingFor(this.currentlyCrafting);
         }
+        currentlyCraftable.addAll(getCraftables(k -> true));
 
         // Notify watchers about items no longer being crafted
         var changed = new HashSet<AEKey>();
         changed.addAll(Sets.difference(previouslyCrafting, currentlyCrafting));
         changed.addAll(Sets.difference(currentlyCrafting, previouslyCrafting));
         for (var what : changed) {
             for (var watcher : interestManager.get(what)) {
-                watcher.getHost().onRequestChange(this, what);
+                watcher.getHost().onRequestChange(what);
+            }
+            for (var watcher : interestManager.getAllStacksWatchers()) {
+                watcher.getHost().onRequestChange(what);
+            }
+        }
+
+        // Notify watchers about items no longer craftable
+        var changedCraftable = new HashSet<AEKey>();
+        changedCraftable.addAll(Sets.difference(previouslyCraftable, currentlyCraftable));
+        changedCraftable.addAll(Sets.difference(currentlyCraftable, previouslyCraftable));
+        for (var what : changedCraftable) {
+            for (var watcher : interestManager.get(what)) {
+                watcher.getHost().onCraftableChange(what);
             }
             for (var watcher : interestManager.getAllStacksWatchers()) {
-                watcher.getHost().onRequestChange(this, what);
+                watcher.getHost().onCraftableChange(what);
             }
         }
     }

src/main/java/appeng/parts/automation/StorageLevelEmitterPart.java

@@ -36,7 +36,6 @@
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IStackWatcher;
 import appeng.api.networking.crafting.ICraftingProvider;
-import appeng.api.networking.crafting.ICraftingService;
 import appeng.api.networking.crafting.ICraftingWatcherNode;
 import appeng.api.networking.storage.IStorageWatcherNode;
 import appeng.api.parts.IPartItem;
@@ -117,9 +116,13 @@ public void updateWatcher(IStackWatcher newWatcher) {
         }
 
         @Override
-        public void onRequestChange(ICraftingService craftingGrid, AEKey what) {
+        public void onRequestChange(AEKey what) {
             updateState();
         }
+
+        @Override
+        public void onCraftableChange(AEKey what) {
+        }
     };
 
     public StorageLevelEmitterPart(IPartItem<?> partItem) {

src/main/java/appeng/parts/reporting/AbstractMonitorPart.java

@@ -34,9 +34,8 @@
 
 import appeng.api.behaviors.ContainerItemStrategies;
 import appeng.api.implementations.parts.IStorageMonitorPart;
+import appeng.api.networking.IGrid;
 import appeng.api.networking.IStackWatcher;
-import appeng.api.networking.crafting.ICraftingService;
-import appeng.api.networking.storage.IStorageService;
 import appeng.api.networking.storage.IStorageWatcherNode;
 import appeng.api.orientation.BlockOrientation;
 import appeng.api.parts.IPartItem;
@@ -206,7 +205,7 @@ public boolean onPartShiftActivate(Player player, InteractionHand hand, Vec3 pos
     }
 
     // update the system...
-    private void configureWatchers() {
+    protected void configureWatchers() {
         if (this.myWatcher != null) {
             this.myWatcher.reset();
         }
@@ -216,15 +215,15 @@ private void configureWatchers() {
                 this.myWatcher.add(this.configuredItem);
             }
 
-            getMainNode().ifPresent(grid -> updateReportingValue(grid.getStorageService(), grid.getCraftingService()));
+            getMainNode().ifPresent(this::updateReportingValue);
         }
     }
 
-    private void updateReportingValue(IStorageService storageService, ICraftingService craftingService) {
+    protected void updateReportingValue(IGrid grid) {
         this.lastHumanReadableText = null;
         if (this.configuredItem != null) {
-            this.amount = storageService.getCachedInventory().get(this.configuredItem);
-            this.canCraft = craftingService.isCraftable(this.configuredItem);
+            this.amount = grid.getStorageService().getCachedInventory().get(this.configuredItem);
+            this.canCraft = grid.getCraftingService().isCraftable(this.configuredItem);
         } else {
             this.amount = 0;
             this.canCraft = false;

src/main/java/appeng/parts/reporting/ConversionMonitorPart.java

@@ -27,9 +27,12 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.Vec3;
 
+import appeng.api.networking.IStackWatcher;
+import appeng.api.networking.crafting.ICraftingWatcherNode;
 import appeng.api.parts.IPartItem;
 import appeng.api.parts.IPartModel;
 import appeng.api.stacks.AEItemKey;
+import appeng.api.stacks.AEKey;
 import appeng.api.storage.ITerminalHost;
 import appeng.api.storage.MEStorage;
 import appeng.api.storage.StorageHelper;
@@ -68,8 +71,27 @@ public class ConversionMonitorPart extends AbstractMonitorPart implements ITermi
     public static final IPartModel MODELS_LOCKED_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_LOCKED_ON,
             MODEL_STATUS_HAS_CHANNEL);
 
+    private IStackWatcher craftingWatcher;
+
     public ConversionMonitorPart(IPartItem<?> partItem) {
         super(partItem, true);
+
+        getMainNode().addService(ICraftingWatcherNode.class, new ICraftingWatcherNode() {
+            @Override
+            public void updateWatcher(IStackWatcher newWatcher) {
+                craftingWatcher = newWatcher;
+                configureWatchers();
+            }
+
+            @Override
+            public void onRequestChange(AEKey what) {
+            }
+
+            @Override
+            public void onCraftableChange(AEKey what) {
+                getMainNode().ifPresent(ConversionMonitorPart.this::updateReportingValue);
+            }
+        });
     }
 
     @Override
@@ -217,6 +239,23 @@ private void extractItem(Player player, int count) {
         });
     }
 
+    @Override
+    protected void configureWatchers() {
+        super.configureWatchers();
+
+        if (craftingWatcher != null) {
+            craftingWatcher.reset();
+        }
+
+        if (getDisplayed() != null) {
+            if (craftingWatcher != null) {
+                craftingWatcher.add(getDisplayed());
+            }
+
+            getMainNode().ifPresent(this::updateReportingValue);
+        }
+    }
+
     @Override
     public IPartModel getStaticModels() {
         return this.selectModel(MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL, MODELS_LOCKED_OFF, MODELS_LOCKED_ON,