From 010fe4662af7af74e0954d6dc2308151eb88fbed Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 28 Feb 2016 23:18:55 -0800 Subject: [PATCH 1/5] Fix #1081 FillBucketHook does not check bucket type --- src/main/java/forestry/plugins/PluginFluids.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; From 98e13299d647c234524338d4679d2ecaff09e98b Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 28 Feb 2016 23:39:55 -0800 Subject: [PATCH 2/5] Fix #1061 Squeezer is very "liberal" regarding oredict in Recipes --- .../forestry/factory/recipes/SqueezerRecipeManager.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java b/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java index 7a970b63a..82891b39b 100644 --- a/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java @@ -70,20 +70,12 @@ public class SqueezerRecipeManager implements ISqueezerManager { } } - // First try to match a specific recipe (without OreDictionary) for (ISqueezerRecipe recipe : recipes) { if (ItemStackUtil.containsSets(recipe.getResources(), items, false, false) > 0) { return recipe; } } - // If that fails - try again with OreDictionary support enabled - for (ISqueezerRecipe recipe : recipes) { - if (ItemStackUtil.containsSets(recipe.getResources(), items, true, false) > 0) { - return recipe; - } - } - return null; } From 99020cde7fd599ce21732e39fd0381ffa40c31b1 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 28 Feb 2016 23:40:57 -0800 Subject: [PATCH 3/5] Fix #1086 Squeezer NEI integration can't lookup multi stack recipes. --- .../factory/recipes/SqueezerRecipeManager.java | 12 ++++++++++++ .../factory/recipes/nei/NEIHandlerSqueezer.java | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java b/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java index 82891b39b..fb2fd01a5 100644 --- a/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java @@ -79,6 +79,18 @@ public class SqueezerRecipeManager implements ISqueezerManager { return null; } + public static ISqueezerRecipe findRecipeWithIngredient(ItemStack ingredient) { + for (ISqueezerRecipe recipe : recipes) { + for (ItemStack recipeIngredient : recipe.getResources()) { + if (ItemStackUtil.isCraftingEquivalent(recipeIngredient, ingredient, false, false)) { + return recipe; + } + } + } + + return null; + } + public static boolean canUse(ItemStack itemStack) { for (ISqueezerRecipe recipe : recipes) { for (ItemStack recipeInput : recipe.getResources()) { 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); } } From 75a3a7b935093a7aaefa9a680599b685d6fb9f6d Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 6 Mar 2016 10:00:22 -0800 Subject: [PATCH 4/5] Fix #1093 Electrical Engine circuit board does not sync --- .../energy/gui/ContainerEngineElectric.java | 11 +-- .../energy/tiles/TileEngineElectric.java | 74 ++++++++++--------- 2 files changed, 44 insertions(+), 41 deletions(-) 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 Date: Sun, 6 Mar 2016 10:01:23 -0800 Subject: [PATCH 5/5] Bump Version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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