diff options
3 files changed, 18 insertions, 18 deletions
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 3aca184a8b..b6081fc9b0 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java @@ -125,11 +125,11 @@ public class PluginGT5VeinStat extends PluginGT5Base { 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("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer)[1], 2, 30, 0x404040, false); - GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer)[2], 2, 40, 0x404040, false); + GuiDraw.drawString(I18n.format(getLocalizedVeinName(oreLayer)[1]), 2, 30, 0x404040, false); + GuiDraw.drawString(I18n.format(getLocalizedVeinName(oreLayer)[2]), 2, 40, 0x404040, false); } else - GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer)[1], 2, 30, 0x404040, false); + GuiDraw.drawString(I18n.format(getLocalizedVeinName(oreLayer)[1]), 2, 30, 0x404040, false); } else GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer)[0], 2, 20, 0x404040, false); @@ -210,15 +210,15 @@ public class PluginGT5VeinStat extends PluginGT5Base { } h.toArray(splt);*/ - String[] ret = {oreLayer.veinName.replace("ore.mix.custom.", "")," "," "}; + String[] ret = {oreLayer.veinName.replace("ore.mix.custom.", "")+" "," "," "}; for (int i=0; i < splt.length;i++) { //FMLLog.info("Split:"+splt[i]); //FMLLog.info("I:"+Integer.toString(i)); if(ret[0].length()+splt[i].length()<=20) ret[0]=ret[0]+splt[i]+" "; - if((ret[0].length()+splt[i].length()>20)&&ret[1].length()+splt[i].length()<=20&&!ret[0].contains(splt[i])) + if((ret[0].length()+splt[i].length()>20)&&ret[1].length()+splt[i].length()<=70&&!ret[0].contains(splt[i])) ret[1]=ret[1]+splt[i]+" "; - if((ret[0].length()+splt[i].length()>20)&&(ret[1].length()+splt[i].length()>20)&&ret[2].length()+splt[i].length()<=20&&!ret[1].contains(splt[i])) + if((ret[0].length()+splt[i].length()>20)&&(ret[1].length()+splt[i].length()>70)&&ret[2].length()+splt[i].length()<=70&&!ret[1].contains(splt[i])) ret[2]=ret[2]+splt[i]+" "; } for (int i=0; i < ret.length;i++) { @@ -226,7 +226,7 @@ public class PluginGT5VeinStat extends PluginGT5Base { } if(ret[2].isEmpty()&&!ret[1].isEmpty()) - if(ret[1].length()<=15) + if(ret[1].length()<=65) ret[1]=ret[1]+" Vein"; else ret[2]=ret[2]+"Vein"; diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java index f81e355f83..c0842bfbfa 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java @@ -46,16 +46,16 @@ public class DimensionHelper { "Underdark"}; public static String[] DimNameDisplayed = - { + {// first 2 letters if one word else 1 letter of every word, execpt capital letter in name, then 1rst + capital Moon = Mo, BarnardC = BC, EndAsteroid = EA "EA", - "MO", - "AS", - "MA", + "Mo", + "As", + "Ma", "BC", "BE", "BF", "Ca", - "CeA", + "CA", "Ce", "De", "En", @@ -69,7 +69,7 @@ public class DimensionHelper { "Mi", "Ob", "Ph", - "Pu", + "Pl", "Pr", "TE", "Ti", @@ -77,8 +77,8 @@ public class DimensionHelper { "VB", "Ve", "Ne", - "OW", - "EN", + "Ow", + "EN",//End = EN bc En = Encalus "VA", "TF", "DD"}; diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java index 33f5604fa7..c616534d8d 100644 --- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java +++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5CFGHelper.java @@ -50,9 +50,9 @@ public class GT5CFGHelper { //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)||((st != null) && found[0]))){ st = reader.readLine(); - if (st.trim().equals("}")) + if ((!(st == null)) && st.trim().equals("}")) found[0] = true; //FMLLog.info("dritte"); //add everything below Veinname { undtil } to raw @@ -76,7 +76,7 @@ public class GT5CFGHelper { //FMLLog.info("VEINNAMEst: "+st); while (!((st == null)||((st != null)&&found[1]))){ st = reader.readLine(); - if (st.trim().equals("}")) + if ((!(st == null)) && st.trim().equals("}")) found[1] = true; //FMLLog.info("vierte"); //add everything below Veinname { undtil } to raw |