dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update changelog, make new crafting tasks actually use bucket filling mechanic again

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-09-10 14:01:54 +02:00
parent f3e983b6ca
commit accea0d383
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,6 +1,8 @@
# Refined Storage Changelog # Refined Storage Changelog
### 1.0 ### 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) - Implemented multithreaded autocrafting (raoulvdberge)
- Processing patterns now hold their items back for pushing until all the required items are gathered from the system (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) - 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) - 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 machines breaking on long distances (raoulvdberge)
- Fixed controller rebuilding network graph on energy change (raoulvdberge) - Fixed controller rebuilding network graph on energy change (raoulvdberge)
- Fixed fluids not caring about NBT tags (raoulvdberge)
### 0.9.4 ### 0.9.4
- Little fixes in German translation (ThexXTURBOXx) - Little fixes in German translation (ThexXTURBOXx)

4
src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskNormal.java
View File

@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World; import net.minecraft.world.World;
import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils; import refinedstorage.apiimpl.storage.fluid.FluidUtils;
public class CraftingTaskNormal extends CraftingTask { public class CraftingTaskNormal extends CraftingTask {
public static final String NBT_SATISFIED = "Satisfied"; public static final String NBT_SATISFIED = "Satisfied";
@@ -37,7 +37,7 @@ public class CraftingTaskNormal extends CraftingTask {
ItemStack input = pattern.getInputs().get(i); ItemStack input = pattern.getInputs().get(i);
if (!satisfied[i]) { if (!satisfied[i]) {
ItemStack received = NetworkUtils.extractItem(network, input, input.stackSize); ItemStack received = FluidUtils.extractItemOrIfBucketLookInFluids(network, input, input.stackSize);
if (received != null) { if (received != null) {
satisfied[i] = true; satisfied[i] = true;

4
src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTaskProcessing.java
View File

@@ -7,8 +7,8 @@ import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.autocrafting.ICraftingPatternContainer; import refinedstorage.api.autocrafting.ICraftingPatternContainer;
import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.storage.CompareUtils; import refinedstorage.api.storage.CompareUtils;
import refinedstorage.apiimpl.storage.fluid.FluidUtils;
public class CraftingTaskProcessing extends CraftingTask { public class CraftingTaskProcessing extends CraftingTask {
public static final String NBT_SATISFIED = "Satisfied"; public static final String NBT_SATISFIED = "Satisfied";
@@ -47,7 +47,7 @@ public class CraftingTaskProcessing extends CraftingTask {
ItemStack input = pattern.getInputs().get(i); ItemStack input = pattern.getInputs().get(i);
if (!satisfied[i]) { if (!satisfied[i]) {
ItemStack received = NetworkUtils.extractItem(network, input, input.stackSize); ItemStack received = FluidUtils.extractItemOrIfBucketLookInFluids(network, input, input.stackSize);
if (received != null) { if (received != null) {
satisfied[i] = true; satisfied[i] = true;