Merge pull request #205 from GTNewHorizons/beefix

fixed bee stuff with genetics

2 files changed, 402 insertions, 532 deletions

diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 0fac4b3af8..a4d67ebf86 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -5,292 +5,161 @@ import gregtech.api.util.GT_LanguageManager;
 
 public enum CombType {
     //Organic Line
-    LIGNIE("lignite", true, Materials.Lignite, 100),
-    COAL("coal", true, Materials.Coal, 100),
-    STICKY("stickyresin", true, Materials._NULL, 50),
-    OIL("oil", true, Materials._NULL, 100),
-    APATITE("apatite", true, Materials.Apatite, 100),
-    ASH("ash", true, Materials.Ash, 100),
+    LIGNIE("lignite", true, Materials.Lignite, 100,0x58300B, 0x906237),
+    COAL("coal", true, Materials.Coal, 100,0x525252, 0x666666),
+    STICKY("stickyresin", true, Materials._NULL, 50,0x2E8F5B, 0xDCC289),
+    OIL("oil", true, Materials._NULL, 100,0x333333, 0x4C4C4C),
+    APATITE("apatite", true, Materials.Apatite, 100,0xc1c1f6, 0x676784),
+    ASH("ash", true, Materials.Ash, 100,0x1e1a18, 0xc6c6c6),
 
     //IC2 Line
-    COOLANT("coolant", true, Materials._NULL, 100),
-    ENERGY("energy", true, Materials._NULL, 80),
-    LAPOTRON("lapotron", true, Materials._NULL, 60),
-    PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50),
-    CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50),
+    COOLANT("coolant", true, Materials._NULL, 100,0x144F5A, 0x2494A2),
+    ENERGY("energy", true, Materials._NULL, 80,0xC11F1F, 0xEBB9B9),
+    LAPOTRON("lapotron", true, Materials._NULL, 60,0x1414FF, 0x6478FF),
+    PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50,0xffebc4, 0xe36400),
+    CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50,0x2660ff, 0x5af7ff),
 
     //Alloy Line
-    REDALLOY("redalloy", true, Materials.RedAlloy, 100),
-    REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90),
-    CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80),
-    VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50),
-    ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70),
-    ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90),
-    DARKSTEEL("darksteel", true, Materials.DarkSteel, 80),
-    PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80),
-    STAINLESSSTEEL("stainlesssteel", true, Materials.StainlessSteel, 75),
-    ENDERIUM("enderium", true, Materials.Enderium, 40),
+    REDALLOY("redalloy", true, Materials.RedAlloy, 100,0xE60000, 0xB80000),
+    REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90,0xB80000, 0xA50808),
+    CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80,0x817671, 0xCEADA3),
+    VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50,0x86A12D, 0xC4F2AE),
+    ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70,0xFF9933, 0xFFAD5C),
+    ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90,0x787878, 0xD8D8D8),
+    DARKSTEEL("darksteel", true, Materials.DarkSteel, 80,0x252525, 0x443B44),
+    PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80,0x006600, 0x6DD284),
+    STAINLESSSTEEL("stainlesssteel", true, Materials.StainlessSteel, 75,0x778899, 0xC8C8DC),
+    ENDERIUM("enderium", true, Materials.Enderium, 40,0x2E8B57, 0x599087),
 
     //Thaumcraft Line
-    THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100),
-    THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85),
-    AMBER("amber", true, Materials.Amber, 90),
-    QUICKSILVER("quicksilver", true, Materials.Mercury, 90),
-    SALISMUNDUS("salismundus", true, Materials._NULL, 75),
-    TAINTED("tainted", true, Materials._NULL, 80),
-    MITHRIL("mithril", true, Materials.Mithril, 70),
-    ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70),
-    THAUMINITE("thauminite", true, Materials._NULL, 50),
-    SHADOWMETAL("shadowmetal", true, Materials.Shadow, 50),
-    DIVIDED("divided", true, Materials.Unstable, 40),
-    SPARKELING("sparkling", true, Materials.NetherStar, 40),
+    THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100,0x7A007A, 0x5C005C),
+    THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85,0x9966FF, 0xAD85FF),
+    AMBER("amber", true, Materials.Amber, 90,0x774B15, 0xEE7700),
+    QUICKSILVER("quicksilver", true, Materials.Mercury, 90,0xc7c7ea, 0xb5b3df),
+    SALISMUNDUS("salismundus", true, Materials._NULL, 75,0xF7ADDE, 0x592582),
+    TAINTED("tainted", true, Materials._NULL, 80,0x904BB8, 0xE800FF),
+    MITHRIL("mithril", true, Materials.Mithril, 70,0xF0E68C, 0xFFFFD2),
+    ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70,0xAFEEEE, 0xE6E6FF),
+    THAUMINITE("thauminite", true, Materials._NULL, 50,0x2E2D79, 0x7581E0),
+    SHADOWMETAL("shadowmetal", true, Materials.Shadow, 50,0x100322, 0x100342),
+    DIVIDED("divided", true, Materials.Unstable, 40,0xF0F0F0, 0xDCDCDC),
+    SPARKELING("sparkling", true, Materials.NetherStar, 40,0x7A007A, 0xFFFFFF),
 
     //Gem Line
-    STONE("stone", true, Materials._NULL, 70),
-    CERTUS("certus", true, Materials.CertusQuartz, 100),
-    FLUIX("fluix", true, Materials.Fluix, 100),
-    REDSTONE("redstone", true, Materials.Redstone, 100),
-    RAREEARTH("rareearth", true, Materials.RareEarth, 100),
-    LAPIS("lapis", true, Materials.Lapis, 100),
-    RUBY("ruby", true, Materials.Ruby, 100),
-    REDGARNET("redgarnet", true, Materials.GarnetRed,100),
-    YELLOWGARNET("yellowgarnet", true, Materials.GarnetYellow,100),
-    SAPPHIRE("sapphire", true, Materials.Sapphire, 100),
-    DIAMOND("diamond", true, Materials.Diamond, 100),
-    OLIVINE("olivine", true, Materials.Olivine, 100),
-    EMERALD("emerald", true, Materials.Emerald, 100),
-    PYROPE("pyrope", true, Materials.Pyrope, 100),
-    GROSSULAR("grossular", true, Materials.Grossular, 100),
-    FIRESTONE("firestone", true, Materials.Firestone, 100),
+    STONE("stone", true, Materials._NULL, 70,0x808080, 0x999999),
+    CERTUS("certus", true, Materials.CertusQuartz, 100,0x57CFFB, 0xBBEEFF),
+    FLUIX("fluix", true, Materials.Fluix, 100,0xA375FF, 0xB591FF),
+    REDSTONE("redstone", true, Materials.Redstone, 100,0x7D0F0F, 0xD11919),
+    RAREEARTH("rareearth", true, Materials.RareEarth, 100,0x555643, 0x343428),
+    LAPIS("lapis", true, Materials.Lapis, 100,0x1947D1, 0x476CDA),
+    RUBY("ruby", true, Materials.Ruby, 100,0xE6005C, 0xCC0052),
+    REDGARNET("redgarnet", true, Materials.GarnetRed,100,0xBD4C4C, 0xECCECE),
+    YELLOWGARNET("yellowgarnet", true, Materials.GarnetYellow,100,0xA3A341, 0xEDEDCE),
+    SAPPHIRE("sapphire", true, Materials.Sapphire, 100,0x0033CC, 0x00248F),
+    DIAMOND("diamond", true, Materials.Diamond, 100,0xCCFFFF, 0xA3CCCC),
+    OLIVINE("olivine", true, Materials.Olivine, 100,0x248F24, 0xCCFFCC),
+    EMERALD("emerald", true, Materials.Emerald, 100,0x248F24, 0x2EB82E),
+    PYROPE("pyrope", true, Materials.Pyrope, 100,0x763162, 0x8B8B8B),
+    GROSSULAR("grossular", true, Materials.Grossular, 100,0x9B4E00, 0x8B8B8B),
+    FIRESTONE("firestone", true, Materials.Firestone, 100,0xC00000, 0xFF0000),
 
     //Metals Line
-    SLAG("slag", true, Materials._NULL, 50),
-    COPPER("copper", true, Materials.Copper, 100),
-    TIN("tin", true, Materials.Tin, 100),
-    LEAD("lead", true, Materials.Lead, 100),
-    IRON("iron", true, Materials.Iron, 100),
-    STEEL("steel", true, Materials.Steel, 95),
-    NICKEL("nickel", true, Materials.Nickel, 100),
-    ZINC("zinc", true, Materials.Zinc, 100),
-    SILVER("silver", true, Materials.Silver, 100),
-    GOLD("gold", true, Materials.Gold, 100),
-    SULFUR("sulfur", true, Materials.Sulfur, 100),
-    GALLIUM ("gallium", true, Materials.Gallium, 75),
-    ARSENIC ("arsenic", true, Materials.Arsenic, 75),
+    SLAG("slag", true, Materials._NULL, 50,0xD4D4D4, 0x58300B),
+    COPPER("copper", true, Materials.Copper, 100,0xFF6600, 0xE65C00),
+    TIN("tin", true, Materials.Tin, 100,0xD4D4D4, 0xDDDDDD),
+    LEAD("lead", true, Materials.Lead, 100,0x666699, 0xA3A3CC),
+    IRON("iron", true, Materials.Iron, 100,0xDA9147, 0xDE9C59),
+    STEEL("steel", true, Materials.Steel, 95,0x808080, 0x999999),
+    NICKEL("nickel", true, Materials.Nickel, 100,0x8585AD, 0x9D9DBD),
+    ZINC("zinc", true, Materials.Zinc, 100,0xF0DEF0, 0xF2E1F2),
+    SILVER("silver", true, Materials.Silver, 100,0xC2C2D6, 0xCECEDE),
+    GOLD("gold", true, Materials.Gold, 100,0xE6B800, 0xCFA600),
+    SULFUR("sulfur", true, Materials.Sulfur, 100,0x6F6F01, 0x8B8B8B),
+    GALLIUM ("gallium", true, Materials.Gallium, 75,0x8B8B8B, 0xC5C5E4),
+    ARSENIC ("arsenic", true, Materials.Arsenic, 75,0x736C52, 0x292412),
 
     //Rare Metals Line
-    BAUXITE("bauxite", true, Materials.Bauxite, 85),
-    ALUMINIUM("aluminium", true, Materials.Aluminium, 60),
-    MANGANESE("manganese", true, Materials.Manganese, 30),
-    MAGNESIUM("magnesium", true, Materials.Magnesium, 75),
-    TITANIUM("titanium", true, Materials.Ilmenite, 100),
-    CHROME("chromium", true, Materials.Chrome, 50),
-    TUNGSTEN("tungsten", true, Materials.Tungstate, 100),
-    PLATINUM("platinum", true, Materials.Platinum, 40),
-    IRIDIUM("iridium", true, Materials.Iridium, 20),
-    MOLYBDENUM("molybdenum", true, Materials.Molybdenum, 20),
-    OSMIUM("osmium", true, Materials.Osmium, 15),
-    LITHIUM("lithium", true, Materials.Lithium, 75),
-    SALT("salt", true, Materials.Salt, 90),
-    ELECTROTINE("electrotine", true, Materials.Electrotine, 75),
-    ALMANDINE("almandine", true, Materials.Almandine, 85),
+    BAUXITE("bauxite", true, Materials.Bauxite, 85,0x6B3600, 0x8B8B8B),
+    ALUMINIUM("aluminium", true, Materials.Aluminium, 60,0x008AB8, 0xD6D6FF),
+    MANGANESE("manganese", true, Materials.Manganese, 30,0xD5D5D5, 0xAAAAAA),
+    MAGNESIUM("magnesium", true, Materials.Magnesium, 75,0xF1D9D9, 0x8B8B8B),
+    TITANIUM("titanium", true, Materials.Ilmenite, 100,0xCC99FF, 0xDBB8FF),
+    CHROME("chromium", true, Materials.Chrome, 50,0xEBA1EB, 0xF2C3F2),
+    TUNGSTEN("tungsten", true, Materials.Tungstate, 100,0x62626D, 0x161620),
+    PLATINUM("platinum", true, Materials.Platinum, 40,0xE6E6E6, 0xFFFFCC),
+    IRIDIUM("iridium", true, Materials.Iridium, 20,0xDADADA, 0xD1D1E0),
+    MOLYBDENUM("molybdenum", true, Materials.Molybdenum, 20,0xAEAED4, 0x8B8B8B),
+    OSMIUM("osmium", true, Materials.Osmium, 15,0x2B2BDA, 0x8B8B8B),
+    LITHIUM("lithium", true, Materials.Lithium, 75,0xF0328C, 0xE1DCFF),
+    SALT("salt", true, Materials.Salt, 90,0xF0C8C8, 0xFAFAFA),
+    ELECTROTINE("electrotine", true, Materials.Electrotine, 75,0x1E90FF, 0x3CB4C8),
+    ALMANDINE("almandine", true, Materials.Almandine, 85,0xC60000, 0x8B8B8B),
 
     //Radioactive Line
-    URANIUM("uranium", true, Materials.Uranium, 50),
-    PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
-    NAQUADAH("naquadah", true, Materials.Naquadah, 10),
-    NAQUADRIA("naquadria", true, Materials.Naquadria, 5),
-    DOB("d-o-b", true, Materials._NULL, 50),
-    THORIUM("thorium", true, Materials.Thorium, 75),
-    LUTETIUM("lutetium", true, Materials.Lutetium, 10),
-    AMERICUM("americum", true, Materials.Americium, 5),
-    NEUTRONIUM("neutronium", true, Materials.Neutronium, 2),
+    URANIUM("uranium", true, Materials.Uranium, 50,0x19AF19, 0x169E16),
+    PLUTONIUM("plutonium", true, Materials.Plutonium, 10,0x240000, 0x570000),
+    NAQUADAH("naquadah", true, Materials.Naquadah, 10,0x000000, 0x004400),
+    NAQUADRIA("naquadria", true, Materials.Naquadria, 5,0x000000, 0x002400),
+    DOB("d-o-b", true, Materials._NULL, 50,0x007700, 0x002400),
+    THORIUM("thorium", true, Materials.Thorium, 75,0x001E00, 0x005000),
+    LUTETIUM("lutetium", true, Materials.Lutetium, 10,0xE6FFE6, 0xFFFFFF),
+    AMERICUM("americum", true, Materials.Americium, 5,0xE6E6FF, 0xC8C8C8),
+    NEUTRONIUM("neutronium", true, Materials.Neutronium, 2,0xFFF0F0, 0xFAFAFA),
 
     //Twilight
-    NAGA("naga", true, Materials._NULL, 100),
-    LICH("lich", true, Materials._NULL, 90),
-    HYDRA("hydra", true, Materials._NULL, 80),
-    URGHAST("urghast", true, Materials._NULL, 70),
-    SNOWQUEEN("snowqueen", true, Materials._NULL, 60),
+    NAGA("naga", true, Materials._NULL, 100,0x0D5A0D, 0x28874B),
+    LICH("lich", true, Materials._NULL, 90,0x5C605E, 0xC5C5C5),
+    HYDRA("hydra", true, Materials._NULL, 80,0x872836, 0xB8132C),
+    URGHAST("urghast", true, Materials._NULL, 70,0x7C0618, 0xA7041C),
+    SNOWQUEEN("snowqueen", true, Materials._NULL, 60,0x9C0018, 0xD02001),
 
     //Space
-    SPACE("space", true, Materials._NULL, 100),
-    METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100),
-    DESH("desh",true, Materials.Desh, 90),
-    LEDOX("ledox",true, Materials.Ledox, 75),
-    CALLISTOICE("callistoice",true, Materials.CallistoIce, 75),
-    MYTRYL("mytryl",true, Materials.Mytryl, 65),
-    QUANTIUM("quantium",true, Materials.Quantium, 50),
-    ORIHARUKON("oriharukon",true, Materials.Oriharukon, 50),
-    MYSTERIOUSCRYSTAL("mysteriouscrystal",true, Materials.MysteriousCrystal, 45),
-    BLACKPLUTONIUM("blackplutonium",true, Materials.Quantium, 25),
-    TRINIUM("trinium",true, Materials.Trinium, 25),
+    SPACE("space", true, Materials._NULL, 100,0x003366, 0xC0C0C0),
+    METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100,0x321928, 0x643250),
+    DESH("desh",true, Materials.Desh, 90,0x282828, 0x323232),
+    LEDOX("ledox",true, Materials.Ledox, 75,0x0000CD, 0x0074FF),
+    CALLISTOICE("callistoice",true, Materials.CallistoIce, 75,0x0074FF, 0x1EB1FF),
+    MYTRYL("mytryl",true, Materials.Mytryl, 65,0xDAA520, 0xF26404),
+    QUANTIUM("quantium",true, Materials.Quantium, 50,0x00FF00, 0x00D10B),
+    ORIHARUKON("oriharukon",true, Materials.Oriharukon, 50,0x228B22, 0x677D68),
+    MYSTERIOUSCRYSTAL("mysteriouscrystal",true, Materials.MysteriousCrystal, 45,0x3CB371, 0x16856C),
+    BLACKPLUTONIUM("blackplutonium",true, Materials.Quantium, 25,0x000000, 0x323232),
+    TRINIUM("trinium",true, Materials.Trinium, 25,0xB0E0E6, 0xC8C8D2),
 
     //Planet
-    MERCURY("mercury", true, Materials._NULL, 65),
-    VENUS("venus",true, Materials._NULL, 65),
-    MOON("moon",true, Materials._NULL, 90),
-    MARS("mars",true, Materials._NULL, 80),
-    JUPITER("jupiter",true, Materials._NULL, 75),
-    SATURN("saturn",true, Materials._NULL, 55),
-    URANUS("uranus",true, Materials._NULL, 45),
-    NEPTUN("neptun",true, Materials._NULL, 35),
-    PLUTO("pluto",true, Materials._NULL, 25),
-    HAUMEA("haumea",true, Materials._NULL, 20),
-    MAKEMAKE("makemake",true, Materials._NULL, 20),
-    CENTAURI("centauri",true, Materials._NULL, 15),
-    TCETI("tceti",true, Materials._NULL, 10),
-    BARNARDA("barnarda",true, Materials._NULL, 10),
-    VEGA("vega",true, Materials._NULL, 10),
+    MERCURY("mercury", true, Materials._NULL, 65,0x4A4033, 0xB5A288),
+    VENUS("venus",true, Materials._NULL, 65,0x120E07, 0x272010),
+    MOON("moon",true, Materials._NULL, 90,0x373735, 0x7E7E78),
+    MARS("mars",true, Materials._NULL, 80,0x220D05, 0x3A1505),
+    JUPITER("jupiter",true, Materials._NULL, 75,0x734B2E, 0xD0CBC4),
+    SATURN("saturn",true, Materials._NULL, 55,0xD2A472, 0xF8C37B),
+    URANUS("uranus",true, Materials._NULL, 45,0x75C0C9, 0x84D8EC),
+    NEPTUN("neptun",true, Materials._NULL, 35,0x334CFF, 0x576DFF),
+    PLUTO("pluto",true, Materials._NULL, 25,0x34271E, 0x69503D),
+    HAUMEA("haumea",true, Materials._NULL, 20,0x1C1413, 0x392B28),
+    MAKEMAKE("makemake",true, Materials._NULL, 20,0x301811, 0x120A07),
+    CENTAURI("centauri",true, Materials._NULL, 15,0x2F2A14, 0xB06B32),
+    TCETI("tceti",true, Materials._NULL, 10,0x46241A, 0x7B412F),
+    BARNARDA("barnarda",true, Materials._NULL, 10,0x0D5A0D, 0xE6C18D),
+    VEGA("vega",true, Materials._NULL, 10,0x1A2036, 0xB5C0DE),
 
     //Infinity
-    COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5),
-    INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2),
-    INFINITY("infinity",true, Materials._NULL, 1);
-
-    private static int[][] colours = new int[][]{
-            //organic
-            {0x58300B, 0x906237},
-            {0x525252, 0x666666},
-            {0x2E8F5B, 0xDCC289},
-            {0x333333, 0x4C4C4C},
-            {0xc1c1f6, 0x676784},
-            {0x1e1a18, 0xc6c6c6},
-            //ic2
-            {0x144F5A, 0x2494A2},
-            {0xC11F1F, 0xEBB9B9},
-            {0x1414FF, 0x6478FF},
-            {0xffebc4, 0xe36400},
-            {0x2660ff, 0x5af7ff},
-            //alloy
-            {0xE60000, 0xB80000},
-            {0xB80000, 0xA50808},
-            {0x817671, 0xCEADA3},
-            {0x86A12D, 0xC4F2AE},
-            {0xFF9933, 0xFFAD5C},
-            {0x787878, 0xD8D8D8},
-            {0x252525, 0x443B44},
-            {0x006600, 0x6DD284},
-            {0x778899, 0xC8C8DC},
-            {0x2E8B57, 0x599087},
-            //Thaumcraft
-            {0x7A007A, 0x5C005C},
-            {0x9966FF, 0xAD85FF},
-            {0x774B15, 0xEE7700},
-            {0xc7c7ea, 0xb5b3df},
-            {0xF7ADDE, 0x592582},
-            {0x904BB8, 0xE800FF},
-            {0xF0E68C, 0xFFFFD2},
-            {0xAFEEEE, 0xE6E6FF},
-            {0x2E2D79, 0x7581E0},
-            {0x100322, 0x100342},
-            {0xF0F0F0, 0xDCDCDC},
-            {0x7A007A, 0xFFFFFF},
-            //gems
-            {0x808080, 0x999999},
-            {0x57CFFB, 0xBBEEFF},
-            {0xA375FF, 0xB591FF},
-            {0x7D0F0F, 0xD11919},
-            {0x555643, 0x343428},
-            {0x1947D1, 0x476CDA},
-            {0xE6005C, 0xCC0052},
-            {0xBD4C4C, 0xECCECE},
-            {0xA3A341, 0xEDEDCE},
-            {0x0033CC, 0x00248F},
-            {0xCCFFFF, 0xA3CCCC},
-            {0x248F24, 0xCCFFCC},
-            {0x248F24, 0x2EB82E},
-            {0x763162, 0x8B8B8B},
-            {0x9B4E00, 0x8B8B8B},
-            {0xC00000, 0xFF0000},
-            //Metals
-            {0xD4D4D4, 0x58300B},
-            {0xFF6600, 0xE65C00},
-            {0xD4D4D4, 0xDDDDDD},
-            {0x666699, 0xA3A3CC},
-            {0xDA9147, 0xDE9C59},
-            {0x808080, 0x999999},
-            {0x8585AD, 0x9D9DBD},
-            {0xF0DEF0, 0xF2E1F2},
-            {0xC2C2D6, 0xCECEDE},
-            {0xE6B800, 0xCFA600},
-            {0x6F6F01, 0x8B8B8B},
-            {0x8B8B8B, 0xC5C5E4},
-            {0x736C52, 0x292412},
-            //Rare Metals
-            {0x6B3600, 0x8B8B8B},
-            {0x008AB8, 0xD6D6FF},
-            {0xD5D5D5, 0xAAAAAA},
-            {0xF1D9D9, 0x8B8B8B},
-            {0xCC99FF, 0xDBB8FF},
-            {0xEBA1EB, 0xF2C3F2},
-            {0x62626D, 0x161620},
-            {0xE6E6E6, 0xFFFFCC},
-            {0xDADADA, 0xD1D1E0},
-            {0xAEAED4, 0x8B8B8B},
-            {0x2B2BDA, 0x8B8B8B},
-            {0xF0328C, 0xE1DCFF},
-            {0xF0C8C8, 0xFAFAFA},
-            {0x1E90FF, 0x3CB4C8},
-            {0xC60000, 0x8B8B8B},
-            //Radioactive Line
-            {0x19AF19, 0x169E16},
-            {0x240000, 0x570000},
-            {0x000000, 0x004400},
-            {0x000000, 0x002400},
-            {0x007700, 0x002400},
-            {0x001E00, 0x005000},
-            {0xE6FFE6, 0xFFFFFF},
-            {0xE6E6FF, 0xC8C8C8},
-            {0xFFF0F0, 0xFAFAFA},
-            //Twilight
-            {0x0D5A0D, 0x28874B},
-            {0x5C605E, 0xC5C5C5},
-            {0x872836, 0xB8132C},
-            {0x7C0618, 0xA7041C},
-            {0x9C0018, 0xD02001},
-            //space
-            {0x003366, 0xC0C0C0},
-            {0x321928, 0x643250},
-            {0x282828, 0x323232},
-            {0x0000CD, 0x0074FF},
-            {0x0074FF, 0x1EB1FF},
-            {0xDAA520, 0xF26404},
-            {0x00FF00, 0x00D10B},
-            {0x228B22, 0x677D68},
-            {0x3CB371, 0x16856C},
-            {0x000000, 0x323232},
-            {0xB0E0E6, 0xC8C8D2},
-            //planets
-            {0x4A4033, 0xB5A288},
-            {0x120E07, 0x272010},
-            {0x373735, 0x7E7E78},
-            {0x220D05, 0x3A1505},
-            {0x734B2E, 0xD0CBC4},
-            {0xD2A472, 0xF8C37B},
-            {0x75C0C9, 0x84D8EC},
-            {0x334CFF, 0x576DFF},
-            {0x34271E, 0x69503D},
-            {0x1C1413, 0x392B28},
-            {0x301811, 0x120A07},
-            {0x2F2A14, 0xB06B32},
-            {0x46241A, 0x7B412F},
-            {0x0D5A0D, 0xE6C18D},
-            {0x1A2036, 0xB5C0DE},
-            //infinity
-            {0x484848, 0x323232},
-            {0xFFFFFF, 0xFFFFFF},
-            {0xFFFFFF, 0xFFFFFF},
-    };
+    COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5,0x484848, 0x323232),
+    INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2,0xFFFFFF, 0xFFFFFF),
+    INFINITY("infinity",true, Materials._NULL, 1,0xFFFFFF, 0xFFFFFF);
     public boolean showInList;
     public Materials material;
     public int chance;
+
     private String name;
-    private CombType(String pName, boolean show, Materials material, int chance) {
+    private int[] color;
+
+    CombType(String pName, boolean show, Materials material, int chance, int... color) {
         this.name = pName;
         this.material = material;
         this.chance = chance;
         this.showInList = show;
+        this.color=color;
     }
 
     public void setHidden() {
@@ -303,6 +172,6 @@ public enum CombType {
     }
 
     public int[] getColours() {
-        return colours[this.ordinal()];
+        return color == null || color.length != 2 ? new int[]{0,0} : color;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index 684506f2a0..e708ece935 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -4,11 +4,9 @@ import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;

 import gregtech.api.items.GT_MetaGenerated_Item_X32;

 import gregtech.api.objects.GT_CopiedBlockTexture;

-import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.objects.ItemData;

 import gregtech.api.objects.MaterialStack;

 import gregtech.api.util.*;

-import gregtech.common.covers.GT_Cover_SolarPanel;

 import gregtech.common.items.behaviors.Behaviour_Arrow;

 import net.minecraft.dispenser.IBlockSource;

 import net.minecraft.enchantment.Enchantment;

@@ -30,312 +28,315 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
     private final static String aTextCover = "Usable as Cover"; private final static String aTextForestry = "Forestry";

 

     public GT_MetaGenerated_Item_02() {

-        super("metaitem.02", new OrePrefixes[]{OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, OrePrefixes.turbineBlade, null, OrePrefixes.itemCasing, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt});

+        super("metaitem.02", OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, OrePrefixes.turbineBlade, null, OrePrefixes.itemCasing, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt);

         INSTANCE = this;

 

         int tLastID = 0;

 

-        ItemList.ThermosCan_Dark_Coffee.set(addItem(tLastID = 0, "Dark Coffee", "Coffee, dark, without anything else", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)}));

-        ItemList.ThermosCan_Dark_Cafe_au_lait.set(addItem(tLastID = 1, "Dark Coffee au lait", "Keeping you awake the whole night", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)}));

-        ItemList.ThermosCan_Coffee.set(addItem(tLastID = 2, "Coffee", "Just the regular morning Coffee", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 0, 50, Potion.digSpeed.id, 400, 0, 50}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)}));

-        ItemList.ThermosCan_Cafe_au_lait.set(addItem(tLastID = 3, "Cafe au lait", "Sweet Coffee", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)}));

-        ItemList.ThermosCan_Lait_au_cafe.set(addItem(tLastID = 4, "Lait au cafe", "You want Coffee to your Sugar?", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)}));

-        ItemList.ThermosCan_Dark_Chocolate_Milk.set(addItem(tLastID = 5, "Dark Chocolate Milk", "A bit bitter, better add a bit Sugar", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 50, 1, 60}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)}));

-        ItemList.ThermosCan_Chocolate_Milk.set(addItem(tLastID = 6, "Chocolate Milk", "Sweet Goodness", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 50, 1, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 2L)}));

-        ItemList.ThermosCan_Tea.set(addItem(tLastID = 7, "Tea", "Keep calm and carry on", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSlowdown.id, 300, 0, 50}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)}));

-        ItemList.ThermosCan_Sweet_Tea.set(addItem(tLastID = 8, "Sweet Tea", "How about a Tea Party? In Boston?", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)}));

-        ItemList.ThermosCan_Ice_Tea.set(addItem(tLastID = 9, "Ice Tea", "Better than this purple Junk Drink from failed Potions", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSlowdown.id, 300, 0, 50}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)}));

-

-        ItemList.GelledToluene.set(addItem(tLastID = 10, "Gelled Toluene", "Raw Explosive", new Object[]{}));

+        ItemList.ThermosCan_Dark_Coffee.set(addItem(tLastID = 0, "Dark Coffee", "Coffee, dark, without anything else", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)));

+        ItemList.ThermosCan_Dark_Cafe_au_lait.set(addItem(tLastID = 1, "Dark Coffee au lait", "Keeping you awake the whole night", SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)));

+        ItemList.ThermosCan_Coffee.set(addItem(tLastID = 2, "Coffee", "Just the regular morning Coffee", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 0, 50, Potion.digSpeed.id, 400, 0, 50), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));

+        ItemList.ThermosCan_Cafe_au_lait.set(addItem(tLastID = 3, "Cafe au lait", "Sweet Coffee", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)));

+        ItemList.ThermosCan_Lait_au_cafe.set(addItem(tLastID = 4, "Lait au cafe", "You want Coffee to your Sugar?", SubTag.INVISIBLE, new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)));

+        ItemList.ThermosCan_Dark_Chocolate_Milk.set(addItem(tLastID = 5, "Dark Chocolate Milk", "A bit bitter, better add a bit Sugar", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.regeneration.id, 50, 1, 60), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)));

+        ItemList.ThermosCan_Chocolate_Milk.set(addItem(tLastID = 6, "Chocolate Milk", "Sweet Goodness", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.regeneration.id, 50, 1, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 2L)));

+        ItemList.ThermosCan_Tea.set(addItem(tLastID = 7, "Tea", "Keep calm and carry on", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSlowdown.id, 300, 0, 50), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));

+        ItemList.ThermosCan_Sweet_Tea.set(addItem(tLastID = 8, "Sweet Tea", "How about a Tea Party? In Boston?", SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));

+        ItemList.ThermosCan_Ice_Tea.set(addItem(tLastID = 9, "Ice Tea", "Better than this purple Junk Drink from failed Potions", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSlowdown.id, 300, 0, 50), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)));

+

+        ItemList.GelledToluene.set(addItem(tLastID = 10, "Gelled Toluene", "Raw Explosive"));

         

-        ItemList.Bottle_Purple_Drink.set(addItem(tLastID = 100, "Purple Drink", "How about Lemonade. Or some Ice Tea? I got Purple Drink!", new Object[]{new GT_FoodStat(8, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSlowdown.id, 400, 1, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L)}));

-        ItemList.Bottle_Grape_Juice.set(addItem(tLastID = 101, "Grape Juice", "This has a cleaning effect on your internals.", new Object[]{new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.hunger.id, 400, 1, 60}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)}));

-        ItemList.Bottle_Wine.set(addItem(tLastID = 102, "Wine", "Ordinary", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 1, 60, Potion.heal.id, 0, 0, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)}));

-        ItemList.Bottle_Vinegar.set(addItem(tLastID = 103, "Vinegar", "Exquisite", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 1, 90, Potion.heal.id, 0, 1, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)}));

-        ItemList.Bottle_Potato_Juice.set(addItem(tLastID = 104, "Potato Juice", "Ever seen Potato Juice in stores? No? That has a reason.", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(3, 0.3F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)}));

-        ItemList.Bottle_Vodka.set(addItem(tLastID = 105, "Vodka", "Not to confuse with Water", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 500, 0, 60, Potion.damageBoost.id, 500, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L)}));

-        ItemList.Bottle_Leninade.set(addItem(tLastID = 106, "Leninade", "Let the Communism flow through you!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 500, 1, 90, Potion.damageBoost.id, 500, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 2L)}));

-        ItemList.Bottle_Mineral_Water.set(addItem(tLastID = 107, "Mineral Water", "The best Stuff you can drink to stay healthy", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 100, 1, 10}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)}));

-        ItemList.Bottle_Salty_Water.set(addItem(tLastID = 108, "Salty Water", "Like Sea Water but less dirty", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(1, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.hunger.id, 400, 2, 95}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TEMPESTAS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)}));

-        ItemList.Bottle_Reed_Water.set(addItem(tLastID = 109, "Reed Water", "I guess this tastes better when fermented", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)}));

-        ItemList.Bottle_Rum.set(addItem(tLastID = 110, "Rum", "A buddle o' rum", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 0, 60, Potion.damageBoost.id, 300, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)}));

-        ItemList.Bottle_Pirate_Brew.set(addItem(tLastID = 111, "Pirate Brew", "Set the Sails, we are going to Torrentuga!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 1, 90, Potion.damageBoost.id, 300, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2L)}));

-        ItemList.Bottle_Hops_Juice.set(addItem(tLastID = 112, "Hops Juice", "Every Beer has a start", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)}));

-        ItemList.Bottle_Dark_Beer.set(addItem(tLastID = 113, "Dark Beer", "Dark Beer, for the real Men", new Object[]{new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 1, 60, Potion.damageBoost.id, 300, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));

-        ItemList.Bottle_Dragon_Blood.set(addItem(tLastID = 114, "Dragon Blood", "FUS RO DAH!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 2, 90, Potion.damageBoost.id, 300, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)}));

-        ItemList.Bottle_Wheaty_Juice.set(addItem(tLastID = 115, "Wheaty Juice", "Is this liquefied Bread or what?", new Object[]{new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)}));

-        ItemList.Bottle_Scotch.set(addItem(tLastID = 116, "Scotch", "Technically this is just a Whisky", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 0, 60, Potion.resistance.id, 400, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)}));

-        ItemList.Bottle_Glen_McKenner.set(addItem(tLastID = 117, "Glen McKenner", "Don't hand to easily surprised people, they will shatter it.", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 1, 90, Potion.resistance.id, 400, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 2L)}));

-        ItemList.Bottle_Wheaty_Hops_Juice.set(addItem(tLastID = 118, "Wheaty Hops Juice", "Also known as 'Duff-Lite'", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 2L)}));

-        ItemList.Bottle_Beer.set(addItem(tLastID = 119, "Beer", "Good old Beer", new Object[]{new GT_FoodStat(6, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 0, 60, Potion.digSpeed.id, 400, 2, 60, Potion.poison.id, 100, 0, 5}), new TC_Aspe