Cleanup (#34)

* Update buildscript and GT5U dependency

* Cleanup

* Apply spotless

14 files changed, 57 insertions, 54 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
index 9561a05784..6b0505e1a4 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
@@ -6,12 +6,6 @@ import net.minecraft.item.Item;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import pers.gwyog.gtneioreplugin.plugin.IMCForNEI;
-import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
-import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
-import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
-import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper;
-import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -19,6 +13,13 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
+import pers.gwyog.gtneioreplugin.plugin.IMCForNEI;
+import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
+import pers.gwyog.gtneioreplugin.util.CSVMaker;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
+import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper;
+import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper;
 
 @Mod(
         modid = GTNEIOrePlugin.MODID,
@@ -27,9 +28,9 @@ import cpw.mods.fml.relauncher.Side;
         dependencies = "required-after:gregtech;required-after:NotEnoughItems")
 public class GTNEIOrePlugin {
 
-    public static final String MODID = "GRADLETOKEN_MODID";
-    public static final String NAME = "GRADLETOKEN_MODNAME";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
+    public static final String MODID = "gtneioreplugin";
+    public static final String NAME = "GT NEI Ore Plugin GT:NH Mod";
+    public static final String VERSION = Tags.VERSION;
     public static final Logger LOG = LogManager.getLogger(NAME);
     public static boolean csv = false;
     public static String CSVname;
@@ -91,7 +92,7 @@ public class GTNEIOrePlugin {
         if (event.getSide() == Side.CLIENT) {
             new GuiRecipeHelper();
             if (csv) {
-                new pers.gwyog.gtneioreplugin.util.CSVMaker().run();
+                new CSVMaker().run();
             }
         }
     }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
index 961d29c2b3..ea60054576 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
@@ -2,8 +2,8 @@ package pers.gwyog.gtneioreplugin.plugin;
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 import cpw.mods.fml.common.event.FMLInterModComms;
+import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 
 public class IMCForNEI {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
index 31405a2f7a..17193b07fe 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
@@ -1,11 +1,11 @@
 package pers.gwyog.gtneioreplugin.plugin;
 
+import codechicken.nei.api.API;
+import codechicken.nei.api.IConfigureNEI;
 import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5SmallOreStat;
 import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid;
 import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat;
-import codechicken.nei.api.API;
-import codechicken.nei.api.IConfigureNEI;
 
 public class NEIPluginConfig implements IConfigureNEI {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java
index 419dbe8d00..db953c7112 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java
@@ -5,9 +5,9 @@ import java.util.Map;
 
 import net.minecraft.block.Block;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
 import pers.gwyog.gtneioreplugin.util.DimensionHelper;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ModBlocks {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
index f0a9433a70..d086175849 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
@@ -5,13 +5,13 @@ import java.awt.Rectangle;
 
 import net.minecraft.client.resources.I18n;
 
-import pers.gwyog.gtneioreplugin.plugin.PluginBase;
-import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper;
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.recipe.GuiRecipe;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
+import pers.gwyog.gtneioreplugin.plugin.PluginBase;
+import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper;
 
 public abstract class PluginGT5Base extends PluginBase {
 
@@ -64,7 +64,7 @@ public abstract class PluginGT5Base extends PluginBase {
      * @param dimNames Dimension names to produce a rectangle for
      * @return Rectangle area of dimension names
      */
-    protected Rectangle getDimensionNamesRect(GuiRecipe gui, int recipe, String dimNames) {
+    protected Rectangle getDimensionNamesRect(GuiRecipe<?> gui, int recipe, String dimNames) {
         int dimNamesHeight = dimNames.length() > 70 ? 30 : (dimNames.length() > 36 ? 20 : 10);
         Point offset = gui.getRecipePosition(recipe);
         return new Rectangle(
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
index 08c3d11411..512f966629 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
@@ -8,13 +8,13 @@ import java.util.List;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.PositionedStack;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
 import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
 import pers.gwyog.gtneioreplugin.util.DimensionHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper.OreSmallWrapper;
-import codechicken.nei.PositionedStack;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
 
 public class PluginGT5SmallOreStat extends PluginGT5Base {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java
index 4ce0d15047..17a8216b7e 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5UndergroundFluid.java
@@ -11,13 +11,13 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.PositionedStack;
+import gregtech.api.util.GT_Utility;
 import pers.gwyog.gtneioreplugin.plugin.PluginBase;
 import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
 import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper;
 import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper.UndergroundFluidWrapper;
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.PositionedStack;
-import gregtech.api.util.GT_Utility;
 
 public class PluginGT5UndergroundFluid extends PluginBase {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
index 52fc458246..556e32fcfe 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
@@ -11,12 +11,12 @@ import java.util.List;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.PositionedStack;
+import cpw.mods.fml.common.Loader;
 import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
 import pers.gwyog.gtneioreplugin.util.DimensionHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
-import codechicken.nei.PositionedStack;
-import cpw.mods.fml.common.Loader;
 
 public class PluginGT5VeinStat extends PluginGT5Base {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
index 6595929e89..b999b8eab0 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
@@ -9,13 +9,13 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.MinecraftForgeClient;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
 import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay;
 import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
 import pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer;
 import pers.gwyog.gtneioreplugin.util.DimensionHelper;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
 
 public class ItemDimensionDisplay extends ItemBlock {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
index 05279919e6..96af04051e 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/CSVMaker.java
@@ -8,15 +8,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
-import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat;
-import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
-
 import com.opencsv.CSVWriter;
 import com.opencsv.bean.ColumnPositionMappingStrategy;
 import com.opencsv.bean.StatefulBeanToCsv;
 import com.opencsv.bean.StatefulBeanToCsvBuilder;
 
+import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
+import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
+
 public class CSVMaker implements Runnable {
 
     public CSVMaker() {}
@@ -54,14 +54,15 @@ public class CSVMaker implements Runnable {
 
     public void runSmallOres() {
         try {
-            Iterator it = GT5OreSmallHelper.mapOreSmallWrapper.entrySet().iterator();
-            List<Oremix> OreVeins = new ArrayList();
+            Iterator<Map.Entry<String, GT5OreSmallHelper.OreSmallWrapper>> it = GT5OreSmallHelper.mapOreSmallWrapper
+                    .entrySet().iterator();
+            List<Oremix> OreVeins = new ArrayList<>();
             while (it.hasNext()) {
                 Oremix oremix = new Oremix();
 
-                Map.Entry pair = (Map.Entry) it.next();
+                Map.Entry<String, GT5OreSmallHelper.OreSmallWrapper> pair = it.next();
                 String Dims = GT5OreSmallHelper.bufferedDims.get(pair.getValue());
-                GT5OreSmallHelper.OreSmallWrapper oreLayer = (GT5OreSmallHelper.OreSmallWrapper) pair.getValue();
+                GT5OreSmallHelper.OreSmallWrapper oreLayer = pair.getValue();
                 oremix.setOreName(oreLayer.oreGenName.split("\\.")[2]);
                 oremix.setHeight(oreLayer.worldGenHeightRange);
                 oremix.setDensity(oreLayer.amountPerChunk);
@@ -105,14 +106,14 @@ public class CSVMaker implements Runnable {
                 it.remove(); // avoids a ConcurrentModificationException
             }
             BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVnameSmall));
-            ColumnPositionMappingStrategy strat = new ColumnPositionMappingStrategy();
+            ColumnPositionMappingStrategy<Oremix> strat = new ColumnPositionMappingStrategy<>();
             strat.setType(Oremix.class);
             String[] columns = "ORENAME,mix,DENSITY,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie"
                     .split("\\,");
             strat.setColumnMapping(columns);
-            StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder(one)
+            StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder<Oremix>(one)
                     .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build();
-            List towrite = Combsort(OreVeins);
+            List<Oremix> towrite = Combsort(OreVeins);
             one.write(
                     "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E");
             one.newLine();
@@ -132,14 +133,15 @@ public class CSVMaker implements Runnable {
 
     public void runVeins() {
         try {
-            Iterator it = GT5OreLayerHelper.mapOreLayerWrapper.entrySet().iterator();
-            List<Oremix> OreVeins = new ArrayList();
+            Iterator<Map.Entry<String, OreLayerWrapper>> it = GT5OreLayerHelper.mapOreLayerWrapper.entrySet()
+                    .iterator();
+            List<Oremix> OreVeins = new ArrayList<>();
             while (it.hasNext()) {
                 Oremix oremix = new Oremix();
 
-                Map.Entry pair = (Map.Entry) it.next();
+                Map.Entry<String, OreLayerWrapper> pair = it.next();
                 String Dims = GT5OreLayerHelper.bufferedDims.get(pair.getValue());
-                OreLayerWrapper oreLayer = (OreLayerWrapper) pair.getValue();
+                OreLayerWrapper oreLayer = pair.getValue();
                 oremix.setOreName(oreLayer.veinName.split("\\.")[2]);
                 oremix.setPrimary(PluginGT5VeinStat.getGTOreLocalizedName(oreLayer.Meta[0]));
                 oremix.setSecondary(PluginGT5VeinStat.getGTOreLocalizedName(oreLayer.Meta[1]));
@@ -196,14 +198,14 @@ public class CSVMaker implements Runnable {
                 it.remove(); // avoids a ConcurrentModificationException
             }
             BufferedWriter one = Files.newBufferedWriter(Paths.get(GTNEIOrePlugin.CSVname));
-            ColumnPositionMappingStrategy strat = new ColumnPositionMappingStrategy();
+            ColumnPositionMappingStrategy<Oremix> strat = new ColumnPositionMappingStrategy<>();
             strat.setType(Oremix.class);
             String[] columns = "ORENAME,PRIMARY,SECONDARY,INBETWEEN,AROUND,mix,TIER,HEIGHT,DENSITY,SIZE,WEIGHT,overworld,nether,end,ea,tf,mo,ma,ph,de,as,ce,eu,ga,ca,io,ve,me,en,ti,mi,ob,pr,tr,pl,kb,ha,make,dd,cb,vb,bc,be,bf,tcetie"
                     .split("\\,");
             strat.setColumnMapping(columns);
-            StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder(one)
+            StatefulBeanToCsv<Oremix> beanToCsv = new StatefulBeanToCsvBuilder<Oremix>(one)
                     .withQuotechar(CSVWriter.NO_QUOTE_CHARACTER).withMappingStrategy(strat).build();
-            List towrite = Combsort(OreVeins);
+            List<Oremix> towrite = Combsort(OreVeins);
             one.write(
                     "Ore Name,Primary,Secondary,Inbetween,Around,ID,Tier,Height,Density,Size,Weight,Overworld,Nether,End,End Asteroids,Twilight Forest,Moon,Mars,Phobos,Deimos,Asteroids,Ceres,Europa,Ganymede,Callisto,Io,Venus,Mercury,Enceladus,Titan,Miranda,Oberon,Proteus,Triton,Pluto,Kuiper Belt,Haumea,Makemake,Deep Dark,Centauri Bb,Vega B,Barnard C,Barnard E,Barnard F,T Ceti E");
             one.newLine();
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java
index 3660d9877e..e6aecb3d85 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java
@@ -12,9 +12,9 @@ import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
-import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 import cpw.mods.fml.common.FMLLog;
 import gregtech.api.GregTech_API;
+import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
 
 public class GT5CFGHelper {
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
index 99308c42ce..3d673a4db7 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
@@ -2,7 +2,6 @@ package pers.gwyog.gtneioreplugin.util;
 
 import static pers.gwyog.gtneioreplugin.util.GT5CFGHelper.oreVeinNotInAnyDim;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -152,12 +151,12 @@ public class GT5OreSmallHelper {
         } catch (ClassNotFoundException e) {}
         if (clazzGTOreSmall != null) {
             try {
-                Field fieldRestrictBiome = clazzGTOreSmall.getField("mRestrictBiome");
+                clazzGTOreSmall.getField("mRestrictBiome");
                 restrictBiomeSupport = true;
             } catch (Exception e) {}
             try {
-                Field fieldGCMoon = clazzGTOreSmall.getField("mMoon");
-                Field fieldGCMars = clazzGTOreSmall.getField("mMars");
+                clazzGTOreSmall.getField("mMoon");
+                clazzGTOreSmall.getField("mMars");
                 gcBasicSupport = true;
             } catch (Exception e) {}
         }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java
index 171ee195a2..5b80d4010f 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5UndergroundFluidHelper.java
@@ -58,7 +58,7 @@ public class GT5UndergroundFluidHelper {
                     loop: for (Class<? extends WorldProvider> candidate : dimensionCandidates) {
                         for (int i = 0; i < DimensionHelper.DimNameTrimmed.length; i++) {
                             if (DimensionHelper.DimNameTrimmed[i]
-                                    .equalsIgnoreCase(candidate.newInstance().getDimensionName())) {
+                                    .equalsIgnoreCase(candidate.getConstructor().newInstance().getDimensionName())) {
                                 dimension = DimensionHelper.DimNameDisplayed[i];
                                 break loop;
                             }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java
index 29eaf8c9f4..a16524ab28 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GuiRecipeHelper.java
@@ -24,7 +24,7 @@ public class GuiRecipeHelper {
      * @param gui GuiRecipe object
      * @return Integer value of the xSize field of that object
      */
-    public static int getXSize(GuiRecipe gui) {
+    public static int getXSize(GuiRecipe<?> gui) {
         if (xSizeField != null) {
             try {
                 return (int) xSizeField.get(gui);
@@ -43,7 +43,7 @@ public class GuiRecipeHelper {
      * @param gui GuiRecipe object
      * @return Integer value of the guiLeft field of that object
      */
-    public static int getGuiLeft(GuiRecipe gui) {
+    public static int getGuiLeft(GuiRecipe<?> gui) {
         if (guiLeftField != null) {
             try {
                 return (int) guiLeftField.get(gui);
@@ -62,7 +62,7 @@ public class GuiRecipeHelper {
      * @param gui GuiRecipe object
      * @return Integer value of the guiTop field of that object
      */
-    public static int getGuiTop(GuiRecipe gui) {
+    public static int getGuiTop(GuiRecipe<?> gui) {
         if (guiTopField != null) {
             try {
                 return (int) guiTopField.get(gui);
@@ -81,6 +81,7 @@ public class GuiRecipeHelper {
      * Initialize the GuiRecipe Field accessors through reflection
      */
     public GuiRecipeHelper() {
+        @SuppressWarnings("rawtypes")
         Class<GuiRecipe> guiRecipeClass = GuiRecipe.class;
         try {
             guiLeftField = guiRecipeClass.getField("guiLeft");