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 17:19:20 +02:00
parent 9e10c9ebcd
commit 0920bab23d
19 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,7 +376,7 @@ public class CraftingManager implements ICraftingManager {
network.getFluidStorageCache().getCraftablesList().add(output);
}
Set<ICraftingPatternContainer> containersForPattern = this.patternToContainer.computeIfAbsent(pattern, (key) -> new LinkedHashSet<>());
Set<ICraftingPatternContainer> containersForPattern = this.patternToContainer.computeIfAbsent(pattern, key -> new LinkedHashSet<>());
containersForPattern.add(container);
}

1
src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability;
import com.refinedmods.refinedstorage.tile.CableTile;

1
src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.ConstructorContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;

1
src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.DestructorContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;

1
src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.container.DiskDriveContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.DiskDriveTile;

1
src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.ExporterContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;

1
src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause;
import com.refinedmods.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode;

1
src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.FluidInterfaceContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;

1
src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType;
import com.refinedmods.refinedstorage.container.FluidStorageContainer;

1
src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.ImporterContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;

1
src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java
View File

@@ -1,6 +1,5 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.InterfaceContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;

6
src/main/java/com/refinedmods/refinedstorage/datageneration/TagGenerator.java
View File

@@ -15,10 +15,6 @@ public class TagGenerator extends ItemTagsProvider {
@Override
protected void registerTags() {
RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> {
map.values().forEach(item -> {
getOrCreateBuilder(tag).add(item.get());
});
});
RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.values().forEach(item -> getOrCreateBuilder(tag).add(item.get())));
}
}

4
src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
View File

@@ -273,7 +273,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
}
public void bindTexture(String namespace, String filenameInTexturesFolder) {
minecraft.getTextureManager().bindTexture(TEXTURE_CACHE.computeIfAbsent(namespace + ":" + filenameInTexturesFolder, (newId) -> new ResourceLocation(namespace, "textures/" + filenameInTexturesFolder)));
minecraft.getTextureManager().bindTexture(TEXTURE_CACHE.computeIfAbsent(namespace + ":" + filenameInTexturesFolder, newId -> new ResourceLocation(namespace, "textures/" + filenameInTexturesFolder)));
}
public void renderItem(MatrixStack matrixStack, int x, int y, ItemStack stack) {
@@ -298,7 +298,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
renderQuantity(matrixStack, x, y, text, textColor);
}
} catch (Throwable t) {
logger.warn("Couldn't render stack: " + stack.getItem().toString(), t);
logger.warn("Couldn't render stack: {}", stack.getItem().getRegistryName());
}
}

8
src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java
View File

@@ -27,13 +27,13 @@ public class KeyInputListener {
PlayerInventory inv = Minecraft.getInstance().player.inventory;
if (RSKeyBindings.OPEN_WIRELESS_GRID.isKeyDown()) {
findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.WIRELESS_GRID.get(), RSItems.CREATIVE_WIRELESS_GRID.get());
findAndOpen(inv, error -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.WIRELESS_GRID.get(), RSItems.CREATIVE_WIRELESS_GRID.get());
} else if (RSKeyBindings.OPEN_WIRELESS_FLUID_GRID.isKeyDown()) {
findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.WIRELESS_FLUID_GRID.get(), RSItems.CREATIVE_WIRELESS_FLUID_GRID.get());
findAndOpen(inv, error -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.WIRELESS_FLUID_GRID.get(), RSItems.CREATIVE_WIRELESS_FLUID_GRID.get());
} else if (RSKeyBindings.OPEN_PORTABLE_GRID.isKeyDown()) {
findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.PORTABLE_GRID.get(), RSItems.CREATIVE_PORTABLE_GRID.get());
findAndOpen(inv, error -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.PORTABLE_GRID.get(), RSItems.CREATIVE_PORTABLE_GRID.get());
} else if (RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR.isKeyDown()) {
findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.WIRELESS_CRAFTING_MONITOR.get(), RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get());
findAndOpen(inv, error -> Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID), RSItems.WIRELESS_CRAFTING_MONITOR.get(), RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get());
}
}
}

3
src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java
View File

@@ -307,7 +307,8 @@ public class AlternativesScreen extends BaseScreen<AlternativesContainer> {
public TagLine(ResourceLocation tagName, boolean checked) {
this.tagName = tagName;
this.widget = addCheckBox(-100, -100, new StringTextComponent(RenderUtils.shorten(tagName.toString(), 22)), checked, (btn) -> {
this.widget = addCheckBox(-100, -100, new StringTextComponent(RenderUtils.shorten(tagName.toString(), 22)), checked, btn -> {
// NO OP
});
widget.setFGColor(0xFF373737);

13
src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java
View File

@@ -19,6 +19,7 @@ import javax.annotation.Nullable;
import java.util.*;
public class FluidGridStack implements IGridStack {
private static final String ERROR_PLACEHOLDER = "<Error>";
private final Logger logger = LogManager.getLogger(getClass());
private final UUID id;
@@ -79,9 +80,9 @@ public class FluidGridStack implements IGridStack {
try {
cachedName = stack.getDisplayName().getString();
} catch (Throwable t) {
logger.warn("Could not retrieve fluid name of " + stack.getFluid().getRegistryName().toString(), t);
logger.warn("Could not retrieve fluid name of {}", stack.getFluid().getRegistryName());
cachedName = "<Error>";
cachedName = ERROR_PLACEHOLDER;
}
}
@@ -96,7 +97,7 @@ public class FluidGridStack implements IGridStack {
if (registryName != null) {
cachedModId = registryName.getNamespace();
} else {
cachedModId = "<Error>";
cachedModId = ERROR_PLACEHOLDER;
}
}
@@ -109,7 +110,7 @@ public class FluidGridStack implements IGridStack {
cachedModName = ItemGridStack.getModNameByModId(getModId());
if (cachedModName == null) {
cachedModName = "<Error>";
cachedModName = ERROR_PLACEHOLDER;
}
}
@@ -136,9 +137,9 @@ public class FluidGridStack implements IGridStack {
try {
tooltip = Arrays.asList(stack.getDisplayName());
} catch (Throwable t) {
logger.warn("Could not retrieve fluid tooltip of " + stack.getFluid().getRegistryName().toString(), t);
logger.warn("Could not retrieve fluid tooltip of {}", stack.getFluid().getRegistryName());
tooltip = Arrays.asList(new StringTextComponent("<Error>"));
tooltip = Arrays.asList(new StringTextComponent(ERROR_PLACEHOLDER));
}
if (bypassCache) {

14
src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java
View File

@@ -21,6 +21,8 @@ import javax.annotation.Nullable;
import java.util.*;
public class ItemGridStack implements IGridStack {
private static final String ERROR_PLACEHOLDER = "<Error>";
private final Logger logger = LogManager.getLogger(getClass());
private UUID id;
@@ -92,9 +94,9 @@ public class ItemGridStack implements IGridStack {
try {
cachedName = stack.getDisplayName().getString();
} catch (Throwable t) {
logger.warn("Could not retrieve item name of " + stack.getItem().toString(), t);
logger.warn("Could not retrieve item name of {}", stack.getItem().getRegistryName());
cachedName = "<Error>";
cachedName = ERROR_PLACEHOLDER;
}
}
@@ -107,7 +109,7 @@ public class ItemGridStack implements IGridStack {
cachedModId = stack.getItem().getCreatorModId(stack);
if (cachedModId == null) {
cachedModId = "<Error>";
cachedModId = ERROR_PLACEHOLDER;
}
}
@@ -120,7 +122,7 @@ public class ItemGridStack implements IGridStack {
cachedModName = getModNameByModId(getModId());
if (cachedModName == null) {
cachedModName = "<Error>";
cachedModName = ERROR_PLACEHOLDER;
}
}
@@ -147,10 +149,10 @@ public class ItemGridStack implements IGridStack {
try {
tooltip = RenderUtils.getTooltipFromItem(stack);
} catch (Throwable t) {
logger.warn("Could not retrieve item tooltip of " + stack.getItem().toString(), t);
logger.warn("Could not retrieve item tooltip of {}", stack.getItem().getRegistryName());
tooltip = new ArrayList<>();
tooltip.add(new StringTextComponent("<Error>"));
tooltip.add(new StringTextComponent(ERROR_PLACEHOLDER));
}
if (bypassCache) {

2
src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java
View File

@@ -56,7 +56,7 @@ public class GridTile extends NetworkNodeTile<GridNetworkNode> {
t.getNode().setSize(v);
t.getNode().markDirty();
}
}, (initial, p) -> BaseScreen.executeLater(GridScreen.class, (screen) -> screen.resize(screen.getMinecraft(), screen.width, screen.height)));
}, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.resize(grid.getMinecraft(), grid.width, grid.height)));
public static final TileDataParameter<Integer, GridTile> TAB_SELECTED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getTabSelected(), (t, v) -> {
t.getNode().setTabSelected(v == t.getNode().getTabSelected() ? -1 : v);
t.getNode().markDirty();

2
src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java
View File

@@ -332,7 +332,7 @@ public final class StackUtils {
item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(tag.getString(NBT_ITEM_ID)));
if (item == null) {
LOGGER.warn("Could not deserialize item from string ID, it no longer exists: " + tag.getString(NBT_ITEM_ID));
LOGGER.warn("Could not deserialize item from string ID {}, it no longer exists", tag.getString(NBT_ITEM_ID));
}
} else {
throw new IllegalStateException("Cannot deserialize ItemStack: no " + NBT_ITEM_ID + " tag was found!");