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

4
src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingStep.java
View File

@@ -27,7 +27,7 @@ public interface ICraftingStep {
/**
* Check if the processing can start.
*
* @param items a list to compare the needed {@link ItemStack} inputs against
* @param items a list to compare the needed {@link ItemStack} inputs against
* @param fluids a list to compare the needed {@link FluidStack} inputs against (eg. a bucket, machine insert)
* @return true if processing can start
*/
@@ -55,7 +55,7 @@ public interface ICraftingStep {
* Execute this step.
* Any items to be added to the network should be inserting into these queues and they'll be managed by the {@link ICraftingTask}.
*
* @param toInsertItems a queue of items to be inserted into the network
* @param toInsertItems a queue of items to be inserted into the network
* @param toInsertFluids a queue of fluids to be inserted into the network
*/
void execute(Deque<ItemStack> toInsertItems, Deque<FluidStack> toInsertFluids);

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

@@ -53,7 +53,7 @@ public class CraftingMonitorElementError implements ICraftingMonitorElement {
@Override
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

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
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

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

@@ -45,7 +45,7 @@ public class CraftingMonitorElementList implements ICraftingMonitorElementList {
if (!currentLists.isEmpty()) {
commit();
}
return elements;
}
}

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.network.INetworkMaster;
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 net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -79,6 +77,7 @@ public abstract class CraftingStep implements ICraftingStep {
public List<ItemStack> getToInsert() {
return pattern.getInputs().stream().filter(Objects::nonNull).collect(Collectors.toList());
}
@Override
public boolean canStartProcessing() {
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())) {
if(byproduct != null) {
for (ItemStack byproduct : (pattern.isOredict() ? pattern.getByproducts(took) : pattern.getByproducts())) {
if (byproduct != null) {
toInsertItems.add(byproduct.copy());
}
}
for (ItemStack output : (pattern.isOredict() ? pattern.getOutputs(took) : pattern.getOutputs())) {
if(output != null) {
if (output != null) {
toInsertItems.add(output.copy());
}
}

6
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()) {
ItemStack actualStack = items.get(stack, IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT | (pattern.isOredict() ? IComparer.COMPARE_OREDICT : 0));
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();
return false;
}
@@ -75,14 +75,14 @@ public class CraftingStepProcess extends CraftingStep {
/**
* Checks whether all stacks can be inserted or not
*
* @param dest target {@link IItemHandler}
* @param dest target {@link IItemHandler}
* @param stacks a {@link Deque} of {@link ItemStack}s
* @return true when all can be inserted, false otherwise
*/
private static boolean insertSimulation(IItemHandler dest, Deque<ItemStack> stacks) {
ItemStack current = stacks.poll();
List<Integer> availableSlots = IntStream.range(0, dest.getSlots()).boxed().collect(Collectors.toList());
while (current != null && !availableSlots.isEmpty()) {
while (current != null && !availableSlots.isEmpty()) {
ItemStack remainder = null;
for (Integer slot : availableSlots) {
remainder = dest.insertItem(slot, current, true);

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java
View File

@@ -106,8 +106,8 @@ public class FluidStackList implements IFluidStackList {
@Override
public void clean() {
List<FluidStack> toRemove = stacks.values().stream()
.filter(stack -> stack.amount <= 0)
.collect(Collectors.toList());
.filter(stack -> stack.amount <= 0)
.collect(Collectors.toList());
toRemove.forEach(stack -> stacks.remove(stack.getFluid(), stack));
}

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.Nullable;
import java.util.Collection;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;

7
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 ArrayListMultimap<Integer, ItemStack> stacks = ArrayListMultimap.create();
private OreDictedItemStackList() {}
private OreDictedItemStackList() {
}
public OreDictedItemStackList(IItemStackList list) {
this.underlyingList = list;
@@ -101,8 +102,8 @@ public class OreDictedItemStackList implements IItemStackList {
private void localClean() {
List<Map.Entry<Integer, ItemStack>> toRemove = stacks.entries().stream()
.filter(entry -> entry.getValue().stackSize <= 0)
.collect(Collectors.toList());
.filter(entry -> entry.getValue().stackSize <= 0)
.collect(Collectors.toList());
toRemove.forEach(entry -> stacks.remove(entry.getKey(), entry.getValue()));
}

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.wrapper.CombinedInvWrapper;
import java.util.HashSet;
import java.util.Set;
public class TileSolderer extends TileNode {
public static final TileDataParameter<Integer> DURATION = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer<Integer, TileSolderer>() {
@Override