Merge pull request #631 from Muramasa-/LoadTimes

Various Load Time Improvements

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 20022aa267..f3d4fb1f8e 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -1,7 +1,5 @@
 package gregtech.api.enums;
 
-import java.util.*;
-
 import cpw.mods.fml.common.Loader;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.TC_Aspects.TC_AspectStack;
@@ -17,6 +15,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
+import java.util.*;
+
 import static gregtech.api.enums.GT_Values.M;
 import static gregtech.api.enums.GT_Values.MOD_ID_TC;
 
@@ -1393,7 +1393,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 
     public static Materials get(String aMaterialName) {
         Object tObject = GT_Utility.getFieldContent(Materials.class, aMaterialName, false, false);
-        if (tObject != null && tObject instanceof Materials) return (Materials) tObject;
+        if (tObject instanceof Materials) return (Materials) tObject;
         return _NULL;
     }
 
@@ -1506,7 +1506,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
     public boolean remove(ItemStack aStack) {
         if (aStack == null) return false;
         boolean temp = false;
-        for (int i = 0; i < mMaterialItems.size(); i++)
+		int mMaterialItems_sS=mMaterialItems.size();
+		for (int i = 0; i < mMaterialItems_sS; i++)
             if (GT_Utility.areStacksEqual(aStack, mMaterialItems.get(i))) {
                 mMaterialItems.remove(i--);
                 temp = true;