Merge addon sources

2 files changed, 0 insertions, 158 deletions

diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java
deleted file mode 100644
index 65beea207a..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.util;
-
-import static gregtech.api.enums.GT_Values.E;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-
-public class GTPP_Config implements Runnable {
-
-    public static boolean troll = false;
-
-    public static Configuration sConfigFileIDs;
-    public final Configuration mConfig;
-
-    public GTPP_Config(Configuration aConfig) {
-        mConfig = aConfig;
-        mConfig.load();
-        mConfig.save();
-    }
-
-    public static int addIDConfig(Object aCategory, String aName, int aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
-        Property tProperty = sConfigFileIDs.get(
-            aCategory.toString()
-                .replaceAll("\\|", "."),
-            aName.replaceAll("\\|", "."),
-            aDefault);
-        int rResult = tProperty.getInt(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) sConfigFileIDs.save();
-        return rResult;
-    }
-
-    public static String getStackConfigName(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return E;
-        Object rName = GT_OreDictUnificator.getAssociation(aStack);
-        if (rName != null) return rName.toString();
-        try {
-            if (GT_Utility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString();
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        String sName = aStack.getItem()
-            .toString();
-        String[] tmp = sName.split("@");
-        if (tmp.length > 0) sName = tmp[0];
-        return sName + "." + aStack.getItemDamage();
-    }
-
-    public boolean get(Object aCategory, ItemStack aStack, boolean aDefault) {
-        String aName = getStackConfigName(aStack);
-        return get(aCategory, aName, aDefault);
-    }
-
-    public boolean get(Object aCategory, String aName, boolean aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
-        Property tProperty = mConfig.get(
-            aCategory.toString()
-                .replaceAll("\\|", "_"),
-            (aName + "_" + aDefault).replaceAll("\\|", "_"),
-            aDefault);
-        boolean rResult = tProperty.getBoolean(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
-        return rResult;
-    }
-
-    public int get(Object aCategory, ItemStack aStack, int aDefault) {
-        return get(aCategory, getStackConfigName(aStack), aDefault);
-    }
-
-    public int get(Object aCategory, String aName, int aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
-        Property tProperty = mConfig.get(
-            aCategory.toString()
-                .replaceAll("\\|", "_"),
-            (aName + "_" + aDefault).replaceAll("\\|", "_"),
-            aDefault);
-        int rResult = tProperty.getInt(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
-        return rResult;
-    }
-
-    public double get(Object aCategory, ItemStack aStack, double aDefault) {
-        return get(aCategory, getStackConfigName(aStack), aDefault);
-    }
-
-    public double get(Object aCategory, String aName, double aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
-        Property tProperty = mConfig.get(
-            aCategory.toString()
-                .replaceAll("\\|", "_"),
-            (aName + "_" + aDefault).replaceAll("\\|", "_"),
-            aDefault);
-        double rResult = tProperty.getDouble(aDefault);
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
-        return rResult;
-    }
-
-    public String get(Object aCategory, ItemStack aStack, String aDefault) {
-        return get(aCategory, getStackConfigName(aStack), aDefault);
-    }
-
-    public String get(Object aCategory, String aName, String aDefault) {
-        if (GT_Utility.isStringInvalid(aName)) return aDefault;
-        Property tProperty = mConfig.get(
-            aCategory.toString()
-                .replaceAll("\\|", "_"),
-            (aName + "_" + aDefault).replaceAll("\\|", "_"),
-            aDefault);
-        String rResult = tProperty.getString();
-        if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
-        return rResult;
-    }
-
-    @Override
-    public void run() {
-        mConfig.save();
-    }
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
deleted file mode 100644
index df95b7de2b..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.util;
-
-import java.util.HashMap;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.util.GT_Utility;
-
-public class SpecialBehaviourTooltipHandler {
-
-    private static final HashMap<ItemStack, String> mTooltipCache = new HashMap<>();
-
-    public static void addTooltipForItem(ItemStack aStack, String aTooltip) {
-        mTooltipCache.put(aStack, aTooltip);
-    }
-
-    @SubscribeEvent
-    public void onItemTooltip(ItemTooltipEvent event) {
-        if (event != null) {
-            if (event.itemStack != null) {
-                for (ItemStack aKey : mTooltipCache.keySet()) {
-                    if (GT_Utility.areStacksEqual(aKey, event.itemStack, false)) {
-                        String s = mTooltipCache.get(aKey);
-                        if (s != null && s.length() > 0) {
-                            event.toolTip.add(EnumChatFormatting.RED + s);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}