Merge addon sources

1 files changed, 0 insertions, 103 deletions

diff --git a/gtpp/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/gtpp/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
deleted file mode 100644
index 9a350ab5e4..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package gtPlusPlus.preloader;
-
-import static gregtech.api.enums.Mods.GregTech;
-
-import net.minecraft.item.ItemStack;
-
-import org.apache.logging.log4j.Level;
-
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-
-public class Preloader_GT_OreDict {
-
-    public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) {
-
-        if (bannedItem == null) {
-            return false;
-        } else if (!CORE_Preloader.enableOldGTcircuits) {
-            return false;
-        }
-
-        try {
-            if (CORE_Preloader.enableOldGTcircuits) {
-                if ((bannedItem != null) && ItemUtils.getModId(bannedItem)
-                    .toLowerCase()
-                    .equals(GregTech.ID)) {
-                    final int damageValue = bannedItem.getItemDamage() - 32000;
-                    if (bannedItem.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720
-                        if ((damageValue >= 700) && (damageValue <= 720)) {
-                            return true;
-                        }
-                    } else {
-                        if (ReflectionUtils.doesClassExist("gregtech.common.items.GT_MetaGenerated_Item_03")) { // 6/11/12/14/16/20/30-57/69-73/79-96
-                            final Class<?> MetaItem03 = ReflectionUtils
-                                .getClass("gregtech.common.items.GT_MetaGenerated_Item_03");
-                            if (isInstanceOf(MetaItem03, bannedItem.getItem())) {
-                                if ((damageValue == 6) || (damageValue == 7)
-                                    || (damageValue == 11)
-                                    || (damageValue == 12)
-                                    || (damageValue == 14)
-                                    || (damageValue == 16)
-                                    || (damageValue == 20)
-                                    || (damageValue == 21)
-                                    || (damageValue == 22)) {
-                                    return true;
-                                } else if ((damageValue >= 30) && (damageValue <= 57)) {
-                                    return true;
-                                } else if ((damageValue >= 69) && (damageValue <= 73)) {
-                                    return true;
-                                } else if ((damageValue >= 78) && (damageValue <= 96)) {
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-        } catch (final Throwable e) {
-            if (CORE.ConfigSwitches.showHiddenNEIItems) {
-                FMLRelaunchLog.log(
-                    "[GT++ ASM] OreDictTransformer",
-                    Level.INFO,
-                    "A mod tried to register an invalid item with the OreDictionary.");
-                if (bannedItem != null) {
-                    FMLRelaunchLog.log(
-                        "[GT++ ASM] OreDictTransformer",
-                        Level.INFO,
-                        "Please report this issue to the authors of %s",
-                        ItemUtils.getModId(bannedItem));
-                    try {
-                        if (bannedItem.getItemDamage() <= Short.MAX_VALUE - 1) {
-                            FMLRelaunchLog.log(
-                                "[GT++ ASM] OreDictTransformer",
-                                Level.INFO,
-                                "Item was not null, but still invalidly registering: %s",
-                                bannedItem.getDisplayName() != null ? bannedItem.getDisplayName()
-                                    : "INVALID ITEM FOUND");
-                        } else {
-                            FMLRelaunchLog.log(
-                                "[GT++ ASM] OreDictTransformer",
-                                Level.INFO,
-                                "Item was not null, but still invalidly registering: %s",
-                                "Found Wildcard item that is being registered too early.");
-                        }
-                    } catch (Exception h) {
-                        h.printStackTrace();
-                    }
-                }
-            }
-            // FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage());
-        }
-        return false;
-    }
-
-    // Simplification of Life.
-    private static boolean isInstanceOf(final Class<?> clazz, final Object obj) {
-        return clazz.isInstance(obj);
-    }
-}