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

Merge remote-tracking branch 'origin/mc1.10' into mc1.10

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-29 14:45:22 +02:00
parent c2524c5689 2325676c67
commit 148df1f822
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java
View File

@@ -35,9 +35,10 @@ public class OreDictedItemStackList implements IItemStackList {
@Override @Override
public void add(ItemStack stack) { public void add(ItemStack stack) {
underlyingList.add(stack); underlyingList.add(stack);
if (underlyingList.get(stack).stackSize == stack.stackSize) { ItemStack internalStack = underlyingList.get(stack);
for (int id : OreDictionary.getOreIDs(stack)) { if (internalStack != null && internalStack.stackSize == stack.stackSize) {
stacks.put(id, stack); for (int id : OreDictionary.getOreIDs(internalStack)) {
stacks.put(id, internalStack);
} }
} }
} }
@@ -83,7 +84,8 @@ public class OreDictedItemStackList implements IItemStackList {
} }
} }
} }
return underlyingList.get(stack, flags); // Check the underlying list but don't do oredict things, as that has been tried before
return underlyingList.get(stack, flags & ~IComparer.COMPARE_OREDICT);
} }
@Nullable @Nullable

2
src/main/java/com/raoulvdberge/refinedstorage/integration/ic2/ControllerEnergyIC2.java
View File

@@ -8,7 +8,7 @@ public class ControllerEnergyIC2 implements IControllerEnergyIC2 {
private BasicSink sink; private BasicSink sink;
public ControllerEnergyIC2(final TileController controller) { public ControllerEnergyIC2(final TileController controller) {
this.sink = new BasicSink(controller, (int) IntegrationIC2.toEU(controller.getEnergy().getMaxEnergyStored()), Integer.MAX_VALUE) { this.sink = new BasicSink(controller, (int) IntegrationIC2.toEU(controller.getEnergy().getMaxEnergyStored()), 3) {
@Override @Override
public double getDemandedEnergy() { public double getDemandedEnergy() {
return Math.max(0.0D, IntegrationIC2.toEU(controller.getEnergy().getMaxEnergyStored()) - IntegrationIC2.toEU(controller.getEnergy().getEnergyStored())); return Math.max(0.0D, IntegrationIC2.toEU(controller.getEnergy().getMaxEnergyStored()) - IntegrationIC2.toEU(controller.getEnergy().getEnergyStored()));