fixed the recipe replacer

+changed out Osmiridium for LuV recipes
+added Tiberium for Blackflame
+added LuVFineWireMaterial("Ruridit")
+added wireFine items & recipes
+fixed Scanner/Replicator recipes
+deleted an unused class
+added a config option to silence the GT++ logging

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

Former-commit-id: a0981899093b854814d4c04c9c321b9a4df17e5f

12 files changed, 1167 insertions, 293 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
index 760adf02dd..e3b88b62e8 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
@@ -38,6 +38,7 @@ import com.github.bartimaeusnek.bartworks.common.loaders.LoaderRegistry;
 import com.github.bartimaeusnek.bartworks.common.net.BW_Network;
 import com.github.bartimaeusnek.bartworks.server.EventHandler.ServerEventHandler;
 import com.github.bartimaeusnek.bartworks.system.log.DebugLog;
+import com.github.bartimaeusnek.bartworks.system.log.STFUGTPPLOG;
 import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.CircuitImprintLoader;
 import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.CircuitPartLoader;
 import com.github.bartimaeusnek.bartworks.system.material.ThreadedLoader;
@@ -69,12 +70,15 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_ElectricImplosionCompressor.eicMap;
 import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.*;
@@ -110,6 +114,16 @@ public final class MainMod {
             MainMod.LOGGER.error("Something has loaded an old API. Please contact the Mod authors to update!");
         }
 
+        if (Loader.isModLoaded("miscutils") && ConfigHandler.GTppLogDisabler) {
+            try {
+                Field loggerField = FieldUtils.getField(Class.forName("gtPlusPlus.api.objects.Logger"),"modLogger",true);
+                FieldUtils.removeFinalModifier(loggerField,true);
+                loggerField.set(null,(Logger)new STFUGTPPLOG());
+            } catch (IllegalAccessException | ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
         //fixing BorosilicateGlass... -_-'
         Materials.BorosilicateGlass.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_RECYCLING, SubTag.SMELTING_TO_FLUID);
 
@@ -194,6 +208,7 @@ public final class MainMod {
         MainMod.unificationEnforcer();
 
         PlatinumSludgeOverHaul.replacePureElements();
+
         if (!extraGasRecipes) {
             ArrayListMultimap<SubTag, GT_Recipe> toChange = MainMod.getRecipesToChange(NOBLE_GAS, ANAEROBE_GAS);
             HashSet<ItemStack> noGas = MainMod.getNoGasItems(toChange);
@@ -289,7 +304,7 @@ public final class MainMod {
     private static void runMoltenUnificationEnfocement(Werkstoff werkstoff){
         if (werkstoff.getGenerationFeatures().enforceUnification && werkstoff.getGenerationFeatures().hasMolten()) {
             try {
-                FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(molten.get(werkstoff), 144), werkstoff.get(cellMolten), Materials.Empty.getCells(1));
+                FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144), werkstoff.get(cellMolten), Materials.Empty.getCells(1));
                 Field f = GT_Utility.class.getDeclaredField("sFilledContainerToData");
                 f.setAccessible(true);
                 Map<GT_ItemStack, FluidContainerRegistry.FluidContainerData> sFilledContainerToData = (Map<GT_ItemStack, FluidContainerRegistry.FluidContainerData>) f.get(null);
@@ -402,7 +417,7 @@ public final class MainMod {
     }
 
     private static void editRecipes(ArrayListMultimap<SubTag,GT_Recipe> base, HashSet<ItemStack> noGas) {
-        if (GT_Recipe.GT_Recipe_Map.sBlastRecipes.mRecipeFluidNameMap.contains(fluids.get(Oganesson).getName()))
+        if (GT_Recipe.GT_Recipe_Map.sBlastRecipes.mRecipeFluidNameMap.contains(Objects.requireNonNull(fluids.get(Oganesson)).getName()))
             return;
         HashSet<GT_Recipe> toAdd = new HashSet<>();
         for (SubTag GasTag : base.keySet()) {
@@ -415,7 +430,7 @@ public final class MainMod {
                             if (!werkstoff.contains(GasTag))
                                 continue;
                             int time = (int) ((double) recipe.mDuration / 200D * (200D + (werkstoff.getStats().getProtons() >= mat.getProtons() ? (double) mat.getProtons() - (double) werkstoff.getStats().getProtons() : (double) mat.getProtons()*2.75D - (double) werkstoff.getStats().getProtons())));
-                            toAdd.add(new BWRecipes.DynamicGTRecipe(false, recipe.mInputs, recipe.mOutputs, recipe.mSpecialItems, recipe.mChances, new FluidStack[]{new FluidStack(fluids.get(werkstoff), recipe.mFluidInputs[0].amount)}, recipe.mFluidOutputs, time, recipe.mEUt, recipe.mSpecialValue));
+                            toAdd.add(new BWRecipes.DynamicGTRecipe(false, recipe.mInputs, recipe.mOutputs, recipe.mSpecialItems, recipe.mChances, new FluidStack[]{new FluidStack(Objects.requireNonNull(fluids.get(werkstoff)), recipe.mFluidInputs[0].amount)}, recipe.mFluidOutputs, time, recipe.mEUt, recipe.mSpecialValue));
                         }
                         for (Materials materials : Materials.values()) {
                             if (!materials.contains(GasTag))
@@ -462,22 +477,13 @@ public final class MainMod {
             }
         }
         toAdd.removeAll(duplicates);
-        for (GT_Recipe recipe : toAdd)
-            GT_Recipe.GT_Recipe_Map.sBlastRecipes.add(recipe);
+        toAdd.forEach(GT_Recipe.GT_Recipe_Map.sBlastRecipes::add);
     }
 
     private static void addElectricImplosionCompressorRecipes() {
         if (eicMap == null) {
             eicMap = new GT_Recipe.GT_Recipe_Map(new HashSet<>(GT_Recipe.GT_Recipe_Map.sImplosionRecipes.mRecipeList.size()), "gt.recipe.electricimplosioncompressor", "Electric Implosion Compressor", (String) null, "gregtech:textures/gui/basicmachines/Default", 1, 2, 1, 0, 1, "", 1, "", true, true);
-            for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sImplosionRecipes.mRecipeList) {
-                if (recipe == null || recipe.mInputs == null)
-                    continue;
-                HashSet<ItemStack> inputs = new HashSet<>();
-                for (ItemStack is : recipe.mInputs)
-                    if (!MainMod.checkForExplosives(is))
-                        inputs.add(is);
-                eicMap.addRecipe(true, inputs.toArray(new ItemStack[0]), recipe.mOutputs, null, null, null, recipe.mDuration, BW_Util.getMachineVoltageFromTier(10), 0);
-            }
+            GT_Recipe.GT_Recipe_Map.sImplosionRecipes.mRecipeList.stream().filter(e -> e.mInputs != null).forEach(recipe -> eicMap.addRecipe(true, Arrays.stream(recipe.mInputs).filter(e -> !MainMod.checkForExplosives(e)).distinct().toArray(ItemStack[]::new), recipe.mOutputs, null, null, null, recipe.mDuration, BW_Util.getMachineVoltageFromTier(10), 0));
         }
     }
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
index b5d5d8b972..da0397087e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
@@ -64,6 +64,7 @@ public class ConfigHandler {
 
     //One-Side-Only
     public static boolean debugLog;
+    public static boolean GTppLogDisabler;
     public static boolean tooltips = true;
     public static boolean[] enabledPatches;
 
@@ -92,6 +93,7 @@ public class ConfigHandler {
             ConfigHandler.IDOffset = 12600;
             ConfigHandler.c.get("System", "ID Offset", 12600, "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS").set(12600);
         }
+        ConfigHandler.GTppLogDisabler = ConfigHandler.c.get("System", "Disable GT++ Logging", false, "Enables or Disables GT++ Logging.").getBoolean(false);
         ConfigHandler.debugLog = ConfigHandler.c.get("System", "Enable Debug Log", false, "Enables or Disables the debug log.").getBoolean(false);
         ConfigHandler.experimentalThreadedLoader = ConfigHandler.c.get("System", "Enable Experimental Threaded Material Loader", false, "Enables or Disables the Experimental Threaded Material Loader.").getBoolean(false);
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/log/DebugLog.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/log/DebugLog.java
index 9e832e0820..f0854d78a9 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/log/DebugLog.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/log/DebugLog.java
@@ -36,7 +36,7 @@ import java.util.logging.Logger;
 
 public class DebugLog {
     private static boolean init;
-    private static FileHandler fh;
+    static FileHandler fh;
     private static Logger utilLog;
     public DebugLog(FMLPreInitializationEvent event) throws IOException {
         if (DebugLog.init)
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/log/STFUGTPPLOG.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/log/STFUGTPPLOG.java
new file mode 100644
index 0000000000..21268ac1c2
--- /dev/null
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/log/STFUGTPPLOG.java
@@ -0,0 +1,653 @@
+/*
+ * Copyright (c) 2019 bartimaeusnek
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.bartimaeusnek.bartworks.system.log;
+
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.message.MessageFactory;
+
+public class STFUGTPPLOG implements Logger {
+
+    @Override
+    public void catching(Level level, Throwable t) {
+
+    }
+
+    @Override
+    public void catching(Throwable t) {
+
+    }
+
+    @Override
+    public void debug(Marker marker, Message msg) {
+
+    }
+
+    @Override
+    public void debug(Marker marker, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void debug(Marker marker, Object message) {
+
+    }
+
+    @Override
+    public void debug(Marker marker, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void debug(Marker marker, String message) {
+
+    }
+
+    @Override
+    public void debug(Marker marker, String message, Object... params) {
+
+    }
+
+    @Override
+    public void debug(Marker marker, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void debug(Message msg) {
+
+    }
+
+    @Override
+    public void debug(Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void debug(Object message) {
+
+    }
+
+    @Override
+    public void debug(Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void debug(String message) {
+
+    }
+
+    @Override
+    public void debug(String message, Object... params) {
+
+    }
+
+    @Override
+    public void debug(String message, Throwable t) {
+
+    }
+
+    @Override
+    public void entry() {
+
+    }
+
+    @Override
+    public void entry(Object... params) {
+
+    }
+
+    @Override
+    public void error(Marker marker, Message msg) {
+
+    }
+
+    @Override
+    public void error(Marker marker, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void error(Marker marker, Object message) {
+
+    }
+
+    @Override
+    public void error(Marker marker, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void error(Marker marker, String message) {
+
+    }
+
+    @Override
+    public void error(Marker marker, String message, Object... params) {
+
+    }
+
+    @Override
+    public void error(Marker marker, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void error(Message msg) {
+
+    }
+
+    @Override
+    public void error(Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void error(Object message) {
+
+    }
+
+    @Override
+    public void error(Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void error(String message) {
+
+    }
+
+    @Override
+    public void error(String message, Object... params) {
+
+    }
+
+    @Override
+    public void error(String message, Throwable t) {
+
+    }
+
+    @Override
+    public void exit() {
+
+    }
+
+    @Override
+    public <R> R exit(R result) {
+        return null;
+    }
+
+    @Override
+    public void fatal(Marker marker, Message msg) {
+
+    }
+
+    @Override
+    public void fatal(Marker marker, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void fatal(Marker marker, Object message) {
+
+    }
+
+    @Override
+    public void fatal(Marker marker, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void fatal(Marker marker, String message) {
+
+    }
+
+    @Override
+    public void fatal(Marker marker, String message, Object... params) {
+
+    }
+
+    @Override
+    public void fatal(Marker marker, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void fatal(Message msg) {
+
+    }
+
+    @Override
+    public void fatal(Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void fatal(Object message) {
+
+    }
+
+    @Override
+    public void fatal(Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void fatal(String message) {
+
+    }
+
+    @Override
+    public void fatal(String message, Object... params) {
+
+    }
+
+    @Override
+    public void fatal(String message, Throwable t) {
+
+    }
+
+    @Override
+    public MessageFactory getMessageFactory() {
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public void info(Marker marker, Message msg) {
+
+    }
+
+    @Override
+    public void info(Marker marker, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void info(Marker marker, Object message) {
+
+    }
+
+    @Override
+    public void info(Marker marker, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void info(Marker marker, String message) {
+
+    }
+
+    @Override
+    public void info(Marker marker, String message, Object... params) {
+
+    }
+
+    @Override
+    public void info(Marker marker, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void info(Message msg) {
+
+    }
+
+    @Override
+    public void info(Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void info(Object message) {
+
+    }
+
+    @Override
+    public void info(Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void info(String message) {
+
+    }
+
+    @Override
+    public void info(String message, Object... params) {
+
+    }
+
+    @Override
+    public void info(String message, Throwable t) {
+
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isDebugEnabled(Marker marker) {
+        return false;
+    }
+
+    @Override
+    public boolean isEnabled(Level level) {
+        return false;
+    }
+
+    @Override
+    public boolean isEnabled(Level level, Marker marker) {
+        return false;
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isErrorEnabled(Marker marker) {
+        return false;
+    }
+
+    @Override
+    public boolean isFatalEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isFatalEnabled(Marker marker) {
+        return false;
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isInfoEnabled(Marker marker) {
+        return false;
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isTraceEnabled(Marker marker) {
+        return false;
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isWarnEnabled(Marker marker) {
+        return false;
+    }
+
+    @Override
+    public void log(Level level, Marker marker, Message msg) {
+
+    }
+
+    @Override
+    public void log(Level level, Marker marker, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void log(Level level, Marker marker, Object message) {
+
+    }
+
+    @Override
+    public void log(Level level, Marker marker, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void log(Level level, Marker marker, String message) {
+
+    }
+
+    @Override
+    public void log(Level level, Marker marker, String message, Object... params) {
+
+    }
+
+    @Override
+    public void log(Level level, Marker marker, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void log(Level level, Message msg) {
+
+    }
+
+    @Override
+    public void log(Level level, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void log(Level level, Object message) {
+
+    }
+
+    @Override
+    public void log(Level level, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void log(Level level, String message) {
+
+    }
+
+    @Override
+    public void log(Level level, String message, Object... params) {
+
+    }
+
+    @Override
+    public void log(Level level, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void printf(Level level, Marker marker, String format, Object... params) {
+
+    }
+
+    @Override
+    public void printf(Level level, String format, Object... params) {
+
+    }
+
+    @Override
+    public <T extends Throwable> T throwing(Level level, T t) {
+        return null;
+    }
+
+    @Override
+    public <T extends Throwable> T throwing(T t) {
+        return null;
+    }
+
+    @Override
+    public void trace(Marker marker, Message msg) {
+
+    }
+
+    @Override
+    public void trace(Marker marker, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void trace(Marker marker, Object message) {
+
+    }
+
+    @Override
+    public void trace(Marker marker, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void trace(Marker marker, String message) {
+
+    }
+
+    @Override
+    public void trace(Marker marker, String message, Object... params) {
+
+    }
+
+    @Override
+    public void trace(Marker marker, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void trace(Message msg) {
+
+    }
+
+    @Override
+    public void trace(Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void trace(Object message) {
+
+    }
+
+    @Override
+    public void trace(Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void trace(String message) {
+
+    }
+
+    @Override
+    public void trace(String message, Object... params) {
+
+    }
+
+    @Override
+    public void trace(String message, Throwable t) {
+
+    }
+
+    @Override
+    public void warn(Marker marker, Message msg) {
+
+    }
+
+    @Override
+    public void warn(Marker marker, Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void warn(Marker marker, Object message) {
+
+    }
+
+    @Override
+    public void warn(Marker marker, Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void warn(Marker marker, String message) {
+
+    }
+
+    @Override
+    public void warn(Marker marker, String message, Object... params) {
+
+    }
+
+    @Override
+    public void warn(Marker marker, String message, Throwable t) {
+
+    }
+
+    @Override
+    public void warn(Message msg) {
+
+    }
+
+    @Override
+    public void warn(Message msg, Throwable t) {
+
+    }
+
+    @Override
+    public void warn(Object message) {
+
+    }
+
+    @Override
+    public void warn(Object message, Throwable t) {
+
+    }
+
+    @Override
+    public void warn(String message) {
+
+    }
+
+    @Override
+    public void warn(String message, Object... params) {
+
+    }
+
+    @Override
+    public void warn(String message, Throwable t) {
+
+    }
+}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BWUnificationEnforcer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BWUnificationEnforcer.java
deleted file mode 100644
index 784459f25e..0000000000
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BWUnificationEnforcer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2019 bartimaeusnek
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.github.bartimaeusnek.bartworks.system.material;
-
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.HashSet;
-
-public class BWUnificationEnforcer {
-    private static boolean enabled;
-    private static final HashSet<String> UNIFICATION_TARGETS = new HashSet<>();
-    public static boolean isEnabled() {
-        return BWUnificationEnforcer.enabled;
-    }
-
-    public static HashSet<String> getUnificationTargets() {
-        return BWUnificationEnforcer.UNIFICATION_TARGETS;
-    }
-
-    public static void addUnificationTarget(String aOreDictName){
-        if (aOreDictName == null || aOreDictName.isEmpty() || !OreDictionary.doesOreNameExist(aOreDictName))
-            return;
-        BWUnificationEnforcer.UNIFICATION_TARGETS.add(aOreDictName);
-        BWUnificationEnforcer.enabled = true;
-    }
-
-
-}
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 c9ae650d36..0144404b46 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
@@ -38,7 +38,7 @@ import java.util.*;
 
 public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
 
-    static final LinkedHashSet<Werkstoff> werkstoffHashSet = new LinkedHashSet<>();
+    public static final LinkedHashSet<Werkstoff> werkstoffHashSet = new LinkedHashSet<>();
     public static final LinkedHashMap<Short, Werkstoff> werkstoffHashMap = new LinkedHashMap<>();
     public static final LinkedHashMap<String, Werkstoff> werkstoffNameHashMap = new LinkedHashMap<>();
 
@@ -164,10 +164,6 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
         }
         this.texSet = texSet;
 
-        if (this.getGenerationFeatures().enforceUnification) {
-            for (OrePrefixes prefix : OrePrefixes.values())
-                BWUnificationEnforcer.addUnificationTarget(prefix+this.getDefaultName());
-        }
         Werkstoff.werkstoffHashSet.add(this);
         Werkstoff.werkstoffHashMap.put(this.mID, this);
         Werkstoff.werkstoffNameHashMap.put(this.defaultName,this);
@@ -378,23 +374,28 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dust,0b1);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustTiny,0b1);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustSmall,0b1);
+
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingot,0b10);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotHot,0b10);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.nugget,0b10);
+
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gem,0b100);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemFlawed,0b100);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemExquisite,0b100);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemChipped,0b100);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.gemFlawless,0b100);
+
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ore,0b1000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustImpure,0b1000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustPure,0b1000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.crushed,0b1000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.crushedPurified,0b1000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.crushedCentrifuged,0b1000);
+
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.cell,0b10000);
+
             Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.cellMolten,0b1000000);
-            Werkstoff.GenerationFeatures.prefixLogic.put(WerkstoffLoader.cellMolten,0b1000000);
+
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plate,0b10000000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.stick,0b10000000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.rod,0b10000000);
@@ -407,6 +408,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.spring,0b100000000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.springSmall,0b100000000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.rotor,0b100000000);
+            Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.wireFine,0b100000000);
 
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateDouble,0b1000000000);
             Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateTriple,0b1000000000);
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 96fe88d759..d4307a13dd 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
@@ -48,6 +48,7 @@ import gregtech.api.interfaces.ISubTagContainer;
 import gregtech.api.objects.GT_Fluid;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.ItemData;
 import gregtech.api.util.*;
 import gregtech.common.GT_Proxy;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
@@ -106,7 +107,8 @@ public class WerkstoffLoader implements Runnable {
             WerkstoffLoader.smallGearShape = Enum.valueOf(ItemList.class, "Shape_Extruder_Small_Gear");