Cleanup (#36)

* updateBuildScript

* Remove unused members in PluginGT5Base

* Remove GuiRecipeHelper

* Use enhanced switch

* Remove / suppress unused members

* Fix empty catch block

* Apply final where possible

* Use toArray(IntFunction)

* Fix redundant default parameters

* Use enhanced for

* Use addAll

* Fix explicit type argument

* Redundant throws

* SameParameterValue

* String concatenation in loop

* constant condition

* Redundant initializer

* Redundant new String()

* Redundant cast

* Instantiation of utility class

* Fix Javadoc

* Don't instantiate DecimalFormat every time

* Put curly brackets

* Rename: liste -> list

* Rename: vertauscht -> swapped

* Rename: schritt -> step

11 files changed, 200 insertions, 332 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
index 96af04051e..d19a1fdff9 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
@@ -21,31 +21,29 @@ public class CSVMaker implements Runnable {
 
     public CSVMaker() {}
 
-    public static List<Oremix> Combsort(List<Oremix> liste) {
+    public static List<Oremix> Combsort(List<Oremix> list) {
         try {
-            List<Oremix> liste2 = new ArrayList<Oremix>(liste.size());
-            for (Oremix element : liste) {
-                liste2.add(element);
-            }
+            List<Oremix> list2 = new ArrayList<>(list.size());
+            list2.addAll(list);
 
-            int schritt = liste2.size();
-            boolean vertauscht = false;
+            int step = list2.size();
+            boolean swapped;
             do {
-                vertauscht = false;
-                if (schritt > 1) {
-                    schritt = (int) (schritt / 1.3);
+                swapped = false;
+                if (step > 1) {
+                    step = (int) (step / 1.3);
                 }
-                for (int i = 0; i < liste2.size() - schritt; i++) {
-                    if (liste2.get(i).getOreName().substring(0, 3)
-                            .compareTo((liste2.get(i + schritt).getOreName().substring(0, 3))) > 0) {
-                        Oremix tmp = (Oremix) liste2.get(i);
-                        liste2.set(i, liste2.get(i + schritt));
-                        liste2.set(i + schritt, (Oremix) tmp);
-                        vertauscht = true;
+                for (int i = 0; i < list2.size() - step; i++) {
+                    if (list2.get(i).getOreName().substring(0, 3)
+                            .compareTo((list2.get(i + step).getOreName().substring(0, 3))) > 0) {
+                        Oremix tmp = list2.get(i);
+                        list2.set(i, list2.get(i + step));
+                        list2.set(i + step, tmp);
+                        swapped = true;
                     }
                 }
-            } while (vertauscht || schritt > 1);
-            return liste2;
+            } while (swapped || step > 1);
+            return list2;
         } catch (Exception e) {
             e.printStackTrace();
             return null;
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
index be95356118..02ad143dd4 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
@@ -5,13 +5,12 @@ import static pers.gwyog.gtneioreplugin.GTNEIOrePlugin.maxTooltipLines;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import net.minecraft.util.StatCollector;
 
 public class DimensionHelper {
 
-    public static String[] DimName = {
+    public static final String[] DimName = {
             // Non GC dimensions in progression order instead of alphabetical
             "Overworld", "Nether", "Twilight", "TheEnd", "Vanilla_EndAsteroids", "EndAsteroid",
             // T1
@@ -33,14 +32,14 @@ public class DimensionHelper {
             "GalaxySpace_BarnardC", "GalaxySpace_BarnardE", "GalaxySpace_BarnardF", "GalaxySpace_CentauriA",
             "GalaxySpace_TcetiE", "Underdark", "GalaxySpace_VegaB", };
 
-    public static String[] DimNameTrimmed = Arrays.stream(DimName)
+    public static final String[] DimNameTrimmed = Arrays.stream(DimName)
             .map(
                     n -> n.replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "")
                             .replaceAll("GalaxySpace_", "").replaceAll("Vanilla_", "Vanilla "))
-            .collect(Collectors.toList()).toArray(new String[0]);
+            .toArray(String[]::new);
 
-    public static String[] DimNameDisplayed = { // first 2 letters if one word else 1 letter of every word, except
-                                                // capital letter in
+    public static final String[] DimNameDisplayed = { // first 2 letters if one word else 1 letter of every word, except
+            // capital letter in
             // name, then 1rst + capital Moon = Mo, BarnardC = BC, EndAsteroid = EA
             // Non GC dimensions in progression order instead of alphabetical
             "Ow", // Overworld
@@ -100,57 +99,18 @@ public class DimensionHelper {
                 if (s.equals(DimNameDisplayed[i])) {
                     String k = DimNameTrimmed[i];
                     s = StatCollector.translateToLocal("gtnop.world." + k);
-                    switch (k) {
-                        case "Moon":
-                            s = "T1: " + s;
-                            break;
-                        case "Deimos":
-                        case "Mars":
-                        case "Phobos":
-                            s = "T2: " + s;
-                            break;
-                        case "Asteroids":
-                        case "Callisto":
-                        case "Ceres":
-                        case "Europa":
-                        case "Ganymede":
-                        case "Ross128b":
-                            s = "T3: " + s;
-                            break;
-                        case "Io":
-                        case "Mercury":
-                        case "Venus":
-                            s = "T4: " + s;
-                            break;
-                        case "Enceladus":
-                        case "Miranda":
-                        case "Oberon":
-                        case "Titan":
-                        case "Ross128ba":
-                            s = "T5: " + s;
-                            break;
-                        case "Proteus":
-                        case "Triton":
-                            s = "T6: " + s;
-                            break;
-                        case "Haumea":
-                        case "Kuiperbelt":
-                        case "MakeMake":
-                        case "Pluto":
-                            s = "T7: " + s;
-                            break;
-                        case "BarnardC":
-                        case "BarnardE":
-                        case "BarnardF":
-                        case "CentauriA":
-                        case "TcetiE":
-                        case "VegaB":
-                            s = "T8: " + s;
-                            break;
-                        case "Underdark":
-                            s = "T9: " + s;
-                            break;
-                    }
+                    s = switch (k) {
+                        case "Moon" -> "T1: " + s;
+                        case "Deimos", "Mars", "Phobos" -> "T2: " + s;
+                        case "Asteroids", "Callisto", "Ceres", "Europa", "Ganymede", "Ross128b" -> "T3: " + s;
+                        case "Io", "Mercury", "Venus" -> "T4: " + s;
+                        case "Enceladus", "Miranda", "Oberon", "Titan", "Ross128ba" -> "T5: " + s;
+                        case "Proteus", "Triton" -> "T6: " + s;
+                        case "Haumea", "Kuiperbelt", "MakeMake", "Pluto" -> "T7: " + s;
+                        case "BarnardC", "BarnardE", "BarnardF", "CentauriA", "TcetiE", "VegaB" -> "T8: " + s;
+                        case "Underdark" -> "T9: " + s;
+                        default -> s;
+                    };
 
                     dims[j] = s;
                 }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java
index e6aecb3d85..ebc9956af1 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java
@@ -19,14 +19,14 @@ import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 public class GT5CFGHelper {
 
     // Do NOT ever put a comma in this or it will break split calls later in the code. Bad, but it is what it is.
-    public static String oreVeinNotInAnyDim = "Not available in any Galactic Dim!";
+    public static final String oreVeinNotInAnyDim = "Not available in any Galactic Dim!";
 
-    private static File F = GregTech_API.sWorldgenFile.mConfig.getConfigFile();
+    private static final File F = GregTech_API.sWorldgenFile.mConfig.getConfigFile();
 
     public static String GT5CFGSmallOres(String Veinname) {
-        List<String> raw = new ArrayList<String>();
-        List<String> rawbools = new ArrayList<String>();
-        String st = null;
+        List<String> raw = new ArrayList<>();
+        List<String> rawbools = new ArrayList<>();
+        String st;
         Configuration c = new Configuration(F);
         ConfigCategory configCategory = c.getCategory("worldgen." + Veinname);
         for (Property p : configCategory.getOrderedValues()) {
@@ -34,33 +34,40 @@ public class GT5CFGHelper {
                 raw.add(p.getName() + "=" + p.getBoolean());
             }
         }
-        if (!raw.isEmpty()) for (int i = 0; i < raw.size(); i++) {
-            for (int j = 0; j < DimensionHelper.DimName.length; j++)
-                if (raw.get(i).contains(DimensionHelper.DimName[j])) rawbools.add(raw.get(i));
-        }
-        else GTNEIOrePlugin.LOG.info("Config entry not found for Vein: " + Veinname);
+        if (!raw.isEmpty()) {
+            for (String s : raw) {
+                for (int j = 0; j < DimensionHelper.DimName.length; j++) {
+                    if (s.contains(DimensionHelper.DimName[j])) {
+                        rawbools.add(s);
+                    }
+                }
+            }
+        } else GTNEIOrePlugin.LOG.info("Config entry not found for Vein: " + Veinname);
 
-        String ret = " ";
+        StringBuilder ret = new StringBuilder(" ");
 
-        HashSet<String> rawboolsset = new HashSet<String>();
+        HashSet<String> rawboolsset = new HashSet<>();
         if (!rawbools.isEmpty()) {
-            for (int i = 0; i < rawbools.size(); i++) {
-                st = rawbools.get(i).replace("B:", "").replace("_true", "").replace("_false", "").replaceAll(" ", "")
+            for (String rawbool : rawbools) {
+                st = rawbool.replace("B:", "").replace("_true", "").replace("_false", "").replaceAll(" ", "")
                         .replaceAll("\"", "");
                 rawboolsset.add(st);
             }
-            rawbools = new ArrayList<String>(rawboolsset);
+            rawbools = new ArrayList<>(rawboolsset);
             for (int j = 0; j < DimensionHelper.DimName.length; j++) {
-                for (int i = 0; i < rawbools.size(); i++) {
-                    st = rawbools.get(i);
-                    if (st.contains(DimensionHelper.DimName[j]))
-                        if (st.contains("=true")) ret = (ret + DimensionHelper.DimNameDisplayed[j] + ",");
+                for (String rawbool : rawbools) {
+                    st = rawbool;
+                    if (st.contains(DimensionHelper.DimName[j]) && st.contains("=true")) {
+                        ret.append(DimensionHelper.DimNameDisplayed[j]).append(",");
+                    }
                 }
             }
         }
-        ret = ret.trim();
-        if (ret.equals("") || ret.equals(" ")) ret = oreVeinNotInAnyDim;
-        return ret;
+        ret = new StringBuilder(ret.toString().trim());
+        if (ret.toString().equals("") || ret.toString().equals(" ")) {
+            ret = new StringBuilder(oreVeinNotInAnyDim);
+        }
+        return ret.toString();
     }
 
     public static String GT5CFG(String Veinname) {
@@ -70,16 +77,18 @@ public class GT5CFGHelper {
             return "Error while Loading CFG";
         } else try {
             int buffer = (int) (0.1 * Runtime.getRuntime().freeMemory());
-            if (buffer > F.length()) buffer = (int) F.length();
+            if (buffer > F.length()) {
+                buffer = (int) F.length();
+            }
             // allocate 10% of free memory for read-in-buffer, if there is less than filesize memory available
             // FMLLog.info("GT_CFG_found[0]");
             FileReader in = new FileReader(F);
             // FMLLog.info("FileReader created");
             BufferedReader reader = new BufferedReader(in, buffer);
             // FMLLog.info("BufferedReader" +Integer.toString(buffer)+"created");
-            String st = null;
-            List<String> raw = new ArrayList<String>();
-            List<String> rawbools = new ArrayList<String>();
+            String st;
+            List<String> raw = new ArrayList<>();
+            List<String> rawbools = new ArrayList<>();
             Boolean[] found = new Boolean[2];
             found[0] = false;
             found[1] = false;
@@ -90,16 +99,18 @@ public class GT5CFGHelper {
                 st = reader.readLine();
                 // FMLLog.info("st: "+st);
                 if (st != null && st.trim().equals("mix {")) {
-                    while (!((st == null) || ((st != null) && found[0]))) {
+                    while (!(st == null || found[0])) {
                         // FMLLog.info("zweite");
                         st = reader.readLine();
                         // read until reached eof or Veinname {
                         // FMLLog.info("MIXst: "+st);
                         if (st != null && st.trim().equals(Veinname + " {")) {
                             // FMLLog.info("VEINNAMEst: "+st);
-                            while (!((st == null) || ((st != null) && found[0]))) {
+                            while (!(st == null || found[0])) {
                                 st = reader.readLine();
-                                if ((!(st == null)) && st.trim().equals("}")) found[0] = true;
+                                if ((!(st == null)) && st.trim().equals("}")) {
+                                    found[0] = true;
+                                }
                                 // FMLLog.info("dritte");
                                 // add everything below Veinname { undtil } to raw
                                 raw.add(st);
@@ -109,20 +120,22 @@ public class GT5CFGHelper {
                 }
 
                 if (st != null && st.trim().equals("dimensions {")) {
-                    while (!((st == null) || ((st != null) && found[1]))) {
+                    while (!(st == null || found[1])) {
                         // FMLLog.info("zweite");
                         st = reader.readLine();
                         if (st != null && (st.trim().equals("mix {"))) {
-                            while (!((st == null) || ((st != null) && found[1]))) {
+                            while (!(st == null || found[1])) {
                                 // FMLLog.info("dritte");
                                 st = reader.readLine();
                                 // read until reached eof or Veinname {
                                 // FMLLog.info("MIXst: "+st);
                                 if (st != null && st.trim().equals(Veinname + " {")) {
                                     // FMLLog.info("VEINNAMEst: "+st);
-                                    while (!((st == null) || ((st != null) && found[1]))) {
+                                    while (!(st == null || found[1])) {
                                         st = reader.readLine();
-                                        if ((!(st == null)) && st.trim().equals("}")) found[1] = true;
+                                        if ((!(st == null)) && st.trim().equals("}")) {
+                                            found[1] = true;
+                                        }
                                         // FMLLog.info("vierte");
                                         // add everything below Veinname { undtil } to raw
                                         raw.add(st);
@@ -135,40 +148,49 @@ public class GT5CFGHelper {
             } while (st != null);
             reader.close(); // not needed anymore
 
-            if (!raw.isEmpty()) for (int i = 0; i < raw.size(); i++) {
-                // filter needed booleans from raw
-                /// FMLLog.info("raw contains"+raw.get(i));
-                for (int j = 0; j < DimensionHelper.DimName.length; j++)
-                    if (raw.get(i).contains(DimensionHelper.DimName[j])) rawbools.add(raw.get(i));
-                // FMLLog.info("rawbools: "+rawbools.get(i));
+            if (!raw.isEmpty()) {
+                for (String s : raw) {
+                    // filter needed booleans from raw
+                    /// FMLLog.info("raw contains"+raw.get(i));
+                    for (int j = 0; j < DimensionHelper.DimName.length; j++) {
+                        if (s.contains(DimensionHelper.DimName[j])) {
+                            rawbools.add(s);
+                        }
+                    }
+                    // FMLLog.info("rawbools: "+rawbools.get(i));
+                }
+            } else {
+                GTNEIOrePlugin.LOG.info("Config entry not found for Vein: " + Veinname);
             }
-            else GTNEIOrePlugin.LOG.info("Config entry not found for Vein: " + Veinname);
 
-            String ret = " ";
+            StringBuilder ret = new StringBuilder(" ");
 
-            HashSet<String> rawboolsset = new HashSet<String>();
+            HashSet<String> rawboolsset = new HashSet<>();
             if (!rawbools.isEmpty()) {
                 // remove dublicates
-                for (int i = 0; i < rawbools.size(); i++) {
-                    st = rawbools.get(i).replace("B:", "").replace("_true", "").replace("_false", "")
-                            .replaceAll(" ", "").replaceAll("\"", "");
+                for (String rawbool : rawbools) {
+                    st = rawbool.replace("B:", "").replace("_true", "").replace("_false", "").replaceAll(" ", "")
+                            .replaceAll("\"", "");
                     rawboolsset.add(st);
                 }
-                rawbools = new ArrayList<String>(rawboolsset);
+                rawbools = new ArrayList<>(rawboolsset);
                 // filter for dims set to true
                 for (int j = 0; j < DimensionHelper.DimName.length; j++) {
                     // FMLLog.info("RawBools:"+st);
-                    for (int i = 0; i < rawbools.size(); i++) {
-                        st = rawbools.get(i);
-                        if (st.contains(DimensionHelper.DimName[j]))
-                            if (st.contains("=true")) ret = (ret + DimensionHelper.DimNameDisplayed[j] + ",");
+                    for (String rawbool : rawbools) {
+                        st = rawbool;
+                        if (st.contains(DimensionHelper.DimName[j]) && st.contains("=true")) {
+                            ret.append(DimensionHelper.DimNameDisplayed[j]).append(",");
+                        }
                     }
                 }
             }
-            ret = ret.trim();
+            ret = new StringBuilder(ret.toString().trim());
             // FMLLog.info("ret:"+ret);
-            if (ret.equals("") || ret.equals(" ")) ret = oreVeinNotInAnyDim;
-            return ret;
+            if (ret.toString().equals("") || ret.toString().equals(" ")) {
+                ret = new StringBuilder(oreVeinNotInAnyDim);
+            }
+            return ret.toString();
         } catch (IOException e) {
             e.printStackTrace();
             return "Error while Loading CFG";
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java
index 996bef161a..c2c4fa9800 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java
@@ -36,13 +36,13 @@ public class GT5OreLayerHelper {
     }
 
     private static final int DIMENSION_COUNT = 33;
-    public static Integer[] weightPerWorld = new Integer[DIMENSION_COUNT];
-    public static Integer[] DimIDs = new Integer[DIMENSION_COUNT];
-    public static HashMap<String, OreLayerWrapper> mapOreLayerWrapper = new HashMap<>();
-    public static HashMap<OreLayerWrapper, String> bufferedDims = new HashMap<>();
-    public static HashMap<String, NormalOreDimensionWrapper> dimToOreWrapper = new HashMap<>();
+    public static final Integer[] weightPerWorld = new Integer[DIMENSION_COUNT];
+    public static final Integer[] DimIDs = new Integer[DIMENSION_COUNT];
+    public static final HashMap<String, OreLayerWrapper> mapOreLayerWrapper = new HashMap<>();
+    public static final HashMap<OreLayerWrapper, String> bufferedDims = new HashMap<>();
+    public static final HashMap<String, NormalOreDimensionWrapper> dimToOreWrapper = new HashMap<>();
 
-    public GT5OreLayerHelper() {
+    public static void init() {
         Arrays.fill(weightPerWorld, 0);
         Arrays.fill(DimIDs, 0);
         for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList)
@@ -82,10 +82,9 @@ public class GT5OreLayerHelper {
 
     public static class OreLayerWrapper {
 
-        public String veinName, worldGenHeightRange;
-        public short[] Meta = new short[4];
-        public short randomWeight, size, density;
-        public List<Integer> Weight = new ArrayList<>();
+        public final String veinName, worldGenHeightRange;
+        public final short[] Meta = new short[4];
+        public final short randomWeight, size, density;
 
         public final Materials mPrimaryVeinMaterial;
         public final Materials mSecondaryMaterial;
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
index 3d673a4db7..8a150967a0 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
@@ -20,13 +20,12 @@ public class GT5OreSmallHelper {
 
     private static final int SMALL_ORE_BASE_META = 16000;
     public static boolean restrictBiomeSupport = false;
-    public static boolean gcBasicSupport = false;
-    public static List<ItemStack> oreSmallList = new ArrayList<>();
-    public static HashMap<String, OreSmallWrapper> mapOreSmallWrapper = new HashMap<>();
-    public static HashMap<String, Short> mapOreDropUnlocalizedNameToOreMeta = new HashMap<>();
-    public static HashMap<Short, List<ItemStack>> mapOreMetaToOreDrops = new HashMap<>();
-    public static HashMap<OreSmallWrapper, String> bufferedDims = new HashMap<>();
-    public static HashMap<String, SmallOreDimensionWrapper> dimToSmallOreWrapper = new HashMap<>();
+    public static final List<ItemStack> oreSmallList = new ArrayList<>();
+    public static final HashMap<String, OreSmallWrapper> mapOreSmallWrapper = new HashMap<>();
+    public static final HashMap<String, Short> mapOreDropUnlocalizedNameToOreMeta = new HashMap<>();
+    public static final HashMap<Short, List<ItemStack>> mapOreMetaToOreDrops = new HashMap<>();
+    public static final HashMap<OreSmallWrapper, String> bufferedDims = new HashMap<>();
+    public static final HashMap<String, SmallOreDimensionWrapper> dimToSmallOreWrapper = new HashMap<>();
 
     public static class SmallOreDimensionWrapper {
 
@@ -46,7 +45,7 @@ public class GT5OreSmallHelper {
         }
     }
 
-    public GT5OreSmallHelper() {
+    public static void init() {
         checkExtraSupport();
         ItemStack stack;
         Materials material;
@@ -148,17 +147,12 @@ public class GT5OreSmallHelper {
         Class<?> clazzGTOreSmall = null;
         try {
             clazzGTOreSmall = Class.forName("gregtech.common" + ".GT_Worldgen_GT_Ore_SmallPieces");
-        } catch (ClassNotFoundException e) {}
+        } catch (ClassNotFoundException ignored) {}
         if (clazzGTOreSmall != null) {
             try {
                 clazzGTOreSmall.getField("mRestrictBiome");
                 restrictBiomeSupport = true;
-            } catch (Exception e) {}
-            try {
-                clazzGTOreSmall.getField("mMoon");
-                clazzGTOreSmall.getField("mMars");
-                gcBasicSupport = true;
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
         }
     }
 
@@ -169,12 +163,12 @@ public class GT5OreSmallHelper {
 
     public static class OreSmallWrapper {
 
-        public String oreGenName;
-        public short oreMeta;
-        public String worldGenHeightRange;
-        public short amountPerChunk;
-        public String restrictBiome;
+        public final String oreGenName;
+        public final short oreMeta;
+        public final String worldGenHeightRange;
+        public final short amountPerChunk;
 
+        @SuppressWarnings("unused")
         public Materials getOreMaterial() {
             return oreMaterial;
         }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java
index 5b80d4010f..9b47c757d8 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java
@@ -33,7 +33,7 @@ public class GT5UndergroundFluidHelper {
     private static final Map<String, List<UndergroundFluidWrapper>> fluidMap = new HashMap<>();
 
     @SuppressWarnings("unchecked")
-    public GT5UndergroundFluidHelper() {
+    public static void init() {
         try {
             Field fieldDimensionList = GT_UO_DimensionList.class.getDeclaredField("fDimensionList");
             fieldDimensionList.setAccessible(true);
@@ -119,31 +119,25 @@ public class GT5UndergroundFluidHelper {
     }
 
     @SuppressWarnings("SwitchStatementWithTooFewBranches")
-    private String getDimensionFromID(int id) {
-        switch (id) {
-            case 0:
-                return "Ow";
-            default:
-                return null;
-        }
+    private static String getDimensionFromID(int id) {
+        return switch (id) {
+            case 0 -> "Ow";
+            default -> null;
+        };
     }
 
-    private String getDimensionForEdgeCase(String rawDimension) {
-        switch (rawDimension) {
-            case "aCentauriBb":
-                return "CB";
-            case "BarnardaC":
-                return "BC";
-            case "BarnardaE":
-                return "BE";
-            case "BarnardaF":
-                return "BF";
-            case "TCetiE":
-                return "TE";
-            default:
+    private static String getDimensionForEdgeCase(String rawDimension) {
+        return switch (rawDimension) {
+            case "aCentauriBb" -> "CB";
+            case "BarnardaC" -> "BC";
+            case "BarnardaE" -> "BE";
+            case "BarnardaF" -> "BF";
+            case "TCetiE" -> "TE";
+            default -> {
                 LOG.warn("Unknown dimension name while parsing: " + rawDimension);
-                return null;
-        }
+                yield null;
+            }
+        };
     }
 
     public static class UndergroundFluidWrapper {
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java
deleted file mode 100644
index a16524ab28..0000000000
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package pers.gwyog.gtneioreplugin.util;
-
-import java.lang.reflect.Field;
-
-import net.minecraft.client.Minecraft;
-
-import org.apache.logging.log4j.Level;
-
-import codechicken.nei.recipe.GuiRecipe;
-import cpw.mods.fml.common.FMLLog;
-
-public class GuiRecipeHelper {
-
-    private static final String INIT_ERROR = "pers.gwyog.gtneioreplugin.util.GuiRecipeHelper failed setting up reflection : ";
-    private static final int DEFAULT_XSIZE = 176;
-
-    public static Field xSizeField;
-    public static Field guiLeftField;
-    public static Field guiTopField;
-
-    /**
-     * Access the xSize field of a GuiRecipe instance, or use a fallback hardcoded value if that fails
-     *
-     * @param gui GuiRecipe object
-     * @return Integer value of the xSize field of that object
-     */
-    public static int getXSize(GuiRecipe<?> gui) {
-        if (xSizeField != null) {
-            try {
-                return (int) xSizeField.get(gui);
-            } catch (IllegalAccessException e) {
-                // Fail silently, hoping that it it fails it will be during initialization
-            }
-        }
-
-        // Fallback should work unless codechicken.nei.recipe.GuiRecipe implementation changes
-        return DEFAULT_XSIZE;
-    }
-
-    /**
-     * Access the guiLeft field of a GuiRecipe instance, or use a fallback hardcoded value if that fails
-     *
-     * @param gui GuiRecipe object
-     * @return Integer value of the guiLeft field of that object
-     */
-    public static int getGuiLeft(GuiRecipe<?> gui) {
-        if (guiLeftField != null) {
-            try {
-                return (int) guiLeftField.get(gui);
-            } catch (IllegalAccessException e) {
-                // Fail silently, hoping that it it fails it will be during initialization
-            }
-        }
-
-        // Fallback should work unless codechicken.nei.recipe.GuiRecipe implementation changes
-        return (Minecraft.getMinecraft().currentScreen.width - DEFAULT_XSIZE) / 2;
-    }
-
-    /**
-     * Access the guiTop field of a GuiRecipe instance, or use a fallback hardcoded value if that fails
-     *
-     * @param gui GuiRecipe object
-     * @return Integer value of the guiTop field of that object
-     */
-    public static int getGuiTop(GuiRecipe<?> gui) {
-        if (guiTopField != null) {
-            try {
-                return (int) guiTopField.get(gui);
-            } catch (IllegalAccessException e) {
-                // Fail silently, hoping that it it fails it will be during initialization
-            }
-        }
-
-        // Fallback should work unless codechicken.nei.recipe.GuiRecipe implementation changes
-        int height = Minecraft.getMinecraft().currentScreen.height;
-        int ySize = Math.min(Math.max(height - 68, 166), 370);
-        return (height - ySize) / 2 + 10;
-    }
-
-    /**
-     * Initialize the GuiRecipe Field accessors through reflection
-     */
-    public GuiRecipeHelper() {
-        @SuppressWarnings("rawtypes")
-        Class<GuiRecipe> guiRecipeClass = GuiRecipe.class;
-        try {
-            guiLeftField = guiRecipeClass.getField("guiLeft");
-            guiLeftField.setAccessible(true);
-            guiTopField = guiRecipeClass.getField("guiTop");
-            guiTopField.setAccessible(true);
-            xSizeField = guiRecipeClass.getField("xSize");
-            xSizeField.setAccessible(true);
-        } catch (NoSuchFieldException | SecurityException e) {
-            FMLLog.log(Level.ERROR, INIT_ERROR + e.getMessage());
-        }
-    }
-}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java
index 69941b6ba2..d17e020db7 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java
@@ -3,141 +3,142 @@ package pers.gwyog.gtneioreplugin.util;
 import com.opencsv.bean.CsvBindByName;
 import com.opencsv.bean.CsvCustomBindByName;
 
+@SuppressWarnings("unused")
 public class Oremix {
 
-    @CsvCustomBindByName(column = "Moon", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Moon", converter = XtoBool.class)
     public boolean mo;
 
-    @CsvCustomBindByName(column = "End Asteroids", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "End Asteroids", converter = XtoBool.class)
     public boolean ea;
 
-    @CsvCustomBindByName(column = "AstroidBelt", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "AstroidBelt", converter = XtoBool.class)
     public boolean as;
 
-    @CsvCustomBindByName(column = "Barnard C", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Barnard C", converter = XtoBool.class)
     public boolean bc;
 
-    @CsvCustomBindByName(column = "Barnard E", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Barnard E", converter = XtoBool.class)
     public boolean be;
 
-    @CsvCustomBindByName(column = "Barnard F", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Barnard F", converter = XtoBool.class)
     public boolean bf;
 
-    @CsvCustomBindByName(column = "Mars", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Mars", converter = XtoBool.class)
     public boolean ma;
 
-    @CsvCustomBindByName(column = "Callisto", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Callisto", converter = XtoBool.class)
     public boolean ca;
 
-    @CsvCustomBindByName(column = "Centauri Bb", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Centauri Bb", converter = XtoBool.class)
     public boolean cb;
 
-    @CsvCustomBindByName(column = "Ceres", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Ceres", converter = XtoBool.class)
     public boolean ce;
 
-    @CsvCustomBindByName(column = "Twilight Forest", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Twilight Forest", converter = XtoBool.class)
     public boolean tf;
 
-    @CsvCustomBindByName(column = "Deep Dark", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Deep Dark", converter = XtoBool.class)
     public boolean dd;
 
-    @CsvCustomBindByName(column = "Phobos", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Phobos", converter = XtoBool.class)
     public boolean ph;
 
-    @CsvCustomBindByName(column = "Deimos", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Deimos", converter = XtoBool.class)
     public boolean de;
 
-    @CsvCustomBindByName(column = "Europa", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Europa", converter = XtoBool.class)
     public boolean eu;
 
-    @CsvCustomBindByName(column = "Ganymede", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Ganymede", converter = XtoBool.class)
     public boolean ga;
 
-    @CsvCustomBindByName(column = "Io", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Io", converter = XtoBool.class)
     public boolean io;
 
-    @CsvCustomBindByName(column = "Venus", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Venus", converter = XtoBool.class)
     public boolean ve;
 
-    @CsvCustomBindByName(column = "Mercury", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Mercury", converter = XtoBool.class)
     public boolean me;
 
-    @CsvCustomBindByName(column = "Enceladus", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Enceladus", converter = XtoBool.class)
     public boolean en;
 
-    @CsvCustomBindByName(column = "Titan", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Titan", converter = XtoBool.class)
     public boolean ti;
 
-    @CsvCustomBindByName(column = "Miranda", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Miranda", converter = XtoBool.class)
     public boolean mi;
 
-    @CsvCustomBindByName(column = "Oberon", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Oberon", converter = XtoBool.class)
     public boolean ob;
 
-    @CsvCustomBindByName(column = "Triton", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Triton", converter = XtoBool.class)
     public boolean tr;
 
-    @CsvCustomBindByName(column = "Proteus", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Proteus", converter = XtoBool.class)
     public boolean pr;
 
-    @CsvCustomBindByName(column = "Pluto", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Pluto", converter = XtoBool.class)
     public boolean pl;
 
-    @CsvCustomBindByName(column = "Kuiper Belt", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Kuiper Belt", converter = XtoBool.class)
     public boolean kb;
 
-    @CsvCustomBindByName(column = "Haumea", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Haumea", converter = XtoBool.class)
     public boolean ha;
 
-    @CsvCustomBindByName(column = "Makemake", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Makemake", converter = XtoBool.class)
     public boolean make;
 
-    @CsvCustomBindByName(column = "Vega B", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Vega B", converter = XtoBool.class)
     public boolean vb;
 
-    @CsvCustomBindByName(column = "T Ceti E", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "T Ceti E", converter = XtoBool.class)
     public boolean tcetie;
 
     @CsvCustomBindByName(column = "Ore Name", required = true, converter = Veinrenamer.class)
     private String oreName;
 
-    @CsvBindByName(column = "Primary", required = false)
+    @CsvBindByName(column = "Primary")
     private String primary = "";
 
-    @CsvBindByName(column = "Secondary", required = false)
+    @CsvBindByName(column = "Secondary")
     private String secondary = "";
 
-    @CsvBindByName(column = "Inbetween", required = false)
+    @CsvBindByName(column = "Inbetween")
     private String inbetween = "";
 
-    @CsvBindByName(column = "Around", required = false)
+    @CsvBindByName(column = "Around")
     private String around = "";
 
-    @CsvBindByName(column = "ID	", required = false)
+    @CsvBindByName(column = "ID	")
     private String mix = "";
 
-    @CsvBindByName(column = "Tier", required = false)
+    @CsvBindByName(column = "Tier")
     private String tier = "";
 
-    @CsvBindByName(column = "Height", required = false)
+    @CsvBindByName(column = "Height")
     private String height = "";
 
-    @CsvBindByName(column = "Density", required = false)
+    @CsvBindByName(column = "Density")
     private int density;
 
-    @CsvBindByName(column = "Size", required = false)
+    @CsvBindByName(column = "Size")
     private int size;
 
-    @CsvBindByName(column = "Weight", required = false)
+    @CsvBindByName(column = "Weight")
     private int weight;
 
-    @CsvCustomBindByName(column = "Overworld", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Overworld", converter = XtoBool.class)
     private boolean overworld;
 
-    @CsvCustomBindByName(column = "Nether", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "Nether", converter = XtoBool.class)
     private boolean nether;
 
-    @CsvCustomBindByName(column = "End", required = false, converter = XtoBool.class)
+    @CsvCustomBindByName(column = "End", converter = XtoBool.class)
     private boolean end;
 
     private int miny, maxy;
@@ -528,6 +529,6 @@ public class Oremix {
     }
 
     public String getHeightcalced() {
-        return new String(this.miny + "-" + this.maxy);
+        return this.miny + "-" + this.maxy;
     }
 }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java b/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java
index 59a55a82fa..0b1d391a08 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/StringPaddingHack.java
@@ -65,13 +65,13 @@ public class StringPaddingHack {
     /**
      * Pads strings with spaces so that they are of equal length and adds to that the number of spaces specified and up
      * to 3 if minExtraSpaces is below 3. Added spaces might be bold.
-     *
+     * <p>
      * Relies on the quirk of bold space characters being 1 pixel wider than regular space characters in the default
      * font renderer.
      *
      * @param strings        List of strings
      * @param minExtraSpaces The minimum number of extra spaces to add
-     * @return List of strings padded with spaces to an equal length
+     * @return Array of strings padded with spaces to an equal length
      */
     public static String[] padStrings(String[] strings, int minExtraSpaces) {
         int[] widths = getStringWidths(strings);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/Veinrenamer.java b/src/main/java/pers/gwyog/gtneioreplugin/util/Veinrenamer.java
index e80d972b17..346573e2a9 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/Veinrenamer.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/Veinrenamer.java
@@ -1,14 +1,12 @@
 package pers.gwyog.gtneioreplugin.util;
 
 import com.opencsv.bean.AbstractBeanField;
-import com.opencsv.exceptions.CsvConstraintViolationException;
-import com.opencsv.exceptions.CsvDataTypeMismatchException;
 
 public class Veinrenamer<T> extends AbstractBeanField<T> {
 
     @Override
-    protected Object convert(String value) throws CsvDataTypeMismatchException, CsvConstraintViolationException {
-        String ret = null;
+    protected Object convert(String value) {
+        String ret;
         CharSequence s = "/";
 
         if (value.contains(s)) {
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java b/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java
index 59dd82fa8e..f3426d53dd 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/XtoBool.java
@@ -7,13 +7,12 @@ import org.apache.commons.beanutils.Converter;
 import org.apache.commons.beanutils.converters.BooleanConverter;
 
 import com.opencsv.bean.AbstractBeanField;
-import com.opencsv.exceptions.CsvConstraintViolationException;
 import com.opencsv.exceptions.CsvDataTypeMismatchException;
 
 public class XtoBool<T> extends AbstractBeanField<T> {
 
     @Override
-    protected Object convert(String value) throws CsvDataTypeMismatchException, CsvConstraintViolationException {
+    protected Object convert(String value) throws CsvDataTypeMismatchException {
         if (value.isEmpty()) {
             return null;
         }