Update scripts and files for new appliance view

.metadata

@@ -7,5 +7,5 @@
   "name" : "MoreFarmingFU",
   "steamContentId" : "928896807",
   "tags" : "Planets and Environments|Food and Farming|Mechanics",
-  "version" : "v1.1.23"
+  "version" : "v1.1.24"
 }

_MFMFUversioning.config

@@ -0,0 +1,5 @@
+{
+  "author" : "ColonolNutty",
+  "friendlyName" : "CN More Farming - Frackin' Universe",
+  "version" : "v1.1.24"
+}

interface/scripted/recipeCrafterMFM/recipeCrafterMFM.config.patch

@@ -0,0 +1,9 @@
+[
+  [
+    { "op": "test", "path": "/gui/craft", "inverse": true },
+    { "op": "add", "path": "/gui/craft", "value": {} }
+  ],
+  [
+    { "op": "remove", "path": "/gui/craft" }
+  ]
+]

recipeCrafterMFM/recipeCrafterMFM.lua

@@ -2,19 +2,29 @@ require "/scripts/debugUtilsCN.lua"
 require "/scripts/recipeCrafterAPI.lua"
 
 local rcUtilsFU = {};
+local logger = nil;
 
 function init(virtual)
-  RecipeCrafterMFMApi.init("[RCFU]")
-
-  if(storage.outputSlotModified == nil) then
-    storage.outputSlotModified = false;
-  end
+  logger = DebugUtilsCN.init("[RCFU]")
+  RecipeCrafterMFMApi.init("/_MFMFUversioning.config")
+  RecipeCrafterMFMApi.printMetaData("/_MFMversioning.config")
 
   storage.consumeIngredientsOnCraft = false;
   storage.noHold = true;
   storage.playSoundBeforeOutputPlaced = false;
   storage.appendNewOutputToCurrentOutput = false;
 
+  if(storage.outputSlotModified == nil) then
+    storage.outputSlotModified = false;
+  end
+  if(storage.hasCrafted == nil) then
+    storage.hasCrafted = false;
+  end
+
+  if(storage.outputSlot == nil) then
+    return
+  end
+
   -- This is to prevent receiving free items when loading the game with an output available but not taken
   -- The downside is, if someone is storing items in the output slot, they will lose them on loading their game. (A small sacrifice to prevent cheating)
   world.containerTakeAt(entity.id(), storage.outputSlot);
@@ -39,21 +49,25 @@ end
 --   Output slot is modified
 --   There is no previous recipe
 function RecipeCrafterMFMApi.isOutputSlotAvailable()
+  if(storage.outputSlot == nil) then
+    return false;
+  end
   local outputSlotItem = world.containerItemAt(entity.id(), storage.outputSlot)
   -- Output slot is empty
   if(outputSlotItem == nil) then
-    DebugUtilsCN.logDebug("No output item")
     if(storage.previousRecipe ~= nil and storage.previousRecipe.output ~= nil and not storage.outputSlotModified) then
-      DebugUtilsCN.logDebug("Output item taken, consuming ingredients for recipe with output: " .. storage.previousRecipe.output.name)
+      logger.logDebug("Output item taken, consuming ingredients for recipe with output: " .. storage.previousRecipe.output.name)
       rcUtilsFU.consumeIngredients()
     end
+    logger.logDebug("No output item detected in output slot")
     return true;
   end
 
   local previousRecipe = storage.previousRecipe;
 
   -- If there is no previousRecipe, but there is an output item or if the output slot item has been modified
   if(previousRecipe == nil or storage.outputSlotModified) then
+    logger.logDebug("No previous recipe, and output slot was modified.")
     return false;
   end
 
@@ -62,13 +76,15 @@ function RecipeCrafterMFMApi.isOutputSlotAvailable()
   -- Check current ingredients to verify the previous recipe still has the required ingredients
   local hasRequiredIngredients = RecipeCrafterMFMApi.hasIngredientsForRecipe(previousRecipe, storage.currentIngredients);
   if(not hasRequiredIngredients) then
+    logger.logDebug("Required ingredients missing for current recipe.")
     return true;
   end
 
   local previousOutput = previousRecipe.output;
 
   if(previousOutput == nil) then
     storage.previousRecipe = nil;
+    logger.logDebug("No previous output, and output slot was modified.")
     return false;
   end
 
@@ -77,7 +93,7 @@ function RecipeCrafterMFMApi.isOutputSlotAvailable()
   -- Output item is different than the previous recipe result
   if(outputSlotItem.name ~= previousOutput.name) then
     storage.outputSlotModified = true;
-    DebugUtilsCN.logDebug("Output item changed, consuming ingredients for recipe with output: " .. previousOutput.name)
+    logger.logDebug("Output item changed, consuming ingredients for recipe with output: " .. previousOutput.name)
     rcUtilsFU.consumeIngredients()
     return false;
   end
@@ -87,10 +103,11 @@ function RecipeCrafterMFMApi.isOutputSlotAvailable()
     -- Output item has the same count as the previous recipe result
     if(outputSlotItem.count ~= previousOutput.count) then
       storage.outputSlotModified = true;
-      DebugUtilsCN.logDebug("Consuming ingredients for recipe with output: " .. previousOutput.name)
+      logger.logDebug("Consuming ingredients for recipe with output: " .. previousOutput.name)
       rcUtilsFU.consumeIngredients()
       return false;
     else
+      logger.logDebug("Output slot item not taken, but modified")
       return not storage.outputSlotModified;
     end
   end
@@ -104,6 +121,16 @@ function RecipeCrafterMFMApi.onContainerContentsChanged()
   RecipeCrafterMFMApi.craftItem()
 end
 
+function RecipeCrafterMFMApi.onRecipeFound()
+  storage.hasCrafted = true;
+end
+
+function RecipeCrafterMFMApi.onNoIngredientsFound()
+  if(storage.outputSlotModified and storage.hasCrafted) then
+    rcUtilsFU.removeOutput();
+  end
+end
+
 function RecipeCrafterMFMApi.onNoRecipeFound()
   rcUtilsFU.removeOutput()
 end
@@ -124,9 +151,35 @@ function rcUtilsFU.removeOutput()
     return;
   end
 
+  logger.logDebug("Removing output item from slot: " .. storage.outputSlot)
+
   -- The output item is one we placed, so remove it
   world.containerTakeAt(entity.id(), storage.outputSlot);
 
   storage.previousRecipe = nil;
   storage.outputSlotModified = false;
+  storage.hasCrafted = false;
+end
+
+function rcUtilsFU.releaseOutput()
+  if(not storage.outputSlotModified) then
+    return
+  end
+
+  local containerId = entity.id()
+  local outputSlotItem = world.containerItemAt(containerId, storage.outputSlot)
+  -- Output slot is empty
+  if(outputSlotItem == nil) then
+    logger.logDebug("No output item")
+    return true;
+  end
+
+  logger.logDebug("Releasing output item with name: " .. outputSlotItem.name .. " and count: " .. outputSlotItem.count)
+  local toExpel = world.containerAddItems(containerId, outputSlotItem)
+  RecipeCrafterMFMApi.expelItems(toExpel)
+end
+
+function die()
+  RecipeCrafterMFMApi.die()
+  rcUtilsFU.releaseOutput()
 end

recipes/starbooze/booze/cinnamonschnappsMFMFU.recipe

@@ -6,5 +6,5 @@
     { "item" : "bottle", "count" : 1 }
   ],
   "output" : { "item" : "cinnamonschnapps", "count" : 1 },
-  "groups" : [ "distillery", "ale", "all", "other" ]
+  "groups" : [ "distillingMFM", "distillery", "ale", "all", "other" ]
 }