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

Add helper method

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-02 22:29:29 +02:00
parent a431f17e6f
commit a5e8f4c811
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -302,6 +302,10 @@ public final class RefinedStorageUtils {
return network.take(stack, size, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT); return network.take(stack, size, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
} }
public static ItemStack getFromNetwork(INetworkMaster network, ItemStack stack) {
return network.getStorage().get(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
}
public static ICraftingPattern getPatternFromNetwork(INetworkMaster network, ItemStack stack) { public static ICraftingPattern getPatternFromNetwork(INetworkMaster network, ItemStack stack) {
return network.getPattern(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT); return network.getPattern(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
} }

3
src/main/java/refinedstorage/apiimpl/network/GridHandler.java
View File

@@ -9,7 +9,6 @@ import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.GridPullFlags; import refinedstorage.api.network.GridPullFlags;
import refinedstorage.api.network.IGridHandler; import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.CompareFlags;
import refinedstorage.item.ItemWirelessGrid; import refinedstorage.item.ItemWirelessGrid;
public class GridHandler implements IGridHandler { public class GridHandler implements IGridHandler {
@@ -23,7 +22,7 @@ public class GridHandler implements IGridHandler {
@Override @Override
public void onPull(ItemStack stack, int flags, EntityPlayerMP player) { public void onPull(ItemStack stack, int flags, EntityPlayerMP player) {
ItemStack item = network.getStorage().get(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT); ItemStack item = RefinedStorageUtils.getFromNetwork(network, stack);
if (item == null) { if (item == null) {
return; return;

3
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -24,7 +24,6 @@ import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.INetworkSlave; import refinedstorage.api.network.INetworkSlave;
import refinedstorage.api.network.IWirelessGridHandler; import refinedstorage.api.network.IWirelessGridHandler;
import refinedstorage.api.storage.CompareFlags;
import refinedstorage.api.storage.IGroupedStorage; import refinedstorage.api.storage.IGroupedStorage;
import refinedstorage.api.storage.IStorage; import refinedstorage.api.storage.IStorage;
import refinedstorage.apiimpl.autocrafting.BasicCraftingTask; import refinedstorage.apiimpl.autocrafting.BasicCraftingTask;
@@ -340,7 +339,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
int score = 0; int score = 0;
for (ItemStack input : patterns.get(i).getInputs()) { for (ItemStack input : patterns.get(i).getInputs()) {
ItemStack stored = storage.get(input, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT); ItemStack stored = RefinedStorageUtils.getFromNetwork(this, input);
score += stored != null ? stored.stackSize : 0; score += stored != null ? stored.stackSize : 0;
} }