Merge pull request #5 from bartimaeusnek/GTNH-Mod-SmallOres

1.0.7

1 files changed, 22 insertions, 38 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java
index 2b6e286174..9e8a608405 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreLayerHelper.java
@@ -1,57 +1,41 @@
 package pers.gwyog.gtneioreplugin.util;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import gregtech.common.GT_Worldgen_GT_Ore_Layer;
+
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-
-import com.opencsv.CSVReader;
-import com.opencsv.CSVWriter;
-import com.opencsv.bean.ColumnPositionMappingStrategy;
-import com.opencsv.bean.CsvToBean;
-import com.opencsv.bean.StatefulBeanToCsv;
-import com.opencsv.bean.StatefulBeanToCsvBuilder;
-
-import cpw.mods.fml.common.Loader;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.common.GT_Worldgen_GT_Ore_Layer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.item.ItemStack;
-import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
-import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat;
 
 public class GT5OreLayerHelper {
-	
+
     public static Integer weightPerWorld[] = new Integer[33];
     public static Integer DimIDs[] = new Integer[33];
     public static HashMap<String, OreLayerWrapper> mapOreLayerWrapper = new HashMap<String, OreLayerWrapper>();
+    public static HashMap<OreLayerWrapper, String> bufferedDims = new HashMap<>();
 
     public GT5OreLayerHelper() {
-    	for (int i=0; i < DimIDs.length;i++)
-    		weightPerWorld[i]=0;
-    	for (int i=0; i < DimIDs.length;i++)
-    		DimIDs[i]=0;
-        for (GT_Worldgen_GT_Ore_Layer tWorldGen: GT_Worldgen_GT_Ore_Layer.sList)
+        for (int i = 0; i < DimIDs.length; i++)
+            weightPerWorld[i] = 0;
+        for (int i = 0; i < DimIDs.length; i++)
+            DimIDs[i] = 0;
+        for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList)
             mapOreLayerWrapper.put(tWorldGen.mWorldGenName, new OreLayerWrapper(tWorldGen));
-  }
-    
+        for (OreLayerWrapper layer : mapOreLayerWrapper.values()) {
+            bufferedDims.put(layer, getDims(layer));
+        }
+    }
+
+    public static String getDims(OreLayerWrapper oreLayer) {
+        return GT5CFGHelper.GT5CFG(oreLayer.veinName.replace("ore.mix.custom.", "").replace("ore.mix.", ""));
+    }
+
+
     public class OreLayerWrapper {
-        public String veinName, worldGenHeightRange, weightedIEChance;
+        public String veinName, worldGenHeightRange;
         public short[] Meta = new short[4];
         public short randomWeight, size, density;
         public List<Integer> Weight = new ArrayList<Integer>();
-        
+
         public OreLayerWrapper(GT_Worldgen_GT_Ore_Layer worldGen) {
             this.veinName = worldGen.mWorldGenName;
             this.Meta[0] = worldGen.mPrimaryMeta;
@@ -62,7 +46,7 @@ public class GT5OreLayerHelper {
             this.density = worldGen.mDensity;
             this.worldGenHeightRange = worldGen.mMinY + "-" + worldGen.mMaxY;
             this.randomWeight = worldGen.mWeight;
-            }
         }
     }
+}
     
\ No newline at end of file