diff --git a/build.gradle b/build.gradle index 3c63696..5d19619 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "${mod_version}" +version = "0.7.b${System.getenv().BUILD_NUMBER}" group= "modtweaker" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "ModTweaker 2" diff --git a/libs/BloodMagic-1.7.10-1.3.0b-3-deobf.jar b/libs/BloodMagic-1.7.10-1.3.0b-3-deobf.jar new file mode 100644 index 0000000..8db3ee6 Binary files /dev/null and b/libs/BloodMagic-1.7.10-1.3.0b-3-deobf.jar differ diff --git a/libs/Mariculture-Deluxe-1.7.10-deobf.jar b/libs/Mariculture-Deluxe-1.7.10-1.2.4c-1-dev.jar similarity index 92% rename from libs/Mariculture-Deluxe-1.7.10-deobf.jar rename to libs/Mariculture-Deluxe-1.7.10-1.2.4c-1-dev.jar index 9e5053d..9c6500e 100644 Binary files a/libs/Mariculture-Deluxe-1.7.10-deobf.jar and b/libs/Mariculture-Deluxe-1.7.10-1.2.4c-1-dev.jar differ diff --git a/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java b/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java index 3f98708..8ef8597 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java @@ -1,25 +1,19 @@ package modtweaker.mods.forestry.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toFluid; import static modtweaker.helpers.InputHelper.getFluid; +import static modtweaker.helpers.InputHelper.toFluid; +import static modtweaker.helpers.InputHelper.toStack; import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.helpers.InputHelper; import modtweaker.util.BaseListAddition; import modtweaker.util.BaseListRemoval; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; +import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.Forestry; -import forestry.api.core.ForestryAPI; -import forestry.api.recipes.RecipeManagers; -import forestry.core.utils.LiquidHelper; import forestry.factory.gadgets.MachineFermenter; import forestry.factory.gadgets.MachineFermenter.Recipe; import forestry.factory.gadgets.MachineFermenter.RecipeManager; @@ -46,13 +40,13 @@ public class Fermenter { } @ZenMethod - public static void removeRecipe(ILiquidStack output) { - MineTweakerAPI.apply(new Remove(MachineFermenter.RecipeManager.recipes, toFluid(output))); + public static void removeRecipe(IItemStack input) { + MineTweakerAPI.apply(new Remove(MachineFermenter.RecipeManager.recipes, toStack(input))); } private static class Remove extends BaseListRemoval { - public Remove(List list, FluidStack stack) { + public Remove(List list, ItemStack stack) { super(list, stack); } @@ -60,7 +54,7 @@ public class Fermenter { @Override public void apply() { for (Recipe r : RecipeManager.recipes) { - if (r.output != null && r.output.isFluidEqual(fluid)) { + if (r.resource != null && r.resource.isItemEqual(stack)) { recipe = r; break; } diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java b/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java index 0554a72..98dd1d0 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java @@ -181,10 +181,10 @@ public class Smeltery { TConstructHelper.renderIndex.remove(in); } - //Readds the Melting recipe + //Reads the Melting recipe @Override public void undo() { - tconstruct.library.crafting.Smeltery.instance.addMelting(input, Block.getBlockFromItem(renderer.getItem()), renderer.getItemDamage(), temp, fluid); +// tconstruct.library.crafting.Smeltery.instance.addMelting(input, Block.getBlockFromItem(renderer.getItem()), renderer.getItemDamage(), temp, fluid); } @Override