From 6fb64bbeb8579302da391bee88de95a3cef1614b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 30 Oct 2016 00:30:02 +0200 Subject: [PATCH] Formatting --- .../api/autocrafting/task/ICraftingStep.java | 4 ++-- .../craftingmonitor/CraftingMonitorElementError.java | 2 +- .../craftingmonitor/CraftingMonitorElementInfo.java | 2 +- .../craftingmonitor/CraftingMonitorElementList.java | 2 +- .../apiimpl/autocrafting/task/CraftingStep.java | 3 +-- .../apiimpl/autocrafting/task/CraftingStepCraft.java | 6 +++--- .../apiimpl/autocrafting/task/CraftingStepProcess.java | 6 +++--- .../refinedstorage/apiimpl/util/FluidStackList.java | 4 ++-- .../refinedstorage/apiimpl/util/ItemStackList.java | 1 - .../apiimpl/util/OreDictedItemStackList.java | 7 ++++--- .../com/raoulvdberge/refinedstorage/tile/TileSolderer.java | 3 --- 11 files changed, 18 insertions(+), 22 deletions(-) mode change 100644 => 100755 src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementInfo.java mode change 100644 => 100755 src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingStep.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingStep.java index 58464f037..7b7bbc5f3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingStep.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/task/ICraftingStep.java @@ -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 toInsertItems, Deque toInsertFluids); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java index 1c7575c14..3814e29fc 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementError.java @@ -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 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementInfo.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementInfo.java old mode 100644 new mode 100755 index f08fded87..80906185c --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementInfo.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementInfo.java @@ -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 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java index 4efdc4bea..d3a3188cc 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java @@ -45,7 +45,7 @@ public class CraftingMonitorElementList implements ICraftingMonitorElementList { if (!currentLists.isEmpty()) { commit(); } - + return elements; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java index d2aafe7e6..684dd683e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java @@ -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 getToInsert() { return pattern.getInputs().stream().filter(Objects::nonNull).collect(Collectors.toList()); } + @Override public boolean canStartProcessing() { return true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java index 2b9dcabac..c807ba404 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java @@ -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()); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java index a8f0adcad..4ea044580 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java @@ -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 stacks) { ItemStack current = stacks.poll(); List 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); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java index 21312e42b..f9abfdc2d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/FluidStackList.java @@ -106,8 +106,8 @@ public class FluidStackList implements IFluidStackList { @Override public void clean() { List 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)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java index 2e8c61bcf..f089273ff 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java @@ -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; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java old mode 100644 new mode 100755 index 506e4f2b5..5574beade --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java @@ -17,7 +17,8 @@ public class OreDictedItemStackList implements IItemStackList { private IItemStackList underlyingList; private ArrayListMultimap 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> 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())); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java index 8ac35ffee..41a5df077 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java @@ -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 DURATION = new TileDataParameter<>(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override