From ba3406d29be250521e4d12d49ea76effba4a4459 Mon Sep 17 00:00:00 2001
From: Supermjork <markehabaziz@gmail.com>
Date: Thu, 2 Jun 2022 20:06:42 +0200
Subject: [PATCH] Instruction go brrrr.

---
 src/RecipeInstructions.java | 81 +++++--------------------------------
 1 file changed, 11 insertions(+), 70 deletions(-)

diff --git a/src/RecipeInstructions.java b/src/RecipeInstructions.java
index 772855f..a381f7a 100644
--- a/src/RecipeInstructions.java
+++ b/src/RecipeInstructions.java
@@ -8,78 +8,20 @@ public class RecipeInstructions
 {
     public static void main(String[] args)
     {
-        int usrChoice;
+        String userInstruction;
 
         ArrayList<RecipeNode> ingredients = new ArrayList<>();
         RecipeTree fullInstructions = new RecipeTree();
 
         do
         {
-            Scanner userOption = new Scanner(System.in);
+            System.out.println("Enter instruction:  ");
+            Scanner userInput = new Scanner(System.in);
+            userInstruction = userInput.nextLine();
 
-            System.out.println("What would you like to do?\n1.Add Ingredient\n2.Mix");
-            usrChoice = userOption.nextInt();
+            RecipeCreation(userInstruction);
 
-            // Switch case for user's choice
-            switch (usrChoice)
-            {
-                case 1:
-                    // Init 3 scanners because usually scanners crash on me with multiple input types lmao
-                    Scanner ingredientAddAmount = new Scanner(System.in);      // Init Scanner for Added amount
-                    Scanner ingredientAddName = new Scanner(System.in);      // Init Another Scanner for Name
-                    Scanner ingredientAddPortion = new Scanner(System.in);      // Init Yet another Scanner for Portion
-
-                    System.out.print("Enter how many ingredients you're adding: ");
-                    int amountIngredient = ingredientAddAmount.nextInt();       // Defining how many ingredients will be added
-
-                    for (int i = 0; i < amountIngredient; i++)
-                    {
-                        // Getting Ingredient Name
-                        System.out.println("Enter ingredient Name");
-                        String ingredientName = ingredientAddName.nextLine();
-
-                        // Getting Ingredient Portion size
-                        System.out.println("\nEnter ingredient portion");
-                        double ingredientPortion = ingredientAddPortion.nextDouble();
-
-                        // Creating the Ingredient's node and putting it into array list
-                        // for safe keeping and later use
-                        RecipeNode newIngredient = new RecipeNode(ingredientName, ingredientPortion);
-//                        fullInstructions.addNode((RecipeNode) null, newIngredient);
-                        ingredients.add(newIngredient);
-                    }
-                    break;
-                case 2:
-                    Scanner ingredientNames = new Scanner(System.in);   // Scanner for ingredients' names
-                    String userIngredients;                             // String poo
-                    ArrayList<RecipeNode> bowl = new ArrayList<>();     // Mixing bowl for ingredients obviously
-
-                    do
-                    {
-                        System.out.println("Enter ingredient names to be mixed (type done to exit)");
-                        userIngredients = ingredientNames.nextLine();
-
-                        for (RecipeNode ingredient : ingredients)
-                        {
-                            if (userIngredients.equals(ingredient.getIngredient()))
-                            {
-                                bowl.add(ingredient);
-                                break;
-                            }
-                        }
-                    } while (!userIngredients.equalsIgnoreCase("done"));
-
-                    RecipeNode mixture = new RecipeNode(bowl.get(0) + " mix", 69);
-                    ingredients.add(mixture);
-
-                    for (RecipeNode childIngredient : bowl)
-                    {
-                        mixture.addChild(childIngredient);
-                        childIngredient.parent = mixture;
-                    }
-
-            }
-        } while (usrChoice != -1);
+        } while (userInstruction.equalsIgnoreCase("done"));
     }
 
     //Magical Regex
@@ -96,7 +38,7 @@ public class RecipeInstructions
         RecipeTree fullInstructions = new RecipeTree();
         //Stinky Scanner please remove or something idk
         //Maybe make the method take a string in or somethiong :D
-        Scanner input = new Scanner(System.in);
+        // Scanner input = new Scanner(System.in); <-- Commented remove for testing
         String userInput;
         //Need to not hardcode verbs maybe a global variable for it? etc etc
         String[] verbs = {"add", "mix", "stir", "wait", "bake", "heat", "sift", "boil", "melt", "fry", "cool",
@@ -104,23 +46,22 @@ public class RecipeInstructions
         //init this shit
         int currentNumber = 0;
         String currentIngredient = null;
-        //Useless sout lol
-        System.out.println("Enter instruction:  ");
+        //Useless sout lol <deleted dw lmao>
 //        userInput = input.nextLine();
         //this was simulating user input for the tests below
-        userInput = "mix 3 eggs and  2 milk";
+        // userInput = "mix 3 eggs and  2 milk"; <-- Commented remove for testing
         //this is where it gets juicy
         //FIRST WE FIND A VERB FOR THE ACTION
         for (String verb : verbs)
         {
             //we regex the input for the thing
-            if (patternMatch(verb, userInput))
+            if (patternMatch(verb, instructionIn))
             {
                 //get Action
                 RecipeNode newAction = new RecipeNode(verb, 0);
                 //Split after verb
                 //this is where we split the string
-                String[] split = userInput.split(verb);
+                String[] split = instructionIn.split(verb);
                 //We get the words only POG
                 String[] words = split[1].split(" ");
                 construct_children(newAction, words);