diff options
Diffstat (limited to 'src/main/java/pers/gwyog/gtneioreplugin/util')
5 files changed, 29 insertions, 27 deletions
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"); |