Add 3 plugins supporting GT6 and refactor some code

16 files changed, 810 insertions, 138 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
index d50011b4ec..a023a21d5b 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
@@ -1,17 +1,16 @@
 package pers.gwyog.gtneioreplugin;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.relauncher.Side;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper;
-import pers.gwyog.gtneioreplugin.util.GTSmallOreHelper;
+import pers.gwyog.gtneioreplugin.util.GT6OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT6OreSmallHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
+import pers.gwyog.gtneioreplugin.util.GT6OreBedrockHelper;
 
 @Mod(modid = GTNEIOrePlugin.MODID, name = GTNEIOrePlugin.NAME, version = GTNEIOrePlugin.VERSION, dependencies = "required-after:gregtech;required-after:NotEnoughItems")
 public class GTNEIOrePlugin {
@@ -19,14 +18,28 @@ public class GTNEIOrePlugin {
     public static final String NAME = "GT NEI Ore Plugin";
     public static final String VERSION = "1.0.2";
     
+    // default is GT5, however it will be "GT6" when GT6 is installed
+    public static String GTVersion = "GT5";
+    
     @Mod.Instance(MODID)
     public static GTNEIOrePlugin instance;
     
     @EventHandler
     public void onLoadComplete(FMLLoadCompleteEvent event) {
         if (event.getSide() == Side.CLIENT) {
-            new GTOreLayerHelper();
-            new GTSmallOreHelper();
+            try {
+                Class clazzGT6API = Class.forName("gregapi.GT_API");
+                GTVersion = "GT6";
+            } catch (ClassNotFoundException e) {}
+            if (GTVersion.equals("GT5")) {
+                new GT5OreLayerHelper();
+                new GT5OreSmallHelper();
+            }
+            else { 
+                new GT6OreLayerHelper();
+                new GT6OreSmallHelper();
+                new GT6OreBedrockHelper();
+            }
         }
     }
 
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
index 738834c8f0..76cd9c4d18 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
@@ -4,7 +4,14 @@ import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
 import cpw.mods.fml.common.Loader;
 import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper;
+import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5AsteroidStat;
+import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5IEVeinStat;
+import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5SmallOreStat;
+import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat;
+import pers.gwyog.gtneioreplugin.plugin.gregtech6.PluginGT6BedrockOreStat;
+import pers.gwyog.gtneioreplugin.plugin.gregtech6.PluginGT6SmallOreStat;
+import pers.gwyog.gtneioreplugin.plugin.gregtech6.PluginGT6VeinStat;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
 
 public class NEIPluginConfig implements IConfigureNEI {
 
@@ -20,20 +27,33 @@ public class NEIPluginConfig implements IConfigureNEI {
 
     @Override
     public void loadConfig() {
-        PluginVeinStat pluginVeinStat = new PluginVeinStat();
-        PluginAsteroidStat pluginAsteriodStat = new PluginAsteroidStat();
-        PluginSmallOreStat pluginSmallOreStat = new PluginSmallOreStat();
-        API.registerRecipeHandler(pluginVeinStat);
-        API.registerUsageHandler(pluginVeinStat);
-        API.registerRecipeHandler(pluginAsteriodStat);
-        API.registerUsageHandler(pluginAsteriodStat);
-        API.registerRecipeHandler(pluginSmallOreStat);
-        API.registerUsageHandler(pluginSmallOreStat);
-        if (GTOreLayerHelper.immersiveEngineeringSupport) {
-            PluginIEVeinStat pluginIEVeinStat = new PluginIEVeinStat();
-            API.registerRecipeHandler(pluginIEVeinStat);
-            API.registerUsageHandler(pluginIEVeinStat);
+        if (GTNEIOrePlugin.GTVersion.equals("GT5")) {
+            PluginGT5VeinStat pluginVeinStat = new PluginGT5VeinStat();
+            PluginGT5AsteroidStat pluginAsteriodStat = new PluginGT5AsteroidStat();
+            PluginGT5SmallOreStat pluginSmallOreStat = new PluginGT5SmallOreStat();
+            API.registerRecipeHandler(pluginVeinStat);
+            API.registerUsageHandler(pluginVeinStat);
+            API.registerRecipeHandler(pluginAsteriodStat);
+            API.registerUsageHandler(pluginAsteriodStat);
+            API.registerRecipeHandler(pluginSmallOreStat);
+            API.registerUsageHandler(pluginSmallOreStat);
+            if (GT5OreLayerHelper.immersiveEngineeringSupport) {
+                PluginGT5IEVeinStat pluginIEVeinStat = new PluginGT5IEVeinStat();
+                API.registerRecipeHandler(pluginIEVeinStat);
+                API.registerUsageHandler(pluginIEVeinStat);
+            }
         }
+        else {
+            PluginGT6VeinStat pluginGT6VeinStat = new PluginGT6VeinStat();
+            PluginGT6SmallOreStat pluginGT6SmallOreStat = new PluginGT6SmallOreStat();
+            PluginGT6BedrockOreStat pluginGT6BedrockOreStat = new PluginGT6BedrockOreStat();
+            API.registerRecipeHandler(pluginGT6VeinStat);
+            API.registerUsageHandler(pluginGT6VeinStat);
+            API.registerRecipeHandler(pluginGT6SmallOreStat);
+            API.registerUsageHandler(pluginGT6SmallOreStat);
+            API.registerRecipeHandler(pluginGT6BedrockOreStat);
+            API.registerUsageHandler(pluginGT6BedrockOreStat);
+        } 
     }
 
 }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java
index 33102a8248..a554cf5f46 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginBase.java
@@ -5,7 +5,6 @@ import java.awt.Rectangle;
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;
-import gregtech.api.util.GT_LanguageManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.EnumChatFormatting;
 
@@ -35,25 +34,7 @@ public class PluginBase extends TemplateRecipeHandler {
     public String getOutputId() {
         return null;
     }
-    
-    public int getMaximumMaterialIndex(short meta, boolean smallOre) {
-        int offset = smallOre? 16000: 0;
-        if (!getGTOreLocalizedName((short)(meta+offset+5000)).equals(getGTOreUnlocalizedName((short)(meta+offset+5000))))
-            return 7;
-        else if (!getGTOreLocalizedName((short)(meta+offset+5000)).equals(getGTOreUnlocalizedName((short)(meta+offset+5000))))
-            return 6;
-        else 
-            return 5;
-    }
-    
-    public String getGTOreLocalizedName(short index) {
-        return GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index));
-    }
-    
-    public String getGTOreUnlocalizedName(short index) {
-        return "gt.blockores." + index + ".name";
-    }
-    
+  
     public String getBiomeTranslated(String unlocalizedBiome) {
         return unlocalizedBiome.equals("None")? I18n.format("gtnop.biome.none.name"): unlocalizedBiome;
     }
@@ -91,5 +72,4 @@ public class PluginBase extends TemplateRecipeHandler {
     public int getGuiWidth() {
         return 166;
     }
-
 }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginAsteroidStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5AsteroidStat.java
index 9cdc5e7108..48e51a5367 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginAsteroidStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5AsteroidStat.java
@@ -1,4 +1,4 @@
-package pers.gwyog.gtneioreplugin.plugin;
+package pers.gwyog.gtneioreplugin.plugin.gregtech5;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;
@@ -12,12 +12,12 @@ import gregtech.api.util.GT_LanguageManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import pers.gwyog.gtneioreplugin.plugin.PluginVeinStat.CachedVeinStatRecipe;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper;
-import pers.gwyog.gtneioreplugin.util.GTSmallOreHelper;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper.OreLayerWrapper;
+import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat.CachedVeinStatRecipe;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
 
-public class PluginAsteroidStat extends PluginBase {
+public class PluginGT5AsteroidStat extends PluginGT5Base {
 
     public class CachedAsteroidStatRecipe extends CachedRecipe {
         public String veinName;
@@ -55,7 +55,7 @@ public class PluginAsteroidStat extends PluginBase {
     @Override
     public void drawExtras(int recipe) {
         CachedAsteroidStatRecipe crecipe = (CachedAsteroidStatRecipe) this.arecipes.get(recipe);
-        OreLayerWrapper oreLayer = GTOreLayerHelper.mapOreLayerWrapper.get(crecipe.veinName);
+        OreLayerWrapper oreLayer = GT5OreLayerHelper.mapOreLayerWrapper.get(crecipe.veinName);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedAsteroidName(oreLayer.veinName), 2, 18, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.asteroidPrimary") + ": " + GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(oreLayer.primaryMeta)), 2, 31, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.asteroidSecondary") + ": " + GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(oreLayer.secondaryMeta)), 2, 44, 0x404040, false);
@@ -91,8 +91,8 @@ public class PluginAsteroidStat extends PluginBase {
     public void loadCraftingRecipes(String outputId, Object... results) {
         if (outputId.equals(getOutputId())) {
             OreLayerWrapper oreLayerWrapper;
-            for (String veinName: GTOreLayerHelper.mapOreLayerWrapper.keySet()) {
-                oreLayerWrapper = GTOreLayerHelper.mapOreLayerWrapper.get(veinName);
+            for (String veinName: GT5OreLayerHelper.mapOreLayerWrapper.keySet()) {
+                oreLayerWrapper = GT5OreLayerHelper.mapOreLayerWrapper.get(veinName);
                 if (oreLayerWrapper.genEndAsteroid || oreLayerWrapper.genGCAsteroid) {
                     ItemStack stackPrimary = new ItemStack(GregTech_API.sBlockOres1, 1, oreLayerWrapper.primaryMeta+2000);
                     ItemStack stackSecondary = new ItemStack(GregTech_API.sBlockOres1, 1, oreLayerWrapper.secondaryMeta+2000);
@@ -114,7 +114,7 @@ public class PluginAsteroidStat extends PluginBase {
                 return;
             }
             short baseMeta = (short)(stack.getItemDamage() % 1000);
-            for (OreLayerWrapper worldGen: GTOreLayerHelper.mapOreLayerWrapper.values()) {
+            for (OreLayerWrapper worldGen: GT5OreLayerHelper.mapOreLayerWrapper.values()) {
                 if (worldGen.primaryMeta == baseMeta || worldGen.secondaryMeta == baseMeta || worldGen.betweenMeta == baseMeta || worldGen.sporadicMeta == baseMeta) {
                     if (worldGen.genEndAsteroid || worldGen.genGCAsteroid) {
                         ItemStack stackPrimary = new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.primaryMeta+2000);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
new file mode 100644
index 0000000000..a61a8bb977
--- /dev/null
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
@@ -0,0 +1,33 @@
+package pers.gwyog.gtneioreplugin.plugin.gregtech5;
+
+import java.awt.Rectangle;
+
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.recipe.TemplateRecipeHandler;
+import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.EnumChatFormatting;
+import pers.gwyog.gtneioreplugin.plugin.PluginBase;
+
+public class PluginGT5Base extends PluginBase {
+    
+    public int getMaximumMaterialIndex(short meta, boolean smallOre) {
+        int offset = smallOre? 16000: 0;
+        if (!getGTOreLocalizedName((short)(meta+offset+5000)).equals(getGTOreUnlocalizedName((short)(meta+offset+5000))))
+            return 7;
+        else if (!getGTOreLocalizedName((short)(meta+offset+5000)).equals(getGTOreUnlocalizedName((short)(meta+offset+5000))))
+            return 6;
+        else 
+            return 5;
+    }
+    
+    public String getGTOreLocalizedName(short index) {
+        return GT_LanguageManager.getTranslation(getGTOreUnlocalizedName(index));
+    }
+    
+    public String getGTOreUnlocalizedName(short index) {
+        return "gt.blockores." + index + ".name";
+    }
+
+}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginIEVeinStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5IEVeinStat.java
index 430490d18a..547c966081 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginIEVeinStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5IEVeinStat.java
@@ -1,4 +1,4 @@
-package pers.gwyog.gtneioreplugin.plugin;
+package pers.gwyog.gtneioreplugin.plugin.gregtech5;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,11 +11,10 @@ import gregtech.api.util.GT_LanguageManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import pers.gwyog.gtneioreplugin.plugin.PluginAsteroidStat.CachedAsteroidStatRecipe;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper.OreLayerWrapper;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
 
-public class PluginIEVeinStat extends PluginBase {
+public class PluginGT5IEVeinStat extends PluginGT5Base {
     
     public class CachedIEVeinStatRecipe extends CachedRecipe {
         public String veinName;
@@ -53,7 +52,7 @@ public class PluginIEVeinStat extends PluginBase {
     @Override
     public void drawExtras(int recipe) {
         CachedIEVeinStatRecipe crecipe = (CachedIEVeinStatRecipe) this.arecipes.get(recipe);
-        OreLayerWrapper oreLayer = GTOreLayerHelper.mapOreLayerWrapper.get(crecipe.veinName);
+        OreLayerWrapper oreLayer = GT5OreLayerHelper.mapOreLayerWrapper.get(crecipe.veinName);
         int stringLength1 = GuiDraw.getStringWidth(I18n.format("gtnop.gui.nei.weightedChance") + ": ");
         int stringLength2 = GuiDraw.getStringWidth("40%");
         int beginXCoord = (stringLength1-stringLength2)/2;
@@ -83,8 +82,8 @@ public class PluginIEVeinStat extends PluginBase {
     public void loadCraftingRecipes(String outputId, Object... results) {
         if (outputId.equals(getOutputId())) {
             OreLayerWrapper oreLayerWrapper;
-            for (String veinName: GTOreLayerHelper.mapOreLayerWrapper.keySet()) {
-                oreLayerWrapper = GTOreLayerHelper.mapOreLayerWrapper.get(veinName);
+            for (String veinName: GT5OreLayerHelper.mapOreLayerWrapper.keySet()) {
+                oreLayerWrapper = GT5OreLayerHelper.mapOreLayerWrapper.get(veinName);
                 if (oreLayerWrapper.genIEVein) {
                     ItemStack stackPrimary = new ItemStack(GregTech_API.sBlockOres1, 1, oreLayerWrapper.primaryMeta);
                     ItemStack stackSecondary = new ItemStack(GregTech_API.sBlockOres1, 1, oreLayerWrapper.secondaryMeta);
@@ -106,7 +105,7 @@ public class PluginIEVeinStat extends PluginBase {
                 return;
             }
             short baseMeta = (short)(stack.getItemDamage() % 1000);
-            for (OreLayerWrapper worldGen: GTOreLayerHelper.mapOreLayerWrapper.values()) {
+            for (OreLayerWrapper worldGen: GT5OreLayerHelper.mapOreLayerWrapper.values()) {
                 if (worldGen.primaryMeta == baseMeta || worldGen.secondaryMeta == baseMeta || worldGen.betweenMeta == baseMeta || worldGen.sporadicMeta == baseMeta) {
                     if (worldGen.genIEVein) {
                         ItemStack stackPrimary = new ItemStack(GregTech_API.sBlockOres1, 1, worldGen.primaryMeta);
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginSmallOreStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
index 1aba8c8992..f1ddce6629 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginSmallOreStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
@@ -1,4 +1,4 @@
-package pers.gwyog.gtneioreplugin.plugin;
+package pers.gwyog.gtneioreplugin.plugin.gregtech5;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;
@@ -15,24 +15,23 @@ import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import pers.gwyog.gtneioreplugin.plugin.PluginAsteroidStat.CachedAsteroidStatRecipe;
-import pers.gwyog.gtneioreplugin.plugin.PluginVeinStat.CachedVeinStatRecipe;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper;
-import pers.gwyog.gtneioreplugin.util.GTSmallOreHelper;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper.OreLayerWrapper;
-import pers.gwyog.gtneioreplugin.util.GTSmallOreHelper.SmallOreWrapper;
+import pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat.CachedVeinStatRecipe;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
+import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper.OreSmallWrapper;
 
-public class PluginSmallOreStat extends PluginBase {
+public class PluginGT5SmallOreStat extends PluginGT5Base {
     
-    public class CachedSmallOreRecipe extends CachedRecipe {
+    public class CachedOreSmallRecipe extends CachedRecipe {
         public String oreGenName;
-        public PositionedStack positionedStackSmallOre;
+        public PositionedStack positionedStackOreSmall;
         public PositionedStack positionedStackMaterialDust;
         public List<PositionedStack> positionedDropStackList;
 
-        public CachedSmallOreRecipe(String oreGenName, List<ItemStack> stackList, List<ItemStack> materialDustStackList, List<ItemStack> dropStackList) {
+        public CachedOreSmallRecipe(String oreGenName, List<ItemStack> stackList, List<ItemStack> materialDustStackList, List<ItemStack> dropStackList) {
             this.oreGenName = oreGenName;
-            this.positionedStackSmallOre = new PositionedStack(stackList, 2, 0);
+            this.positionedStackOreSmall = new PositionedStack(stackList, 2, 0);
             this.positionedStackMaterialDust = new PositionedStack(materialDustStackList, 43, 79+getRestrictBiomeOffset());
             List<PositionedStack> positionedDropStackList = new ArrayList<PositionedStack>();
             int i = 1;
@@ -43,9 +42,9 @@ public class PluginSmallOreStat extends PluginBase {
 
         @Override
         public List<PositionedStack> getIngredients() {
-            positionedStackSmallOre.setPermutationToRender((cycleticks / 20) % positionedStackSmallOre.items.length);
+            positionedStackOreSmall.setPermutationToRender((cycleticks / 20) % positionedStackOreSmall.items.length);
             positionedStackMaterialDust.setPermutationToRender((cycleticks / 20) % positionedStackMaterialDust.items.length);
-            positionedDropStackList.add(positionedStackSmallOre);
+            positionedDropStackList.add(positionedStackOreSmall);
             positionedDropStackList.add(positionedStackMaterialDust);
             return positionedDropStackList;
             
@@ -60,25 +59,25 @@ public class PluginSmallOreStat extends PluginBase {
     
     @Override
     public void drawExtras(int recipe) {
-        CachedSmallOreRecipe crecipe = (CachedSmallOreRecipe) this.arecipes.get(recipe);
-        SmallOreWrapper smallOre = GTSmallOreHelper.mapSmallOreWrapper.get(crecipe.oreGenName);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreName") + ": " + getGTOreLocalizedName((short)(smallOre.oreMeta+16000)), 2, 18, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.genHeight") + ": " + smallOre.worldGenHeightRange, 2, 31, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.amount") + ": " + smallOre.amountPerChunk, 2, 44, 0x404040, false);
-        GuiDraw.drawString(I18n.format("gtnop.gui.nei.worldNames") + ": " + getWorldNameTranslated(smallOre.genOverworld, smallOre.genNether, smallOre.genEnd, smallOre.genMoon, smallOre.genMars), 2, 57, 0x404040, false);
-        if (GTSmallOreHelper.restrictBiomeSupport) GuiDraw.drawString(I18n.format("gtnop.gui.nei.restrictBiome") + ": " + getBiomeTranslated(smallOre.restrictBiome), 2, 70, 0x404040, false);
+        CachedOreSmallRecipe crecipe = (CachedOreSmallRecipe) this.arecipes.get(recipe);
+        OreSmallWrapper oreSmall = GT5OreSmallHelper.mapOreSmallWrapper.get(crecipe.oreGenName);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.oreName") + ": " + getGTOreLocalizedName((short)(oreSmall.oreMeta+16000)), 2, 18, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.genHeight") + ": " + oreSmall.worldGenHeightRange, 2, 31, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.amount") + ": " + oreSmall.amountPerChunk, 2, 44, 0x404040, false);
+        GuiDraw.drawString(I18n.format("gtnop.gui.nei.worldNames") + ": " + getWorldNameTranslated(oreSmall.genOverworld, oreSmall.genNether, oreSmall.genEnd, oreSmall.genMoon, oreSmall.genMars), 2, 57, 0x404040, false);
+        if (GT5OreSmallHelper.restrictBiomeSupport) GuiDraw.drawString(I18n.format("gtnop.gui.nei.restrictBiome") + ": " + getBiomeTranslated(oreSmall.restrictBiome), 2, 70, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.chanceDrops") + ": ", 2, 83+getRestrictBiomeOffset(), 0x404040, false);
         GuiDraw.drawStringR(EnumChatFormatting.BOLD + I18n.format("gtnop.gui.nei.seeAll"), getGuiWidth()-3, 5, 0x404040, false);
     }
     
     public int getRestrictBiomeOffset() {
-        return GTSmallOreHelper.restrictBiomeSupport? 0: -13;
+        return GT5OreSmallHelper.restrictBiomeSupport? 0: -13;
     }
     
     @Override
     public void loadCraftingRecipes(String outputId, Object... results) {
         if (outputId.equals(getOutputId()))
-            for (ItemStack stack: GTSmallOreHelper.smallOreList)
+            for (ItemStack stack: GT5OreSmallHelper.oreSmallList)
                 loadCraftingRecipes(stack);
         else
             super.loadCraftingRecipes(outputId, results);
@@ -92,31 +91,31 @@ public class PluginSmallOreStat extends PluginBase {
                 return;
             }
             short baseMeta = (short)(stack.getItemDamage() % 1000);
-            for (SmallOreWrapper smallOreWorldGen: GTSmallOreHelper.mapSmallOreWrapper.values()) {
-                if (smallOreWorldGen.oreMeta == baseMeta) {
+            for (OreSmallWrapper oreSmallWorldGen: GT5OreSmallHelper.mapOreSmallWrapper.values()) {
+                if (oreSmallWorldGen.oreMeta == baseMeta) {
                     List<ItemStack> stackList = new ArrayList<ItemStack>();
                     int maximumIndex = getMaximumMaterialIndex(baseMeta, true);
                     for (int i=0;i<maximumIndex;i++) 
-                        stackList.add(new ItemStack(GregTech_API.sBlockOres1, 1, smallOreWorldGen.oreMeta+16000+i*1000));
+                        stackList.add(new ItemStack(GregTech_API.sBlockOres1, 1, oreSmallWorldGen.oreMeta+16000+i*1000));
                     List<ItemStack> materialDustStackList = new ArrayList<ItemStack>();
                     for (int i=0;i<maximumIndex;i++)
-                        materialDustStackList.add(GT_OreDictUnificator.get(OrePrefixes.dust, GTSmallOreHelper.getDroppedDusts()[i], 1L));
-                    this.arecipes.add(new CachedSmallOreRecipe(smallOreWorldGen.oreGenName, stackList, materialDustStackList, GTSmallOreHelper.mapOreMetaToOreDrops.get(baseMeta)));
+                        materialDustStackList.add(GT_OreDictUnificator.get(OrePrefixes.dust, GT5OreSmallHelper.getDroppedDusts()[i], 1L));
+                    this.arecipes.add(new CachedOreSmallRecipe(oreSmallWorldGen.oreGenName, stackList, materialDustStackList, GT5OreSmallHelper.mapOreMetaToOreDrops.get(baseMeta)));
                 }
             }
         }
-        else if (GTSmallOreHelper.mapOreDropUnlocalizedNameToOreMeta.keySet().contains(stack.getUnlocalizedName())) {
-            short baseMeta = GTSmallOreHelper.mapOreDropUnlocalizedNameToOreMeta.get(stack.getUnlocalizedName());
-            for (String oreGenName: GTSmallOreHelper.mapSmallOreWrapper.keySet()) {
-                SmallOreWrapper smallOreWrapper = GTSmallOreHelper.mapSmallOreWrapper.get(oreGenName);
-                if (smallOreWrapper.oreMeta == baseMeta) {
+        else if (GT5OreSmallHelper.mapOreDropUnlocalizedNameToOreMeta.keySet().contains(stack.getUnlocalizedName())) {
+            short baseMeta = GT5OreSmallHelper.mapOreDropUnlocalizedNameToOreMeta.get(stack.getUnlocalizedName());
+            for (String oreGenName: GT5OreSmallHelper.mapOreSmallWrapper.keySet()) {
+                OreSmallWrapper oreSmallWrapper = GT5OreSmallHelper.mapOreSmallWrapper.get(oreGenName);
+                if (oreSmallWrapper.oreMeta == baseMeta) {
                     List<ItemStack> stackList = new ArrayList<ItemStack>();
                     for (int i=0;i<7;i++) 
                         stackList.add(new ItemStack(GregTech_API.sBlockOres1, 1, baseMeta+16000+i*1000));
                     List<ItemStack> materialDustStackList = new ArrayList<ItemStack>();
                     for (int i=0;i<7;i++)
-                        materialDustStackList.add(GT_OreDictUnificator.get(OrePrefixes.dust, GTSmallOreHelper.getDroppedDusts()[i], 1L));
-                    this.arecipes.add(new CachedSmallOreRecipe(GTSmallOreHelper.mapSmallOreWrapper.get(oreGenName).oreGenName, stackList, materialDustStackList, GTSmallOreHelper.mapOreMetaToOreDrops.get(baseMeta)));
+                        materialDustStackList.add(GT_OreDictUnificator.get(OrePrefixes.dust, GT5OreSmallHelper.getDroppedDusts()[i], 1L));
+                    this.arecipes.add(new CachedOreSmallRecipe(GT5OreSmallHelper.mapOreSmallWrapper.get(oreGenName).oreGenName, stackList, materialDustStackList, GT5OreSmallHelper.mapOreMetaToOreDrops.get(baseMeta)));
                 }
             }
         }    
@@ -126,7 +125,7 @@ public class PluginSmallOreStat extends PluginBase {
     
     @Override
     public String getOutputId() {
-        return "GTOrePluginSmallOre";
+        return "GTOrePluginOreSmall";
     }
         
     @Override
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginVeinStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
index e2b43cf482..d9085ab82a 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/PluginVeinStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
@@ -1,4 +1,4 @@
-package pers.gwyog.gtneioreplugin.plugin;
+package pers.gwyog.gtneioreplugin.plugin.gregtech5;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;
@@ -18,10 +18,10 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper;
-import pers.gwyog.gtneioreplugin.util.GTOreLayerHelper.OreLayerWrapper;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
 
-public class PluginVeinStat extends PluginBase {
+public class PluginGT5VeinStat extends PluginGT5Base {
 
     public class CachedVeinStatRecipe extends CachedRecipe {
         public String veinName;
@@ -64,8 +64,8 @@ public class PluginVeinStat extends PluginBase {
     public void loadCraftingRecipes(String outputId, Object... results) {
         if (outputId.equals(getOutputId())) {
             OreLayerWrapper oreLayerWrapper;
-            for (String veinName: GTOreLayerHelper.mapOreLayerWrapper.keySet()) {
-                oreLayerWrapper = GTOreLayerHelper.mapOreLayerWrapper.get(veinName);
+            for (String veinName: GT5OreLayerHelper.mapOreLayerWrapper.keySet()) {
+                oreLayerWrapper = GT5OreLayerHelper.mapOreLayerWrapper.get(veinName);
                 List<ItemStack> stackListPrimary = new ArrayList<ItemStack>();
                 List<ItemStack> stackListSecondary = new ArrayList<ItemStack>();
                 List<ItemStack> stackListBetween = new ArrayList<ItemStack>();
@@ -91,7 +91,7 @@ public class PluginVeinStat extends PluginBase {
                 return;
             }
             short baseMeta = (short)(stack.getItemDamage() % 1000);
-            for (OreLayerWrapper worldGen: GTOreLayerHelper.mapOreLayerWrapper.values()) {
+            for (OreLayerWrapper worldGen: GT5OreLayerHelper.mapOreLayerWrapper.values()) {
                 if (worldGen.primaryMeta == baseMeta || worldGen.secondaryMeta == baseMeta || worldGen.betweenMeta == baseMeta || worldGen.sporadicMeta == baseMeta) {
                     List<ItemStack> stackListPrimary = new ArrayList<ItemStack>();
                     List<ItemStack> stackListSecondary = new ArrayList<ItemStack>();
@@ -114,7 +114,7 @@ public class PluginVeinStat extends PluginBase {
     @Override
     public void drawExtras(int recipe) {
         CachedVeinStatRecipe crecipe = (CachedVeinStatRecipe) this.arecipes.get(recipe);
-        OreLayerWrapper oreLayer = GTOreLayerHelper.mapOreLayerWrapper.get(crecipe.veinName);
+        OreLayerWrapper oreLayer = GT5OreLayerHelper.mapOreLayerWrapper.get(crecipe.veinName);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.veinName") + ": " + getLocalizedVeinName(oreLayer.veinName), 2, 18, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.primaryOre") + ": " + getGTOreLocalizedName(oreLayer.primaryMeta), 2, 31, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.secondaryOre") + ": " + getGTOreLocalizedName(oreLayer.secondaryMeta), 2, 44, 0x404040, false);
@@ -123,7 +123,7 @@ public class PluginVeinStat extends PluginBase {
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.genHeight") + ": " + oreLayer.worldGenHeightRange, 2, 83, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.weightedChance") + ": " + oreLayer.weightedChance, 2, 96, 0x404040, false);
         GuiDraw.drawString(I18n.format("gtnop.gui.nei.worldNames") + ": " + getWorldNameTranslated(oreLayer.genOverworld, oreLayer.genNether, oreLayer.genEnd, oreLayer.genMoon, oreLayer.genMars), 2, 109, 0x404040, false);
-        if (GTOreLayerHelper.restrictBiomeSupport) GuiDraw.drawString(I18n.format("gtnop.gui.nei.restrictBiome") + ": " + getBiomeTranslated(oreLayer.restrictBiome), 2, 122, 0x404040, false);
+        if (GT5OreLayerHelper.restrictBiomeSupport) GuiDraw.drawString(I18n.format("gtnop.gui.nei.restrictBiome") + ": " + getBiomeTranslated(oreLayer.restrictBiome), 2, 122, 0x404040, false);
         GuiDraw.drawStringR(EnumChatFormatting.BOLD + I18n.format("gtnop.gui.nei.seeAll"), getGuiWidth()-3, 5, 0x404040, false);
     }
     
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6BedrockOreStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6BedrockOreStat.java
new file mode 100644
index 0000000000..ce46736597
--- /dev/null
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech6/PluginGT6BedrockOreStat.java
@@ -0,0 +1,114 @@
+package pers.gwyog.gtneioreplugin.plugin.gregtech6;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe;
+import gregapi.block.prefixblock.PrefixBlock;
+import gregapi.data.CS;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import pers.gwyog.gtneioreplugin.plugin.PluginBase;
+import pers.gwyog.gtneioreplugin.util.GT6OreBedrockHelper;
+import pers.gwyog.gtneioreplugin.util.GT6OreLayerHelper;
+import pers.gwyog.gtneioreplugin.util.GT6OreSmallHelper;
+import pers.gwyog.gtneioreplugin.util.GT6OreBedrockHelper.OreBedrockWrapper;
+
+public class PluginGT6BedrockOreStat extends PluginBase {
+    
+    public class CachedBedrockOreStatRecipe extends CachedRecipe {
+        public String oreName;
+        public PositionedStack positionedStackOreBedrock;
+        public PositionedStack positionedStackOreSmallBedrock;
+        public PositionedStack positionedStackOre;
+        public PositionedStack positionedStackOreSmall;
+            
+        public CachedBedrockOreStatRecipe(String oreName, ItemStack stackOreBedrock, ItemStack stackOreSmallBedrock,
+                List<ItemStack> stackListOre, List<ItemStack> stackListOreSmall) {
+            this.oreName = oreName;
+            positionedStackOreBedrock = new PositionedStack(stackOreBedrock, 2, 0);
+            positionedStackOreSmallBedrock = new PositionedStack(stackOreSmallBedrock, 22, 0);
+            positionedStackOre = new PositionedStack(stackListOre, 42, 0);
+            positionedStackOreSmall = new PositionedStack(stackListOreSmall, 62, 0);
+        }
+        
+        @Override
+        public List<PositionedStack> getIngredients() {