Anvilcraft/ModTweaker
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix for #354: ICastingRecipe can also be implemented by BucketCastingRecipe and throws a ClassCastException when removing recipes

Browse source 
- included optional parameters for consumeCast and timeInTicks as mentioned in the wiki (although timeInTicks is now also optional)
This commit is contained in:
Thomas Thieringer 2016-09-17 11:37:46 +02:00
parent 1deff335ea
commit 29e2fbe5bf
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java
View file

@ -9,6 +9,7 @@ import modtweaker.helpers.LogHelper;
import modtweaker.mods.tconstruct.TConstructHelper;
import modtweaker.utils.BaseListAddition;
import modtweaker.utils.BaseListRemoval;
import net.minecraftforge.fluids.FluidStack;
import slimeknights.mantle.util.RecipeMatch;
import slimeknights.tconstruct.library.smeltery.CastingRecipe;
import slimeknights.tconstruct.library.smeltery.ICastingRecipe;
@ -30,17 +31,21 @@ public class Casting {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ZenMethod
public static void addBasinRecipe(IItemStack output, ILiquidStack liquid, @Optional IItemStack cast) {
public static void addBasinRecipe(IItemStack output, ILiquidStack liquid, @Optional IItemStack cast, @Optional boolean consumeCast, @Optional Integer timeInTicks) {
if (liquid == null || output == null) {
LogHelper.logError(String.format("Required parameters missing for %s Recipe.", name));
return;
}
CastingRecipe rec = new CastingRecipe(toStack(output), RecipeMatch.of(toStack(cast)), toFluid(liquid).getFluid(), liquid.getAmount());
FluidStack fluid = toFluid(liquid);
if (timeInTicks == null) {
timeInTicks = CastingRecipe.calcCooldownTime(fluid.getFluid(), fluid.amount);
}
CastingRecipe rec = new CastingRecipe(toStack(output), RecipeMatch.of(toStack(cast)), fluid, timeInTicks, consumeCast, false);
MineTweakerAPI.apply(new Add(rec, (LinkedList<ICastingRecipe>) TConstructHelper.basinCasting));
}
@ZenMethod
public static void addTableRecipe(IItemStack output, ILiquidStack liquid, @Optional IItemStack cast) {
public static void addTableRecipe(IItemStack output, ILiquidStack liquid, @Optional IItemStack cast, @Optional boolean consumeCast, @Optional Integer timeInTicks) {
if (liquid == null || output == null) {
LogHelper.logError(String.format("Required parameters missing for %s Recipe.", name));
return;
@ -49,7 +54,11 @@ public class Casting {
if (cast != null) {
match = RecipeMatch.of(toStack(cast));
}
CastingRecipe rec = new CastingRecipe(toStack(output), match, toFluid(liquid).getFluid(), liquid.getAmount());
FluidStack fluid = toFluid(liquid);
if (timeInTicks == null) {
timeInTicks = CastingRecipe.calcCooldownTime(fluid.getFluid(), fluid.amount);
}
CastingRecipe rec = new CastingRecipe(toStack(output), match, fluid, timeInTicks, consumeCast, false);
MineTweakerAPI.apply(new Add(rec, (LinkedList<ICastingRecipe>) TConstructHelper.tableCasting));
}
@ -92,7 +101,7 @@ public class Casting {
List<ICastingRecipe> recipes = new LinkedList<ICastingRecipe>();
for (ICastingRecipe recipe : list) {
if (recipe != null) {
if (recipe instanceof CastingRecipe) {
if (!matches(output, toIItemStack(((CastingRecipe) recipe).getResult()))) {
continue;