SonarQube changes

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java

@@ -109,10 +109,6 @@ public class Network implements INetwork, IRedstoneConfigurable {
         return root;
     }
 
-    public BaseEnergyStorage getEnergy() {
-        return energy;
-    }
-
     @Override
     public BlockPos getPosition() {
         return pos;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java

@@ -316,7 +316,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I
 
     @Override
     public IItemHandler getDrops() {
-        return upgrades;
+        return getUpgrades();
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java

@@ -646,12 +646,12 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
 
     @Override
     public IItemHandlerModifiable getItemFilters() {
-        return processingMatrix;
+        return getProcessingMatrix();
     }
 
     @Override
     public FluidInventory getFluidFilters() {
-        return processingMatrixFluids;
+        return getProcessingMatrixFluids();
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java

@@ -210,7 +210,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh
 
     @Override
     public IItemHandler getDrops() {
-        return upgrades;
+        return getUpgrades();
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java

@@ -81,7 +81,7 @@ public class NetworkTransmitterNetworkNode extends NetworkNode {
 
     @Override
     public IItemHandler getDrops() {
-        return networkCard;
+        return getNetworkCard();
     }
 
     @Nullable

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java

@@ -71,7 +71,7 @@ public class WirelessTransmitterNetworkNode extends NetworkNode implements IWire
 
     @Override
     public IItemHandler getDrops() {
-        return upgrades;
+        return getUpgrades();
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java

@@ -350,6 +350,6 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide
 
     @Override
     public IItemHandler getDrops() {
-        return disks;
+        return getDisks();
     }
 }

src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java

@@ -21,7 +21,9 @@ public class GuiContainerHandler implements IGuiContainerHandler<ContainerScreen
             GridScreen grid = (GridScreen) screen;
 
             if (!grid.getSearchField().isFocused() && grid.isOverSlotArea(mouseX, mouseY)) {
-                return (grid.getSlotNumber() >= 0 && grid.getSlotNumber() < grid.getView().getStacks().size()) ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null;
+                boolean inRange = grid.getSlotNumber() >= 0 && grid.getSlotNumber() < grid.getView().getStacks().size();
+
+                return inRange ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null;
             }
         }
 

src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java

@@ -132,10 +132,10 @@ public class FluidRenderer {
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferBuilder = tessellator.getBuffer();
         bufferBuilder.begin(7, DefaultVertexFormats.POSITION_TEX);
-        bufferBuilder.pos(matrix, xCoord, yCoord + 16, zLevel).tex((float) uMin, (float) vMax).endVertex();
+        bufferBuilder.pos(matrix, xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex();
-        bufferBuilder.pos(matrix, xCoord + 16 - maskRight, yCoord + 16, zLevel).tex((float) uMax, (float) vMax).endVertex();
+        bufferBuilder.pos(matrix, xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex();
-        bufferBuilder.pos(matrix, xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex((float) uMax, (float) vMin).endVertex();
+        bufferBuilder.pos(matrix, xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex(uMax, vMin).endVertex();
-        bufferBuilder.pos(matrix, xCoord, yCoord + maskTop, zLevel).tex((float) uMin, (float) vMin).endVertex();
+        bufferBuilder.pos(matrix, xCoord, yCoord + maskTop, zLevel).tex(uMin, vMin).endVertex();
         tessellator.draw();
     }
 }

src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java

@@ -49,6 +49,8 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
     private static final Map<String, ResourceLocation> TEXTURE_CACHE = new HashMap<>();
     private static final Map<Class, Queue<Consumer>> ACTIONS = new HashMap<>();
 
+    private static final ITextComponent ALTERNATIVES_TEXT = new TranslationTextComponent("gui.refinedstorage.alternatives");
+
     private final Logger logger = LogManager.getLogger(getClass());
 
     private int sideButtonY;
@@ -187,7 +189,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
                     minecraft.displayGuiScreen(new AlternativesScreen(
                         this,
                         minecraft.player,
-                        new TranslationTextComponent("gui.refinedstorage.alternatives"),
+                        ALTERNATIVES_TEXT,
                         slot.getStack(),
                         slot.getSlotIndex()
                     ));
@@ -201,7 +203,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
                         ((FilterSlot) slot).isAlternativesAllowed() ? (parent -> new AlternativesScreen(
                             parent,
                             minecraft.player,
-                            new TranslationTextComponent("gui.refinedstorage.alternatives"),
+                            ALTERNATIVES_TEXT,
                             slot.getStack(),
                             slot.getSlotIndex()
                         )) : null
@@ -216,7 +218,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
                     minecraft.displayGuiScreen(new AlternativesScreen(
                         this,
                         minecraft.player,
-                        new TranslationTextComponent("gui.refinedstorage.alternatives"),
+                        ALTERNATIVES_TEXT,
                         stack,
                         slot.getSlotIndex()
                     ));
@@ -230,7 +232,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
                         ((FluidFilterSlot) slot).isAlternativesAllowed() ? (parent -> new AlternativesScreen(
                             this,
                             minecraft.player,
-                            new TranslationTextComponent("gui.refinedstorage.alternatives"),
+                            ALTERNATIVES_TEXT,
                             stack,
                             slot.getSlotIndex()
                         )) : null

src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java

@@ -30,6 +30,7 @@ public class ConstructorScreen extends BaseScreen<ConstructorContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java

@@ -15,10 +15,12 @@ public class CrafterScreen extends BaseScreen<CrafterContainer> {
 
     @Override
     public void onPostInit(int x, int y) {
+        // NO OP
     }
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java

@@ -30,6 +30,7 @@ public class DestructorScreen extends BaseScreen<DestructorContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java

@@ -57,6 +57,7 @@ public class DetectorScreen extends BaseScreen<DetectorContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java

@@ -26,7 +26,7 @@ public class DiskManipulatorScreen extends BaseScreen<DiskManipulatorContainer>
 
     @Override
     public void tick(int x, int y) {
-
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java

@@ -110,6 +110,7 @@ public class FilterScreen extends BaseScreen<FilterContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java

@@ -29,6 +29,7 @@ public class FluidInterfaceScreen extends BaseScreen<FluidInterfaceContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java

@@ -31,6 +31,7 @@ public class ImporterScreen extends BaseScreen<ImporterContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java

@@ -25,6 +25,7 @@ public class InterfaceScreen extends BaseScreen<InterfaceContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java

@@ -23,6 +23,7 @@ public class StorageMonitorScreen extends BaseScreen<StorageMonitorContainer> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java

@@ -77,6 +77,7 @@ public class StorageScreen<T extends Container> extends BaseScreen<T> {
 
     @Override
     public void tick(int x, int y) {
+        // NO OP
     }
 
     @Override

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

@@ -188,7 +188,7 @@ public class FluidGridStack implements IGridStack {
 
     @Override
     public Object getIngredient() {
-        return stack;
+        return getStack();
     }
 
     @Nullable

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

@@ -199,7 +199,7 @@ public class ItemGridStack implements IGridStack {
 
     @Override
     public Object getIngredient() {
-        return stack;
+        return getStack();
     }
 
     @Nullable

src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java

@@ -41,6 +41,13 @@ import java.util.Arrays;
 import java.util.function.BiConsumer;
 
 public class ClientSetup {
+    private static final ResourceLocation DISK_RESOURCE = new ResourceLocation(RS.ID + ":block/disks/disk");
+    private static final ResourceLocation DISK_NEAR_CAPACITY_RESOURCE = new ResourceLocation(RS.ID + ":block/disks/disk_near_capacity");
+    private static final ResourceLocation DISK_FULL_RESOURCE = new ResourceLocation(RS.ID + ":block/disks/disk_full");
+    private static final ResourceLocation DISK_DISCONNECTED_RESOURCE = new ResourceLocation(RS.ID + ":block/disks/disk_disconnected");
+
+    private static final ResourceLocation CONNECTED = new ResourceLocation("connected");
+
     private final BakedModelOverrideRegistry bakedModelOverrideRegistry = new BakedModelOverrideRegistry();
 
     public ClientSetup() {
@@ -91,10 +98,10 @@ public class ClientSetup {
         bakedModelOverrideRegistry.add(new ResourceLocation(RS.ID, "disk_drive"), (base, registry) -> new FullbrightBakedModel(
             new DiskDriveBakedModel(
                 base,
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk")),
+                registry.get(DISK_RESOURCE),
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk_near_capacity")),
+                registry.get(DISK_NEAR_CAPACITY_RESOURCE),
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk_full")),
+                registry.get(DISK_FULL_RESOURCE),
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk_disconnected"))
+                registry.get(DISK_DISCONNECTED_RESOURCE)
             ),
             false,
             new ResourceLocation(RS.ID, "block/disks/leds")
@@ -104,10 +111,10 @@ public class ClientSetup {
             new DiskManipulatorBakedModel(
                 base,
                 registry.get(new ResourceLocation(RS.ID + ":block/disk_manipulator/disconnected")),
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk")),
+                registry.get(DISK_RESOURCE),
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk_near_capacity")),
+                registry.get(DISK_NEAR_CAPACITY_RESOURCE),
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk_full")),
+                registry.get(DISK_FULL_RESOURCE),
-                registry.get(new ResourceLocation(RS.ID + ":block/disks/disk_disconnected"))
+                registry.get(DISK_DISCONNECTED_RESOURCE)
             ),
             false,
             new ResourceLocation(RS.ID, "block/disks/leds"), new ResourceLocation(RS.ID, "block/disk_manipulator/cutouts/" + color)
@@ -139,10 +146,10 @@ public class ClientSetup {
 
         bakedModelOverrideRegistry.add(new ResourceLocation(RS.ID, "pattern"), (base, registry) -> new PatternBakedModel(base));
 
-        ModelLoader.addSpecialModel(new ResourceLocation(RS.ID + ":block/disks/disk"));
+        ModelLoader.addSpecialModel(DISK_RESOURCE);
-        ModelLoader.addSpecialModel(new ResourceLocation(RS.ID + ":block/disks/disk_near_capacity"));
+        ModelLoader.addSpecialModel(DISK_NEAR_CAPACITY_RESOURCE);
-        ModelLoader.addSpecialModel(new ResourceLocation(RS.ID + ":block/disks/disk_full"));
+        ModelLoader.addSpecialModel(DISK_FULL_RESOURCE);
-        ModelLoader.addSpecialModel(new ResourceLocation(RS.ID + ":block/disks/disk_disconnected"));
+        ModelLoader.addSpecialModel(DISK_DISCONNECTED_RESOURCE);
 
         ModelLoader.addSpecialModel(new ResourceLocation(RS.ID + ":block/disk_manipulator/disconnected"));
 
@@ -274,14 +281,14 @@ public class ClientSetup {
         RSItems.CONTROLLER.values().forEach(controller -> ItemModelsProperties.func_239418_a_(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter()));
         RSItems.CREATIVE_CONTROLLER.values().forEach(controller -> ItemModelsProperties.func_239418_a_(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter()));
 
-        ItemModelsProperties.func_239418_a_(RSItems.WIRELESS_CRAFTING_MONITOR.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+        ItemModelsProperties.func_239418_a_(RSItems.WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter());
-        ItemModelsProperties.func_239418_a_(RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+        ItemModelsProperties.func_239418_a_(RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter());
 
-        ItemModelsProperties.func_239418_a_(RSItems.WIRELESS_GRID.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+        ItemModelsProperties.func_239418_a_(RSItems.WIRELESS_GRID.get(), CONNECTED, new NetworkItemPropertyGetter());
-        ItemModelsProperties.func_239418_a_(RSItems.CREATIVE_WIRELESS_GRID.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+        ItemModelsProperties.func_239418_a_(RSItems.CREATIVE_WIRELESS_GRID.get(), CONNECTED, new NetworkItemPropertyGetter());
 
-        ItemModelsProperties.func_239418_a_(RSItems.WIRELESS_FLUID_GRID.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+        ItemModelsProperties.func_239418_a_(RSItems.WIRELESS_FLUID_GRID.get(), CONNECTED, new NetworkItemPropertyGetter());
-        ItemModelsProperties.func_239418_a_(RSItems.CREATIVE_WIRELESS_FLUID_GRID.get(), new ResourceLocation("connected"), new NetworkItemPropertyGetter());
+        ItemModelsProperties.func_239418_a_(RSItems.CREATIVE_WIRELESS_FLUID_GRID.get(), CONNECTED, new NetworkItemPropertyGetter());
     }
 
     @SubscribeEvent

src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/IPortableGrid.java

@@ -15,22 +15,22 @@ public interface IPortableGrid {
     IStorageCache getCache();
 
     default IStorageCache<ItemStack> getItemCache() {
-        return (IStorageCache<ItemStack>) getCache();
+        return getCache();
     }
 
     default IStorageCache<FluidStack> getFluidCache() {
-        return (IStorageCache<FluidStack>) getCache();
+        return getCache();
     }
 
     @Nullable
     IStorageDisk getStorage();
 
     default IStorageDisk<ItemStack> getItemStorage() {
-        return (IStorageDisk<ItemStack>) getStorage();
+        return getStorage();
     }
 
     default IStorageDisk<FluidStack> getFluidStorage() {
-        return (IStorageDisk<FluidStack>) getStorage();
+        return getStorage();
     }
 
     void drainEnergy(int energy);

src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java

@@ -41,6 +41,7 @@ public final class StackUtils {
 
     private static final String NBT_INVENTORY = "Inventory_%d";
     private static final String NBT_SLOT = "Slot";
+    private static final String NBT_FORGE_CAPS = "ForgeCaps"; // @Volatile
 
     private static final Logger LOGGER = LogManager.getLogger(StackUtils.class);
 
@@ -317,13 +318,12 @@ public final class StackUtils {
             itemTag.put(NBT_ITEM_NBT, stack.getTag());
         }
 
+        // @Volatile
         stack.write(dummy);
-
+        if (dummy.contains(NBT_FORGE_CAPS)) {
-        if (dummy.contains("ForgeCaps")) {
+            itemTag.put(NBT_ITEM_CAPS, dummy.get(NBT_FORGE_CAPS));
-            itemTag.put(NBT_ITEM_CAPS, dummy.get("ForgeCaps"));
         }
-
+        dummy.remove(NBT_FORGE_CAPS);
-        dummy.remove("ForgeCaps");
 
         return itemTag;
     }