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

Use tracked when importing

Browse Source
This commit is contained in:
raoulvdberge
2017-02-06 21:21:05 +01:00
parent bd220b5832
commit 9c70e7d668
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/raoulvdberge/refinedstorage/integration/cyclopscore/ImportingBehaviorCyclops.java
View File

@@ -11,7 +11,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
public class ImportingBehaviorCyclops implements IImportingBehavior { public class ImportingBehaviorCyclops implements IImportingBehavior {
public static final IImportingBehavior INSTANCE = new ImportingBehaviorCyclops(); public static final IImportingBehavior INSTANCE = new ImportingBehaviorCyclops();
@Override @Override
@@ -21,13 +20,15 @@ public class ImportingBehaviorCyclops implements IImportingBehavior {
ItemStack result = SlotlessItemHandlerHelper.extractItem(entity, facing, upgrades.getItemInteractCount(), true); ItemStack result = SlotlessItemHandlerHelper.extractItem(entity, facing, upgrades.getItemInteractCount(), true);
if (result != null && !result.isEmpty() && network.insertItem(result, result.getCount(), true) == null) { if (result != null && !result.isEmpty() && network.insertItem(result, result.getCount(), true) == null) {
network.insertItem(result, result.getCount(), false); network.insertItemTracked(result, result.getCount());
SlotlessItemHandlerHelper.extractItem(entity, facing, result.copy(), upgrades.getItemInteractCount(), false); SlotlessItemHandlerHelper.extractItem(entity, facing, result.copy(), upgrades.getItemInteractCount(), false);
} }
} }
} else { } else {
return ImportingBehaviorItemHandler.INSTANCE.doImport(entity, facing, currentSlot, itemFilters, mode, compare, ticks, upgrades, network); return ImportingBehaviorItemHandler.INSTANCE.doImport(entity, facing, currentSlot, itemFilters, mode, compare, ticks, upgrades, network);
} }
return 0; return 0;
} }
} }

3
src/main/java/com/raoulvdberge/refinedstorage/inventory/ImportingBehaviorItemHandler.java
View File

@@ -10,7 +10,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
public class ImportingBehaviorItemHandler implements IImportingBehavior { public class ImportingBehaviorItemHandler implements IImportingBehavior {
public static final IImportingBehavior INSTANCE = new ImportingBehaviorItemHandler(); public static final IImportingBehavior INSTANCE = new ImportingBehaviorItemHandler();
@Override @Override
@@ -34,7 +33,7 @@ public class ImportingBehaviorItemHandler implements IImportingBehavior {
ItemStack result = handler.extractItem(currentSlot, upgrades.getItemInteractCount(), true); ItemStack result = handler.extractItem(currentSlot, upgrades.getItemInteractCount(), true);
if (result != null && !stack.isEmpty() && network.insertItem(result, result.getCount(), true) == null) { if (result != null && !stack.isEmpty() && network.insertItem(result, result.getCount(), true) == null) {
network.insertItem(result, result.getCount(), false); network.insertItemTracked(result, result.getCount());
handler.extractItem(currentSlot, upgrades.getItemInteractCount(), false); handler.extractItem(currentSlot, upgrades.getItemInteractCount(), false);
} else { } else {