Keeps removing valueless elements

* Change variables to be lowercase
* Remove unnecessary ingredients
* Renames variables from Dutch to English
This commit is contained in:
julien Lengrand-Lambert
2017-05-08 17:16:57 +02:00
parent f5e5cefadb
commit f82de0f351
8 changed files with 27 additions and 40 deletions

View File

@@ -5,7 +5,7 @@ import com.ing.baker.java_api.JInteraction;
import com.ing.baker.java_api.RequiresIngredient;
import erwtensoep.events.Cooked5MinutesEvent;
import erwtensoep.ingredients.DutchPeaSoup;
import erwtensoep.ingredients.RookWorst;
import erwtensoep.ingredients.SmokedSausage;
/**
* Created by jll on 5/5/2017.
@@ -14,7 +14,7 @@ public class AddSmokedSausage implements JInteraction{
@FiresEvent(oneOf = Cooked5MinutesEvent.class)
public Cooked5MinutesEvent apply(
@RequiresIngredient("rookWorst")RookWorst rookWorst,
@RequiresIngredient("smokedSausage") SmokedSausage smokedSausage,
@RequiresIngredient("ErwtenSoep") DutchPeaSoup erwtenSoep
){
System.out.println("Adding sausage");

View File

@@ -10,14 +10,12 @@ import erwtensoep.ingredients.*;
*/
public class ChopVegetables implements JInteraction{
@ProvidesIngredient("ChoppedVegetables")
@ProvidesIngredient("choppedVegetables")
public ChoppedVegetables apply(
@RequiresIngredient("cuttingBoard") CuttingBoard cuttingBoard,
@RequiresIngredient("knife") Knife knife,
@RequiresIngredient("prei")Prei prei,
@RequiresIngredient("aardappel")Aardappel aardappel,
@RequiresIngredient("winterwortel")WinterWortel winterwortel,
@RequiresIngredient("knolselderij")KnolSelderij knolSelderij
@RequiresIngredient("potato") Potato potato,
@RequiresIngredient("carrot") Carrot carrot
){
System.out.println("Chopping vegetables");
return new ChoppedVegetables();

View File

@@ -12,9 +12,9 @@ public class CombineDutchPeaSoup implements JInteraction{
@ProvidesIngredient("ErwtenSoep")
public DutchPeaSoup apply(
@RequiresIngredient("ChoppedMeat")ChoppedMeat choppedMeat,
@RequiresIngredient("ChoppedVegetables")ChoppedVegetables choppedVegetables,
@RequiresIngredient("HeatedBasicSoup")HeatedBasicSoup heatedBasicSoup,
@RequiresIngredient("choppedMeat")ChoppedMeat choppedMeat,
@RequiresIngredient("choppedVegetables")ChoppedVegetables choppedVegetables,
@RequiresIngredient("heatedBasicSoup")HeatedBasicSoup heatedBasicSoup,
@RequiresIngredient("spoon") Spoon spoon
){
System.out.println("Mixing all ingredients together");

View File

@@ -13,11 +13,11 @@ import erwtensoep.ingredients.CuttingBoard;
*/
public class CutBoiledMeat implements JInteraction {
@ProvidesIngredient("ChoppedMeat")
@ProvidesIngredient("choppedMeat")
public ChoppedMeat apply(
@RequiresIngredient("cuttingBoard") CuttingBoard cuttingBoard,
@RequiresIngredient("knife") Knife knife,
@RequiresIngredient("HeatedBasicSoup")HeatedBasicSoup heatedBasicSoup
@RequiresIngredient("heatedBasicSoup")HeatedBasicSoup heatedBasicSoup
){
System.out.println("Chopping boiled meat");
return new ChoppedMeat();

View File

@@ -10,13 +10,10 @@ import erwtensoep.ingredients.*;
*/
public class PreheatSoup implements JInteraction{
@ProvidesIngredient("HeatedBasicSoup")
@ProvidesIngredient("heatedBasicSoup")
public HeatedBasicSoup apply(
@RequiresIngredient("water") Water water,
@RequiresIngredient("laurier") Laurier laurier,
@RequiresIngredient("rookspek") RookSpek rookSpek,
@RequiresIngredient("hamschrijf") Hamschijf hamschijf,
@RequiresIngredient("zout") Zout zout,
@RequiresIngredient("bacon") Bacon bacon,
@RequiresIngredient("ham") Ham ham,
@RequiresIngredient("pan") Pan pan,
@RequiresIngredient("spoon") Spoon spoon,
@RequiresIngredient("furnace") Furnace furnace

View File

@@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableList
import com.ing.baker.java_api.{JBaker, JCompiledRecipe}
import erwtensoep.PeaSoupRecipeUtils
import erwtensoep.events.{GroceriesDone, KitchenToolsReady}
import erwtensoep.ingredients.SplitErwten
import erwtensoep.ingredients.Peas
import erwtensoep.interactions.PreheatSoup
/**

View File

@@ -7,15 +7,10 @@ import erwtensoep.ingredients._
* Created by jll on 5/4/2017.
*/
class GroceriesDone extends Event {
val zout = new Zout
val laurier = new Laurier
val prei = new Prei
val aardappel= new Aardappel
val winterwortel = new WinterWortel
val knolselderij = new KnolSelderij
val water = new Water
val rookspek = new RookSpek
val hamschrijf = new Hamschijf
val spliterwten = new SplitErwten
val rookWorst = new RookWorst
val potato= new Potato
val carrot = new Carrot
val bacon = new Bacon
val ham = new Ham
val peas = new Peas
val smokedSausage = new SmokedSausage
}

View File

@@ -7,14 +7,11 @@ import com.ing.baker.api.Ingredient
*/
class SoupIngredients
class Zout extends Ingredient
class Laurier extends Ingredient
class Prei extends Ingredient
class Aardappel extends Ingredient
class WinterWortel extends Ingredient
class KnolSelderij extends Ingredient
class Leek extends Ingredient
class Potato extends Ingredient
class Carrot extends Ingredient
class Water extends Ingredient
class RookSpek extends Ingredient
class Hamschijf extends Ingredient
class SplitErwten extends Ingredient
class RookWorst extends Ingredient
class Bacon extends Ingredient
class Ham extends Ingredient
class Peas extends Ingredient
class SmokedSausage extends Ingredient