Merge pull request #12 from GTNewHorizons/selectable_ores

Selectable ores - Inspired by Gregicality

3 files changed, 14 insertions, 28 deletions

diff --git a/src/main/java/com/detrav/utils/DetravCreativeTab.java b/src/main/java/com/detrav/utils/DetravCreativeTab.java
index 4871289a9b..6d0830f2bb 100644
--- a/src/main/java/com/detrav/utils/DetravCreativeTab.java
+++ b/src/main/java/com/detrav/utils/DetravCreativeTab.java
@@ -7,7 +7,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -27,34 +26,25 @@ public class DetravCreativeTab extends CreativeTabs {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void displayAllReleventItems(List p_78018_1_)
-    {
-        Iterator iterator = Item.itemRegistry.iterator();
+    public void displayAllReleventItems(List p_78018_1_) {
+        for (Object o : Item.itemRegistry) {
+            Item item = (Item) o;
 
-        while (iterator.hasNext())
-        {
-            Item item = (Item)iterator.next();
-
-            if (item == null)
-            {
+            if (item == null) {
                 continue;
             }
 
-            for (CreativeTabs tab : item.getCreativeTabs())
-            {
-                if (tab == this)
-                {
+            for (CreativeTabs tab : item.getCreativeTabs()) {
+                if (tab == this) {
                     item.getSubItems(item, this, p_78018_1_);
-                    if(item instanceof DetravMetaGeneratedTool01)
-                    {
-                        ((DetravMetaGeneratedTool01)item).getDetravSubItems(item,this,p_78018_1_);
+                    if (item instanceof DetravMetaGeneratedTool01) {
+                        ((DetravMetaGeneratedTool01) item).getDetravSubItems(item, this, p_78018_1_);
                     }
                 }
             }
         }
 
-        if (this.func_111225_m() != null)
-        {
+        if (this.func_111225_m() != null) {
             this.addEnchantmentBooksToList(p_78018_1_, this.func_111225_m());
         }
     }
diff --git a/src/main/java/com/detrav/utils/FluidColors.java b/src/main/java/com/detrav/utils/FluidColors.java
index ae6f1d202d..2a0ede49b9 100644
--- a/src/main/java/com/detrav/utils/FluidColors.java
+++ b/src/main/java/com/detrav/utils/FluidColors.java
@@ -1,14 +1,12 @@
 package com.detrav.utils;
 
-import com.detrav.net.DetravProPickPacket00;
-import cpw.mods.fml.common.ProgressManager;
 import gregtech.api.enums.Materials;
 import net.minecraftforge.fluids.FluidRegistry;
 
 import java.util.Arrays;
 import java.util.Objects;
 
-import static com.detrav.net.DetravProPickPacket00.fluidColors;
+import static com.detrav.net.ProspectingPacket.fluidColors;
 
 public class FluidColors {
 
diff --git a/src/main/java/com/detrav/utils/GTppHelper.java b/src/main/java/com/detrav/utils/GTppHelper.java
index 0978c2817e..e773234e9e 100644
--- a/src/main/java/com/detrav/utils/GTppHelper.java
+++ b/src/main/java/com/detrav/utils/GTppHelper.java
@@ -1,6 +1,5 @@
 package com.detrav.utils;
 
-import cpw.mods.fml.common.Loader;
 import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.material.Material;
 import net.minecraft.block.Block;
@@ -11,18 +10,17 @@ import java.util.HashMap;
  * Created by bartimaeusnek on 19.04.2018.
  */
 public class GTppHelper {
-	public static HashMap<Short,Material> decodeoresGTpp = new HashMap<Short,Material>();
-	public static HashMap<Material,Short> encodeoresGTpp = new HashMap<Material,Short>();
+	public static final HashMap<Short,Material> decodeoresGTpp = new HashMap<>();
+	public static final HashMap<Material,Short> encodeoresGTpp = new HashMap<>();
 	
 	public static void generate_OreIDs() {
-		for (short n=0;n<gtPlusPlus.core.material.ORES.class.getFields().length;++n) {
+		for (short n=0 ; n < gtPlusPlus.core.material.ORES.class.getFields().length ; ++n) {
 			try {
 				Short i = (short) (n+1);
 				Material m = ((Material)gtPlusPlus.core.material.ORES.class.getFields()[n].get(gtPlusPlus.core.material.ORES.class.getFields()[n]));
 				decodeoresGTpp.put(i,m);
 				encodeoresGTpp.put(m,i);
-			} catch (Exception e) {
-			}
+			} catch (Exception ignored) {}
 			
 		}
 	}