performance improve

+ drasticly improved performance
+ updated mcmod.info
+ changed forge version to 10.13.4.1614

7 files changed, 55 insertions, 37 deletions

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index a74e435141..61b662ef27 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -1,8 +1,13 @@
 package com.detrav;
 
+import org.apache.logging.log4j.LogManager;
+
+import com.detrav.net.DetravNetwork;
 import com.detrav.proxies.CommonProxy;
 import com.detrav.utils.DetravCreativeTab;
-import com.detrav.net.DetravNetwork;
+import com.detrav.utils.GTppHelper;
+
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.SidedProxy;
@@ -14,14 +19,16 @@ import gregtech.api.GregTech_API;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraftforge.common.config.Configuration;
 
-@Mod(modid = DetravScannerMod.MODID, version = DetravScannerMod.VERSION,dependencies = "required-after:IC2;required-after:gregtech")
+@Mod(modid = DetravScannerMod.MODID, version = DetravScannerMod.VERSION,dependencies = "required-after:IC2;required-after:gregtech;after:miscutils")
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "1.3";
+    public static final String VERSION = "1.4.2";
 
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
 
+    public static final org.apache.logging.log4j.Logger Logger = LogManager.getLogger("GT Scanner Mod");
+    
     @SidedProxy(clientSide = "com.detrav.proxies.ClientProxy", serverSide = "com.detrav.proxies.ServerProxy")
     public static CommonProxy proxy;
 
@@ -64,6 +71,8 @@ public class DetravScannerMod
     @EventHandler
     public void onPostLoad(FMLPostInitializationEvent aEvent) {
         proxy.onPostLoad();
+        if (Loader.isModLoaded("miscutils"))
+        	GTppHelper.generate_OreIDs();
     }
 
 }
diff --git a/src/main/java/com/detrav/gui/DetravGuiProPick.java b/src/main/java/com/detrav/gui/DetravGuiProPick.java
index 9c95fa13cd..b62be499fe 100644
--- a/src/main/java/com/detrav/gui/DetravGuiProPick.java
+++ b/src/main/java/com/detrav/gui/DetravGuiProPick.java
@@ -1,16 +1,18 @@
 package com.detrav.gui;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import org.lwjgl.opengl.GL11;
+
 import com.detrav.gui.textures.DetravMapTexture;
+
 import cpw.mods.fml.client.GuiScrollingList;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * Created by wital_000 on 21.03.2016.
diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
index 7696e67d43..58d69260ce 100644
--- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
@@ -1,15 +1,17 @@
 package com.detrav.gui.textures;
 
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+
+import org.lwjgl.opengl.GL11;
+
 import com.detrav.net.DetravProPickPacket00;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.client.resources.IResourceManager;
-import org.lwjgl.opengl.GL11;
-
-import java.awt.image.BufferedImage;
-import java.util.HashMap;
 
 /**
  * Created by wital_000 on 21.03.2016.
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index 9704a8f582..3a588aa74f 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -1,8 +1,15 @@
 package com.detrav.items.behaviours;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import com.detrav.DetravScannerMod;
 import com.detrav.items.DetravMetaGeneratedTool01;
 import com.detrav.net.DetravNetwork;
 import com.detrav.net.DetravProPickPacket00;
+import com.detrav.utils.GTppHelper;
+
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_LanguageManager;
@@ -11,6 +18,7 @@ import gregtech.common.GT_UndergroundOil;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import gtPlusPlus.core.block.base.BlockBaseOre;
+import gtPlusPlus.core.material.Material;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -22,10 +30,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 /**
  * Created by wital_000 on 19.03.2016.
  */
@@ -36,7 +40,6 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
     }
 
 	public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-
         if (!aWorld.isRemote) {
             int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue();
             if (aPlayer.isSneaking()) {
@@ -89,7 +92,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                         int ySize = c.getHeightValue(x, z);//(int)aPlayer.posY;//c.getHeightValue(x, z);
                         for (int y = 1; y < ySize; y++) {
                             switch (data) {
-                                case 0:
+                                case 0: 
                                 case 1:
                                     Block tBlock = c.getBlock(x,y,z);
                                     short tMetaID = (short)c.getBlockMetadata(x,y,z);
@@ -114,16 +117,15 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                         }
                                     }
                                     else if (tBlock instanceof BlockBaseOre) {
-                                    	short num=0;
-                                    	for (byte n=0;n<gtPlusPlus.core.material.ORES.class.getFields().length;++n)
-											try {
-												if (gtPlusPlus.core.material.ORES.class.getFields()[n].get(gtPlusPlus.core.material.ORES.class.getFields()[n]).equals(((BlockBaseOre) tBlock).getMaterialEx())) {
-													num = n;
-													break;
-												}
-											} catch (Exception e) {}
-                                    			
-                                       	packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) (7000+num));
+                                    	Short packaged = 0;
+                                    	Material m = ((BlockBaseOre) tBlock).getMaterialEx();
+                                    	packaged = GTppHelper.encodeoresGTpp.get(m);
+                                    	try {
+                                    	packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) (packaged+7000));
+                                    	}
+                                        catch(Exception e) {
+                                        	
+                                        }
                                     	}
                                     else if (data == 1) {
                                         ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
@@ -155,7 +157,8 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                     packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution);
                                     break;
                             }
-                            if (data > 1) break;
+                            if (data > 1) 
+                            	break;
                         }
                     }
             }
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index 16b6a94e5d..5dd8ddd55d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -1,6 +1,10 @@
 package com.detrav.items.behaviours;
 
+import java.util.HashMap;
+import java.util.Random;
+
 import com.detrav.items.DetravMetaGeneratedTool01;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.items.GT_MetaBase_Item;
@@ -24,9 +28,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.HashMap;
-import java.util.Random;
-
 /**
  * Created by wital_000 on 19.03.2016.
  */
diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java
index d7f90b39e8..1631e98dc3 100644
--- a/src/main/java/com/detrav/net/DetravProPickPacket00.java
+++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java
@@ -3,6 +3,7 @@ package com.detrav.net;
 import com.detrav.DetravScannerMod;
 import com.detrav.gui.DetravGuiProPick;
 import com.detrav.gui.textures.DetravMapTexture;
+import com.detrav.utils.GTppHelper;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
@@ -143,8 +144,8 @@ public class DetravProPickPacket00 extends DetravPacket {
                             	if (meta<7000||meta>7500) {
                             		tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
                             	} else {
-                            		short l = (short) (meta-7000);
-                            		pMaterial = (Material) gtPlusPlus.core.material.ORES.class.getFields()[l].get(gtPlusPlus.core.material.ORES.class.getFields()[l]);
+                            		Short l = (short) (meta-7000);
+                            		pMaterial = GTppHelper.decodeoresGTpp.get(l);
                             	}
                             } catch (Exception e) {
                                 tMaterial = null;
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 4d3750bd65..618df6eb4e 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,11 +3,11 @@
   "modid": "detravscannermod",
   "name": "GT Scanner Mod",
   "description": "To locate ores deep underground.",
-  "version": "1.3",
+  "version": "1.4.2",
   "mcversion": "1.7.10",
   "url": "https://github.com/GTNewHorizons/GTScannerMod",
   "updateUrl": "",
-  "authorList": ["Ethryan, GTNewHorizons Team"],
+  "authorList": ["Ethryan, GTNewHorizons Team, bartimaeusnek"],
   "credits": "Detrav",
   "logoFile": "",
   "screenshots": [],