Cleanup detrav (#3058)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

12 files changed, 415 insertions, 384 deletions

diff --git a/src/main/java/detrav/commands/DetravScannerCommand.java b/src/main/java/detrav/commands/DetravScannerCommand.java
index 76c6673be1..783a522aa4 100644
--- a/src/main/java/detrav/commands/DetravScannerCommand.java
+++ b/src/main/java/detrav/commands/DetravScannerCommand.java
@@ -47,22 +47,21 @@ public class DetravScannerCommand implements ICommand {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        int aX = 0;
-        int aZ = 0;
-        int aY = 0;
         String name = null;
 
         ArrayList<String> strs = new ArrayList<>();
         for (int i = 0; i < args.length; i++) {
             strs.add(args[i]);
-            if (args[i].startsWith("\"")) {
-                for (i++; i < args.length; i++) {
-                    String temp = (String) strs.get(strs.size() - 1);
-                    temp = temp + " " + args[i];
-                    temp = temp.replace("\"", "");
-                    strs.set(strs.size() - 1, temp);
-                    if (args[i].endsWith("\"")) break;
-                }
+            if (!args[i].startsWith("\"")) {
+                continue;
+            }
+
+            for (i++; i < args.length; i++) {
+                String temp = (String) strs.get(strs.size() - 1);
+                temp = temp + " " + args[i];
+                temp = temp.replace("\"", "");
+                strs.set(strs.size() - 1, temp);
+                if (args[i].endsWith("\"")) break;
             }
         }
         args = new String[strs.size()];
@@ -72,7 +71,7 @@ public class DetravScannerCommand implements ICommand {
             case 0:
                 break;
             case 1:
-                if (args[0].toLowerCase() == "help") {
+                if (args[0].equalsIgnoreCase("help")) {
                     sendHelpMessage(sender);
                     return;
                 }
@@ -96,23 +95,28 @@ public class DetravScannerCommand implements ICommand {
             int ySize = c.getHeightValue(x, z);
             for (int y = 1; y < ySize; y++) {
                 Block b = c.getBlock(x, y, z);
-                if (b == GregTechAPI.sBlockOres1) {
-                    TileEntity entity = c.getTileEntityUnsafe(x, y, z);
-                    if (entity != null) {
-                        TileEntityOres gt_entity = (TileEntityOres) entity;
-                        short meta = gt_entity.getMetaData();
-                        String name = Materials.getLocalizedNameForItem(
-                            GTLanguageManager.getTranslation(b.getUnlocalizedName() + "." + meta + ".name"),
-                            meta % 1000);
-                        if (name.startsWith("Small")) continue;
-                        if (fName == null || name.toLowerCase()
-                            .contains(fName)) {
-                            if (!ores.containsKey(name)) ores.put(name, 1);
-                            else {
-                                int val = ores.get(name);
-                                ores.put(name, val + 1);
-                            }
-                        }
+                if (b != GregTechAPI.sBlockOres1) {
+                    continue;
+                }
+
+                TileEntity entity = c.getTileEntityUnsafe(x, y, z);
+
+                if (entity == null) {
+                    continue;
+                }
+
+                TileEntityOres gt_entity = (TileEntityOres) entity;
+                short meta = gt_entity.getMetaData();
+                String name = Materials.getLocalizedNameForItem(
+                    GTLanguageManager.getTranslation(b.getUnlocalizedName() + "." + meta + ".name"),
+                    meta % 1000);
+                if (name.startsWith("Small")) continue;
+                if (fName == null || name.toLowerCase()
+                    .contains(fName)) {
+                    if (!ores.containsKey(name)) ores.put(name, 1);
+                    else {
+                        int val = ores.get(name);
+                        ores.put(name, val + 1);
                     }
                 }
             }
diff --git a/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java b/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java
new file mode 100644
index 0000000000..2149252ff3
--- /dev/null
+++ b/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java
@@ -0,0 +1,25 @@
+package detrav.enums;
+
+public enum IDDetraveMetaGeneratedTool01 {
+
+    ProspectorScannerULV(0),
+    ProspectorScannerLV(2),
+    ProspectorScannerMV(4),
+    ProspectorScannerHV(6),
+    ProspectorScannerEV(8),
+    ProspectorScannerIV(10),
+    ProspectorScannerLuV(12),
+    ProspectorScannerZPM(14),
+    ProspectorScannerUV(16),
+    ProspectorScannerUHV(18),
+    ElectricProspectorScannerLuV(100),
+    ElectricProspectorScannerZPM(102),
+    ElectricProspectorScannerUV(104),
+    ElectricProspectorScannerUHV(106),;
+
+    public final int ID;
+
+    private IDDetraveMetaGeneratedTool01(int ID) {
+        this.ID = ID;
+    }
+}
diff --git a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
index c171f56561..75788a5bfb 100644
--- a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
@@ -1,9 +1,26 @@
 package detrav.items;
 
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ElectricProspectorScannerLuV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ElectricProspectorScannerUHV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ElectricProspectorScannerUV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ElectricProspectorScannerZPM;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerEV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerHV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerIV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerLV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerLuV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerMV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerUHV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerULV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerUV;
+import static detrav.enums.IDDetraveMetaGeneratedTool01.ProspectorScannerZPM;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+
 import java.util.List;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -16,7 +33,6 @@ import detrav.items.tools.DetravProspector;
 import detrav.items.tools.DetravToolElectricProspector;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.Mods;
 import gregtech.api.enums.TCAspects;
 import gregtech.api.interfaces.IToolStats;
 import gregtech.api.items.MetaGeneratedTool;
@@ -32,7 +48,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
         super("detrav.metatool.01");
         INSTANCE = this;
         addTool(
-            0,
+            ProspectorScannerULV.ID,
             "Prospector's Scanner(ULV)",
             "",
             new DetravProspector(0),
@@ -41,7 +57,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            2,
+            ProspectorScannerLV.ID,
             "Prospector's Scanner(LV)",
             "",
             new DetravProspector(1),
@@ -50,7 +66,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            4,
+            ProspectorScannerMV.ID,
             "Prospector's Scanner(MV)",
             "",
             new DetravProspector(2),
@@ -59,7 +75,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            6,
+            ProspectorScannerHV.ID,
             "Prospector's Scanner(HV)",
             "",
             new DetravProspector(3),
@@ -68,7 +84,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            8,
+            ProspectorScannerEV.ID,
             "Prospector's Scanner(EV)",
             "",
             new DetravProspector(4),
@@ -77,7 +93,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            10,
+            ProspectorScannerIV.ID,
             "Prospector's Scanner(IV)",
             "",
             new DetravProspector(5),
@@ -86,7 +102,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            12,
+            ProspectorScannerLuV.ID,
             "Prospector's Scanner(LuV)",
             "",
             new DetravProspector(6),
@@ -95,7 +111,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            14,
+            ProspectorScannerZPM.ID,
             "Prospector's Scanner(ZPM)",
             "",
             new DetravProspector(7),
@@ -104,7 +120,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            16,
+            ProspectorScannerUV.ID,
             "Prospector's Scanner(UV)",
             "",
             new DetravProspector(8),
@@ -113,7 +129,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
         addTool(
-            18,
+            ProspectorScannerUHV.ID,
             "Prospector's Scanner(UHV)",
             "",
             new DetravProspector(9),
@@ -123,7 +139,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.PERFODIO, 4L));
 
         addTool(
-            100,
+            ElectricProspectorScannerLuV.ID,
             "Electric Prospector's Scanner (LuV)",
             "",
             new DetravToolElectricProspector(6),
@@ -132,7 +148,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L));
         addTool(
-            102,
+            ElectricProspectorScannerZPM.ID,
             "Electric Prospector's Scanner (ZPM)",
             "",
             new DetravToolElectricProspector(7),
@@ -141,7 +157,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L));
         addTool(
-            104,
+            ElectricProspectorScannerUV.ID,
             "Electric Prospector's Scanner (UV)",
             "",
             new DetravToolElectricProspector(8),
@@ -150,7 +166,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             new TCAspects.TC_AspectStack(TCAspects.METALLUM, 4L),
             new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 4L));
         addTool(
-            106,
+            ElectricProspectorScannerUHV.ID,
             "Electric Prospector's Scanner (UHV)",
             "",
             new DetravToolElectricProspector(9),
@@ -169,32 +185,30 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
         int tOffset = aList.size();
         if (tStats == null) return;
 
-        String name = aStack.getUnlocalizedName();
-        String num = name.substring("gt.detrav.metatool.01.".length());
-        int meta = Integer.parseInt(num);
+        int meta = Items.feather.getDamage(aStack);
+
+        // range in chunks
         int range = getHarvestLevel(aStack, "") / 2 + (meta / 4);
         if ((range % 2) == 0) {
             range += 1;
         }
+
         if (meta < 100) {
             aList.add(
-                tOffset + 0,
+                tOffset,
                 EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability")
                     + EnumChatFormatting.GREEN
-                    + Long.toString(tMaxDamage - getToolDamage(aStack))
+                    + (tMaxDamage - getToolDamage(aStack))
                     + " / "
-                    + Long.toString(tMaxDamage)
+                    + tMaxDamage
                     + EnumChatFormatting.GRAY);
             aList.add(
                 tOffset + 1,
                 EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY);
             aList.add(
                 tOffset + 2,
-                EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range")
-                    + Integer.toString(range)
-                    + "x"
-                    + Integer.toString(range)
-                    + EnumChatFormatting.GRAY);
+                EnumChatFormatting.WHITE + StatCollector
+                    .translateToLocal("tooltip.detrav.scanner.range") + range + "x" + range + EnumChatFormatting.GRAY);
             aList.add(
                 tOffset + 3,
                 EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0")
@@ -207,7 +221,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
                 tOffset + 5,
                 EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.success.chance")
                     + EnumChatFormatting.RESET
-                    + Integer.toString(((((1 + meta) * 8) <= 100) ? ((1 + meta) * 8) : 100))
+                    + (Math.min(((1 + meta) * 8), 100))
                     + EnumChatFormatting.GRAY
                     + "%");
             aList.add(
@@ -216,44 +230,45 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
             aList.add(
                 tOffset + 7,
                 EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.distance.1"));
+            return;
 
-        } else if (meta >= 100 && meta < 200) {
-            aList.add(
-                tOffset + 0,
-                EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability")
-                    + EnumChatFormatting.GREEN
-                    + (tMaxDamage - getToolDamage(aStack))
-                    + " / "
-                    + tMaxDamage
-                    + EnumChatFormatting.GRAY);
-            aList.add(
-                tOffset + 1,
-                EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY);
-            aList.add(
-                tOffset + 2,
-                EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range")
-                    + EnumChatFormatting.YELLOW
-                    + (getHarvestLevel(aStack, "") * 2 + 1)
-                    + "x"
-                    + (getHarvestLevel(aStack, "") * 2 + 1)
-                    + EnumChatFormatting.GRAY);
-            aList.add(
-                tOffset + 3,
-                EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0"));
-            aList.add(
-                tOffset + 4,
-                EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1"));
-            aList.add(
-                tOffset + 5,
-                EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.2"));
-            aList.add(
-                tOffset + 6,
-                EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.3"));
-            aList.add(
-                tOffset + 7,
-                EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.4"));
         }
 
+        // from here, it's for the electric prospector scanners
+        aList.add(
+            tOffset + 0,
+            EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability")
+                + EnumChatFormatting.GREEN
+                + (tMaxDamage - getToolDamage(aStack))
+                + " / "
+                + tMaxDamage
+                + EnumChatFormatting.GRAY);
+        aList.add(
+            tOffset + 1,
+            EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY);
+        aList.add(
+            tOffset + 2,
+            EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range")
+                + EnumChatFormatting.YELLOW
+                + (getHarvestLevel(aStack, "") * 2 + 1)
+                + "x"
+                + (getHarvestLevel(aStack, "") * 2 + 1)
+                + EnumChatFormatting.GRAY);
+        aList.add(
+            tOffset + 3,
+            EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0"));
+        aList.add(
+            tOffset + 4,
+            EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1"));
+        aList.add(
+            tOffset + 5,
+            EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.2"));
+        aList.add(
+            tOffset + 6,
+            EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.3"));
+        aList.add(
+            tOffset + 7,
+            EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.4"));
     }
 
     public Long getToolGTDetravData(ItemStack aStack) {
@@ -281,37 +296,70 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
     public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) {
 
         ItemStack dStack;
-        if (Mods.NewHorizonsCoreMod.isModLoaded()) {
+        if (NewHorizonsCoreMod.isModLoaded()) {
             // Materials at tiers
-            list.add(getToolWithStats(0, 1, Materials.Polycaprolactam, Materials.Polycaprolactam, null));
-            list.add(getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null));
-            list.add(getToolWithStats(2, 1, Materials.Bronze, Materials.Steel, null));
-            list.add(getToolWithStats(4, 1, Materials.Manyullyn, Materials.Aluminium, null));
-            list.add(getToolWithStats(6, 1, Materials.DamascusSteel, Materials.DamascusSteel, null));
-            list.add(getToolWithStats(8, 1, Materials.Titanium, Materials.Titanium, null));
-            list.add(getToolWithStats(10, 1, Materials.TungstenSteel, Materials.TungstenSteel, null));
-            list.add(getToolWithStats(12, 1, Materials.Iridium, Materials.Iridium, null));
-            list.add(getToolWithStats(12, 1, Materials.Osmium, Materials.Osmium, null));
-            list.add(getToolWithStats(14, 1, Materials.Neutronium, Materials.Neutronium, null));
-            list.add(getToolWithStats(16, 1, Materials.InfinityCatalyst, Materials.InfinityCatalyst, null));
-            list.add(getToolWithStats(18, 1, Materials.Infinity, Materials.Infinity, null));
+            list.add(
+                getToolWithStats(
+                    ProspectorScannerULV.ID,
+                    1,
+                    Materials.Polycaprolactam,
+                    Materials.Polycaprolactam,
+                    null));
+            list.add(getToolWithStats(ProspectorScannerLV.ID, 1, Materials.Steel, Materials.Steel, null));
+            list.add(getToolWithStats(ProspectorScannerLV.ID, 1, Materials.Bronze, Materials.Steel, null));
+            list.add(getToolWithStats(ProspectorScannerMV.ID, 1, Materials.Manyullyn, Materials.Aluminium, null));
+            list.add(
+                getToolWithStats(ProspectorScannerHV.ID, 1, Materials.DamascusSteel, Materials.DamascusSteel, null));
+            list.add(getToolWithStats(ProspectorScannerEV.ID, 1, Materials.Titanium, Materials.Titanium, null));
+            list.add(
+                getToolWithStats(ProspectorScannerIV.ID, 1, Materials.TungstenSteel, Materials.TungstenSteel, null));
+            list.add(getToolWithStats(ProspectorScannerLuV.ID, 1, Materials.Iridium, Materials.Iridium, null));
+            list.add(getToolWithStats(ProspectorScannerLuV.ID, 1, Materials.Osmium, Materials.Osmium, null));
+            list.add(getToolWithStats(ProspectorScannerZPM.ID, 1, Materials.Neutronium, Materials.Neutronium, null));
+            list.add(
+                getToolWithStats(
+                    ProspectorScannerUV.ID,
+                    1,
+                    Materials.InfinityCatalyst,
+                    Materials.InfinityCatalyst,
+                    null));
+            list.add(getToolWithStats(ProspectorScannerUHV.ID, 1, Materials.Infinity, Materials.Infinity, null));
+
+            // electric prospector scanners:
+            dStack = getToolWithStats(
+                ElectricProspectorScannerUV.ID,
+                1,
+                Materials.InfinityCatalyst,
+                Materials.TungstenSteel,
+                new long[] { 1638400000L, GTValues.V[8], 8L, -1L });
+            setCharge(dStack, 1638400000L);
+            list.add(dStack);
+
+            dStack = getToolWithStats(
+                ElectricProspectorScannerUHV.ID,
+                1,
+                Materials.Infinity,
+                Materials.TungstenSteel,
+                new long[] { 6553600000L, GTValues.V[9], 9L, -1L });
+            setCharge(dStack, 6553600000L);
+            list.add(dStack);
         }
 
         // Steel for comparison
-        list.add(getToolWithStats(0, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(4, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(6, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(8, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(10, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(12, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(14, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(16, 1, Materials.Steel, Materials.Steel, null));
-        list.add(getToolWithStats(18, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerULV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerLV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerMV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerHV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerEV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerIV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerLuV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerZPM.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerUV.ID, 1, Materials.Steel, Materials.Steel, null));
+        list.add(getToolWithStats(ProspectorScannerUHV.ID, 1, Materials.Steel, Materials.Steel, null));
 
         // Electric Scanners
         dStack = getToolWithStats(
-            100,
+            ElectricProspectorScannerLuV.ID,
             1,
             Materials.Iridium,
             Materials.TungstenSteel,
@@ -320,7 +368,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
         list.add(dStack);
 
         dStack = getToolWithStats(
-            102,
+            ElectricProspectorScannerZPM.ID,
             1,
             Materials.Neutronium,
             Materials.TungstenSteel,
@@ -328,33 +376,13 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
         setCharge(dStack, 409600000L);
         list.add(dStack);
 
-        if (Mods.NewHorizonsCoreMod.isModLoaded()) {
-            dStack = getToolWithStats(
-                104,
-                1,
-                Materials.InfinityCatalyst,
-                Materials.TungstenSteel,
-                new long[] { 1638400000L, GTValues.V[8], 8L, -1L });
-            setCharge(dStack, 1638400000L);
-            list.add(dStack);
-
-            dStack = getToolWithStats(
-                106,
-                1,
-                Materials.Infinity,
-                Materials.TungstenSteel,
-                new long[] { 6553600000L, GTValues.V[9], 9L, -1L });
-            setCharge(dStack, 6553600000L);
-            list.add(dStack);
-        } else {
-            dStack = getToolWithStats(
-                106,
-                1,
-                Materials.Neutronium,
-                Materials.TungstenSteel,
-                new long[] { 6553600000L, GTValues.V[9], 9L, -1L });
-            setCharge(dStack, 6553600000L);
-            list.add(dStack);
-        }
+        dStack = getToolWithStats(
+            ElectricProspectorScannerUHV.ID,
+            1,
+            Materials.Neutronium,
+            Materials.TungstenSteel,
+            new long[] { 6553600000L, GTValues.V[9], 9L, -1L });
+        setCharge(dStack, 6553600000L);
+        list.add(dStack);
     }
 }
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
index 56f97ea862..04b1c47cf6 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
@@ -1,5 +1,7 @@
 package detrav.items.behaviours;
 
+import static gregtech.api.enums.Mods.VisualProspecting;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,7 +24,6 @@ import detrav.net.DetravNetwork;
 import detrav.net.ProspectingPacket;
 import detrav.utils.BartWorksHelper;
 import detrav.utils.GTppHelper;
-import gregtech.api.enums.Mods;
 import gregtech.api.items.MetaBaseItem;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GTLanguageManager;
@@ -47,29 +48,10 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
             if (aPlayer.isSneaking()) {
                 data++;
                 if (data > 3) data = 0;
-                switch (data) {
-                    case 0:
-                        aPlayer.addChatMessage(
-                            new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.0")));
-                        break;
-                    case 1:
-                        aPlayer.addChatMessage(
-                            new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1")));
-                        break;
-                    case 2:
-                        aPlayer.addChatMessage(
-                            new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2")));
-                        break;
-                    case 3:
-                        aPlayer.addChatMessage(
-                            new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3")));
-                        break;
-                    default:
-                        aPlayer.addChatMessage(
-                            new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error")));
-                        break;
-                }
-                DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, (long) data);
+                aPlayer.addChatMessage(
+                    new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode." + data)));
+
+                DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, data);
                 return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
             }
 
@@ -98,15 +80,14 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
                     final int ySize = c.getHeightValue(x, z);
                     for (int y = 1; y < ySize; y++) {
                         switch (data) {
-                            case 0:
-                            case 1:
+                            case 0, 1 -> {
                                 final Block tBlock = c.getBlock(x, y, z);
                                 short tMetaID = (short) c.getBlockMetadata(x, y, z);
                                 if (tBlock instanceof BlockOresAbstract) {
                                     TileEntity tTileEntity = c.getTileEntityUnsafe(x, y, z);
                                     if ((tTileEntity instanceof TileEntityOres)
                                         && ((TileEntityOres) tTileEntity).mNatural) {
-                                        tMetaID = (short) ((TileEntityOres) tTileEntity).getMetaData();
+                                        tMetaID = ((TileEntityOres) tTileEntity).getMetaData();
                                         try {
                                             String name = GTLanguageManager
                                                 .getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name");
@@ -143,8 +124,8 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
                                             (short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID);
                                     }
                                 }
-                                break;
-                            case 2:
+                            }
+                            case 2 -> {
                                 if ((x == 0) || (z == 0)) { // Skip doing the locations with the grid on them.
                                     break;
                                 }
@@ -160,9 +141,9 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
                                     packet
                                         .addBlock(c.xPosition * 16 + x, 2, c.zPosition * 16 + z, (short) fStack.amount);
                                 }
-                                break;
-                            case 3:
-                                float polution = (float) getPolution(
+                            }
+                            case 3 -> {
+                                float polution = (float) getPollution(
                                     aWorld,
                                     c.xPosition * 16 + x,
                                     c.zPosition * 16 + z);
@@ -171,17 +152,17 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
                                 if (polution > 0xFF) polution = 0xFF;
                                 polution = 0xFF - polution;
                                 packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution);
-                                break;
+                            }
                         }
                         if (data > 1) break;
                     }
                 }
             }
-            packet.level = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, "");
+            packet.level = aItem.getHarvestLevel(aStack, "");
             DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer);
             if (!aPlayer.capabilities.isCreativeMode) tool.doDamage(aStack, this.mCosts * chunks.size());
 
-            if (Mods.VisualProspecting.isModLoaded()) {
+            if (VisualProspecting.isModLoaded()) {
                 if (data == 0 || data == 1) {
                     VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
                         (EntityPlayerMP) aPlayer,
@@ -228,13 +209,12 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
                     if (!aPlayer.capabilities.isCreativeMode)
                         ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts);
                 }
-                return true;
             } else {
                 if (!aWorld.isRemote) {
-                    prospectSingleChunk((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ);
+                    prospectSingleChunk(aItem, aStack, aPlayer, aWorld, aX, aY, aZ);
                 }
-                return true;
             }
+            return true;
         }
         if (data < 3) if (!aWorld.isRemote) {
             FluidStack fStack = UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1);
@@ -243,7 +223,7 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
             return true;
         }
         if (!aWorld.isRemote) {
-            int polution = getPolution(aWorld, aX, aZ);
+            int polution = getPollution(aWorld, aX, aZ);
             addChatMassageByValue(aPlayer, polution, "Pollution");
         }
         return true;
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
index 45b4c7fb29..7038d42817 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
@@ -1,5 +1,7 @@
 package detrav.items.behaviours;
 
+import static gregtech.api.enums.Mods.VisualProspecting;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -30,7 +32,6 @@ import detrav.utils.BartWorksHelper;
 import detrav.utils.GTppHelper;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.Mods;
 import gregtech.api.items.MetaBaseItem;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GTLanguageManager;
@@ -64,7 +65,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
         int aZ, int aSide, float hitX, float hitY, float hitZ) {
 
         SplittableRandom aRandom = new SplittableRandom();
-        int chance = ((1 + aStack.getItemDamage()) * 8) > 100 ? 100 : (1 + aStack.getItemDamage()) * 8;
+        int chance = Math.min(((1 + aStack.getItemDamage()) * 8), 100);