Merge pull request #1 from GTNewHorizons/experimental

sync

5 files changed, 2842 insertions, 2710 deletions

diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
index d8fae1917e..358e21a9a6 100644
--- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
+++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
@@ -5,9 +5,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.google.common.collect.ImmutableMap;
-
-import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
@@ -16,322 +13,330 @@ import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
 public class GT_Assemblyline_Server {
-	
-	
-	public static LinkedHashMap<String,String> lServerNames = new LinkedHashMap<String,String>();
-	private static LinkedHashMap<String,String> internal2= new LinkedHashMap<String,String>(),internal3 = new LinkedHashMap<String,String>(),internal4= new LinkedHashMap<String,String>();
+
+
+	public static LinkedHashMap<String, String> lServerNames = new LinkedHashMap<String, String>();
+	private static LinkedHashMap<String, String> internal2 = new LinkedHashMap<String, String>(), internal3 = new LinkedHashMap<String, String>(), internal4 = new LinkedHashMap<String, String>();
 	private static HashMap<String, Property> internal = new HashMap<String, Property>();
-	
+
 	public static void fillMap(FMLPreInitializationEvent aEvent) {
-		
+
 		String s = new String(aEvent.getModConfigurationDirectory().getAbsolutePath());
-		s = s.substring(0, aEvent.getModConfigurationDirectory().getAbsolutePath().length()-6);
+		s = s.substring(0, aEvent.getModConfigurationDirectory().getAbsolutePath().length() - 6);
 		s = s + "GregTech.lang";
 		File f = new File(s);
 		s = "";
 		Configuration conf = new Configuration(f);
-		
+
 		ConfigCategory cat = conf.getCategory("languagefile");
 		internal.putAll(cat.getValues());
-		for (Map.Entry<String, Property> entry : internal.entrySet())
-		{
-				s=entry.getValue().getString().replaceAll("%", "");
+		for (Map.Entry<String, Property> entry : internal.entrySet()) {
+			try {
+				s = entry.getValue().getString().replaceAll("%", "");
 
-			if (entry.getKey().contains("metaitem") && s.contains("material"))
-				internal2.put(entry.getKey(), s);
-			else if (entry.getKey().contains("blockmachines") && s.contains("material"))
-				internal3.put(entry.getKey(), s);
-			else if ((entry.getKey().contains("blockores")||(entry.getKey().contains("blockmetal")||entry.getKey().contains("blockgem"))) && s.contains("material"))
-				internal4.put(entry.getKey(), s);
-			else
-				lServerNames.put(entry.getKey(), s);
+				if (entry.getKey().contains("metaitem") && s.contains("material"))
+					internal2.put(entry.getKey(), s);
+				else if (entry.getKey().contains("blockmachines") && s.contains("material"))
+					internal3.put(entry.getKey(), s);
+				else if ((entry.getKey().contains("blockores") || (entry.getKey().contains("blockmetal") || entry.getKey().contains("blockgem"))) && s.contains("material"))
+					internal4.put(entry.getKey(), s);
+				else
+					lServerNames.put(entry.getKey(), s);
+			} catch (Exception ignored) {
+			}
 		}
 		for (Map.Entry<String, String> entry : internal2.entrySet()) {
-			if (entry.getKey().contains("name")) {
-				int i = Integer.parseInt(entry.getKey().substring("gt.metaitem.01.".length(), entry.getKey().length()-".name".length()));
-				i=i%1000;
-				if (GregTech_API.sGeneratedMaterials[i] != null)
-					lServerNames.put(entry.getKey(), entry.getValue().replace("material",GregTech_API.sGeneratedMaterials[i].toString()));
-				else
-					lServerNames.put(entry.getKey(), null);
+			try {
+				if (entry.getKey().contains("name")) {
+					int i = Integer.parseInt(entry.getKey().substring("gt.metaitem.01.".length(), entry.getKey().length() - ".name".length()));
+					i = i % 1000;
+					if (GregTech_API.sGeneratedMaterials[i] != null)
+						lServerNames.put(entry.getKey(), entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString()));
+					else
+						lServerNames.put(entry.getKey(), null);
+				}
+			} catch (Exception ignored) {
 			}
 		}
 		for (Map.Entry<String, String> entry : internal3.entrySet()) {
-			if (entry.getKey().contains("cable"))
-				lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.cable.".length(), entry.getKey().length()-".01.name".length())));	
-			else if (entry.getKey().contains("gt_frame_"))
-				lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_frame_".length(), entry.getKey().length()-".name".length())));	
-			else if(entry.getKey().contains("gt_pipe_")) {
-					if(
-					!entry.getKey().contains("_huge")	&&
-					!entry.getKey().contains("_large")	&&
-					!entry.getKey().contains("_nonuple")&&
-					!entry.getKey().contains("_quadruple")&&
-					!entry.getKey().contains("_small")&&
-					!entry.getKey().contains("_tiny")
+			try {
+				if (entry.getKey().contains("cable"))
+					lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.cable.".length(), entry.getKey().length() - ".01.name".length())));
+				else if (entry.getKey().contains("gt_frame_"))
+					lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_frame_".length(), entry.getKey().length() - ".name".length())));
+				else if (entry.getKey().contains("gt_pipe_")) {
+					if (
+							!entry.getKey().contains("_huge") &&
+									!entry.getKey().contains("_large") &&
+									!entry.getKey().contains("_nonuple") &&
+									!entry.getKey().contains("_quadruple") &&
+									!entry.getKey().contains("_small") &&
+									!entry.getKey().contains("_tiny")
 					)
-						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-".name".length())));
-					else if (entry.getKey().contains("_huge")||entry.getKey().contains("_tiny"))
-						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-"_tiny.name".length())));	
-					else if (entry.getKey().contains("_large")||entry.getKey().contains("_small"))
-						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-"_large.name".length())));
+						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length() - ".name".length())));
+					else if (entry.getKey().contains("_huge") || entry.getKey().contains("_tiny"))
+						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length() - "_tiny.name".length())));
+					else if (entry.getKey().contains("_large") || entry.getKey().contains("_small"))
+						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length() - "_large.name".length())));
 					else if (entry.getKey().contains("_nonuple"))
-						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-"_nonuple.name".length())));
+						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length() - "_nonuple.name".length())));
 					else if (entry.getKey().contains("_quadruple"))
-						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-"_quadruple.name".length())));
+						lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length() - "_quadruple.name".length())));
+				} else if (entry.getKey().contains("wire"))
+					lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.wire.".length(), entry.getKey().length() - ".01.name".length())));
+				else
+					lServerNames.put(entry.getKey(), entry.getValue());
+			} catch (Exception ignored) {
 			}
-			else if (entry.getKey().contains("wire"))
-				lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.wire.".length(), entry.getKey().length()-".01.name".length())));	
-			else
-				lServerNames.put(entry.getKey(), entry.getValue());
 		}
 		for (Map.Entry<String, String> entry : internal4.entrySet()) {
-			if (entry.getKey().contains("blockores")) {
-				int i = Integer.parseInt(entry.getKey().substring("gt.blockores.".length(), entry.getKey().length()-".name".length()));
-				i=i%1000;
-				if (GregTech_API.sGeneratedMaterials[i] != null)
-					lServerNames.put(entry.getKey(), entry.getValue().replace("material",GregTech_API.sGeneratedMaterials[i].toString()));
-				else
-					lServerNames.put(entry.getKey(), null);
-			}
-			else if(entry.getKey().contains("blockmetal")) {
-				Materials[] mMats = null;
-				String t = entry.getKey().substring("gt.blockmetal".length());
-					t=t.substring(0,1);
-				int i = Integer.parseInt(t);
-				switch (i) {
-				case 1:
-					mMats=new Materials[]{
-			                Materials.Adamantium,
-			                Materials.Aluminium,
-			                Materials.Americium,
-			                Materials.AnnealedCopper,
-			                Materials.Antimony,
-			                Materials.Arsenic,
-			                Materials.AstralSilver,
-			                Materials.BatteryAlloy,
-			                Materials.Beryllium,
-			                Materials.Bismuth,
-			                Materials.BismuthBronze,
-			                Materials.BlackBronze,
-			                Materials.BlackSteel,
-			                Materials.BlueAlloy,
-			                Materials.BlueSteel,
-			                Materials.Brass
-			                };
-					break;
-				case 2:
-					mMats=new Materials[]{
-			                Materials.Bronze,
-			                Materials.Caesium,
-			                Materials.Cerium,
-			                Materials.Chrome,
-			                Materials.ChromiumDioxide,
-			                Materials.Cobalt,
-			                Materials.CobaltBrass,
-			                Materials.Copper,
-			                Materials.Cupronickel,
-			                Materials.DamascusSteel,
-			                Materials.DarkIron,
-			                Materials.DeepIron,
-			                Materials.Desh,
-			                Materials.Duranium,
-			                Materials.Dysprosium,
-			                Materials.Electrum
-			                };
-					break;
-				case 3:
-					mMats=new Materials[]{
-			                Materials.ElectrumFlux,
-			                Materials.Enderium,
-			                Materials.Erbium,
-			                Materials.Europium,
-			                Materials.FierySteel,
-			                Materials.Gadolinium,
-			                Materials.Gallium,
-			                Materials.Holmium,
-			                Materials.HSLA,
-			                Materials.Indium,
-			                Materials.InfusedGold,
-			                Materials.Invar,
-			                Materials.Iridium,
-			                Materials.IronMagnetic,
-			                Materials.IronWood,
-			                Materials.Kanthal
-					};
-					break;
-				case 4:
-					mMats=new Materials[]{
-			                Materials.Knightmetal,
-			                Materials.Lanthanum,
-			                Materials.Lead,
-			                Materials.Lutetium,
-			                Materials.Magnalium,
-			                Materials.Magnesium,
-			                Materials.Manganese,
-			                Materials.MeteoricIron,
-			                Materials.MeteoricSteel,
-			                Materials.Trinium,
-			                Materials.Mithril,
-			                Materials.Molybdenum,
-			                Materials.Naquadah,
-			                Materials.NaquadahAlloy,
-			                Materials.NaquadahEnriched,
-			                Materials.Naquadria
-			                };
-					break;
-				case 5:
-					mMats=new Materials[]{
-			                Materials.Neodymium,
-			                Materials.NeodymiumMagnetic,
-			                Materials.Neutronium,
-			                Materials.Nichrome,
-			                Materials.Nickel,
-			                Materials.Niobium,
-			                Materials.NiobiumNitride,
-			                Materials.NiobiumTitanium,
-			                Materials.Osmiridium,
-			                Materials.Osmium,
-			                Materials.Palladium,
-			                Materials.PigIron,
-			                Materials.Platinum,
-			                Materials.Plutonium,
-			                Materials.Plutonium241,
-			                Materials.Praseodymium
-					};
-					break;
-				case 6:
-					mMats=new Materials[]{
-			                Materials.Promethium,
-			                Materials.RedAlloy,
-			                Materials.RedSteel,
-			                Materials.RoseGold,
-			                Materials.Rubidium,
-			                Materials.Samarium,
-			                Materials.Scandium,
-			                Materials.ShadowIron,
-			                Materials.ShadowSteel,
-			                Materials.Silicon,
-			                Materials.Silver,
-			                Materials.SolderingAlloy,
-			                Materials.StainlessSteel,
-			                Materials.Steel,
-			                Materials.SteelMagnetic,
-			                Materials.SterlingSilver
-					};
-					break;
-				case 7:
-					mMats=new Materials[]{
-			                Materials.Sunnarium,
-			                Materials.Tantalum,
-			                Materials.Tellurium,
-			                Materials.Terbium,
-			                Materials.Thaumium,
-			                Materials.Thorium,
-			                Materials.Thulium,
-			                Materials.Tin,
-			                Materials.TinAlloy,
-			                Materials.Titanium,
-			                Materials.Tritanium,
-			                Materials.Tungsten,
-			                Materials.TungstenSteel,
-			                Materials.Ultimet,
-			                Materials.Uranium,
-			                Materials.Uranium235
-					};
-					break;
-				case 8:
-					mMats=new Materials[]{
-		                Materials.Vanadium,
-		                Materials.VanadiumGallium,
-		                Materials.WroughtIron,
-		                Materials.Ytterbium,
-		                Materials.Yttrium,
-		                Materials.YttriumBariumCuprate,
-		                Materials.Zinc,
-		                Materials.TungstenCarbide,
-		                Materials.VanadiumSteel,
-		                Materials.HSSG,
-		                Materials.HSSE,
-		                Materials.HSSS,
-		                Materials.Steeleaf,
-		                Materials.Ichorium
-					};
-					break;
-				}
-				t = entry.getKey().substring("gt.blockmetal1.".length(), entry.getKey().length()-".name".length());
-				i = Integer.parseInt(t);
-				lServerNames.put(entry.getKey(),"Block of "+mMats[i].toString());
-				mMats = null;
-			}
-			else if(entry.getKey().contains("blockgem")) {
-				Materials[] mMats = null;
-				String t = entry.getKey().substring("gt.blockgem".length());
-					t=t.substring(0,1);
-				int i = Integer.parseInt(t);
-				switch (i) {
-				case 1:
-					mMats=new Materials[]{
-							  Materials.InfusedAir,
-				              Materials.Amber,
-				              Materials.Amethyst,
-				              Materials.InfusedWater,
-				              Materials.BlueTopaz,
-				              Materials.CertusQuartz,
-				              Materials.Dilithium,
-				              Materials.EnderEye,
-				              Materials.EnderPearl,
-				              Materials.FoolsRuby,
-				              Materials.Force,
-				              Materials.Forcicium,
-				              Materials.Forcillium,
-				              Materials.GreenSapphire,
-				              Materials.InfusedFire,
-				              Materials.Jasper
-			                };
-					break;
-				case 2:
-					mMats=new Materials[]{
-							  Materials.Lazurite,
-				              Materials.Lignite,
-				              Materials.Monazite,
-				              Materials.Niter,
-				              Materials.Olivine,
-				              Materials.Opal,
-				              Materials.InfusedOrder,
-				              Materials.InfusedEntropy,
-				              Materials.Phosphorus,
-				              Materials.Quartzite,
-				              Materials.GarnetRed,
-				              Materials.Ruby,
-				              Materials.Sapphire,
-				              Materials.Sodalite,
-				              Materials.Tanzanite,
-				              Materials.InfusedEarth
-			                };
-					break;
-				case 3:
-					mMats=new Materials[]{
-							  Materials.Topaz,
-			                  Materials.Vinteum,
-			                  Materials.GarnetYellow,
-			                  Materials.NetherStar,
-			                  Materials.Charcoal,
-			                  Materials.Blaze
-					};
-					break;
+			try {
+				if (entry.getKey().contains("blockores")) {
+					int i = Integer.parseInt(entry.getKey().substring("gt.blockores.".length(), entry.getKey().length() - ".name".length()));
+					i = i % 1000;
+					if (GregTech_API.sGeneratedMaterials[i] != null)
+						lServerNames.put(entry.getKey(), entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString()));
+					else
+						lServerNames.put(entry.getKey(), null);
+				} else if (entry.getKey().contains("blockmetal")) {
+					Materials[] mMats = null;
+					String t = entry.getKey().substring("gt.blockmetal".length());
+					t = t.substring(0, 1);
+					int i = Integer.parseInt(t);
+					switch (i) {
+						case 1:
+							mMats = new Materials[]{
+									Materials.Adamantium,
+									Materials.Aluminium,
+									Materials.Americium,
+									Materials.AnnealedCopper,
+									Materials.Antimony,
+									Materials.Arsenic,
+									Materials.AstralSilver,
+									Materials.BatteryAlloy,
+									Materials.Beryllium,
+									Materials.Bismuth,
+									Materials.BismuthBronze,
+									Materials.BlackBronze,
+									Materials.BlackSteel,
+									Materials.BlueAlloy,
+									Materials.BlueSteel,
+									Materials.Brass
+							};
+							break;
+						case 2:
+							mMats = new Materials[]{
+									Materials.Bronze,
+									Materials.Caesium,
+									Materials.Cerium,
+									Materials.Chrome,
+									Materials.ChromiumDioxide,
+									Materials.Cobalt,
+									Materials.CobaltBrass,
+									Materials.Copper,
+									Materials.Cupronickel,
+									Materials.DamascusSteel,
+									Materials.DarkIron,
+									Materials.DeepIron,
+									Materials.Desh,
+									Materials.Duranium,
+									Materials.Dysprosium,
+									Materials.Electrum
+							};
+							break;
+						case 3:
+							mMats = new Materials[]{
+									Materials.ElectrumFlux,
+									Materials.Enderium,
+									Materials.Erbium,
+									Materials.Europium,
+									Materials.FierySteel,
+									Materials.Gadolinium,
+									Materials.Gallium,
+									Materials.Holmium,
+									Materials.HSLA,
+									Materials.Indium,
+									Materials.InfusedGold,
+									Materials.Invar,
+									Materials.Iridium,
+									Materials.IronMagnetic,
+									Materials.IronWood,
+									Materials.Kanthal
+							};
+							break;
+						case 4:
+							mMats = new Materials[]{
+									Materials.Knightmetal,
+									Materials.Lanthanum,
+									Materials.Lead,
+									Materials.Lutetium,
+									Materials.Magnalium,
+									Materials.Magnesium,
+									Materials.Manganese,
+									Materials.MeteoricIron,
+									Materials.MeteoricSteel,
+									Materials.Trinium,
+									Materials.Mithril,
+									Materials.Molybdenum,
+									Materials.Naquadah,
+									Materials.NaquadahAlloy,
+									Materials.NaquadahEnriched,
+									Materials.Naquadria
+							};
+							break;
+						case 5:
+							mMats = new Materials[]{
+									Materials.Neodymium,
+									Materials.NeodymiumMagnetic,
+									Materials.Neutronium,
+									Materials.Nichrome,
+									Materials.Nickel,
+									Materials.Niobium,
+									Materials.NiobiumNitride,
+									Materials.NiobiumTitanium,
+									Materials.Osmiridium,
+									Materials.Osmium,
+									Materials.Palladium,
+									Materials.PigIron,
+									Materials.Platinum,
+									Materials.Plutonium,
+									Materials.Plutonium241,
+									Materials.Praseodymium
+							};
+							break;
+						case 6:
+							mMats = new Materials[]{
+									Materials.Promethium,
+									Materials.RedAlloy,
+									Materials.RedSteel,
+									Materials.RoseGold,
+									Materials.Rubidium,
+									Materials.Samarium,
+									Materials.Scandium,
+									Materials.ShadowIron,
+									Materials.ShadowSteel,
+									Materials.Silicon,
+									Materials.Silver,
+									Materials.SolderingAlloy,
+									Materials.StainlessSteel,
+									Materials.Steel,
+									Materials.SteelMagnetic,
+									Materials.SterlingSilver
+							};
+							break;
+						case 7:
+							mMats = new Materials[]{
+									Materials.Sunnarium,
+									Materials.Tantalum,
+									Materials.Tellurium,
+									Materials.Terbium,
+									Materials.Thaumium,
+									Materials.Thorium,
+									Materials.Thulium,
+									Materials.Tin,
+									Materials.TinAlloy,
+									Materials.Titanium,
+									Materials.Tritanium,
+									Materials.Tungsten,
+									Materials.TungstenSteel,
+									Materials.Ultimet,
+									Materials.Uranium,
+									Materials.Uranium235
+							};
+							break;
+						case 8:
+							mMats = new Materials[]{
+									Materials.Vanadium,
+									Materials.VanadiumGallium,
+									Materials.WroughtIron,
+									Materials.Ytterbium,
+									Materials.Yttrium,
+									Materials.YttriumBariumCuprate,
+									Materials.Zinc,
+									Materials.TungstenCarbide,
+									Materials.VanadiumSteel,
+									Materials.HSSG,
+									Materials.HSSE,
+									Materials.HSSS,
+									Materials.Steeleaf,
+									Materials.Ichorium,
+									Materials.Firestone
+							};
+							break;
+					}
+					t = entry.getKey().substring("gt.blockmetal1.".length(), entry.getKey().length() - ".name".length());
+					i = Integer.parseInt(t);
+					lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString());
+					mMats = null;
+				} else if (entry.getKey().contains("blockgem")) {
+					Materials[] mMats = null;
+					String t = entry.getKey().substring("gt.blockgem".length());
+					t = t.substring(0, 1);
+					int i = Integer.parseInt(t);
+					switch (i) {
+						case 1:
+							mMats = new Materials[]{
+									Materials.InfusedAir,
+									Materials.Amber,
+									Materials.Amethyst,
+									Materials.InfusedWater,
+									Materials.BlueTopaz,
+									Materials.CertusQuartz,
+									Materials.Dilithium,
+									Materials.EnderEye,
+									Materials.EnderPearl,
+									Materials.FoolsRuby,
+									Materials.Force,
+									Materials.Forcicium,
+									Materials.Forcillium,
+									Materials.GreenSapphire,
+									Materials.InfusedFire,
+									Materials.Jasper
+							};
+							break;
+						case 2:
+							mMats = new Materials[]{
+									Materials.Lazurite,
+									Materials.Lignite,
+									Materials.Monazite,
+									Materials.Niter,
+									Materials.Olivine,
+									Materials.Opal,
+									Materials.InfusedOrder,
+									Materials.InfusedEntropy,
+									Materials.Phosphorus,
+									Materials.Quartzite,
+									Materials.GarnetRed,
+									Materials.Ruby,
+									Materials.Sapphire,
+									Materials.Sodalite,
+									Materials.Tanzanite,
+									Materials.InfusedEarth
+							};
+							break;
+						case 3:
+							mMats = new Materials[]{
+									Materials.Topaz,
+									Materials.Vinteum,
+									Materials.GarnetYellow,
+									Materials.NetherStar,
+									Materials.Charcoal,
+									Materials.Blaze
+							};
+							break;
+					}
+					t = entry.getKey().substring("gt.blockgem1.".length(), entry.getKey().length() - ".name".length());
+					i = Integer.parseInt(t);
+					lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString());
+					mMats = null;
 				}
-				t = entry.getKey().substring("gt.blockgem1.".length(), entry.getKey().length()-".name".length());
-				i = Integer.parseInt(t);
-				lServerNames.put(entry.getKey(),"Block of "+mMats[i].toString());
-				mMats = null;
+			} catch (Exception ignored) {
 			}
 		}
-		
+
 		internal = null;
 		internal2 = null;
 		internal3 = null;
 		internal4 = null;
 	}
-		
-}
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index 8a1519234c..e195bf9b02 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -40,6 +40,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import static gregtech.api.enums.GT_Values.*;
 
@@ -777,6 +778,7 @@ public class GT_ModHandler {
         if (GT_Mod.gregtechproxy.mAddGTRecipesToIC2Machines) GT_Utility.removeSimpleIC2MachineRecipe(aInput, getOreWashingRecipeList(), null);
         if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.orewashing, aInput, true)) return false;
         RA.addOreWasherRecipe(aInput, (ItemStack)aOutput[0], (ItemStack)aOutput[1], (ItemStack)aOutput[2], GT_ModHandler.getWater(1000L), 500, 16);
+        RA.addOreWasherRecipe(aInput, (ItemStack)aOutput[0], (ItemStack)aOutput[1], (ItemStack)aOutput[2], GT_ModHandler.getDistilledWater(200L), 300, 16);
         if (GT_Mod.gregtechproxy.mAddGTRecipesToIC2Machines) {
             NBTTagCompound tNBT = new NBTTagCompound();
             tNBT.setInteger("amount", aWaterAmount);
@@ -1014,7 +1016,7 @@ public class GT_ModHandler {
                 Character chr = (Character) aRecipe[idx];
                 Object in = aRecipe[idx + 1];
                 if (in instanceof ItemStack) {
-                    tItemStackMap.put(chr, GT_Utility.copy((ItemStack) in));
+                    tItemStackMap.put(chr, GT_Utility.copy(in));
                     tItemDataMap.put(chr, GT_OreDictUnificator.getItemData((ItemStack) in));
                 } else if (in instanceof ItemData) {
                     String tString = in.toString();
@@ -1392,7 +1394,7 @@ public class GT_ModHandler {
      * If you have multiple Mods, which add Bronze Armor for example
      * This also removes old Recipes from the List.
      */
-    public static ArrayList<ItemStack> getVanillyToolRecipeOutputs(ItemStack... aRecipe) {
+    public static List<ItemStack> getVanillyToolRecipeOutputs(ItemStack... aRecipe) {
         if (!GregTech_API.sPostloadStarted || GregTech_API.sPostloadFinished)
             sSingleNonBlockDamagableRecipeList.clear();
         if (sSingleNonBlockDamagableRecipeList.isEmpty()) {
@@ -1431,7 +1433,7 @@ public class GT_ModHandler {
             }
             GT_Log.out.println("GT_Mod: Created a List of Tool Recipes containing " + sSingleNonBlockDamagableRecipeList.size() + " Recipes for recycling." + (sSingleNonBlockDamagableRecipeList.size() > 1024 ? " Scanning all these Recipes is the reason for the startup Lag you receive right now." : E));
         }
-        ArrayList<ItemStack> rList = getRecipeOutputs(sSingleNonBlockDamagableRecipeList, true, aRecipe);
+        List<ItemStack> rList = getRecipeOutputs(sSingleNonBlockDamagableRecipeList, true, aRecipe);
         if (!GregTech_API.sPostloadStarted || GregTech_API.sPostloadFinished)
             sSingleNonBlockDamagableRecipeList.clear();
         return rList;
@@ -1441,49 +1443,95 @@ public class GT_ModHandler {
      * Gives you a list of the Outputs from a Crafting Recipe
      * If you have multiple Mods, which add Bronze Armor for example
      */
-    public static ArrayList<ItemStack> getRecipeOutputs(ItemStack... aRecipe) {
+    public static List<ItemStack> getRecipeOutputs(ItemStack... aRecipe) {
         return getRecipeOutputs(CraftingManager.getInstance().getRecipeList(), false, aRecipe);
     }
 
+    private static List<IRecipe> bufferedRecipes = null;
+
+    /**
+     * Gives you a list of the Outputs from a Crafting Recipe
+     * If you have multiple Mods, which add Bronze Armor for example
+     * Buffers a List which only has armor-alike crafting in it
+     */
+    public static List<ItemStack> getRecipeOutputsBuffered(ItemStack... aRecipe) {
+
+        if (bufferedRecipes == null)
+            bufferedRecipes = (List<IRecipe>) CraftingManager.getInstance().getRecipeList().stream().filter(
+                    tRecipe -> !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe) && !(tRecipe instanceof IGT_CraftingRecipe)
+            )
+                    .filter(tRecipe ->
+            {
+                try {
+                    ItemStack tOutput = ((IRecipe) tRecipe).getRecipeOutput();
+                    if (tOutput.stackSize == 1 && tOutput.getMaxDamage() > 0 && tOutput.getMaxStackSize() == 1) {
+                        return true;
+                    }
+                } catch (Exception ignored) {
+                }
+                return false;
+            })
+                    .collect(Collectors.toList());
+        return getRecipeOutputs(bufferedRecipes, false, aRecipe);
+    }
+
     /**
      * Gives you a list of the Outputs from a Crafting Recipe
      * If you have multiple Mods, which add Bronze Armor for example
      */
-    public static ArrayList<ItemStack> getRecipeOutputs(List<IRecipe> aList, boolean aDeleteFromList, ItemStack... aRecipe) {
-        ArrayList<ItemStack> rList = new ArrayList<ItemStack>();
-        if (aRecipe == null) return rList;
-        boolean temp = false;
-        for (byte i = 0; i < aRecipe.length; i++) {
-            if (aRecipe[i] != null) {
-                temp = true;
-                break;
-            }
-        }
-        if (!temp) return rList;
+    public static List<ItemStack> getRecipeOutputs(List<IRecipe> aList, boolean aDeleteFromList, ItemStack... aRecipe) {
+        List<ItemStack> rList = new ArrayList<>();
+        if (aRecipe == null || Arrays.stream(aRecipe).noneMatch(Objects::nonNull))
+            return rList;
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
             public boolean canInteractWith(EntityPlayer var1) {
                 return false;
             }
         }, 3, 3);
-        for (int i = 0; i < 9 && i < aRecipe.length; i++) aCrafting.setInventorySlotContents(i, aRecipe[i]);
-        for (int i = 0; i < aList.size(); i++) {
-            temp = false;
+        for (int i = 0; i < 9 && i < aRecipe.length; i++)
+            aCrafting.setInventorySlotContents(i, aRecipe[i]);
+        if (!aDeleteFromList) {
+            HashSet<ItemStack> stacks = new HashSet<>();
+            aList.stream().filter(
+                    tRecipe -> {
+                        if (tRecipe instanceof ShapelessRecipes || tRecipe instanceof ShapelessOreRecipe || tRecipe instanceof IGT_CraftingRecipe)
+                            return false;
+                        try {
+                            return tRecipe.matches(aCrafting, DW);
+                        } catch (Throwable e) {
+                            e.printStackTrace(GT_Log.err);
+                            return false;
+                        }
+                    }
+            ).forEach(tRecipe -> stacks.add(tRecipe.getCraftingResult(aCrafting)));
+            rList = stacks.stream().filter(tOutput -> tOutput.stackSize == 1 && tOutput.getMaxDamage() > 0 && tOutput.getMaxStackSize() == 1).collect(Collectors.toList());
+        } else for (int i = 0; i < aList.size(); i++) {
+            boolean temp = false;
+
             try {
                 temp = aList.get(i).matches(aCrafting, DW);
             } catch (Throwable e) {
                 e.printStackTrace(GT_Log.err);
             }
             if (temp) {
-                ItemStack tOutput = aList.get(i).getCraftingResult(aCrafting);
+                IRecipe tRecipe = aList.get(i);
+                ItemStack tOutput = tRecipe.getCraftingResult(aCrafting);
+
                 if (tOutput == null || tOutput.stackSize <= 0) {
                     // Seriously, who would ever do that shit?
                     if (!GregTech_API.sPostloadFinished)
                         throw new GT_ItsNotMyFaultException("Seems another Mod added a Crafting Recipe with null Output. Tell the Developer of said Mod to fix that.");
-                } else {
-                    rList.add(GT_Utility.copy(tOutput));
-                    if (aDeleteFromList) aList.remove(i--);
+                    continue;
                 }
+                if (tOutput.stackSize != 1) continue;
+                if (tOutput.getMaxDamage() <= 0) continue;
+                if (tOutput.getMaxStackSize() != 1) continue;
+                if (tRecipe instanceof ShapelessRecipes) continue;
+                if (tRecipe instanceof ShapelessOreRecipe) continue;
+                if (tRecipe instanceof IGT_CraftingRecipe) continue;
+                rList.add(GT_Utility.copy(tOutput));
+                aList.remove(i--);
             }
         }
         return rList;
@@ -1538,7 +1586,7 @@ public class GT_ModHandler {
             for (Entry<IRecipeInput, RecipeOutput> tEntry : aRecipeList.entrySet()) {
                 if (tEntry.getKey().matches(aInput)) {
                     if (tEntry.getKey().getAmount() <= aInput.stackSize) {
-                        ItemStack[] tList = (ItemStack[]) tEntry.getValue().items.toArray(new ItemStack[tEntry.getValue().items.size()]);
+                        ItemStack[] tList = tEntry.getValue().items.toArray(new ItemStack[tEntry.getValue().items.size()]);
                         if (tList.length == 0) break;
                         ItemStack[] rList = new ItemStack[aOutputSlots.length];
                         rRecipeMetaData.setTag("return", tEntry.getValue().metadata);
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 5a5ba21fa4..21bac2b246 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -546,7 +546,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public static final GT_Recipe_Map sSifterRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(105), "gt.recipe.sifter", "Sifter", null, RES_PATH_GUI + "basicmachines/Sifter", 1, 9, 1, 0, 1, E, 1, E, true, true);

         public static final GT_Recipe_Map sPressRecipes = new GT_Recipe_Map_FormingPress(new HashSet<GT_Recipe>(300), "gt.recipe.press", "Forming Press", null, RES_PATH_GUI + "basicmachines/Press", 2, 1, 2, 0, 1, E, 1, E, true, true);

         public static final GT_Recipe_Map sLaserEngraverRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(810), "gt.recipe.laserengraver", "Precision Laser Engraver", null, RES_PATH_GUI + "basicmachines/LaserEngraver", 2, 1, 2, 0, 1, E, 1, E, true, true);

-        public static final GT_Recipe_Map sMixerRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(900), "gt.recipe.mixer", "Mixer", null, RES_PATH_GUI + "basicmachines/Mixer", 6, 1, 1, 0, 1, E, 1, E, true, true);

+        public static final GT_Recipe_Map sMixerRecipes