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

- Updated Mekanism jar

Browse source 
- Small fix for coke oven recipe adding
This commit is contained in:
Turkey 2015-04-26 21:47:30 -04:00
parent 80f03ba32b
commit 9cda6d7450
3 changed files with 84 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
libs/Mekanism-1.7.10-8.1.0.215.jar → libs/Mekanism-1.7.10-8.1.1.225.jar
View file

Binary file not shown.

BIN
libs/MekanismAll-1.7.10-7.1.2.homebaked-dev.jar
View file

Binary file not shown.

123
src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java
View file

@ -2,63 +2,108 @@ package modtweaker2.mods.railcraft.handlers;
import static modtweaker2.helpers.InputHelper.toFluid;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import java.lang.reflect.Field;
import java.util.List;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import mods.railcraft.api.crafting.ICokeOvenRecipe;
import mods.railcraft.common.util.crafting.CokeOvenCraftingManager;
import mods.railcraft.common.util.crafting.CokeOvenCraftingManager.CokeOvenRecipe;
import modtweaker2.mods.railcraft.RailcraftHelper;
import modtweaker2.utils.BaseListAddition;
import modtweaker2.utils.BaseListRemoval;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@ZenClass("mods.railcraft.CokeOven")
public class CokeOven {
@ZenMethod
public static void addRecipe(IItemStack input, boolean matchDamage, boolean matchNBT, IItemStack output, ILiquidStack fluidOutput, int cookTime) {
MineTweakerAPI.apply(new Add(RailcraftHelper.getCokeOvenRecipe(toStack(input), matchDamage, matchNBT, toStack(output), toFluid(fluidOutput), cookTime)));
}
@ZenMethod
public static void addRecipe(IItemStack input, boolean matchDamage, boolean matchNBT, IItemStack output, ILiquidStack fluidOutput, int cookTime) {
MineTweakerAPI.apply(new Add(toStack(input), matchDamage, matchNBT, toStack(output), toFluid(fluidOutput), cookTime));
}
private static class Add extends BaseListAddition {
public Add(ICokeOvenRecipe recipe) {
super("Coke Oven", RailcraftHelper.oven, recipe);
}
private static class Add implements IUndoableAction {
@Override
public String getRecipeInfo() {
return ((ICokeOvenRecipe) recipe).getOutput().getDisplayName();
}
}
private ItemStack stack;
private boolean matchDamage;
private boolean matchNBT;
private ItemStack stack2;
private FluidStack fluid;
private int cookTime;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
public Add(ItemStack stack, boolean matchDamage, boolean matchNBT, ItemStack stack2, FluidStack fluid, int cookTime) {
this.stack = stack;
this.matchDamage = matchDamage;
this.matchNBT = matchNBT;
this.stack2 = stack2;
this.fluid = fluid;
this.cookTime = cookTime;
}
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(toStack(output)));
}
@Override
public void apply() {
CokeOvenCraftingManager.getInstance().addRecipe(stack, matchDamage, matchNBT, stack2, fluid, cookTime);
private static class Remove extends BaseListRemoval {
public Remove(ItemStack stack) {
super("Coke Oven", RailcraftHelper.oven, stack);
}
}
@Override
public void apply() {
for (ICokeOvenRecipe r : RailcraftHelper.oven) {
if (r.getOutput() != null && areEqual(r.getOutput(), stack)) {
recipe = r;
break;
}
}
@Override
public boolean canUndo() {
return false;
}
RailcraftHelper.oven.remove(recipe);
}
@Override
public String describe() {
return "Adding a Railcraft CokeOven recipie for " + stack.getUnlocalizedName() + " and " + stack2.getUnlocalizedName() + "to get " + fluid.getUnlocalizedName();
}
@Override
public String getRecipeInfo() {
return stack.getDisplayName();
}
}
@Override
public String describeUndo() {
return null;
}
@Override
public Object getOverrideKey() {
return null;
}
@Override
public void undo() {
}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(toStack(output)));
}
private static class Remove extends BaseListRemoval {
public Remove(ItemStack stack) {
super("Coke Oven", RailcraftHelper.oven, stack);
}
@Override
public void apply() {
for (ICokeOvenRecipe r : RailcraftHelper.oven) {
if (r.getOutput() != null && r.getOutput().getItem().equals(stack)) {
recipe = r;
break;
}
}
RailcraftHelper.oven.remove(recipe);
}
@Override
public String getRecipeInfo() {
return stack.getDisplayName();
}
}
}