merge sources and fix dependencies

42 files changed, 20 insertions, 7 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index 3608761d73..de7bc2c93f 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -70,6 +70,7 @@ dependencies {
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false}
     compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:VisualProspecting:1.2.11:dev') { transitive = false }
 
     compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") { transitive = false }
     implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.8-GTNH:dev")
diff --git a/detrav/src/main/resources/mcmod.info b/detrav/src/main/resources/mcmod.info
index 5e742d8f52..0104aa9859 100644
--- a/detrav/src/main/resources/mcmod.info
+++ b/detrav/src/main/resources/mcmod.info
@@ -1,8 +1,7 @@
 [
 {
-  "modid": "${modId}",
-  "name": "${modName}",
-  "description": "To locate ores deep underground.",
+  "modid": "detravscannermod",
+  "name": "GT Scanner Mod", "description": "To locate ores deep underground.",
   "version": "${modVersion}",
   "mcversion": "${minecraftVersion}",
   "url": "https://github.com/GTNewHorizons/GTScannerMod",
diff --git a/detrav/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index 8d6b24077e..152b9fbc71 100644
--- a/detrav/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -1,7 +1,5 @@
 package com.detrav;
 
-import static com.detrav.Tags.VERSION;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraftforge.common.config.Configuration;
 
@@ -19,11 +17,12 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
+import gregtech.GT_Version;
 import gregtech.api.GregTech_API;
 
 @Mod(
         modid = DetravScannerMod.MODID,
-        version = VERSION,
+        version = GT_Version.VERSION,
         dependencies = "required-after:IC2;required-after:gregtech;after:miscutils;after:bartworks")
 public class DetravScannerMod {
 
diff --git a/detrav/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java
index 5cdb2bff88..5cdb2bff88 100644
--- a/detrav/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java
+++ b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java
diff --git a/detrav/src/main/java/com/detrav/commands/DetravScannerCommand.java b/src/main/java/com/detrav/commands/DetravScannerCommand.java
index ba16e47a6c..ba16e47a6c 100644
--- a/detrav/src/main/java/com/detrav/commands/DetravScannerCommand.java
+++ b/src/main/java/com/detrav/commands/DetravScannerCommand.java
diff --git a/detrav/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java
index 128545360c..128545360c 100644
--- a/detrav/src/main/java/com/detrav/enums/DetravToolDictNames.java
+++ b/src/main/java/com/detrav/enums/DetravToolDictNames.java
diff --git a/detrav/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java
index cc65d4d1ca..cc65d4d1ca 100644
--- a/detrav/src/main/java/com/detrav/enums/Textures01.java
+++ b/src/main/java/com/detrav/enums/Textures01.java
diff --git a/detrav/src/main/java/com/detrav/events/DetravLoginEventHandler.java b/src/main/java/com/detrav/events/DetravLoginEventHandler.java
index 5178516267..5178516267 100644
--- a/detrav/src/main/java/com/detrav/events/DetravLoginEventHandler.java
+++ b/src/main/java/com/detrav/events/DetravLoginEventHandler.java
diff --git a/detrav/src/main/java/com/detrav/gui/DetravScannerGUI.java b/src/main/java/com/detrav/gui/DetravScannerGUI.java
index c0a7e7f16f..c0a7e7f16f 100644
--- a/detrav/src/main/java/com/detrav/gui/DetravScannerGUI.java
+++ b/src/main/java/com/detrav/gui/DetravScannerGUI.java
diff --git a/detrav/src/main/java/com/detrav/gui/OresList.java b/src/main/java/com/detrav/gui/OresList.java
index 54c2152f5a..54c2152f5a 100644
--- a/detrav/src/main/java/com/detrav/gui/OresList.java
+++ b/src/main/java/com/detrav/gui/OresList.java
diff --git a/detrav/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
index 01c570d5a1..01c570d5a1 100644
--- a/detrav/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
diff --git a/detrav/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index c5b891784e..c5b891784e 100644
--- a/detrav/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
diff --git a/detrav/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
index 8cd4e28fa4..8cd4e28fa4 100644
--- a/detrav/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
diff --git a/detrav/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java
index f6f6350020..f6f6350020 100644
--- a/detrav/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java
diff --git a/detrav/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java
index cc4bc7c081..cc4bc7c081 100644
--- a/detrav/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java
+++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java
diff --git a/detrav/src/main/java/com/detrav/items/tools/DetravProspector.java b/src/main/java/com/detrav/items/tools/DetravProspector.java
index e6328844c8..e6328844c8 100644
--- a/detrav/src/main/java/com/detrav/items/tools/DetravProspector.java
+++ b/src/main/java/com/detrav/items/tools/DetravProspector.java
diff --git a/detrav/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java
index 21eb432148..21eb432148 100644
--- a/detrav/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java
diff --git a/detrav/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java
index 36a2f22790..36a2f22790 100644
--- a/detrav/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java
diff --git a/detrav/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java
index 75e0a267ab..75e0a267ab 100644
--- a/detrav/src/main/java/com/detrav/net/DetravNetwork.java
+++ b/src/main/java/com/detrav/net/DetravNetwork.java
diff --git a/detrav/src/main/java/com/detrav/net/DetravPacket.java b/src/main/java/com/detrav/net/DetravPacket.java
index 8659549045..8659549045 100644
--- a/detrav/src/main/java/com/detrav/net/DetravPacket.java
+++ b/src/main/java/com/detrav/net/DetravPacket.java
diff --git a/detrav/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java
index bc2f1bc9f2..bc2f1bc9f2 100644
--- a/detrav/src/main/java/com/detrav/net/ProspectingPacket.java
+++ b/src/main/java/com/detrav/net/ProspectingPacket.java
diff --git a/detrav/src/main/java/com/detrav/proxies/ClientProxy.java b/src/main/java/com/detrav/proxies/ClientProxy.java
index b9b978b021..b9b978b021 100644
--- a/detrav/src/main/java/com/detrav/proxies/ClientProxy.java
+++ b/src/main/java/com/detrav/proxies/ClientProxy.java
diff --git a/detrav/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index 62473ec4d7..62473ec4d7 100644
--- a/detrav/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
diff --git a/detrav/src/main/java/com/detrav/proxies/ServerProxy.java b/src/main/java/com/detrav/proxies/ServerProxy.java
index 46d58450d9..46d58450d9 100644
--- a/detrav/src/main/java/com/detrav/proxies/ServerProxy.java
+++ b/src/main/java/com/detrav/proxies/ServerProxy.java
diff --git a/detrav/src/main/java/com/detrav/utils/BartWorksHelper.java b/src/main/java/com/detrav/utils/BartWorksHelper.java
index bac23893c1..bac23893c1 100644
--- a/detrav/src/main/java/com/detrav/utils/BartWorksHelper.java
+++ b/src/main/java/com/detrav/utils/BartWorksHelper.java
diff --git a/detrav/src/main/java/com/detrav/utils/DetravCreativeTab.java b/src/main/java/com/detrav/utils/DetravCreativeTab.java
index ba79c55ab2..ba79c55ab2 100644
--- a/detrav/src/main/java/com/detrav/utils/DetravCreativeTab.java
+++ b/src/main/java/com/detrav/utils/DetravCreativeTab.java
diff --git a/detrav/src/main/java/com/detrav/utils/FluidColors.java b/src/main/java/com/detrav/utils/FluidColors.java
index a5cd94e492..a5cd94e492 100644
--- a/detrav/src/main/java/com/detrav/utils/FluidColors.java
+++ b/src/main/java/com/detrav/utils/FluidColors.java
diff --git a/detrav/src/main/java/com/detrav/utils/GTppHelper.java b/src/main/java/com/detrav/utils/GTppHelper.java
index 59db67eac7..59db67eac7 100644
--- a/detrav/src/main/java/com/detrav/utils/GTppHelper.java
+++ b/src/main/java/com/detrav/utils/GTppHelper.java
diff --git a/detrav/src/main/resources/assets/detravscannermod/lang/en_US.lang b/src/main/resources/assets/detravscannermod/lang/en_US.lang
index e67901e512..e67901e512 100644
--- a/detrav/src/main/resources/assets/detravscannermod/lang/en_US.lang
+++ b/src/main/resources/assets/detravscannermod/lang/en_US.lang
diff --git a/detrav/src/main/resources/assets/detravscannermod/lang/zh_CN.lang b/src/main/resources/assets/detravscannermod/lang/zh_CN.lang
index f65360d579..f65360d579 100644
--- a/detrav/src/main/resources/assets/detravscannermod/lang/zh_CN.lang
+++ b/src/main/resources/assets/detravscannermod/lang/zh_CN.lang
diff --git a/detrav/src/main/resources/assets/gregtech/textures/gui/propick.png b/src/main/resources/assets/gregtech/textures/gui/propick.png
index 582078659d..582078659d 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/gui/propick.png
+++ b/src/main/resources/assets/gregtech/textures/gui/propick.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png
index b97d245942..b97d245942 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png
index c7eff4b666..c7eff4b666 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD_OVERLAY.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD.png
index 57706b0457..57706b0457 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD_OVERLAY.png
index 3ab9c67f23..3ab9c67f23 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD_OVERLAY.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD_OVERLAY.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png
index 57706b0457..57706b0457 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png
index f42b2213a3..f42b2213a3 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD_OVERLAY.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png
index 7864cf9036..7864cf9036 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png
index 04e3157a47..04e3157a47 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD_OVERLAY.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD.png
index f537cd9c01..f537cd9c01 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD.png
diff --git a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD_OVERLAY.png
index 48cf18804f..48cf18804f 100644
--- a/detrav/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD_OVERLAY.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.detrav.metatool.01/PRO_PICK_HEAD_OVERLAY.png
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 9d8c7f0d9d..0740371963 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -315,5 +315,19 @@
       "credits": "",
       "logoFile": "",
       "screenshots": []
-    }]
+    },
+    {
+      "modid": "detravscannermod",
+      "name": "GT Scanner Mod", "description": "To locate ores deep underground.",
+      "version": "${modVersion}",
+      "mcversion": "${minecraftVersion}",
+      "url": "https://github.com/GTNewHorizons/GTScannerMod",
+      "updateUrl": "",
+      "authorList": ["Ethryan, GTNewHorizons Team, bartimaeusnek, richardhendricks, mitchej123"],
+      "credits": "Detrav",
+      "logoFile": "",
+      "screenshots": [],
+      "dependencies": []
+    }
+    ]
 }