dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More SonarQube fixes.

Browse Source
This commit is contained in:
raoulvdberge
2020-10-17 13:57:35 +02:00
parent 7c5534dd3c
commit d7148abac7
4 changed files with 94 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/refinedmods/refinedstorage/RSContainers.java
View File

@@ -54,4 +54,7 @@ public final class RSContainers {
public static final ContainerType<CraftingMonitorContainer> CRAFTING_MONITOR = null;
@ObjectHolder("wireless_crafting_monitor")
public static final ContainerType<CraftingMonitorContainer> WIRELESS_CRAFTING_MONITOR = null;
private RSContainers() {
}
}

151
src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java
View File

@@ -123,54 +123,15 @@ public class CraftingManager implements ICraftingManager {
public void update() {
if (network.canRun()) {
if (tasksToRead != null) {
for (int i = 0; i < tasksToRead.size(); ++i) {
CompoundNBT taskTag = tasksToRead.getCompound(i);
ResourceLocation taskType = new ResourceLocation(taskTag.getString(NBT_TASK_TYPE));
CompoundNBT taskData = taskTag.getCompound(NBT_TASK_DATA);
ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(taskType);
if (factory != null) {
try {
ICraftingTask task = factory.createFromNbt(network, taskData);
tasks.put(task.getId(), task);
} catch (CraftingTaskReadException e) {
LOGGER.error("Could not deserialize crafting task", e);
}
}
}
this.tasksToRead = null;
readTasks();
}
boolean changed = !tasksToCancel.isEmpty() || !tasksToAdd.isEmpty();
for (UUID idToCancel : tasksToCancel) {
if (this.tasks.containsKey(idToCancel)) {
this.tasks.get(idToCancel).onCancelled();
this.tasks.remove(idToCancel);
}
}
this.tasksToCancel.clear();
processTasksToCancel();
processTasksToAdd();
for (ICraftingTask task : this.tasksToAdd) {
this.tasks.put(task.getId(), task);
}
this.tasksToAdd.clear();
boolean anyFinished = false;
Iterator<Map.Entry<UUID, ICraftingTask>> it = tasks.entrySet().iterator();
while (it.hasNext()) {
ICraftingTask task = it.next().getValue();
if (task.update()) {
anyFinished = true;
it.remove();
}
}
boolean anyFinished = updateTasks();
if (changed || anyFinished) {
onTaskChanged();
@@ -182,6 +143,62 @@ public class CraftingManager implements ICraftingManager {
}
}
private void processTasksToCancel() {
for (UUID idToCancel : tasksToCancel) {
if (this.tasks.containsKey(idToCancel)) {
this.tasks.get(idToCancel).onCancelled();
this.tasks.remove(idToCancel);
}
}
this.tasksToCancel.clear();
}
private void processTasksToAdd() {
for (ICraftingTask task : this.tasksToAdd) {
this.tasks.put(task.getId(), task);
}
this.tasksToAdd.clear();
}
private boolean updateTasks() {
boolean anyFinished = false;
Iterator<Map.Entry<UUID, ICraftingTask>> it = tasks.entrySet().iterator();
while (it.hasNext()) {
ICraftingTask task = it.next().getValue();
if (task.update()) {
anyFinished = true;
it.remove();
}
}
return anyFinished;
}
private void readTasks() {
for (int i = 0; i < tasksToRead.size(); ++i) {
CompoundNBT taskTag = tasksToRead.getCompound(i);
ResourceLocation taskType = new ResourceLocation(taskTag.getString(NBT_TASK_TYPE));
CompoundNBT taskData = taskTag.getCompound(NBT_TASK_DATA);
ICraftingTaskFactory factory = API.instance().getCraftingTaskRegistry().get(taskType);
if (factory != null) {
try {
ICraftingTask task = factory.createFromNbt(network, taskData);
tasks.put(task.getId(), task);
} catch (CraftingTaskReadException e) {
LOGGER.error("Could not deserialize crafting task", e);
}
}
}
this.tasksToRead = null;
}
@Override
public void readFromNbt(CompoundNBT tag) {
this.tasksToRead = tag.getList(NBT_TASKS, Constants.NBT.TAG_COMPOUND);
@@ -230,10 +247,8 @@ public class CraftingManager implements ICraftingManager {
}
for (ICraftingTask task : getTasks()) {
if (task.getRequested().getItem() != null) {
if (API.instance().getComparer().isEqualNoQuantity(task.getRequested().getItem(), stack)) {
amount -= task.getQuantity();
}
if (task.getRequested().getItem() != null && API.instance().getComparer().isEqualNoQuantity(task.getRequested().getItem(), stack)) {
amount -= task.getQuantity();
}
}
@@ -242,6 +257,8 @@ public class CraftingManager implements ICraftingManager {
if (result.isOk()) {
start(result.getTask());
return result.getTask();
} else {
throttle(source);
}
@@ -258,10 +275,8 @@ public class CraftingManager implements ICraftingManager {
}
for (ICraftingTask task : getTasks()) {
if (task.getRequested().getFluid() != null) {
if (API.instance().getComparer().isEqual(task.getRequested().getFluid(), stack, IComparer.COMPARE_NBT)) {
amount -= task.getQuantity();
}
if (task.getRequested().getFluid() != null && API.instance().getComparer().isEqual(task.getRequested().getFluid(), stack, IComparer.COMPARE_NBT)) {
amount -= task.getQuantity();
}
}
@@ -270,6 +285,8 @@ public class CraftingManager implements ICraftingManager {
if (result.isOk()) {
start(result.getTask());
return result.getTask();
} else {
throttle(source);
}
@@ -345,15 +362,7 @@ public class CraftingManager implements ICraftingManager {
this.containerInventories.clear();
this.patternToContainer.clear();
List<ICraftingPatternContainer> containers = new ArrayList<>();
for (INetworkNode node : network.getNodeGraph().all()) {
if (node instanceof ICraftingPatternContainer && node.isActive()) {
containers.add((ICraftingPatternContainer) node);
}
}
containers.sort((a, b) -> b.getPosition().compareTo(a.getPosition()));
List<ICraftingPatternContainer> containers = getContainers();
for (ICraftingPatternContainer container : containers) {
for (ICraftingPattern pattern : container.getPatterns()) {
@@ -367,12 +376,8 @@ public class CraftingManager implements ICraftingManager {
network.getFluidStorageCache().getCraftablesList().add(output);
}
Set<ICraftingPatternContainer> list = this.patternToContainer.get(pattern);
if (list == null) {
list = new LinkedHashSet<>();
}
list.add(container);
this.patternToContainer.put(pattern, list);
Set<ICraftingPatternContainer> containersForPattern = this.patternToContainer.computeIfAbsent(pattern, (key) -> new LinkedHashSet<>());
containersForPattern.add(container);
}
IItemHandlerModifiable handler = container.getPatternInventory();
@@ -385,6 +390,20 @@ public class CraftingManager implements ICraftingManager {
this.network.getFluidStorageCache().reAttachListeners();
}
private List<ICraftingPatternContainer> getContainers() {
List<ICraftingPatternContainer> containers = new ArrayList<>();
for (INetworkNode node : network.getNodeGraph().all()) {
if (node instanceof ICraftingPatternContainer && node.isActive()) {
containers.add((ICraftingPatternContainer) node);
}
}
containers.sort((a, b) -> b.getPosition().compareTo(a.getPosition()));
return containers;
}
@Override
public Set<ICraftingPatternContainer> getAllContainers(ICraftingPattern pattern) {
return patternToContainer.getOrDefault(pattern, Collections.emptySet());

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java
View File

@@ -67,7 +67,7 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa
this.nodes.put(pos, node);
}
} else {
logger.warn("Factory for " + id + " not found in network node registry");
logger.warn("Factory for {} not found in network node registry", id);
}
}
}

12
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java
View File

@@ -1,5 +1,6 @@
package com.refinedmods.refinedstorage.apiimpl.network.grid;
import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.api.network.grid.IGridFactory;
import com.refinedmods.refinedstorage.api.network.grid.IGridManager;
@@ -70,13 +71,10 @@ public class GridManager implements IGridManager {
IGrid grid = null;
TileEntity tile = factory.getRelevantTile(player.world, pos);
switch (factory.getType()) {
case STACK:
grid = factory.createFromStack(player, stack, slotId);
break;
case BLOCK:
grid = factory.createFromBlock(player, pos);
break;
if (factory.getType() == GridFactoryType.STACK) {
grid = factory.createFromStack(player, stack, slotId);
} else if (factory.getType() == GridFactoryType.BLOCK) {
grid = factory.createFromBlock(player, pos);
}
if (grid == null) {