From 3525bd3e909296996a19d604759d9876fb3d85c6 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sat, 17 Oct 2020 22:07:41 +0200
Subject: [PATCH] More SonarQube fixes.

---
 .../apiimpl/autocrafting/task/v6/IoUtil.java              | 4 +++-
 .../refinedstorage/block/shape/ShapeCache.java            | 5 ++++-
 .../capability/NetworkNodeProxyCapability.java            | 3 +++
 .../craftingtweaks/CraftingTweaksIntegration.java         | 3 +++
 .../inventorysorter/InventorySorterIntegration.java       | 3 +++
 .../inventorytweaks/InventoryTweaksIntegration.java       | 3 +++
 .../refinedstorage/integration/jei/JeiIntegration.java    | 3 +++
 .../refinedmods/refinedstorage/network/ClientProxy.java   | 3 +++
 .../com/refinedmods/refinedstorage/render/Styles.java     | 3 +++
 .../refinedstorage/render/model/QuadTransformer.java      | 3 +++
 .../screen/grid/filtering/GridFilterParser.java           | 3 +++
 .../refinedstorage/tile/data/RSSerializers.java           | 3 +++
 .../refinedmods/refinedstorage/util/AccessTypeUtils.java  | 3 +++
 .../com/refinedmods/refinedstorage/util/BlockUtils.java   | 8 ++++++--
 .../refinedmods/refinedstorage/util/CollisionUtils.java   | 3 +++
 .../refinedmods/refinedstorage/util/DirectionUtils.java   | 3 +++
 .../refinedstorage/util/FluidStorageBlockUtils.java       | 3 +++
 .../com/refinedmods/refinedstorage/util/GridUtils.java    | 3 +++
 .../refinedstorage/util/PacketBufferUtils.java            | 3 +++
 .../com/refinedmods/refinedstorage/util/RenderUtils.java  | 3 +++
 .../com/refinedmods/refinedstorage/util/StackUtils.java   | 3 +++
 .../refinedstorage/util/StorageBlockUtils.java            | 3 +++
 .../com/refinedmods/refinedstorage/util/TimeUtils.java    | 3 +++
 .../com/refinedmods/refinedstorage/util/WorldUtils.java   | 3 +++
 24 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/IoUtil.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/IoUtil.java
index edf507cf4..eed2b1f00 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/IoUtil.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/IoUtil.java
@@ -21,9 +21,11 @@ import java.util.stream.IntStream;
 
 public final class IoUtil {
     private static final Logger LOGGER = LogManager.getLogger(IoUtil.class);
-
     private static final int DEFAULT_EXTRACT_FLAGS = IComparer.COMPARE_NBT;
 
+    private IoUtil() {
+    }
+
     public static IStackList<ItemStack> extractFromInternalItemStorage(IStackList<ItemStack> list, IStorageDisk<ItemStack> storage, Action action) {
         IStackList<ItemStack> extracted = API.instance().createItemStackList();
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/block/shape/ShapeCache.java b/src/main/java/com/refinedmods/refinedstorage/block/shape/ShapeCache.java
index ba9b50f98..07402ab69 100644
--- a/src/main/java/com/refinedmods/refinedstorage/block/shape/ShapeCache.java
+++ b/src/main/java/com/refinedmods/refinedstorage/block/shape/ShapeCache.java
@@ -7,9 +7,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 
-public class ShapeCache {
+public final class ShapeCache {
     private static final Map<BlockState, VoxelShape> CACHE = new HashMap<>();
 
+    private ShapeCache() {
+    }
+
     public static VoxelShape getOrCreate(BlockState state, Function<BlockState, VoxelShape> shapeFactory) {
         return CACHE.computeIfAbsent(state, shapeFactory);
     }
diff --git a/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java b/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java
index 568a0436b..011ee812a 100644
--- a/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java
+++ b/src/main/java/com/refinedmods/refinedstorage/capability/NetworkNodeProxyCapability.java
@@ -17,6 +17,9 @@ public class NetworkNodeProxyCapability {
     @CapabilityInject(INetworkNodeProxy.class)
     public static final Capability<INetworkNodeProxy> NETWORK_NODE_PROXY_CAPABILITY = null;
 
+    private NetworkNodeProxyCapability() {
+    }
+
     public static void register() {
         CapabilityManager.INSTANCE.register(INetworkNodeProxy.class, new Storage(), new Factory());
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java
index 9ff364a8c..2606db440 100644
--- a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java
+++ b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java
@@ -13,6 +13,9 @@ import java.util.function.Predicate;
 public final class CraftingTweaksIntegration {
     private static final String ID = "craftingtweaks";
 
+    private CraftingTweaksIntegration() {
+    }
+
     public static boolean isLoaded() {
         return ModList.get().isLoaded(ID);
     }
diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java
index ec8d1f067..06b571886 100644
--- a/src/main/java/com/refinedmods/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java
+++ b/src/main/java/com/refinedmods/refinedstorage/integration/inventorysorter/InventorySorterIntegration.java
@@ -5,6 +5,9 @@ import net.minecraftforge.fml.ModList;
 public class InventorySorterIntegration {
     private static final String ID = "inventorysorter";
 
+    private InventorySorterIntegration() {
+    }
+
     public static boolean isLoaded() {
         return ModList.get().isLoaded(ID);
     }
diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java
index 7b8552399..327830c9b 100644
--- a/src/main/java/com/refinedmods/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java
+++ b/src/main/java/com/refinedmods/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java
@@ -3,6 +3,9 @@ package com.refinedmods.refinedstorage.integration.inventorytweaks;
 import net.minecraftforge.fml.ModList;
 
 public class InventoryTweaksIntegration {
+    private InventoryTweaksIntegration() {
+    }
+
     public static boolean isLoaded() {
         return ModList.get().isLoaded("inventorytweaks");
     }
diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiIntegration.java
index 63171776a..2a56f78e4 100644
--- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiIntegration.java
+++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/JeiIntegration.java
@@ -3,6 +3,9 @@ package com.refinedmods.refinedstorage.integration.jei;
 import net.minecraftforge.fml.ModList;
 
 public final class JeiIntegration {
+    private JeiIntegration() {
+    }
+
     public static boolean isLoaded() {
         return ModList.get().isLoaded("jei");
     }
diff --git a/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java
index ff3c97c12..37dc9be9a 100644
--- a/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java
+++ b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java
@@ -11,6 +11,9 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.text.TranslationTextComponent;
 
 public class ClientProxy {
+    private ClientProxy() {
+    }
+
     public static void onReceivedCraftingPreviewResponseMessage(GridCraftingPreviewResponseMessage message) {
         Screen screen = Minecraft.getInstance().currentScreen;
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/render/Styles.java b/src/main/java/com/refinedmods/refinedstorage/render/Styles.java
index 95b5b3c15..762dc0bc7 100644
--- a/src/main/java/com/refinedmods/refinedstorage/render/Styles.java
+++ b/src/main/java/com/refinedmods/refinedstorage/render/Styles.java
@@ -11,4 +11,7 @@ public final class Styles {
     public static final Style RED = Style.EMPTY.setColor(Color.func_240744_a_(TextFormatting.RED));
     public static final Style BLUE = Style.EMPTY.setColor(Color.func_240744_a_(TextFormatting.BLUE));
     public static final Style AQUA = Style.EMPTY.setColor(Color.func_240744_a_(TextFormatting.AQUA));
+
+    private Styles() {
+    }
 }
diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java b/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java
index b48ff850b..e25b1417b 100644
--- a/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java
+++ b/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java
@@ -17,6 +17,9 @@ import java.util.List;
 import java.util.Random;
 
 public final class QuadTransformer {
+    private QuadTransformer() {
+    }
+
     public static List<BakedQuad> getTransformedQuads(IBakedModel model, Direction facing, @Nullable Vector3f translation, BlockState state, Random rand, Direction side) {
         double r = Math.PI * (360 - facing.getOpposite().getHorizontalIndex() * 90) / 180d;
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/GridFilterParser.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/GridFilterParser.java
index d020c7fed..a69ca3f58 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/GridFilterParser.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/filtering/GridFilterParser.java
@@ -10,6 +10,9 @@ import java.util.List;
 import java.util.function.Predicate;
 
 public final class GridFilterParser {
+    private GridFilterParser() {
+    }
+
     public static List<Predicate<IGridStack>> getFilters(@Nullable IGrid grid, String query, List<IFilter> filters) {
         List<Predicate<IGridStack>> gridFilters;
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java
index 1b33fa318..f564bba61 100644
--- a/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java
+++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java
@@ -12,6 +12,9 @@ import net.minecraftforge.fluids.FluidStack;
 import java.util.*;
 
 public final class RSSerializers {
+    private RSSerializers() {
+    }
+
     public static final IDataSerializer<List<ClientNode>> CLIENT_NODE_SERIALIZER = new IDataSerializer<List<ClientNode>>() {
         @Override
         public void write(PacketBuffer buf, List<ClientNode> nodes) {
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/AccessTypeUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/AccessTypeUtils.java
index 1c5b86e39..d0fc915ec 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/AccessTypeUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/AccessTypeUtils.java
@@ -6,6 +6,9 @@ import net.minecraft.nbt.CompoundNBT;
 public final class AccessTypeUtils {
     private static final String NBT_ACCESS_TYPE = "AccessType";
 
+    private AccessTypeUtils() {
+    }
+
     public static void writeAccessType(CompoundNBT tag, AccessType type) {
         tag.putInt(NBT_ACCESS_TYPE, type.getId());
     }
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java
index 6be0c9f28..e996bbebb 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java
@@ -1,5 +1,6 @@
 package com.refinedmods.refinedstorage.util;
 
+import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
@@ -7,8 +8,11 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 
 public class BlockUtils {
-    public static final Block.Properties DEFAULT_ROCK_PROPERTIES = Block.Properties.create(Material.ROCK).hardnessAndResistance(1.9F).sound(SoundType.STONE);
-    public static final Block.Properties DEFAULT_GLASS_PROPERTIES = Block.Properties.create(Material.GLASS).sound(SoundType.GLASS).hardnessAndResistance(0.35F);
+    public static final AbstractBlock.Properties DEFAULT_ROCK_PROPERTIES = AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(1.9F).sound(SoundType.STONE);
+    public static final AbstractBlock.Properties DEFAULT_GLASS_PROPERTIES = AbstractBlock.Properties.create(Material.GLASS).sound(SoundType.GLASS).hardnessAndResistance(0.35F);
+
+    private BlockUtils() {
+    }
 
     // Block#getTranslatedName is client only
     public static ITextComponent getBlockTranslation(Block block) {
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java
index 188149670..f298ca8c2 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java
@@ -6,6 +6,9 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.vector.Vector3d;
 
 public final class CollisionUtils {
+    private CollisionUtils() {
+    }
+
     public static boolean isInBounds(VoxelShape shape, BlockPos pos, Vector3d hit) {
         AxisAlignedBB aabb = shape.getBoundingBox().offset(pos);
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java
index f9bb8701b..42a7b9d18 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java
@@ -5,6 +5,9 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 
 public final class DirectionUtils {
+    private DirectionUtils() {
+    }
+
     public static Direction getFacingFromEntity(BlockPos clickedBlock, LivingEntity entity) {
         return Direction.getFacingFromVector(
             (float) (entity.getPosX() - clickedBlock.getX()),
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java
index 7addbb36d..2427260c8 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/FluidStorageBlockUtils.java
@@ -8,6 +8,9 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
 
 public class FluidStorageBlockUtils {
+    private FluidStorageBlockUtils() {
+    }
+
     public static ResourceLocation getNetworkNodeId(FluidStorageType type) {
         switch (type) {
             case SIXTY_FOUR_K:
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java
index 68fcfdf0a..1e494c22f 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/GridUtils.java
@@ -8,6 +8,9 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
 
 public class GridUtils {
+    private GridUtils() {
+    }
+
     public static ResourceLocation getNetworkNodeId(GridType type) {
         switch (type) {
             case NORMAL:
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java
index d6e802655..9a049e844 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java
@@ -3,6 +3,9 @@ package com.refinedmods.refinedstorage.util;
 import net.minecraft.network.PacketBuffer;
 
 public class PacketBufferUtils {
+    private PacketBufferUtils() {
+    }
+
     // @Volatile: From PacketBuffer#readString, this exists because SideOnly
     public static String readString(PacketBuffer buffer) {
         return buffer.readString(32767);
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java
index ef758b281..0182b7434 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java
@@ -26,6 +26,9 @@ import java.util.List;
 import java.util.Set;
 
 public final class RenderUtils {
+    private RenderUtils() {
+    }
+
     public static String shorten(String text, int length) {
         if (text.length() > length) {
             text = text.substring(0, length) + "...";
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java
index 58c86a276..aa44204a4 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java
@@ -44,6 +44,9 @@ public final class StackUtils {
 
     private static final Logger LOGGER = LogManager.getLogger(StackUtils.class);
 
+    private StackUtils() {
+    }
+
     // @Volatile: from PacketBuffer#writeItemStack, with some tweaks to allow int stack counts
     public static void writeItemStack(PacketBuffer buf, @Nonnull ItemStack stack) {
         if (stack.isEmpty()) {
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java
index 4800221cf..a3b223a29 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/StorageBlockUtils.java
@@ -8,6 +8,9 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
 
 public class StorageBlockUtils {
+    private StorageBlockUtils() {
+    }
+
     public static ResourceLocation getNetworkNodeId(ItemStorageType type) {
         switch (type) {
             case ONE_K:
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java
index 35e50888e..f372b5b2a 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java
@@ -10,6 +10,9 @@ public final class TimeUtils {
     private static final long WEEK = DAY * 7;
     private static final long YEAR = DAY * 365;
 
+    private TimeUtils() {
+    }
+
     public static String getAgo(long ago, String by) {
         long diff = System.currentTimeMillis() - ago;
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java
index cbbfa08e1..2cf88b84d 100644
--- a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java
+++ b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java
@@ -30,6 +30,9 @@ import javax.annotation.Nullable;
 import java.util.UUID;
 
 public final class WorldUtils {
+    private WorldUtils() {
+    }
+
     public static void updateBlock(@Nullable World world, BlockPos pos) {
         if (world != null && world.isBlockPresent(pos)) {
             BlockState state = world.getBlockState(pos);