From accea0d383e124f16a2a0f87b4261cb57e1cfe59 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 10 Sep 2016 14:01:54 +0200 Subject: [PATCH] Update changelog, make new crafting tasks actually use bucket filling mechanic again --- CHANGELOG.md | 3 +++ .../apiimpl/autocrafting/task/CraftingTaskNormal.java | 4 ++-- .../apiimpl/autocrafting/task/CraftingTaskProcessing.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a18db8b47..3994ecb2e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Refined Storage Changelog ### 1.0 +**NOTE:** Due to the new crafting system, all Crafting Patterns made before 1.x have to be re-made. + - Implemented multithreaded autocrafting (raoulvdberge) - Processing patterns now hold their items back for pushing until all the required items are gathered from the system (raoulvdberge) - Fixed item and fluid storage stored count having incorrect values at times (raoulvdberge) @@ -10,6 +12,7 @@ - When shift clicking a recipe in the Crafting Grid, the player inventory is now leveraged as well (raoulvdberge) - Fixed machines breaking on long distances (raoulvdberge) - Fixed controller rebuilding network graph on energy change (raoulvdberge) +- Fixed fluids not caring about NBT tags (raoulvdberge) ### 0.9.4 - Little fixes in German translation (ThexXTURBOXx) diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java index 44eeee355..db2172071 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java +++ b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.NetworkUtils; +import refinedstorage.apiimpl.storage.fluid.FluidUtils; public class CraftingTaskNormal extends CraftingTask { public static final String NBT_SATISFIED = "Satisfied"; @@ -37,7 +37,7 @@ public class CraftingTaskNormal extends CraftingTask { ItemStack input = pattern.getInputs().get(i); if (!satisfied[i]) { - ItemStack received = NetworkUtils.extractItem(network, input, input.stackSize); + ItemStack received = FluidUtils.extractItemOrIfBucketLookInFluids(network, input, input.stackSize); if (received != null) { satisfied[i] = true; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java index fd7ac4405..4b58e97f7 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java +++ b/src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java @@ -7,8 +7,8 @@ import net.minecraftforge.items.ItemHandlerHelper; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.autocrafting.ICraftingPatternContainer; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.NetworkUtils; import refinedstorage.api.storage.CompareUtils; +import refinedstorage.apiimpl.storage.fluid.FluidUtils; public class CraftingTaskProcessing extends CraftingTask { public static final String NBT_SATISFIED = "Satisfied"; @@ -47,7 +47,7 @@ public class CraftingTaskProcessing extends CraftingTask { ItemStack input = pattern.getInputs().get(i); if (!satisfied[i]) { - ItemStack received = NetworkUtils.extractItem(network, input, input.stackSize); + ItemStack received = FluidUtils.extractItemOrIfBucketLookInFluids(network, input, input.stackSize); if (received != null) { satisfied[i] = true;