diff --git a/gradle.properties b/gradle.properties index edebf3ed8..8b5ef7ef6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.4.1566-1.7.10 version_major=4 version_minor=2 -version_patch=9 +version_patch=10 diff --git a/src/main/java/forestry/energy/gui/ContainerEngineElectric.java b/src/main/java/forestry/energy/gui/ContainerEngineElectric.java index 3d43aeeda..9bd9f3ba3 100644 --- a/src/main/java/forestry/energy/gui/ContainerEngineElectric.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineElectric.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.energy.gui; +import forestry.core.network.packets.PacketGuiUpdate; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; @@ -36,13 +37,9 @@ public class ContainerEngineElectric extends ContainerSocketed 0) { return recipe; } } - // If that fails - try again with OreDictionary support enabled + return null; + } + + public static ISqueezerRecipe findRecipeWithIngredient(ItemStack ingredient) { for (ISqueezerRecipe recipe : recipes) { - if (ItemStackUtil.containsSets(recipe.getResources(), items, true, false) > 0) { - return recipe; + for (ItemStack recipeIngredient : recipe.getResources()) { + if (ItemStackUtil.isCraftingEquivalent(recipeIngredient, ingredient, false, false)) { + return recipe; + } } } diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java index e832f2591..d33e0b846 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java @@ -246,11 +246,9 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase { return; } - ISqueezerRecipe recipe = SqueezerRecipeManager.findMatchingRecipe(new ItemStack[]{ingred}); + ISqueezerRecipe recipe = SqueezerRecipeManager.findRecipeWithIngredient(ingred); if (recipe != null) { CachedSqueezerRecipe crecipe = new CachedSqueezerRecipe(recipe); - // Override recipe to show the right input in case it's OD - crecipe.setIngredients(new ItemStack[]{ingred}); this.arecipes.add(crecipe); } } diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/plugins/PluginFluids.java index 1955d0c9f..3f8546fdc 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/plugins/PluginFluids.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -175,6 +176,11 @@ public class PluginFluids extends ForestryPlugin { public static class FillBucketHook { @SubscribeEvent public void fillBucket(FillBucketEvent event) { + ItemStack bucket = event.current; + if (bucket == null || bucket.getItem() != Items.bucket) { + return; + } + MovingObjectPosition movingObjectPosition = event.target; int x = movingObjectPosition.blockX; int y = movingObjectPosition.blockY;