remove enumhelper towards OrePrefixes and force gtnh gt (#298)

* remove EnumHelper usage towards OrePrefixes

also removed gtnh gt detection. it has long been mandatory since bart's quit.

* might as well just remove this field

* fix up dependencies

Former-commit-id: 2b0e68b0065868aec7fb7a2fb88ae79eb2493e0e

21 files changed, 178 insertions, 329 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java
index 56601399e4..9202be7d18 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java
@@ -132,14 +132,12 @@ public final class BioVatLogicAdder {
                     96,
                     10);
 
-            if (WerkstoffLoader.gtnhGT) {
-                giveItemStackRadioHatchAbilites(ItemList.MNqCell_1.get(1), Materials.Naquadria, 3);
-                giveItemStackRadioHatchAbilites(ItemList.MNqCell_2.get(1), Materials.Naquadria, 6);
-                giveItemStackRadioHatchAbilites(ItemList.MNqCell_4.get(1), Materials.Naquadria, 12);
-                giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_1.get(1), Materials.Naquadria, 3, 10);
-                giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_2.get(1), Materials.Naquadria, 6, 10);
-                giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_4.get(1), Materials.Naquadria, 12, 10);
-            }
+            giveItemStackRadioHatchAbilites(ItemList.MNqCell_1.get(1), Materials.Naquadria, 3);
+            giveItemStackRadioHatchAbilites(ItemList.MNqCell_2.get(1), Materials.Naquadria, 6);
+            giveItemStackRadioHatchAbilites(ItemList.MNqCell_4.get(1), Materials.Naquadria, 12);
+            giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_1.get(1), Materials.Naquadria, 3, 10);
+            giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_2.get(1), Materials.Naquadria, 6, 10);
+            giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_4.get(1), Materials.Naquadria, 12, 10);
         }
 
         private static final HashSet<BioVatLogicAdder.MaterialSvPair> MaSv = new HashSet<>();
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java
index 84d37b0e9c..2e025b27e4 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java
@@ -19,7 +19,6 @@ import java.util.Map;
 import java.util.stream.Stream;
 
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -37,7 +36,7 @@ public class PrefixTextureLinker implements Runnable {
 
     private static void fillBlockTexMap() {
         blockTexMap.put(TextureSet.SET_QUARTZ, TextureSet.INDEX_block4);
-        Stream.of(WerkstoffLoader.blockCasing, WerkstoffLoader.blockCasingAdvanced).forEach(prefixes -> {
+        Stream.of(OrePrefixes.blockCasing, OrePrefixes.blockCasingAdvanced).forEach(prefixes -> {
             HashMap<TextureSet, IIconContainer> curr = new HashMap<>();
             Arrays.stream(TextureSet.class.getFields()).filter(field -> field.getName().contains("SET"))
                     .forEach(SET -> {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
index a66ad633d5..cb4bd63e1d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java
@@ -366,7 +366,7 @@ public class ItemRegistry {
                     "MegaOilCracker",
                     "Mega Oil Cracker").getStackForm(1L);
 
-            if (LoaderReference.galacticgreg && WerkstoffLoader.gtnhGT) {
+            if (LoaderReference.galacticgreg) {
                 ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV(
                         ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11,
                         "VoidMiner3",
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java
index ee839f56c4..5e92aa94eb 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java
@@ -207,14 +207,12 @@ public class RadioHatchMaterialLoader {
                 96,
                 Materials.Naquadah.mRGBa);
 
-        if (WerkstoffLoader.gtnhGT) {
-            BWRecipes.instance.addRadHatch(ItemList.MNqCell_1.get(1), 150, 3, Materials.Naquadria.mRGBa);
-            BWRecipes.instance.addRadHatch(ItemList.MNqCell_2.get(1), 150, 6, Materials.Naquadria.mRGBa);
-            BWRecipes.instance.addRadHatch(ItemList.MNqCell_4.get(1), 150, 12, Materials.Naquadria.mRGBa);
-
-            BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_1.get(1), 150 / 10, 3, Materials.Naquadria.mRGBa);
-            BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_2.get(1), 150 / 10, 6, Materials.Naquadria.mRGBa);
-            BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_4.get(1), 150 / 10, 12, Materials.Naquadria.mRGBa);
-        }
+        BWRecipes.instance.addRadHatch(ItemList.MNqCell_1.get(1), 150, 3, Materials.Naquadria.mRGBa);
+        BWRecipes.instance.addRadHatch(ItemList.MNqCell_2.get(1), 150, 6, Materials.Naquadria.mRGBa);
+        BWRecipes.instance.addRadHatch(ItemList.MNqCell_4.get(1), 150, 12, Materials.Naquadria.mRGBa);
+
+        BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_1.get(1), 150 / 10, 3, Materials.Naquadria.mRGBa);
+        BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_2.get(1), 150 / 10, 6, Materials.Naquadria.mRGBa);
+        BWRecipes.instance.addRadHatch(ItemList.Depleted_MNq_4.get(1), 150 / 10, 12, Materials.Naquadria.mRGBa);
     }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
index bfcf0eadc3..7c9dc72202 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
@@ -854,17 +854,12 @@ public class RecipeLoader {
                 ItemList[] sensors = { ItemList.Sensor_EV, ItemList.Sensor_IV, ItemList.Sensor_LuV,
                         ItemList.Sensor_ZPM };
 
-                OrePrefixes[] prefixes = { WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt04 : OrePrefixes.wireGt04,
-                        WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt08 : OrePrefixes.wireGt08,
-                        WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt12 : OrePrefixes.wireGt12,
-                        WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt16 : OrePrefixes.cableGt12 };
+                OrePrefixes[] prefixes = { OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12,
+                        OrePrefixes.cableGt16 };
 
                 GT_Values.RA.addAssemblerRecipe(
                         new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(32),
-                                GT_OreDictUnificator.get(
-                                        WerkstoffLoader.gtnhGT ? OrePrefixes.foil : OrePrefixes.plateDouble,
-                                        Materials.Electrum,
-                                        WerkstoffLoader.gtnhGT ? 8 : 1),
+                                GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8),
                                 WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2) },
                         Materials.Polytetrafluoroethylene.getMolten(72),
                         new ItemStack(
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
index fe73bc18f6..756d99351a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
@@ -32,7 +32,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import com.github.bartimaeusnek.bartworks.util.BWRecipes;
 import com.github.bartimaeusnek.bartworks.util.BW_Util;
 import com.github.bartimaeusnek.bartworks.util.Pair;
@@ -215,11 +214,11 @@ public class StaticRecipeChangeLoaders {
 
     @SuppressWarnings("ALL")
     private static void runMoltenUnificationEnfocement(Werkstoff werkstoff) {
-        if (werkstoff.getGenerationFeatures().enforceUnification && werkstoff.hasItemType(WerkstoffLoader.cellMolten)) {
+        if (werkstoff.getGenerationFeatures().enforceUnification && werkstoff.hasItemType(OrePrefixes.cellMolten)) {
             try {
                 FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(
                         new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144),
-                        werkstoff.get(WerkstoffLoader.cellMolten),
+                        werkstoff.get(OrePrefixes.cellMolten),
                         Materials.Empty.getCells(1));
                 Field f = GT_Utility.class.getDeclaredField("sFilledContainerToData");
                 f.setAccessible(true);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java
index aca8dfe63f..ca8b06151d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java
@@ -83,8 +83,8 @@ public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks
 
     @Override
     public String getUnlocalizedName() {
-        if (_prefixes == WerkstoffLoader.blockCasing) return "bw.werkstoffblockscasing.01";
-        else if (_prefixes == WerkstoffLoader.blockCasingAdvanced) return "bw.werkstoffblockscasingadvanced.01";
+        if (_prefixes == OrePrefixes.blockCasing) return "bw.werkstoffblockscasing.01";
+        else if (_prefixes == OrePrefixes.blockCasingAdvanced) return "bw.werkstoffblockscasingadvanced.01";
         return "";
     }
 
@@ -95,7 +95,7 @@ public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks
         Werkstoff.werkstoffHashSet.stream()
                 .filter(
                         pMaterial -> pMaterial.getType().equals(Werkstoff.Types.BIOLOGICAL)
-                                && pMaterial.hasGenerationFeature(WerkstoffLoader.blockCasing)
+                                && pMaterial.hasGenerationFeature(OrePrefixes.blockCasing)
                                 || pMaterial.doesOreDictedItemExists(OrePrefixes.plate)
                                         && pMaterial.doesOreDictedItemExists(OrePrefixes.screw)
                                         && pMaterial.doesOreDictedItemExists(OrePrefixes.plateDouble)
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java
index 3c64631373..ac9c71fb25 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java
@@ -38,7 +38,7 @@ public class BW_MetaGeneratedBlocks_CasingAdvanced_TE extends BW_MetaGenerated_B
             if ((aMaterial != null)) {
                 TextureSet set = aMaterial.getTexSet();
                 ITexture aIconSet = TextureFactory.of(
-                        PrefixTextureLinker.texMapBlocks.get(WerkstoffLoader.blockCasingAdvanced)
+                        PrefixTextureLinker.texMapBlocks.get(OrePrefixes.blockCasingAdvanced)
                                 .getOrDefault(set, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]),
                         aMaterial.getRGBA());
                 return new ITexture[] { TextureFactory.of(Blocks.iron_block), aIconSet };
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java
index f52767969e..d3fdd2f731 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java
@@ -38,7 +38,7 @@ public class BW_MetaGeneratedBlocks_Casing_TE extends BW_MetaGenerated_Block_TE
             if ((aMaterial != null)) {
                 TextureSet set = aMaterial.getTexSet();
                 ITexture aIconSet = TextureFactory.of(
-                        PrefixTextureLinker.texMapBlocks.get(WerkstoffLoader.blockCasing)
+                        PrefixTextureLinker.texMapBlocks.get(OrePrefixes.blockCasing)
                                 .getOrDefault(set, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]),
                         aMaterial.getRGBA());
                 return new ITexture[] { TextureFactory.of(Blocks.iron_block), aIconSet };
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java
index 99d4afb1e1..bbbdb36349 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java
@@ -256,14 +256,16 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa
     @Override
     public int getCapacity(ItemStack aStack) {
         return this.orePrefixes == OrePrefixes.capsule || this.orePrefixes == OrePrefixes.cell
-                || this.orePrefixes == OrePrefixes.cellPlasma ? 1000
-                        : this.orePrefixes == WerkstoffLoader.cellMolten
-                                || this.orePrefixes == WerkstoffLoader.capsuleMolten ? 144 : 0;
+                || this.orePrefixes == OrePrefixes.cellPlasma
+                        ? 1000
+                        : this.orePrefixes == OrePrefixes.cellMolten || this.orePrefixes == OrePrefixes.capsuleMolten
+                                ? 144
+                                : 0;
     }
 
     @Override
     public ItemStack getContainerItem(ItemStack aStack) {
         return this.orePrefixes == OrePrefixes.cell || this.orePrefixes == OrePrefixes.cellPlasma
-                || this.orePrefixes == WerkstoffLoader.cellMolten ? Materials.Empty.getCells(1) : null;
+                || this.orePrefixes == OrePrefixes.cellMolten ? Materials.Empty.getCells(1) : null;
     }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java
index c2c3730874..24882d995c 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java
@@ -34,7 +34,6 @@ import com.github.bartimaeusnek.bartworks.API.SideReference;
 import com.github.bartimaeusnek.bartworks.client.textures.PrefixTextureLinker;
 import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_Items;
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference;
 
 import cpw.mods.fml.relauncher.Side;
@@ -58,7 +57,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items {
         for (int i = 0; i < Materials.values().length; i++) {
             ItemStack tStack = new ItemStack(this, 1, i);
             Materials material = Materials.values()[i];
-            if (((material.getMolten(1) == null && orePrefixes == WerkstoffLoader.capsuleMolten)
+            if (((material.getMolten(1) == null && orePrefixes == OrePrefixes.capsuleMolten)
                     || ((material.getFluid(1) == null && material.getGas(1) == null)
                             && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle))))
                 continue;
@@ -80,7 +79,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items {
             for (int i = 0; i < noSubIDMaterials.size(); i++) {
                 ItemStack tStack = new ItemStack(this, 1, i + 1001);
                 Materials w = noSubIDMaterials.get(i);
-                if (((w.getMolten(1) == null && orePrefixes == WerkstoffLoader.capsuleMolten)
+                if (((w.getMolten(1) == null && orePrefixes == OrePrefixes.capsuleMolten)
                         || ((w.getFluid(1) == null && w.getGas(1) == null)
                                 && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle))))
                     continue;
@@ -179,7 +178,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items {
             if ((w == null) || (w.mTypes & Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes)) == 0
                     && Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes) != 0)
                 continue;
-            else if (((w.getMolten(1) == null && orePrefixes == WerkstoffLoader.capsuleMolten)
+            else if (((w.getMolten(1) == null && orePrefixes == OrePrefixes.capsuleMolten)
                     || ((w.getFluid(1) == null && w.getGas(1) == null)
                             && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle))))
                 continue;
@@ -191,7 +190,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items {
             if ((w == null) || (w.mTypes & Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes)) == 0
                     && Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes) != 0)
                 continue;
-            else if (((w.getMolten(1) == null && orePrefixes == WerkstoffLoader.capsuleMolten)
+            else if (((w.getMolten(1) == null && orePrefixes == OrePrefixes.capsuleMolten)
                     || ((w.getFluid(1) == null && w.getGas(1) == null)
                             && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle))))
                 continue;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java
index cc3f6d6611..3fa75568d8 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java
@@ -24,7 +24,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.github.bartimaeusnek.bartworks.API.LoaderReference;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -40,43 +39,19 @@ public class GTMetaItemEnhancer {
     private GTMetaItemEnhancer() {}
 
     public static void init() {
-        if (!WerkstoffLoader.gtnhGT) {
-            Item moltenCell = new BWGTMetaItems(WerkstoffLoader.cellMolten, null);
-            Materials[] values = Materials.values();
-            for (int i = 0, valuesLength = values.length; i < valuesLength; i++) {
-                Materials m = values[i];
-                if (m == null || m.mStandardMoltenFluid == null) continue;
-                final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData(
-                        m.getMolten(144),
-                        new ItemStack(moltenCell, 1, i),
-                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L));
-                FluidContainerRegistry.registerFluidContainer(emptyData);
-                GT_Utility.addFluidContainerData(emptyData);
-                GT_Values.RA.addFluidCannerRecipe(
-                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L),
-                        new ItemStack(moltenCell, 1, i),
-                        m.getMolten(144),
-                        GT_Values.NF);
-                GT_Values.RA.addFluidCannerRecipe(
-                        new ItemStack(moltenCell, 1, i),
-                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L),
-                        GT_Values.NF,
-                        m.getMolten(144));
-            }
-        }
         if (!LoaderReference.Forestry) {
             return;
         }
         NoMetaValue = Materials.getMaterialsMap().values().stream().filter(m -> m.mMetaItemSubID == -1)
                 .collect(Collectors.toList());
-        Item moltenCapsuls = new BWGTMetaItems(WerkstoffLoader.capsuleMolten, null);
+        Item moltenCapsuls = new BWGTMetaItems(OrePrefixes.capsuleMolten, null);
         Item capsuls = new BWGTMetaItems(OrePrefixes.capsule, NoMetaValue);
         // Item bottles = new BWGTMetaItems(OrePrefixes.bottle, NoMetaValue);
 
         Materials[] values = Materials.values();
         for (int i = 0, valuesLength = values.length; i < valuesLength; i++) {
             Materials m = values[i];
-            if (m.mStandardMoltenFluid != null && GT_OreDictUnificator.get(WerkstoffLoader.cellMolten, m, 1) != null) {
+            if (m.mStandardMoltenFluid != null && GT_OreDictUnificator.get(OrePrefixes.cellMolten, m, 1) != null) {
                 final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData(
                         m.getMolten(144),
                         new ItemStack(moltenCapsuls, 1, i),
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
index 779183e439..b04068521b 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
@@ -101,7 +101,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
 
     /**
      * GT Materials Bridge Constructor
-     * 
+     *
      * @param materials          a GT Materials
      * @param generationFeatures the new Types you want to add
      * @param type               - self explainatory
@@ -692,8 +692,8 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsule, 0b10000);
             // Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.bottle,0b10000);
 
-            Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.capsuleMolten, 0b1000000);
-            Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.cellMolten, 0b1000000);
+            Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.capsuleMolten, 0b1000000);
+            Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.cellMolten, 0b1000000);
 
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plate, 0b10000000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.foil, 0b10000000);
@@ -724,8 +724,8 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotQuadruple, 0x200);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotQuintuple, 0x200);
 
-            Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.blockCasing, 0x380);
-            Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.blockCasingAdvanced, 0x380);
+            Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasing, 0x380);
+            Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasingAdvanced, 0x380);
         }
 
         public void setExtension() {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index fd5dc54a01..643dc62c49 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -58,7 +58,6 @@ import gregtech.api.enums.*;
 import gregtech.api.fluid.GT_FluidFactory;
 import gregtech.api.interfaces.ISubTagContainer;
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import ic2.api.recipe.IRecipeInput;
 import ic2.api.recipe.RecipeInputOreDict;
 import ic2.api.recipe.RecipeOutput;
@@ -74,63 +73,16 @@ public class WerkstoffLoader {
     public static final SubTag ANAEROBE_SMELTING = SubTag.getNewSubTag("AnaerobeSmelting");
     public static final SubTag NOBLE_GAS_SMELTING = SubTag.getNewSubTag("NobleGasSmelting");
     public static final SubTag NO_BLAST = SubTag.getNewSubTag("NoBlast");
-    public static OrePrefixes cellMolten;
-    public static OrePrefixes capsuleMolten;
-    public static OrePrefixes blockCasing;
-    public static OrePrefixes blockCasingAdvanced;
     public static ItemList rotorMold;
     public static ItemList rotorShape;
     public static ItemList smallGearShape;
     public static ItemList ringMold;
     public static ItemList boltMold;
-    public static boolean gtnhGT = false;
 
     public static void setUp() {
-        // GTNH detection hack
-        try {
-            Field f = GT_MetaGenerated_Tool_01.class.getField("SOLDERING_IRON_MV");
-            gtnhGT = true;
-        } catch (Exception ignored) {
-            gtnhGT = false;
-        }
-        // GTNH detection hack #2
-        // GTNH hack for molten cells
-        for (OrePrefixes prefix : values()) {
-            if (prefix.toString().equals("cellMolten")) {
-                WerkstoffLoader.cellMolten = prefix;
-                gtnhGT = true;
-                break;
-            }
-        }
-
-        if (!gtnhGT) {
-            WerkstoffLoader.HDCS.getGenerationFeatures().extraRecipes ^= 10;
-        }
 
-        if (WerkstoffLoader.cellMolten == null) {
-            WerkstoffLoader.cellMolten = EnumUtils.addNewOrePrefix(
-                    "cellMolten",
-                    "Cells of Molten stuff",
-                    "Molten ",
-                    " Cell",
-                    true,
-                    true,
-                    true,
-                    true,
-                    false,
-                    false,
-                    false,
-                    true,
-                    false,
-                    false,
-                    0b1000000,
-                    3628800L,
-                    64,
-                    31);
-            // GT_LanguageManager.addStringLocalization(".name", this.getDefaultLocalization(w));
-        } else {
-            WerkstoffLoader.cellMolten.mMaterialGenerationBits = 0b1000000;
-        }
+        OrePrefixes.cellMolten.mMaterialGenerationBits = 0b1000000;
+        OrePrefixes.capsuleMolten.mMaterialGenerationBits = 0b1000000;
 
         try {
             WerkstoffLoader.rotorMold = Enum.valueOf(ItemList.class, "Shape_Mold_Rotor");
@@ -142,68 +94,6 @@ public class WerkstoffLoader {
 
         // add tiberium
         Element t = EnumUtils.createNewElement("Tr", 123L, 203L, 0L, -1L, null, "Tiberium", false);
-        blockCasing = EnumUtils.addNewOrePrefix(
-                "blockCasing",
-                "A Casing block for a Multiblock-Machine",
-                "Bolted ",
-                " Casing",
-                true,
-                true,
-                true,
-                true,
-                false,
-                true,
-                false,
-                true,
-                false,
-                false,
-                0,
-                32659200L,
-                64,
-                -1);
-        blockCasingAdvanced = EnumUtils.addNewOrePrefix(
-                "blockCasingAdvanced",
-                "An Advanced Casing block for a Multiblock-Machine",
-                "Rebolted ",
-                " Casing",
-                true,
-                true,
-                true,
-                true,
-                false,
-                true,
-                false,
-                true,
-                false,
-                false,
-                0,
-                32659200L,
-                64,
-                -1);
-        // add molten & regular capsuls
-        if (LoaderReference.Forestry) {
-            capsuleMolten = EnumUtils.addNewOrePrefix(
-                    "capsuleMolten",
-                    "Capsule of Molten stuff",
-                    "Molten ",
-                    " Capsule",
-                    true,
-                    true,
-                    true,
-                    true,
-                    false,
-                    false,
-                    false,
-                    true,
-                    false,
-                    false,
-                    0b1000000,
-                    3628800L,
-                    64,
-                    -1);
-            capsule.mMaterialGenerationBits = 0b100000;
-            capsule.mDefaultStackSize = 64;
-        }
 
         bottle.mDefaultStackSize = 1;
         Werkstoff.GenerationFeatures.initPrefixLogic();
@@ -1472,9 +1362,9 @@ public class WerkstoffLoader {
         if (orePrefixes == ore) return new ItemStack(WerkstoffLoa