diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 07a7d988a..0ba3e4fe2 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -413,20 +413,21 @@ public final class BotaniaAPI { } /** - * Registers a Pure Daisy Recipe with the default time of 150 ticks per block + * Registers a Pure Daisy Recipe with the default time * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. * @param outputState The blockstate to be placed upon recipe completion. * @return The recipe created. */ public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState) { - return registerPureDaisyRecipe(input, outputState, 150); + return registerPureDaisyRecipe(input, outputState, RecipePureDaisy.DEFAULT_TIME); } /** * Registers a Pure Daisy Recipe. * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. * @param outputState The blockstate to be placed upon recipe completion. - * @param time The amount of time in ticks to complete this recipe + * @param time The amount of time in ticks to complete this recipe. Note that this is ticks on your block, not total time. + * The Pure Daisy only ticks one block at a time in a round robin fashion. * @return The recipe created. */ public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState, int time) { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index a861e4dc9..ffb9ce340 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -25,12 +25,17 @@ import vazkii.botania.api.subtile.SubTileEntity; public class RecipePureDaisy { + public static final int DEFAULT_TIME = 150; private static final Map> oreMap = new HashMap<>(); private final Object input; private final IBlockState outputState; private final int time; + public RecipePureDaisy(Object input, IBlockState state) { + this(input, state, DEFAULT_TIME); + } + public RecipePureDaisy(Object input, IBlockState state, int time) { Preconditions.checkArgument(time >= 0, "Time must be nonnegative"); this.input = input; @@ -38,7 +43,6 @@ public class RecipePureDaisy { this.time = time; if(input != null && !(input instanceof String || input instanceof Block)) throw new IllegalArgumentException("input must be an oredict String or a Block."); - } /**