From 1cf5729640520df53ef63906e31f0071bea401f5 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 30 May 2018 10:39:01 +0200 Subject: [PATCH] Fix issues pointed out by the static analyzer. --- .../refinedstorage/apiimpl/autocrafting/CraftingManager.java | 4 ++-- .../refinedstorage/capability/CapabilityNetworkNodeProxy.java | 2 +- .../refinedstorage/integration/oc/EnvironmentNetwork.java | 4 +++- .../network/MessageCraftingMonitorElements.java | 4 +--- .../refinedstorage/render/BakedModelDiskDrive.java | 2 +- .../refinedstorage/render/BakedModelDiskManipulator.java | 2 +- .../refinedstorage/render/CustomModelLoaderDefault.java | 2 +- .../refinedstorage/tile/grid/portable/PortableGrid.java | 4 +--- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java index 494ee12a3..0163259b5 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -93,9 +93,9 @@ public class CraftingManager implements ICraftingManager { tasksToAdd.stream().filter(ICraftingTask::isValid).forEach(tasks::add); tasksToAdd.clear(); - changed = tasks.removeIf(ICraftingTask::update); + boolean anyFinished = tasks.removeIf(ICraftingTask::update); - if (changed) { + if (changed || anyFinished) { markCraftingMonitorForUpdate(); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/capability/CapabilityNetworkNodeProxy.java b/src/main/java/com/raoulvdberge/refinedstorage/capability/CapabilityNetworkNodeProxy.java index 5b9aa74f5..43a22c62e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/capability/CapabilityNetworkNodeProxy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/capability/CapabilityNetworkNodeProxy.java @@ -38,7 +38,7 @@ public class CapabilityNetworkNodeProxy { private static class Factory implements Callable { @Override - public INetworkNodeProxy call() throws Exception { + public INetworkNodeProxy call() { return new INetworkNodeProxy() { @Nonnull @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java index fa1000b36..04564bcb7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java @@ -76,10 +76,12 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { if (node.getNetwork() == null) { return new Object[]{null, "not connected"}; } - List patterns = new LinkedList(); + + List patterns = new LinkedList<>(); for (ICraftingPattern pattern : node.getNetwork().getCraftingManager().getPatterns()) { patterns.addAll(pattern.getOutputs()); } + return new Object[]{patterns}; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorElements.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorElements.java index 7613640c0..845370e12 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorElements.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorElements.java @@ -67,9 +67,7 @@ public class MessageCraftingMonitorElements implements IMessage, IMessageHandler @Override public IMessage onMessage(MessageCraftingMonitorElements message, MessageContext ctx) { - GuiBase.executeLater(GuiCraftingMonitor.class, craftingMonitor -> { - craftingMonitor.setElements(message.elements); - }); + GuiBase.executeLater(GuiCraftingMonitor.class, craftingMonitor -> craftingMonitor.setElements(message.elements)); return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java index 6564a419e..2feb8637b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java @@ -70,7 +70,7 @@ public class BakedModelDiskDrive implements IBakedModel { private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override - public List load(CacheKey key) throws Exception { + public List load(CacheKey key) { EnumFacing facing = key.state.getValue(RSBlocks.DISK_DRIVE.getDirection().getProperty()); List quads = models.get(facing).getQuads(key.state, key.side, 0); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java index 5125475f5..7bab45e85 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java @@ -71,7 +71,7 @@ public class BakedModelDiskManipulator implements IBakedModel { private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override - public List load(CacheKey key) throws Exception { + public List load(CacheKey key) { EnumFacing facing = key.state.getValue(RSBlocks.DISK_MANIPULATOR.getDirection().getProperty()); List quads = (key.state.getValue(BlockDiskManipulator.CONNECTED) ? modelsConnected : modelsDisconnected).get(facing).getQuads(key.state, key.side, 0); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/CustomModelLoaderDefault.java b/src/main/java/com/raoulvdberge/refinedstorage/render/CustomModelLoaderDefault.java index d5e431158..89496a465 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/CustomModelLoaderDefault.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/CustomModelLoaderDefault.java @@ -22,7 +22,7 @@ public class CustomModelLoaderDefault implements ICustomModelLoader { } @Override - public IModel loadModel(ResourceLocation modelLocation) throws Exception { + public IModel loadModel(ResourceLocation modelLocation) { return model.get(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java index 8ced76003..3c9ff463a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java @@ -61,9 +61,7 @@ public class PortableGrid implements IGrid, IPortableGrid { private int tabPage; private int size; - private StorageTrackerItem storageTracker = new StorageTrackerItem(() -> { - stack.getTagCompound().setTag(NBT_STORAGE_TRACKER, getStorageTracker().serializeNBT()); - }); + private StorageTrackerItem storageTracker = new StorageTrackerItem(() -> stack.getTagCompound().setTag(NBT_STORAGE_TRACKER, getStorageTracker().serializeNBT())); private List filters = new ArrayList<>(); private List tabs = new ArrayList<>();