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

Formatting

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-30 00:30:02 +02:00
parent be2a682b32
commit 6fb64bbeb8
11 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java
View File

@@ -53,7 +53,7 @@ public class CraftingMonitorElementError implements ICraftingMonitorElement {
@Override @Override
public boolean merge(ICraftingMonitorElement element) { public boolean merge(ICraftingMonitorElement element) {
return element.getId().equals(getId()) && elementHashCode() == element.elementHashCode() && base.merge(((CraftingMonitorElementError)element).base); return element.getId().equals(getId()) && elementHashCode() == element.elementHashCode() && base.merge(((CraftingMonitorElementError) element).base);
} }
@Override @Override

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementInfo.java Normal file → Executable file
View File

@@ -53,7 +53,7 @@ public class CraftingMonitorElementInfo implements ICraftingMonitorElement {
@Override @Override
public boolean merge(ICraftingMonitorElement element) { public boolean merge(ICraftingMonitorElement element) {
return element.getId().equals(getId()) && elementHashCode() == element.elementHashCode() && base.merge(((CraftingMonitorElementInfo)element).base); return element.getId().equals(getId()) && elementHashCode() == element.elementHashCode() && base.merge(((CraftingMonitorElementInfo) element).base);
} }
@Override @Override

3
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java
View File

@@ -6,8 +6,6 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider
import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IFluidStackList;
import com.raoulvdberge.refinedstorage.api.util.IItemStackList;
import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@@ -79,6 +77,7 @@ public abstract class CraftingStep implements ICraftingStep {
public List<ItemStack> getToInsert() { public List<ItemStack> getToInsert() {
return pattern.getInputs().stream().filter(Objects::nonNull).collect(Collectors.toList()); return pattern.getInputs().stream().filter(Objects::nonNull).collect(Collectors.toList());
} }
@Override @Override
public boolean canStartProcessing() { public boolean canStartProcessing() {
return true; return true;

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java
View File

@@ -77,14 +77,14 @@ public class CraftingStepCraft extends CraftingStep {
} }
} }
for (ItemStack byproduct : (pattern.isOredict()? pattern.getByproducts(took) : pattern.getByproducts())) { for (ItemStack byproduct : (pattern.isOredict() ? pattern.getByproducts(took) : pattern.getByproducts())) {
if(byproduct != null) { if (byproduct != null) {
toInsertItems.add(byproduct.copy()); toInsertItems.add(byproduct.copy());
} }
} }
for (ItemStack output : (pattern.isOredict() ? pattern.getOutputs(took) : pattern.getOutputs())) { for (ItemStack output : (pattern.isOredict() ? pattern.getOutputs(took) : pattern.getOutputs())) {
if(output != null) { if (output != null) {
toInsertItems.add(output.copy()); toInsertItems.add(output.copy());
} }
} }

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java
View File

@@ -36,7 +36,7 @@ public class CraftingStepProcess extends CraftingStep {
for (ItemStack stack : getToInsert()) { for (ItemStack stack : getToInsert()) {
ItemStack actualStack = items.get(stack, IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT | (pattern.isOredict() ? IComparer.COMPARE_OREDICT : 0)); ItemStack actualStack = items.get(stack, IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT | (pattern.isOredict() ? IComparer.COMPARE_OREDICT : 0));
ItemStack removeStack = ItemHandlerHelper.copyStackWithSize(actualStack, stack.stackSize); ItemStack removeStack = ItemHandlerHelper.copyStackWithSize(actualStack, stack.stackSize);
if (actualStack == null || actualStack.stackSize == 0 || !items.trackedRemove(removeStack, true) ) { if (actualStack == null || actualStack.stackSize == 0 || !items.trackedRemove(removeStack, true)) {
items.undo(); items.undo();
return false; return false;
} }

1
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java
View File

@@ -11,7 +11,6 @@ import net.minecraftforge.items.ItemHandlerHelper;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collection; import java.util.Collection;
import java.util.Deque;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

3
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java Normal file → Executable file
View File

@@ -17,7 +17,8 @@ public class OreDictedItemStackList implements IItemStackList {
private IItemStackList underlyingList; private IItemStackList underlyingList;
private ArrayListMultimap<Integer, ItemStack> stacks = ArrayListMultimap.create(); private ArrayListMultimap<Integer, ItemStack> stacks = ArrayListMultimap.create();
private OreDictedItemStackList() {} private OreDictedItemStackList() {
}
public OreDictedItemStackList(IItemStackList list) { public OreDictedItemStackList(IItemStackList list) {
this.underlyingList = list; this.underlyingList = list;

3
src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java
View File

@@ -19,9 +19,6 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper; import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import java.util.HashSet;
import java.util.Set;
public class TileSolderer extends TileNode { public class TileSolderer extends TileNode {
public static final TileDataParameter<Integer> DURATION = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileSolderer>() { public static final TileDataParameter<Integer> DURATION = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileSolderer>() {
@Override @Override