From 97db1008394c820dbd64cd6f9c50f5929d3fbc3e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 18 Dec 2016 00:54:53 +0100 Subject: [PATCH] Reformat --- .../api/autocrafting/ICraftingPattern.java | 2 +- .../api/network/INetworkNodeGraph.java | 8 -------- .../api/solderer/ISoldererRegistry.java | 2 +- .../registry/CraftingTaskFactory.java | 2 -- .../task/CraftingStepProcess.java | 5 ++--- .../apiimpl/network/NetworkNodeGraph.java | 19 ------------------- .../apiimpl/util/StackListItem.java | 2 +- .../container/ContainerExporter.java | 2 +- .../jei/RecipeTransferHandlerPattern.java | 2 +- .../render/ModelDiskManipulator.java | 12 ++++++------ .../externalstorage/StorageFluidExternal.java | 2 +- 11 files changed, 14 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java index d443dbe09..952601616 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java @@ -96,7 +96,7 @@ public interface ICraftingPattern { * Returns the actual outputted {@link ItemStack} * * @param requested an item requested - * @param compare the {@link IComparer} flags + * @param compare the {@link IComparer} flags * @return the actual {@link ItemStack} with quantity */ ItemStack getActualOutput(ItemStack requested, int compare); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java index fca769dae..c7a3ed78b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeGraph.java @@ -6,7 +6,6 @@ import java.util.List; * Represents a graph of all the nodes connected to a network. */ public interface INetworkNodeGraph { - /** /** * Rebuilds the network graph. */ @@ -17,13 +16,6 @@ public interface INetworkNodeGraph { */ List all(); - /** - * Replaces an old node with a new one. - * - * @param node the node to replace - */ - void replace(INetworkNode node); - /** * Disconnects and notifies all connected nodes. */ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java index c404898a9..056542a93 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/solderer/ISoldererRegistry.java @@ -47,7 +47,7 @@ public interface ISoldererRegistry { * Remove existing recipes from the solderer * * @param result the result - * @param rows none or the three rows that give the result + * @param rows none or the three rows that give the result * @return a list of removed {@link ISoldererRecipe}s */ List removeRecipe(@Nonnull ItemStack result, ItemStack... rows); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java index 7eaa13a54..3ff43ff7e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/registry/CraftingTaskFactory.java @@ -8,8 +8,6 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStep; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStepCraft; -import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStepProcess; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; 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 4e228f75a..281633afd 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 @@ -5,7 +5,6 @@ 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.IStackList; -import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; @@ -99,8 +98,8 @@ public class CraftingStepProcess extends CraftingStep { /** * Insert or simulate insertion of {@link ItemStack}s into an {@link IItemHandler} * - * @param dest target {@link IItemHandler} - * @param stacks a {@link Deque} of {@link ItemStack}s + * @param dest target {@link IItemHandler} + * @param stacks a {@link Deque} of {@link ItemStack}s * @param simulate simulate or actually insert the {@link ItemStack}s * @return true when all can be inserted, false otherwise */ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java index 4a65b8045..f31f625a2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -1,11 +1,9 @@ package com.raoulvdberge.refinedstorage.apiimpl.network; import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; import com.raoulvdberge.refinedstorage.api.network.INetworkNeighborhoodAware; import com.raoulvdberge.refinedstorage.api.network.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; -import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider; import com.raoulvdberge.refinedstorage.item.ItemBlockController; import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.block.state.IBlockState; @@ -100,23 +98,6 @@ public class NetworkNodeGraph implements INetworkNodeGraph { return nodes; } - @Override - public void replace(INetworkNode node) { - nodes.remove(node); - nodes.add(node); - - if (node instanceof ICraftingPatternContainer) { - controller.rebuildPatterns(); - } - - if (node instanceof IStorageProvider) { - controller.getItemStorageCache().invalidate(); - controller.getFluidStorageCache().invalidate(); - } - - controller.getDataManager().sendParameterToWatchers(TileController.NODES); - } - @Override public void disconnectAll() { List oldNodes = new ArrayList<>(nodes); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListItem.java index 6a233783c..6b0c79db3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListItem.java @@ -64,7 +64,7 @@ public class StackListItem implements IStackList { ItemStack removed = ItemHandlerHelper.copyStackWithSize(otherStack, Math.min(size, otherStack.getCount())); this.removeTracker.add(removed); - boolean success = otherStack.getCount() - size >= 0; + boolean success = otherStack.getCount() - size >= 0; otherStack.shrink(size); if (otherStack.isEmpty()) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java index 5bbe1f23a..5ee9468c0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java @@ -22,7 +22,7 @@ public class ContainerExporter extends ContainerBase { public void initSlots() { this.inventorySlots.clear(); this.inventoryItemStacks.clear(); - + for (int i = 0; i < 4; ++i) { addSlotToContainer(new SlotItemHandler(exporter.getUpgrades(), i, 187, 6 + (i * 18))); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java index e4b76262d..c805c0263 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeTransferHandlerPattern.java @@ -31,7 +31,7 @@ public class RecipeTransferHandlerPattern implements IRecipeTransferHandler { if (getAccessType() == AccessType.INSERT) { return 0; } - + return remainder == null ? size : (size - remainder.amount); }