add more situations to the recipe logic

Author: PrototypeTrousers

src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java

@@ -171,8 +171,6 @@ protected void trySearchNewRecipe() {
         }
         if (this.currentRecipe != null && setupAndConsumeRecipeInputs(this.currentRecipe)) {
             setupRecipe(this.currentRecipe);
-        } else {
-            metaTileEntity.setSituation(OUTPUT_INVENTORY_FULL);
         }
     }
 
@@ -244,11 +242,20 @@ protected boolean setupAndConsumeRecipeInputs(Recipe recipe) {
         IItemHandlerModifiable exportInventory = getOutputInventory();
         IMultipleTankHandler importFluids = getInputTank();
         IMultipleTankHandler exportFluids = getOutputTank();
-        return (totalEUt >= 0 ? getEnergyStored() >= (totalEUt > getEnergyCapacity() / 2 ? resultOverclock[0] : totalEUt) :
-            (getEnergyStored() - resultOverclock[0] <= getEnergyCapacity())) &&
-            MetaTileEntity.addItemsToItemHandler(exportInventory, true, recipe.getAllItemOutputs(exportInventory.getSlots())) &&
-            MetaTileEntity.addFluidsToFluidHandler(exportFluids, true, recipe.getFluidOutputs()) &&
-            recipe.matches(true, importInventory, importFluids);
+        if (!(totalEUt >= 0 ? getEnergyStored() >= (totalEUt > getEnergyCapacity() / 2 ? resultOverclock[0] : totalEUt) :
+            (getEnergyStored() - resultOverclock[0] <= getEnergyCapacity()))) {
+            metaTileEntity.setSituation(INSUFFICIENT_POWER_TO_START);
+            return false;
+        }
+        if (!MetaTileEntity.addItemsToItemHandler(exportInventory, true, recipe.getAllItemOutputs(exportInventory.getSlots()))) {
+            metaTileEntity.setSituation(OUTPUT_SLOTS_FULL);
+            return false;
+        }
+        if (!MetaTileEntity.addFluidsToFluidHandler(exportFluids, true, recipe.getFluidOutputs())) {
+            metaTileEntity.setSituation(OUTPUT_TANKS_FULL);
+            return false;
+        }
+        return recipe.matches(true, importInventory, importFluids);
     }
 
     protected int[] calculateOverclock(int EUt, long voltage, int duration) {

src/main/java/gregtech/api/situation/Situations.java

@@ -8,17 +8,20 @@ public class Situations {
     public static Situation IDLE = new Situation(2, "idle", SituationTypes.IDLE);
     public static Situation DISABLED_BY_CONTROLLER = new Situation(3, "disabled_by_controller", SituationTypes.IDLE);
 
-    public static Situation EMPTY_SOURCE = new Situation(4, "empty_source", SituationTypes.WARNING);
-    public static Situation INSUFFICIENT_POWER = new Situation(5, "insufficient_power", SituationTypes.WARNING);
-    public static Situation NO_MATCHING_RECIPE = new Situation(6, "no_matching_recipe", SituationTypes.WARNING);
-    public static Situation OUTPUT_INVENTORY_FULL = new Situation(7, "output_inventory_full", SituationTypes.WARNING);
-    public static Situation TARGET_INVENTORY_FULL = new Situation(8, "target_inventory_full", SituationTypes.WARNING);
-
-    public static Situation NO_IMPORT_INVENTORY = new Situation(9, "no_import_inventory", SituationTypes.ERROR);
-    public static Situation NO_EXPORT_INVENTORY = new Situation(10, "no_export_inventory", SituationTypes.ERROR);
-    public static Situation NO_IMPORT_TANK = new Situation(11, "no_import_tank", SituationTypes.ERROR);
-    public static Situation NO_EXPORT_TANK = new Situation(12, "no_export_tank", SituationTypes.ERROR);
-    public static Situation EXPECTED_CAPABILITY_UNAVAILABLE = new Situation(13, "null_capability", SituationTypes.ERROR);
+    public static Situation EMPTY_SOURCE = new Situation(100, "empty_source", SituationTypes.WARNING);
+    public static Situation INSUFFICIENT_POWER = new Situation(101, "insufficient_power", SituationTypes.WARNING);
+    public static Situation INSUFFICIENT_POWER_TO_START = new Situation(102, "insufficient_power_to_start", SituationTypes.WARNING);
+    public static Situation NO_MATCHING_RECIPE = new Situation(103, "no_matching_recipe", SituationTypes.WARNING);
+    public static Situation OUTPUT_SLOTS_FULL = new Situation(104, "output_slots_full", SituationTypes.WARNING);
+    public static Situation OUTPUT_TANKS_FULL = new Situation(105, "output_tanks_full", SituationTypes.WARNING);
+    public static Situation OUTPUT_INVENTORY_FULL = new Situation(106, "output_inventory_full", SituationTypes.WARNING);
+    public static Situation TARGET_INVENTORY_FULL = new Situation(107, "target_inventory_full", SituationTypes.WARNING);
+
+    public static Situation NO_IMPORT_INVENTORY = new Situation(201, "no_import_inventory", SituationTypes.ERROR);
+    public static Situation NO_EXPORT_INVENTORY = new Situation(202, "no_export_inventory", SituationTypes.ERROR);
+    public static Situation NO_IMPORT_TANK = new Situation(203, "no_import_tank", SituationTypes.ERROR);
+    public static Situation NO_EXPORT_TANK = new Situation(204, "no_export_tank", SituationTypes.ERROR);
+    public static Situation EXPECTED_CAPABILITY_UNAVAILABLE = new Situation(205, "null_capability", SituationTypes.ERROR);
 
     public static void init() {
         GTLog.logger.info("Registering situations...");

src/main/resources/assets/gregtech/lang/en_us.lang

@@ -763,9 +763,12 @@ gregtech.situation.working=Working
 gregtech.situation.null_capability=Error accessing inventory from this side
 gregtech.situation.empty_source=This inventory is empty
 gregtech.situation.insufficient_power=Not enough power to run this recipe
+gregtech.situation.insufficient_power_to_start=Not enough power to start this recipe
 gregtech.situation.no_matching_recipe=No recipe found
 gregtech.situation.target_inventory_full=The target inventory is full
-gregtech.situation.output_inventory_full=Output is full
+gregtech.situation.output_slots_full=Output slots are full
+gregtech.situation.output_tanks_full=Output tanks are full
+gregtech.situation.output_inventory_full=Output slots and tanks are full
 gregtech.situation.no_import_inventory=Cant access inventory to import from
 gregtech.situation.no_export_inventory=Cant access inventory to export to
 gregtech.situation.no_import_tank=Cant access tank to import from