diff options
5 files changed, 13 insertions, 49 deletions
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java index 0ce4ed0b81..032da37281 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java @@ -32,6 +32,7 @@ public class GTNEIOrePlugin { Config c = new Config(event, this.MODID+".cfg"); csv = c.tConfig.getBoolean("print csv","ALL", false, "princsv, you need apache commons collections to be injected in the minecraft jar."); CSVname = c.tConfig.getString("CSV_name", "ALL", event.getModConfigurationDirectory()+"/GTNH-Oresheet.csv", "rename the oresheet here, it will appear in /config"); + c.save(); } @EventHandler 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 ddb130eec3..4cc76f2bf4 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java @@ -124,7 +124,7 @@ public class PluginGT5VeinStat extends PluginGT5Base { String Dims = getDims(oreLayer); - if (getLocalizedVeinName(oreLayer).length>1) { + /*if (getLocalizedVeinName(oreLayer).length>1) { GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer)[0], 2, 20, 0x404040, false); if (getLocalizedVeinName(oreLayer).length>2) { GuiDraw.drawString(I18n.format(getLocalizedVeinName(oreLayer)[1]), 2, 30, 0x404040, false); @@ -133,10 +133,13 @@ public class PluginGT5VeinStat extends PluginGT5Base { else GuiDraw.drawString(I18n.format(getLocalizedVeinName(oreLayer)[1]), 2, 30, 0x404040, false); } + else*/ + if (getGTOreLocalizedName(oreLayer.Meta[0]).contains("Ore")) + GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getGTOreLocalizedName(oreLayer.Meta[0]).split("Ore")[0] + " " +I18n.format("gtnop.gui.nei.vein"), 2, 20, 0x404040, false); + else if (getGTOreLocalizedName(oreLayer.Meta[0]).contains("Sand")) + GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getGTOreLocalizedName(oreLayer.Meta[0]).split("Sand")[0] + " " +I18n.format("gtnop.gui.nei.vein"), 2, 20, 0x404040, false); else - GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer)[0], 2, 20, 0x404040, false); - - + GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getGTOreLocalizedName(oreLayer.Meta[0]) + " " +I18n.format("gtnop.gui.nei.vein"), 2, 20, 0x404040, false); GuiDraw.drawString(I18n.format("gtnop.gui.nei.primaryOre") + ": " + getGTOreLocalizedName(oreLayer.Meta[0]), 2, 50, 0x404040, false); GuiDraw.drawString(I18n.format("gtnop.gui.nei.secondaryOre") + ": " + getGTOreLocalizedName(oreLayer.Meta[1]), 2, 60, 0x404040, false); diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java index fa09482efb..18aca0e5d8 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java @@ -32,6 +32,8 @@ public class GT5OreSmallHelper { if (worldGen.mWorldGenName.startsWith("ore.small.") && worldGen instanceof GT_Worldgen_GT_Ore_SmallPieces) { GT_Worldgen_GT_Ore_SmallPieces worldGenSmallPieces = (GT_Worldgen_GT_Ore_SmallPieces)worldGen; meta = worldGenSmallPieces.mMeta; + if (meta<0) + break; material = GregTech_API.sGeneratedMaterials[meta]; mapOreSmallWrapper.put(worldGen.mWorldGenName, new OreSmallWrapper(worldGenSmallPieces)); if (!mapOreMetaToOreDrops.keySet().contains(meta)) { diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java index 0835293f8d..1b1f44df67 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/Oremix.java @@ -285,7 +285,7 @@ public class Oremix { @CsvCustomBindByName(column = "End Asteroids", required = false, converter = XtoBool.class) public boolean ea; - @CsvCustomBindByName(column = "Astroids", required = false, converter = XtoBool.class) + @CsvCustomBindByName(column = "AstroidBelt", required = false, converter = XtoBool.class) public boolean as; @CsvCustomBindByName(column = "Barnard C", required = false, converter = XtoBool.class) public boolean bc; diff --git a/src/main/resources/assets/gtneioreplugin/lang/en_US.lang b/src/main/resources/assets/gtneioreplugin/lang/en_US.lang index bf6ce27511..a02ecb0b58 100644 --- a/src/main/resources/assets/gtneioreplugin/lang/en_US.lang +++ b/src/main/resources/assets/gtneioreplugin/lang/en_US.lang @@ -28,7 +28,7 @@ gtnop.gui.nei.ieVeinComponent=Vein components gtnop.gui.nei.fromMod=From mod gtnop.gui.nei.seeAll=See All - +gtnop.gui.nei.vein=Vein gtnop.gui.nei.oreOthers=Other ore gtnop.nei.genPosition=Position gtnop.nei.genPositionInfo=In the center of each chunk @@ -54,46 +54,4 @@ gtnop.ore.null.name=None # vein types gtnop.ore.vein.name=Vein gtnop.ore.asteroid.name=Asteriod -gtnop.ore.custom.name=Custom - - -# vein names -gtnop.ore.mix.naquadah=Naquadah -gtnop.ore.mix.lignite=Lignite -gtnop.ore.mix.coal=Coal -gtnop.ore.mix.magnetite=Magnetite -gtnop.ore.mix.gold=Gold -gtnop.ore.mix.iron=Iron -gtnop.ore.mix.cassiterite=Cassiterite -gtnop.ore.mix.tetrahedrite=Tetrahedrite -gtnop.ore.mix.netherquartz=Nether Quartz -gtnop.ore.mix.sulfur=Sulfur -gtnop.ore.mix.copper=Copper -gtnop.ore.mix.bauxite=Bauxite -gtnop.ore.mix.salts=Salts -gtnop.ore.mix.redstone=Redstone -gtnop.ore.mix.soapstone=Soapstone -gtnop.ore.mix.nickel=Nickel -gtnop.ore.mix.platinum=Platinum -gtnop.ore.mix.pitchblende=Pitchblends -gtnop.ore.mix.uranium=Uranium -gtnop.ore.mix.monazite=Monazite -gtnop.ore.mix.molybdenum=Molybdenum -gtnop.ore.mix.tungstate=Tungstate -gtnop.ore.mix.sapphire=Sapphire -gtnop.ore.mix.manganese=Manganese -gtnop.ore.mix.quartz=Quartz -gtnop.ore.mix.diamond=Diamond -gtnop.ore.mix.olivine=Olivine -gtnop.ore.mix.apatite=Apatite -gtnop.ore.mix.galena=Galena -gtnop.ore.mix.lapis=Lapis -gtnop.ore.mix.beryllium=Beryllium -gtnop.ore.mix.oilsand=Oilsand -gtnop.ore.mix.plutonium=Plutonium -gtnop.ore.mix.iodinesalt=Iodinesalt -gtnop.ore.mix.rocksalt=Rocksalt -gtnop.ore.mix.asbestos=Asbestos -gtnop.ore.mix.titanium=Titanium -gtnop.ore.mix.garnet=Garnet -gtnop.ore.mix.dolamide=Dolamide
\ No newline at end of file +gtnop.ore.custom.name=Custom
\ No newline at end of file |