Selectable ores on electronic prospector

* Cleaned up some class/file names
* Removed unused code/comments
* Cached other mods being loaded
* Various optimizations

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index acf8ffec76..92ad44617a 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -24,10 +24,13 @@ import net.minecraftforge.common.config.Configuration;
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "1.5.7";
+    public static final String VERSION = "1.6.0";
     public static final String DEBUGOVERRIDE = "@false";
     public static final boolean DEBUGBUILD = Boolean.parseBoolean(DEBUGOVERRIDE.substring(1));
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
+    public static boolean isDreamcraftLoaded = false;
+    public static boolean isBartWorksLoaded = false;
+    public static boolean isGTppLoaded = false;
 
     public static final org.apache.logging.log4j.Logger Logger = LogManager.getLogger("GT Scanner Mod");
     
@@ -39,6 +42,10 @@ public class DetravScannerMod
 
     public DetravScannerMod() {
         GregTech_API.sAfterGTPreload.add(new Detrav_AfterGTPreload_Loader());
+        isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
+        isBartWorksLoaded = Loader.isModLoaded("bartworks");
+        isGTppLoaded = Loader.isModLoaded("miscutils");
+
         new DetravNetwork();
     }
 
@@ -64,8 +71,7 @@ public class DetravScannerMod
     @EventHandler
     public void onPostLoad(FMLPostInitializationEvent aEvent) {
         proxy.onPostLoad();
-        if (Loader.isModLoaded("miscutils"))
-        	GTppHelper.generate_OreIDs();
+        if (isGTppLoaded) GTppHelper.generate_OreIDs();
         FluidColors.makeColors();
     }