Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

8 files changed, 157 insertions, 154 deletions

diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 3dab9bde39..0e69ba88d5 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -457,11 +457,13 @@ public class Material {
                         if (hashSize2 + hashSize >= 9) {
                             b = String.valueOf(aValueForGen);
                         } else {
-                            String c = b;
+                            StringBuilder c = new StringBuilder(b);
                             while (MathUtils.howManyPlaces(hashSize + c.length()) < 9) {
-                                c = c + c.hashCode();
+                                c.append(
+                                    c.toString()
+                                        .hashCode());
                             }
-                            b = c;
+                            b = c.toString();
                         }
                     }
 
@@ -471,7 +473,7 @@ public class Material {
                     } else {
                         valueR = a;
                     }
-                    short fc[] = new short[3];
+                    short[] fc = new short[3];
                     int aIndex = 0;
                     for (char gg : valueR.toCharArray()) {
                         short ui = Short.parseShort("" + gg);
@@ -570,7 +572,7 @@ public class Material {
                 this.isRadioactive = true;
                 this.vRadiationLevel = (byte) radiationLevel;
             } else {
-                if (vMaterialInput.size() > 0) {
+                if (!vMaterialInput.isEmpty()) {
                     ArrayList<Byte> aDataSet = new ArrayList<>();
                     for (MaterialStack m : this.vMaterialInput) {
                         aDataSet.add(m.getStackMaterial().vRadiationLevel);
@@ -1183,11 +1185,8 @@ public class Material {
     }
 
     public final boolean hasSolidForm() {
-        if (ItemUtils
-            .checkForInvalidItems(new ItemStack[] { getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1) })) {
-            return true;
-        }
-        return false;
+        return ItemUtils
+            .checkForInvalidItems(new ItemStack[] { getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1) });
     }
 
     public final ItemStack[] getMaterialComposites() {
@@ -1273,16 +1272,18 @@ public class Material {
                 final long[] smallestRatio = MathUtils.simplifyNumbersToSmallestForm(tempRatio);
 
                 if (smallestRatio.length > 0) {
-                    String tempRatioStringThing1 = "";
+                    StringBuilder tempRatioStringThing1 = new StringBuilder();
                     for (long value : tempRatio) {
-                        tempRatioStringThing1 = tempRatioStringThing1 + value + " : ";
+                        tempRatioStringThing1.append(value)
+                            .append(" : ");
                     }
                     Logger.MATERIALS("Default Ratio: " + tempRatioStringThing1);
 
-                    String tempRatioStringThing = "";
+                    StringBuilder tempRatioStringThing = new StringBuilder();
                     int tempSmallestCraftingUseSize = 0;
                     for (long l : smallestRatio) {
-                        tempRatioStringThing = tempRatioStringThing + l + " : ";
+                        tempRatioStringThing.append(l)
+                            .append(" : ");
                         tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + l);
                     }
                     // this.smallestStackSizeWhenProcessing = tempSmallestCraftingUseSize;
@@ -1299,13 +1300,13 @@ public class Material {
             return "";
         }
         Logger.MATERIALS("===============| Calculating Atomic Formula for " + this.localizedName + " |===============");
-        if (!chemSymbol.equals("")) {
+        if (!chemSymbol.isEmpty()) {
             return chemSymbol;
         }
         final ArrayList<MaterialStack> tempInput = this.vMaterialInput;
         if (tempInput != null) {
             if (!tempInput.isEmpty()) {
-                String dummyFormula = "";
+                StringBuilder dummyFormula = new StringBuilder();
                 final long[] dummyFormulaArray = this.getSmallestRatio(tempInput);
                 if (dummyFormulaArray != null) {
                     if (dummyFormulaArray.length >= 1) {
@@ -1329,32 +1330,35 @@ public class Material {
 
                                             if (aChemFormula.length() > 3
                                                 || StringUtils.uppercaseCount(aChemFormula) > 1) {
-                                                dummyFormula = dummyFormula + "("
-                                                    + aChemFormula
-                                                    + ")"
-                                                    + dummyFormulaArray[e];
+                                                dummyFormula.append("(")
+                                                    .append(aChemFormula)
+                                                    .append(")")
+                                                    .append(dummyFormulaArray[e]);
                                             } else {
-                                                dummyFormula = dummyFormula + aChemFormula + dummyFormulaArray[e];
+                                                dummyFormula.append(aChemFormula)
+                                                    .append(dummyFormulaArray[e]);
                                             }
                                         } else if (dummyFormulaArray[e] == 1) {
                                             if (aChemFormula.length() > 3
                                                 || StringUtils.uppercaseCount(aChemFormula) > 1) {
-                                                dummyFormula = dummyFormula + "(" + aChemFormula + ")";
+                                                dummyFormula.append("(")
+                                                    .append(aChemFormula)
+                                                    .append(")");
                                             } else {
-                                                dummyFormula = dummyFormula + aChemFormula;
+                                                dummyFormula.append(aChemFormula);
                                             }
                                         } else {
-                                            dummyFormula = dummyFormula + "??";
+                                            dummyFormula.append("??");
                                         }
                                     } else {
-                                        dummyFormula = dummyFormula + "??";
+                                        dummyFormula.append("??");
                                     }
                                 } else {
-                                    dummyFormula = dummyFormula + "??";
+                                    dummyFormula.append("??");
                                 }
                             }
                         }
-                        return StringUtils.subscript(dummyFormula);
+                        return StringUtils.subscript(dummyFormula.toString());
                         // return dummyFormula;
                     }
                     Logger.MATERIALS("dummyFormulaArray <= 0");
@@ -1371,7 +1375,7 @@ public class Material {
         return isFluidQueued = true;
     }
 
-    public static final void generateQueuedFluids() {
+    public static void generateQueuedFluids() {
         for (Material m : mMaterialMap) {
             if (m.isFluidQueued) {}
         }
@@ -1520,8 +1524,7 @@ public class Material {
         if (this.mFluid == null) {
             return null;
         }
-        final FluidStack moltenFluid = new FluidStack(this.mFluid, fluidAmount);
-        return moltenFluid;
+        return new FluidStack(this.mFluid, fluidAmount);
     }
 
     public final boolean setFluid(Fluid aFluid) {
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
index 48f52a9f7a..f21c40411f 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -82,10 +82,7 @@ public class MaterialGenerator {
         FluidStack rFluidOut, Integer aTime, Integer aEu) {
 
         RecipeGenFluidCanning g = new RecipeGenFluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
-        if (g != null && g.valid()) {
-            return true;
-        }
-        return false;
+        return g != null && g.valid();
     }
 
     public static void generate(final Material matInfo) {
@@ -116,7 +113,7 @@ public class MaterialGenerator {
             }
 
             if (matInfo.getState() == MaterialState.SOLID) {
-                if (generateEverything == true) {
+                if (generateEverything) {
                     if (sRadiation >= 1) {
                         tempBlock = new BlockBaseModular(matInfo, BlockTypes.STANDARD);
                         temp = new BaseItemIngot(matInfo);
@@ -156,7 +153,7 @@ public class MaterialGenerator {
                     temp = new BaseItemPlateDouble(matInfo);
                 }
             } else if (matInfo.getState() == MaterialState.LIQUID) {
-                if (generateEverything == true) {
+                if (generateEverything) {
                     tempBlock = new BlockBaseModular(matInfo, BlockTypes.STANDARD);
                 }
                 temp = new BaseItemIngot(matInfo);
@@ -197,8 +194,7 @@ public class MaterialGenerator {
             return true;
 
         } catch (final Throwable t) {
-
-            Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate.");
+            Logger.MATERIALS(matInfo.getLocalizedName() + " failed to generate.");
             return false;
         }
     }
@@ -304,7 +300,7 @@ public class MaterialGenerator {
             new RecipeGenPlasma(matInfo);
 
         } catch (final Throwable t) {
-            Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate.");
+            Logger.MATERIALS(matInfo.getLocalizedName() + " failed to generate.");
         }
     }
 
@@ -324,8 +320,7 @@ public class MaterialGenerator {
 
             final String unlocalizedName = matInfo.getUnlocalizedName();
             final String materialName = matInfo.getLocalizedName();
-            final short[] C = customRGB;
-            final Integer Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
+            final Integer Colour = Utils.rgbtoHexValue(customRGB[0], customRGB[1], customRGB[2]);
 
             if (Colour == null) {
                 Logger.DEBUG_MATERIALS("Invalid Material while constructing " + materialName + ".");
@@ -421,7 +416,7 @@ public class MaterialGenerator {
             new RecipeGenPlasma(matInfo);
             return true;
         } catch (final Throwable t) {
-            Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate.");
+            Logger.MATERIALS(matInfo.getLocalizedName() + " failed to generate.");
             t.printStackTrace();
             return false;
         }
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java
index 53017a4d29..6c54c3b545 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java
@@ -303,7 +303,7 @@ public final class MaterialsAlloy {
         -1,
         true, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack(MaterialsElements.getInstance().IRON, 06),
+        new MaterialStack(MaterialsElements.getInstance().IRON, 6),
         new MaterialStack(MaterialsElements.getInstance().COBALT, 2),
         new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 24),
         new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 6),
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
index e8cc6ee8f7..c92deae057 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
@@ -576,12 +576,13 @@ public final class MaterialsElements {
             false,
             "҈",
             0,
-            new MaterialStack[] { new MaterialStack(getInstance().LEAD, 15),
-                new MaterialStack(getInstance().MANGANESE, 25), new MaterialStack(getInstance().CARBON, 60) }); // Not
-                                                                                                                // a
-                                                                                                                // GT
-                                                                                                                // Inherited
-                                                                                                                // Material
+            new MaterialStack(getInstance().LEAD, 15),
+            new MaterialStack(getInstance().MANGANESE, 25),
+            new MaterialStack(getInstance().CARBON, 60)); // Not
+                                                          // a
+                                                          // GT
+                                                          // Inherited
+                                                          // Material
         public static final Material WHITE_METAL = new Material(
             "White Metal",
             MaterialState.SOLID,
@@ -594,9 +595,10 @@ public final class MaterialsElements {
             false,
             "҉",
             0,
-            new MaterialStack[] { new MaterialStack(getInstance().COPPER, 5),
-                new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10),
-                new MaterialStack(getInstance().TIN, 75) }); // Not a GT Inherited Material
+            new MaterialStack(getInstance().COPPER, 5),
+            new MaterialStack(getInstance().ANTIMONY, 10),
+            new MaterialStack(getInstance().PLATINUM, 10),
+            new MaterialStack(getInstance().TIN, 75)); // Not a GT Inherited Material
 
         public static final Material GRANITE = new Material(
             "Ancient Granite",
@@ -611,15 +613,18 @@ public final class MaterialsElements {
             "«»",
             0,
             false,
-            new MaterialStack[] { new MaterialStack(getInstance().OXYGEN, 16),
-                new MaterialStack(getInstance().IRON, 10), new MaterialStack(getInstance().SILICONDIOXIDE, 10),
-                new MaterialStack(getInstance().ALUMINIUMOXIDE, 6), new MaterialStack(getInstance().POTASSIUM, 6),
-                new MaterialStack(getInstance().CALCIUM, 4), new MaterialStack(getInstance().SODIUM, 4),
-                new MaterialStack(getInstance().YTTERBIUM, 2) }); // Not
-                                                                  // a
-                                                                  // GT
-                                                                  // Inherited
-                                                                  // Material
+            new MaterialStack(getInstance().OXYGEN, 16),
+            new MaterialStack(getInstance().IRON, 10),
+            new MaterialStack(getInstance().SILICONDIOXIDE, 10),
+            new MaterialStack(getInstance().ALUMINIUMOXIDE, 6),
+            new MaterialStack(getInstance().POTASSIUM, 6),
+            new MaterialStack(getInstance().CALCIUM, 4),
+            new MaterialStack(getInstance().SODIUM, 4),
+            new MaterialStack(getInstance().YTTERBIUM, 2)); // Not
+                                                            // a
+                                                            // GT
+                                                            // Inherited
+                                                            // Material
 
         public static final Material RUNITE = new Material(
             "Runite",
diff --git a/src/main/java/gtPlusPlus/core/material/Particle.java b/src/main/java/gtPlusPlus/core/material/Particle.java
index fefb3f4497..f33a795a07 100644
--- a/src/main/java/gtPlusPlus/core/material/Particle.java
+++ b/src/main/java/gtPlusPlus/core/material/Particle.java
@@ -95,13 +95,13 @@ public class Particle {
         UNKNOWN = new Particle(ElementaryGroup.UNKNOWN, "Unknown");
     }
 
-    public static enum ElementaryGroup {
+    public enum ElementaryGroup {
         QUARK,
         LEPTON,
         BOSON,
         BARYON,
         MESON,
-        UNKNOWN;
+        UNKNOWN
     }
 
     public final ElementaryGroup mParticleType;
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java
index f3ae16c644..120e42584b 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java
@@ -20,10 +20,10 @@ public class MaterialsFluorides {
         false, // Uses Blast furnace?
         false, // Generate cells
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 16),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 32),
-            new MaterialStack(MaterialsElements.getInstance().IRON, 4),
-            new MaterialStack(MaterialsElements.getInstance().CARBON, 2) });
+        new MaterialStack(MaterialsElements.getInstance().CALCIUM, 16),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 32),
+        new MaterialStack(MaterialsElements.getInstance().IRON, 4),
+        new MaterialStack(MaterialsElements.getInstance().CARBON, 2));
 
     // ThF4
     public static final Material THORIUM_TETRAFLUORIDE = new Material(
@@ -36,8 +36,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
+        new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4));
 
     // ThF6
     public static final Material THORIUM_HEXAFLUORIDE = new Material(
@@ -50,9 +50,9 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1),
-            new MaterialStack(MaterialsElements.getInstance().THORIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 12) });
+        new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1),
+        new MaterialStack(MaterialsElements.getInstance().THORIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 12));
 
     // UF4
     public static final Material URANIUM_TETRAFLUORIDE = new Material(
@@ -65,8 +65,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().URANIUM233, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
+        new MaterialStack(MaterialsElements.getInstance().URANIUM233, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4));
 
     // UF6
     public static final Material URANIUM_HEXAFLUORIDE = new Material(
@@ -79,8 +79,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) });
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2));
 
     // ZrF4
 
@@ -99,8 +99,8 @@ public class MaterialsFluorides {
         -1,
         true,
         false,
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
+        new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4));
 
     /*
      * public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material( "Zirconium Tetrafluoride", //Material Name
@@ -121,8 +121,8 @@ public class MaterialsFluorides {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) });
+        new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2));
 
     // LiF
     public static final Material LITHIUM_FLUORIDE = new Material(
@@ -135,8 +135,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM7, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) });
+        new MaterialStack(MaterialsElements.getInstance().LITHIUM7, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1));
 
     // LFTR sub components
 
@@ -151,9 +151,9 @@ public class MaterialsFluorides {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) });
+        new MaterialStack(MaterialMisc.AMMONIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2));
 
     // Be(OH)2
     public static final Material BERYLLIUM_HYDROXIDE = new Material(
@@ -166,8 +166,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
-            new MaterialStack(MaterialMisc.HYDROXIDE, 2) });
+        new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
+        new MaterialStack(MaterialMisc.HYDROXIDE, 2));
 
     // (NH4)2BeF4
     public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material(
@@ -180,9 +180,9 @@ public class MaterialsFluorides {
         -1,
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 2),
-            new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) });
+        new MaterialStack(MaterialMisc.AMMONIUM, 2),
+        new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4));
 
     // LFTR Output
     public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
@@ -195,8 +195,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NEPTUNIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) });
+        new MaterialStack(MaterialsElements.getInstance().NEPTUNIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6));
 
     public static final Material TECHNETIUM_HEXAFLUORIDE = new Material(
         "Technetium Hexafluoride", // Material Name
@@ -208,8 +208,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().TECHNETIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) });
+        new MaterialStack(MaterialsElements.getInstance().TECHNETIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6));
 
     public static final Material SELENIUM_HEXAFLUORIDE = new Material(
         "Selenium Hexafluoride", // Material Name
@@ -221,8 +221,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) });
+        new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6));
 
     public static final Material SODIUM_FLUORIDE = new Material(
         "Sodium Fluoride", // Material Name
@@ -234,8 +234,8 @@ public class MaterialsFluorides {
         -1, // Neutrons
         false, // Uses Blast furnace?
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) });
+        new MaterialStack(MaterialsElements.getInstance().SODIUM, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1));
 
     private static final MaterialsFluorides INSTANCE = new MaterialsFluorides();
 
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java
index 8d74ef9ab8..0e5c1592df 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java
@@ -22,8 +22,8 @@ public final class MaterialsNuclides {
         StringUtils.subscript(StringUtils.superscript("7") + "Li2BeF4"), // Chemical Formula
         4, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 2),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) });
+        new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 2),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1));
 
     public static final Material LiFBeF2ThF4UF4 = new Material(
         "LFTR Fuel 3", // Material Name
@@ -38,10 +38,10 @@ public final class MaterialsNuclides {
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4UF4"), // Chemical Formula
         5, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28),
-            new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28),
+        new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1));
 
     public static final Material LiFBeF2ZrF4UF4 = new Material(
         "LFTR Fuel 2", // Material Name
@@ -56,10 +56,10 @@ public final class MaterialsNuclides {
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4UF4"), // Chemical Formula
         5, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28),
-            new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 5),
-            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 2) });
+        new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28),
+        new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 5),
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 2));
 
     public static final Material LiFBeF2ZrF4U235 = new Material(
         "LFTR Fuel 1", // Material Name
@@ -75,10 +75,10 @@ public final class MaterialsNuclides {
                                                                                                                // Formula
         5, // Radioactivity Level
            // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 55),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 25),
-            new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 6),
-            new MaterialStack(MaterialsElements.getInstance().URANIUM235, 14) });
+        new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 55),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 25),
+        new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 6),
+        new MaterialStack(MaterialsElements.getInstance().URANIUM235, 14));
 
     // Misc
     public static final Material BurntLftrFuel_MK1 = new Material(
@@ -92,10 +92,10 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+        new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1));
 
     public static final Material BurntLftrFuel_MK2 = new Material(
         "Burnt Reactor Fuel II", // Material Name
@@ -108,10 +108,10 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+        new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1));
 
     // LFTR Core Fluids
     public static final Material LiFBeF2UF4FP = new Material(
@@ -125,10 +125,10 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+        new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1));
 
     public static final Material Sparged_LiFBeF2UF4FP = new Material(
         "Helium Sparged U Salt", // Material Name
@@ -141,10 +141,10 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
-            new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) });
+        new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1),
+        new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1));
 
     public static final Material UF6F2FP = new Material(
         "Phosphorous Uranium Hexafluoride (P-UF6)", // Material Name
@@ -157,9 +157,9 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript("UF6F2FP"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1),
-            new MaterialStack(MaterialsElements.getInstance().FLUORINE, 3),
-            new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1) });
+        new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1),
+        new MaterialStack(MaterialsElements.getInstance().FLUORINE, 3),
+        new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1));
 
     public static final Material LiFBeF2 = new Material(
         "Stable Molten Salt Base", // Material Name
@@ -172,8 +172,8 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) });
+        new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
+        new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1));
 
     public static final Material LiFBeF2UF4 = new Material(
         "LFTR Fuel Base", // Material Name
@@ -186,8 +186,8 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(LiFBeF2, 1),
-            new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) });
+        new MaterialStack(LiFBeF2, 1),
+        new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1));
 
     // LFTR Blanket Fluids
 
@@ -203,8 +203,8 @@ public final class MaterialsNuclides {
         false, // Uses Blast furnace?
         StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula
         // Material Stacks with Percentage of required elements.
-        new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1),
-            new MaterialStack(MaterialsFluorides.THORIUM_