Fix issues pointed out by the static analyzer.
This commit is contained in:
@@ -93,9 +93,9 @@ public class CraftingManager implements ICraftingManager {
|
|||||||
tasksToAdd.stream().filter(ICraftingTask::isValid).forEach(tasks::add);
|
tasksToAdd.stream().filter(ICraftingTask::isValid).forEach(tasks::add);
|
||||||
tasksToAdd.clear();
|
tasksToAdd.clear();
|
||||||
|
|
||||||
changed = tasks.removeIf(ICraftingTask::update);
|
boolean anyFinished = tasks.removeIf(ICraftingTask::update);
|
||||||
|
|
||||||
if (changed) {
|
if (changed || anyFinished) {
|
||||||
markCraftingMonitorForUpdate();
|
markCraftingMonitorForUpdate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class CapabilityNetworkNodeProxy {
|
|||||||
|
|
||||||
private static class Factory implements Callable<INetworkNodeProxy> {
|
private static class Factory implements Callable<INetworkNodeProxy> {
|
||||||
@Override
|
@Override
|
||||||
public INetworkNodeProxy call() throws Exception {
|
public INetworkNodeProxy call() {
|
||||||
return new INetworkNodeProxy() {
|
return new INetworkNodeProxy() {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -76,10 +76,12 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
|
|||||||
if (node.getNetwork() == null) {
|
if (node.getNetwork() == null) {
|
||||||
return new Object[]{null, "not connected"};
|
return new Object[]{null, "not connected"};
|
||||||
}
|
}
|
||||||
List<ItemStack> patterns = new LinkedList<ItemStack>();
|
|
||||||
|
List<ItemStack> patterns = new LinkedList<>();
|
||||||
for (ICraftingPattern pattern : node.getNetwork().getCraftingManager().getPatterns()) {
|
for (ICraftingPattern pattern : node.getNetwork().getCraftingManager().getPatterns()) {
|
||||||
patterns.addAll(pattern.getOutputs());
|
patterns.addAll(pattern.getOutputs());
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Object[]{patterns};
|
return new Object[]{patterns};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -67,9 +67,7 @@ public class MessageCraftingMonitorElements implements IMessage, IMessageHandler
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IMessage onMessage(MessageCraftingMonitorElements message, MessageContext ctx) {
|
public IMessage onMessage(MessageCraftingMonitorElements message, MessageContext ctx) {
|
||||||
GuiBase.executeLater(GuiCraftingMonitor.class, craftingMonitor -> {
|
GuiBase.executeLater(GuiCraftingMonitor.class, craftingMonitor -> craftingMonitor.setElements(message.elements));
|
||||||
craftingMonitor.setElements(message.elements);
|
|
||||||
});
|
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ public class BakedModelDiskDrive implements IBakedModel {
|
|||||||
|
|
||||||
private LoadingCache<CacheKey, List<BakedQuad>> cache = CacheBuilder.newBuilder().build(new CacheLoader<CacheKey, List<BakedQuad>>() {
|
private LoadingCache<CacheKey, List<BakedQuad>> cache = CacheBuilder.newBuilder().build(new CacheLoader<CacheKey, List<BakedQuad>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<BakedQuad> load(CacheKey key) throws Exception {
|
public List<BakedQuad> load(CacheKey key) {
|
||||||
EnumFacing facing = key.state.getValue(RSBlocks.DISK_DRIVE.getDirection().getProperty());
|
EnumFacing facing = key.state.getValue(RSBlocks.DISK_DRIVE.getDirection().getProperty());
|
||||||
|
|
||||||
List<BakedQuad> quads = models.get(facing).getQuads(key.state, key.side, 0);
|
List<BakedQuad> quads = models.get(facing).getQuads(key.state, key.side, 0);
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ public class BakedModelDiskManipulator implements IBakedModel {
|
|||||||
|
|
||||||
private LoadingCache<CacheKey, List<BakedQuad>> cache = CacheBuilder.newBuilder().build(new CacheLoader<CacheKey, List<BakedQuad>>() {
|
private LoadingCache<CacheKey, List<BakedQuad>> cache = CacheBuilder.newBuilder().build(new CacheLoader<CacheKey, List<BakedQuad>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<BakedQuad> load(CacheKey key) throws Exception {
|
public List<BakedQuad> load(CacheKey key) {
|
||||||
EnumFacing facing = key.state.getValue(RSBlocks.DISK_MANIPULATOR.getDirection().getProperty());
|
EnumFacing facing = key.state.getValue(RSBlocks.DISK_MANIPULATOR.getDirection().getProperty());
|
||||||
|
|
||||||
List<BakedQuad> quads = (key.state.getValue(BlockDiskManipulator.CONNECTED) ? modelsConnected : modelsDisconnected).get(facing).getQuads(key.state, key.side, 0);
|
List<BakedQuad> quads = (key.state.getValue(BlockDiskManipulator.CONNECTED) ? modelsConnected : modelsDisconnected).get(facing).getQuads(key.state, key.side, 0);
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class CustomModelLoaderDefault implements ICustomModelLoader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IModel loadModel(ResourceLocation modelLocation) throws Exception {
|
public IModel loadModel(ResourceLocation modelLocation) {
|
||||||
return model.get();
|
return model.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,9 +61,7 @@ public class PortableGrid implements IGrid, IPortableGrid {
|
|||||||
private int tabPage;
|
private int tabPage;
|
||||||
private int size;
|
private int size;
|
||||||
|
|
||||||
private StorageTrackerItem storageTracker = new StorageTrackerItem(() -> {
|
private StorageTrackerItem storageTracker = new StorageTrackerItem(() -> stack.getTagCompound().setTag(NBT_STORAGE_TRACKER, getStorageTracker().serializeNBT()));
|
||||||
stack.getTagCompound().setTag(NBT_STORAGE_TRACKER, getStorageTracker().serializeNBT());
|
|
||||||
});
|
|
||||||
|
|
||||||
private List<IFilter> filters = new ArrayList<>();
|
private List<IFilter> filters = new ArrayList<>();
|
||||||
private List<IGridTab> tabs = new ArrayList<>();
|
private List<IGridTab> tabs = new ArrayList<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user