From fa4a20cadddcf5a67d7143091c1d991f8a64f68a Mon Sep 17 00:00:00 2001 From: Dragon2488 Date: Thu, 3 Aug 2017 12:17:31 +0700 Subject: [PATCH] no more ton of whitespaces --- .../api/enums/material/Materials.java | 537 +++++++++--------- 1 file changed, 258 insertions(+), 279 deletions(-) diff --git a/src/main/java/gregtech/api/enums/material/Materials.java b/src/main/java/gregtech/api/enums/material/Materials.java index 500fd39c..00a6b2b0 100644 --- a/src/main/java/gregtech/api/enums/material/Materials.java +++ b/src/main/java/gregtech/api/enums/material/Materials.java @@ -27,10 +27,10 @@ import static gregtech.api.enums.material.MaterialIconSet.*; public class Materials { private static final int STD_SOLID = GENERATE_PLATE | GENERATE_ROD | GENERATE_BOLT_SCREW; - private static final int STD_GEM = GENERATE_ORE | STD_SOLID | GENERATE_LENSE; - private static final int STD_METAL = GENERATE_PLATE; - private static final int EXT_METAL = STD_METAL | GENERATE_ROD | GENERATE_BOLT_SCREW; - private static final int EXT2_METAL = EXT_METAL | GENERATE_GEAR | GENERATE_FOIL | GENERATE_FINE_WIRE; +private static final int STD_GEM = GENERATE_ORE | STD_SOLID | GENERATE_LENSE; +private static final int STD_METAL = GENERATE_PLATE; +private static final int EXT_METAL = STD_METAL | GENERATE_ROD | GENERATE_BOLT_SCREW; +private static final int EXT2_METAL = EXT_METAL | GENERATE_GEAR | GENERATE_FOIL | GENERATE_FINE_WIRE; /** * Direct Elements @@ -52,7 +52,7 @@ public class Materials { public static FluidMaterial Chlorine = new FluidMaterial(15, "chlorine", "Chlorine", 0xEEEECC, GAS, of(), STATE_GAS, Element.Cl); public static MetalMaterial Chrome = new MetalMaterial(16, "chrome", "Chrome", 0xFFAAAB, SHINY, of(), STD_METAL, Element.Cr, 11.0F, 3, 256, 1700); public static MetalMaterial Cobalt = new MetalMaterial(17, "cobalt", "Cobalt", 0xAAAAFF, METALLIC, of(), STD_METAL | GENERATE_ORE, Element.Co, 8.0F, 3, 512); - public static MetalMaterial Copper = new MetalMaterial(18, "copper", "Copper", 0xFF8000, SHINY, of(), EXT2_METAL | GENERATE_ORE, Element.Cu); + public static MetalMaterial Copper = new MetalMaterial(18, "copper", "Copper", 0xFF8000, SHINY, of(), EXT2_METAL | GENERATE_ORE | MORTAR_GRINDABLE, Element.Cu); public static FluidMaterial Deuterium = new FluidMaterial(19, "deuterium", "Deuterium", 0xEEEE00, FLUID, of(), STATE_GAS | GENERATE_PLASMA, Element.D); public static MetalMaterial Dysprosium = new MetalMaterial(20, "dysprosium", "Dysprosium", 0xFFFFEE, SHINY, of(), 0, Element.Dy, 1680); public static MetalMaterial Erbium = new MetalMaterial(21, "erbium", "Erbium", 0xEEEEEE, METALLIC, of(), STD_METAL, Element.Er, 1802); @@ -67,14 +67,14 @@ public class Materials { public static FluidMaterial Helium3 = new FluidMaterial(30, "helium3", "Helium 3", 0xDDDD00, GAS, of(), STATE_GAS, Element.He_3); public static MetalMaterial Indium = new MetalMaterial(31, "indium", "Indium", 0x6600BB, METALLIC, of(), 0, Element.In); public static MetalMaterial Iridium = new MetalMaterial(32, "iridium", "Iridium", 0xFFFFFF, DULL, of(), STD_METAL | GENERATE_ORE, Element.Ir, 6.0F, 3, 2560, 2719); - public static MetalMaterial Iron = new MetalMaterial(33, "iron", "Iron", 0xAAAAAA, METALLIC, of(), EXT2_METAL | GENERATE_ORE, Element.Fe, 6.0F, 2, 256); + public static MetalMaterial Iron = new MetalMaterial(33, "iron", "Iron", 0xAAAAAA, METALLIC, of(), EXT2_METAL | GENERATE_ORE | MORTAR_GRINDABLE, Element.Fe, 6.0F, 2, 256); public static MetalMaterial Lanthanum = new MetalMaterial(34, "lanthanum", "Lanthanum", 0xFFFFFF, METALLIC, of(), 0, Element.La, 1193); - public static MetalMaterial Lead = new MetalMaterial(35, "lead", "Lead", 0x770077, DULL, of(), STD_METAL | GENERATE_ORE, Element.Pb, 8.0F, 1, 64); + public static MetalMaterial Lead = new MetalMaterial(35, "lead", "Lead", 0x770077, DULL, of(), STD_METAL | GENERATE_ORE | MORTAR_GRINDABLE, Element.Pb, 8.0F, 1, 64); public static MetalMaterial Lithium = new MetalMaterial(36, "lithium", "Lithium", 0x553355, DULL, of(), STD_METAL | GENERATE_ORE, Element.Li); public static MetalMaterial Lutetium = new MetalMaterial(37, "lutetium", "Lutetium", 0xFFFFFF, METALLIC, of(), 0, Element.Lu, 1925); public static MetalMaterial Magnesium = new MetalMaterial(38, "magnesium", "Magnesium", 0xFFBBBB, METALLIC, of(), 0, Element.Mg); public static MetalMaterial Manganese = new MetalMaterial(39, "manganese", "Manganese", 0xEEEEEE, DULL, of(), 0, Element.Mn, 7.0F, 2, 512); - public static GemMaterial Mercury = new GemMaterial(40, "mercury", "Mercury", 0xFFDDDD, FLUID, of(), SMELT_INTO_FLUID, Element.Hg); + public static FluidMaterial Mercury = new FluidMaterial(40, "mercury", "Mercury", 0xFFDDDD, FLUID, of(), SMELT_INTO_FLUID, Element.Hg); public static MetalMaterial Molybdenum = new MetalMaterial(41, "molybdenum", "Molybdenum", 0xAAAADD, DULL, of(), 0, Element.Mo, 7.0F, 512, 2); public static MetalMaterial Neodymium = new MetalMaterial(42, "neodymium", "Neodymium", 0x999999, METALLIC, of(), STD_METAL, Element.Nd, 7.0F, 2, 512, 1297); public static MetalMaterial Darmstadtium = new MetalMaterial(43, "darmstadtium", "Darmstadtium", 0xAAAAAA, METALLIC, of(), STD_METAL, Element.Ds, 24.0F, 6, 655360); @@ -105,7 +105,7 @@ public class Materials { public static MetalMaterial Terbium = new MetalMaterial(68, "terbium", "Terbium", 0xFFFFFF, METALLIC, of(), STD_METAL, Element.Tb, 1629); public static MetalMaterial Thorium = new MetalMaterial(69, "thorium", "Thorium", 0x001E00, SHINY, of(), STD_METAL | GENERATE_ORE, Element.Th, 6.0F, 2, 512); public static MetalMaterial Thulium = new MetalMaterial(70, "thulium", "Thulium", 0xFFFFFF, METALLIC, of(), STD_METAL, Element.Tm, 1818); - public static MetalMaterial Tin = new MetalMaterial(71, "tin", "Tin", 0xDCDCDC, DULL, of(), EXT2_METAL, Element.Sn, 505); + public static MetalMaterial Tin = new MetalMaterial(71, "tin", "Tin", 0xDCDCDC, DULL, of(), EXT2_METAL | MORTAR_GRINDABLE, Element.Sn, 505); public static MetalMaterial Titanium = new MetalMaterial(72, "titanium", "Titanium", 0xDCA0F0, METALLIC, of(), EXT2_METAL, Element.Ti, 7.0F, 3, 1600, 1941); public static FluidMaterial Tritium = new FluidMaterial(73, "tritium", "Tritium", 0xFF0000, METALLIC, of(), STATE_GAS, Element.T); public static MetalMaterial Tungsten = new MetalMaterial(74, "tungsten", "Tungsten", 0x323232, METALLIC, of(), EXT2_METAL, Element.W, 7.0F, 3, 2560, 3000); @@ -116,32 +116,32 @@ public class Materials { public static MetalMaterial Yttrium = new MetalMaterial(78, "yttrium", "Yttrium", 0xDCFADC, METALLIC, of(), STD_METAL, Element.Y, 1799); public static MetalMaterial Zinc = new MetalMaterial(79, "zinc", "Zinc", 0xFAF0F0, METALLIC, of(), STD_METAL | GENERATE_ORE, Element.Zn); - /** - * Not possible to determine exact Components - */ - public static DustMaterial ConstructionFoam = new DustMaterial(313, "construction_foam", "Construction Foam", 0x808080, DULL, of(), 0); - public static FluidMaterial BioFuel = new FluidMaterial(314, "bio_fuel", "Biofuel", 0xFF8000, FLUID, of(), 0); - public static FluidMaterial Biomass = new FluidMaterial(315, "biomass", "Biomass", 0x00FF00, FLUID, of(), 0); - public static FluidMaterial Creosote = new FluidMaterial(316, "creosote", "Creosote", 0x804000, FLUID, of(), 0); - public static FluidMaterial Ethanol = new FluidMaterial(317, "ethanol", "Ethanol", 0xFF8000, FLUID, of(), 0); - public static FluidMaterial Fuel = new FluidMaterial(318, "fuel", "Diesel", 0xFFFF00, FLUID, of(), 0); - public static FluidMaterial Glue = new FluidMaterial(319, "glue", "Glue", 0xC8C400, FLUID, of(), 0_0); - public static DustMaterial Gunpowder = new DustMaterial(320, "gunpowder", "Gunpowder", 0x808080, DULL, of(), 0); - public static FluidMaterial Lubricant = new FluidMaterial(321, "lubricant", "Lubricant", 0xFFC400, FLUID, of(), 0); - public static FluidMaterial McGuffium239 = new FluidMaterial(322, "mc_guffium239", "Mc Guffium 239", 0xC83296, FLUID, of(), 0); - public static FluidMaterial Oil = new FluidMaterial(323, "oil", "Oil", 0x0A0A0A, FLUID, of(), 0); - public static DustMaterial Oilsands = new DustMaterial(324, "oilsands", "Oilsands", 0x0A0A0A, NONE, of(), GENERATE_ORE); - public static DustMaterial Paper = new DustMaterial(325, "paper", "Paper", 0xFFFFFF, PAPER, of(), 0); - public static DustMaterial RareEarth = new DustMaterial(326, "rare_earth", "Rare Earth", 0x808064, FINE, of(), 0); - public static FluidMaterial SeedOil = new FluidMaterial(327, "seed_oil", "Seed Oil", 0xC4FF00, FLUID, of(), 0); - public static SolidMaterial Stone = new SolidMaterial(328, "stone", "Stone", 0xCDCDCD, ROUGH, of(), 0, null, 4.0F, 1, 32); - public static FluidMaterial Lava = new FluidMaterial(329, "lava", "Lava", 0xFF4000, FLUID, of(), 0); - public static DustMaterial Glowstone = new DustMaterial(330, "glowstone", "Glowstone", 0xFFFF00, SHINY, of(), 0); - public static GemMaterial NetherStar = new GemMaterial(331, "nether_star", "Nether Star", 0xFFFFFF, NETHERSTAR, of(), STD_SOLID | GENERATE_LENSE, null, 1.0F, 4, 5120); - public static DustMaterial Endstone = new DustMaterial(332, "endstone", "Endstone", 0xFFFFFF, DULL, of(), 0); - public static DustMaterial Netherrack = new DustMaterial(333, "netherrack", "Netherrack", 0xC80000, DULL, of(), 0); +/** + * Not possible to determine exact Components + */ +public static DustMaterial ConstructionFoam = new DustMaterial(313, "construction_foam", "Construction Foam", 0x808080, DULL, of(), 0); +public static FluidMaterial BioFuel = new FluidMaterial(314, "bio_fuel", "Biofuel", 0xFF8000, FLUID, of(), 0); +public static FluidMaterial Biomass = new FluidMaterial(315, "biomass", "Biomass", 0x00FF00, FLUID, of(), 0); +public static FluidMaterial Creosote = new FluidMaterial(316, "creosote", "Creosote", 0x804000, FLUID, of(), 0); +public static FluidMaterial Ethanol = new FluidMaterial(317, "ethanol", "Ethanol", 0xFF8000, FLUID, of(), 0); +public static FluidMaterial Fuel = new FluidMaterial(318, "fuel", "Diesel", 0xFFFF00, FLUID, of(), 0); +public static FluidMaterial Glue = new FluidMaterial(319, "glue", "Glue", 0xC8C400, FLUID, of(), 0); +public static DustMaterial Gunpowder = new DustMaterial(320, "gunpowder", "Gunpowder", 0x808080, DULL, of(), FLAMMABLE | EXPLOSIVE | NO_SMELTING | NO_SMASHING); +public static FluidMaterial Lubricant = new FluidMaterial(321, "lubricant", "Lubricant", 0xFFC400, FLUID, of(), 0); +public static FluidMaterial McGuffium239 = new FluidMaterial(322, "mc_guffium239", "Mc Guffium 239", 0xC83296, FLUID, of(), 0); +public static FluidMaterial Oil = new FluidMaterial(323, "oil", "Oil", 0x0A0A0A, FLUID,of(), 0); +public static DustMaterial Oilsands = new DustMaterial(324, "oilsands", "Oilsands", 0x0A0A0A, NONE, of(), GENERATE_ORE); +public static DustMaterial Paper = new DustMaterial(325, "paper", "Paper", 0xFFFFFF, PAPER, of(), FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE); +public static DustMaterial RareEarth = new DustMaterial(326, "rare_earth", "Rare Earth", 0x808064, FINE, of(), 0); +public static FluidMaterial SeedOil = new FluidMaterial(327, "seed_oil", "Seed Oil", 0xC4FF00, FLUID, of(), 0); +public static SolidMaterial Stone = new SolidMaterial(328, "stone", "Stone", 0xCDCDCD, ROUGH, of(), MORTAR_GRINDABLE | GENERATE_PLATE, null, 4.0F, 1, 32); +public static FluidMaterial Lava = new FluidMaterial(329, "lava", "Lava", 0xFF4000, FLUID, of(), 0); +public static DustMaterial Glowstone = new DustMaterial(330, "glowstone", "Glowstone", 0xFFFF00, SHINY, of(), 0); +public static GemMaterial NetherStar = new GemMaterial(331, "nether_star", "Nether Star", 0xFFFFFF, NETHERSTAR, of(), STD_SOLID | GENERATE_LENSE, null, 1.0F, 4, 5120); +public static DustMaterial Endstone = new DustMaterial(332, "endstone", "Endstone", 0xFFFFFF, DULL, of(), 0); +public static DustMaterial Netherrack = new DustMaterial(333, "netherrack", "Netherrack", 0xC80000, DULL, of(), 0); - /** +/** * First Degree Compounds */ public static FluidMaterial Methane = new FluidMaterial(80, "methane", "Methane", 0xFFFFFF, FLUID, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 4)), 0); @@ -159,19 +159,19 @@ public class Materials { public static GemMaterial BlueTopaz = new GemMaterial(92, "blue_topaz", "Blue Topaz", 0x0000FF, GEM_HORIZONTAL, of(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), GENERATE_LENSE | GENERATE_ORE, 7.0F, 3, 256); public static SolidMaterial Bone = new SolidMaterial(93, "bone", "Bone", 0xFFFFFF, DULL, of(new MaterialStack(Calcium, 1)), 0); public static MetalMaterial Brass = new MetalMaterial(94, "brass", "Brass", 0xFFB400, METALLIC, of(new MaterialStack(Zinc, 1), new MaterialStack(Copper, 3)), EXT2_METAL, 7.0F, 1, 96); - public static MetalMaterial Bronze = new MetalMaterial(95, "bronze", "Bronze", 0xFF8000, METALLIC, of(new MaterialStack(Tin, 1), new MaterialStack(Copper, 3)), EXT2_METAL, 6.0F, 2, 192); + public static MetalMaterial Bronze = new MetalMaterial(95, "bronze", "Bronze", 0xFF8000, METALLIC, of(new MaterialStack(Tin, 1), new MaterialStack(Copper, 3)), EXT2_METAL | MORTAR_GRINDABLE, 6.0F, 2, 192); public static DustMaterial BrownLimonite = new DustMaterial(96, "brown_limonite", "Brown Limonite", 0xC86400, METALLIC, of(new MaterialStack(Iron, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); public static DustMaterial Calcite = new DustMaterial(97, "calcite", "Calcite", 0xFAE6DC, DULL, of(new MaterialStack(Calcium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)), GENERATE_ORE); public static DustMaterial Cassiterite = new DustMaterial(98, "cassiterite", "Cassiterite", 0xDCDCDC, METALLIC, of(new MaterialStack(Tin, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); public static DustMaterial CassiteriteSand = new DustMaterial(99, "cassiterite_sand", "Cassiterite Sand", 0xDCDCDC, SAND, of(new MaterialStack(Tin, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); public static DustMaterial Chalcopyrite = new DustMaterial(100, "chalcopyrite", "Chalcopyrite", 0xA07828, DULL, of(new MaterialStack(Copper, 1), new MaterialStack(Iron, 1), new MaterialStack(Sulfur, 2)), GENERATE_ORE); - public static RoughMaterial Charcoal = new RoughMaterial(101, "charcoal", "Charcoal", 0x644646, FINE, of(new MaterialStack(Carbon, 1)), 0); + public static RoughMaterial Charcoal = new RoughMaterial(101, "charcoal", "Charcoal", 0x644646, FINE, of(new MaterialStack(Carbon, 1)), FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE); public static MetalMaterial Chromite = new MetalMaterial(102, "chromite", "Chromite", 0x23140F, METALLIC, of(new MaterialStack(Iron, 1), new MaterialStack(Chrome, 2), new MaterialStack(Oxygen, 4)), GENERATE_ORE, null, 1700); public static MetalMaterial ChromiumDioxide = new MetalMaterial(103, "chromium_dioxide", "Chromium Dioxide", 0xE6C8C8, DULL, of(new MaterialStack(Chrome, 1), new MaterialStack(Oxygen, 2)), EXT_METAL, null, 11.0F, 3, 256, 650); public static RoughMaterial Cinnabar = new RoughMaterial(103, "cinnabar", "Cinnabar", 0x960000, ROUGH, of(new MaterialStack(Mercury, 1), new MaterialStack(Sulfur, 1)), GENERATE_ORE); public static FluidMaterial Water = new FluidMaterial(104, "water", "Water", 0x0000FF, FLUID, of(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), NO_RECYCLING); public static RoughMaterial Clay = new RoughMaterial(105, "clay", "Clay", 0xC8C8DC, ROUGH, of(new MaterialStack(Sodium, 2), new MaterialStack(Lithium, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 2), new MaterialStack(Water, 6)), 0); - public static RoughMaterial Coal = new RoughMaterial(106, "coal", "Coal", 0x464646, ROUGH, of(new MaterialStack(Carbon, 1)), 0); + public static RoughMaterial Coal = new RoughMaterial(106, "coal", "Coal", 0x464646, ROUGH, of(new MaterialStack(Carbon, 1)), GENERATE_ORE | FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE); public static DustMaterial Cobaltite = new DustMaterial(107, "cobaltite", "Cobaltite", 0x5050FA, METALLIC, of(new MaterialStack(Cobalt, 1), new MaterialStack(Arsenic, 1), new MaterialStack(Sulfur, 1)), GENERATE_ORE); public static DustMaterial Cooperite = new DustMaterial(108, "cooperite", "Sheldonite", 0xFFFFC8, METALLIC, of(new MaterialStack(Platinum, 3), new MaterialStack(Nickel, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Palladium, 1)), GENERATE_ORE); public static MetalMaterial Cupronickel = new MetalMaterial(109, "cupronickel", "Cupronickel", 0xE39680, METALLIC, of(new MaterialStack(Copper, 1), new MaterialStack(Nickel, 1)), EXT_METAL, 6.0F, 1, 64); @@ -181,7 +181,7 @@ public class Materials { public static GemMaterial Emerald = new GemMaterial(113, "emerald", "Emerald", 0x50FF50, EMERALD, of(new MaterialStack(Beryllium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 6), new MaterialStack(Oxygen, 18)), GENERATE_ORE, 7.0F, 2, 256); public static DustMaterial Galena = new DustMaterial(114, "galena", "Galena", 0x643C64, DULL, of(new MaterialStack(Lead, 3), new MaterialStack(Silver, 3), new MaterialStack(Sulfur, 2)), GENERATE_ORE); public static DustMaterial Garnierite = new DustMaterial(115, "garnierite", "Garnierite", 0x32C846, METALLIC, of(new MaterialStack(Nickel, 1), new MaterialStack(Oxygen, 1)), GENERATE_ORE); - public static FluidMaterial Glyceryl = new FluidMaterial(116, "glyceryl", "Glyceryl Trinitrate", 0x009696, FLUID, of(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 5), new MaterialStack(Nitrogen, 3), new MaterialStack(Oxygen, 9)), 0); + public static FluidMaterial Glyceryl = new FluidMaterial(116, "glyceryl", "Glyceryl Trinitrate", 0x009696, FLUID, of(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 5), new MaterialStack(Nitrogen, 3), new MaterialStack(Oxygen, 9)), FLAMMABLE | EXPLOSIVE | NO_SMELTING | NO_SMASHING); public static GemMaterial GreenSapphire = new GemMaterial(117, "green_sapphire", "Green Sapphire", 0x64C882, GEM_HORIZONTAL, of(new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), GENERATE_ORE, 7.0F, 2, 256); public static DustMaterial Grossular = new DustMaterial(118, "grossular", "Grossular", 0xC86400, ROUGH, of(new MaterialStack(Calcium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)), GENERATE_ORE); public static FluidMaterial HolyWater = new FluidMaterial(119, "holy_water", "Holy Water", 0x0000FF, FLUID, of(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), NO_RECYCLING); @@ -206,18 +206,18 @@ public class Materials { public static DustMaterial Obsidian = new DustMaterial(138, "obsidian", "Obsidian", 0x503264, DULL, of(new MaterialStack(Magnesium, 1), new MaterialStack(Iron, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 8)), 0); public static DustMaterial Phosphate = new DustMaterial(139, "phosphate", "Phosphate", 0xFFFF00, DULL, of(new MaterialStack(Phosphor, 1), new MaterialStack(Oxygen, 4)), GENERATE_ORE); public static MetalMaterial PigIron = new MetalMaterial(140, "pig_iron", "Pig Iron", 0xC8B4B4, METALLIC, of(new MaterialStack(Iron, 1)), EXT_METAL, 6.0F, 2, 384); - public static SolidMaterial Plastic = new SolidMaterial(141, "plastic", "Polyethylene", 0xC8C8C8, DULL, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), STD_SOLID | GENERATE_GEAR | GENERATE_FOIL, null, 3.0F, 1, 32); + public static SolidMaterial Plastic = new SolidMaterial(141, "plastic", "Polyethylene", 0xC8C8C8, DULL, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING, null, 3.0F, 1, 32); public static MetalMaterial Epoxid = new MetalMaterial(142, "epoxid", "Epoxid", 0xC88C14, DULL, of(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)), EXT2_METAL, 3.0F, 1, 32); - public static SolidMaterial Silicone = new SolidMaterial(143, "silicone", "Polysiloxane", 0xDCDCDC, DULL, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 1)), STD_SOLID | GENERATE_GEAR | GENERATE_FOIL, null, 3.0F, 1, 128); - public static SolidMaterial Polycaprolactam = new SolidMaterial(144, "polycaprolactam", "Polycaprolactam", 0x323232, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), STD_SOLID | GENERATE_GEAR | GENERATE_FOIL, null, 3.0F, 1, 32); - public static SolidMaterial Polytetrafluoroethylene = new SolidMaterial(145, "polytetrafluoroethylene", "Polytetrafluoroethylene", 0x646464, DULL, of(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)), STD_SOLID | GENERATE_GEAR | GENERATE_FOIL, null, 3.0F, 1, 32); + public static SolidMaterial Silicone = new SolidMaterial(143, "silicone", "Polysiloxane", 0xDCDCDC, DULL, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING, null, 3.0F, 1, 128); + public static SolidMaterial Polycaprolactam = new SolidMaterial(144, "polycaprolactam", "Polycaprolactam", 0x323232, DULL, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), GENERATE_PLATE, null, 3.0F, 1, 32); + public static SolidMaterial Polytetrafluoroethylene = new SolidMaterial(145, "polytetrafluoroethylene", "Polytetrafluoroethylene", 0x646464, DULL, of(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)), GENERATE_PLATE, null, 3.0F, 1, 32); public static DustMaterial Powellite = new DustMaterial(146, "powellite", "Powellite", 0xFFFF00, DULL, of(new MaterialStack(Calcium, 1), new MaterialStack(Molybdenum, 1), new MaterialStack(Oxygen, 4)), GENERATE_ORE); public static DustMaterial Pumice = new DustMaterial(147, "pumice", "Pumice", 0xE6B9B9, DULL, of(new MaterialStack(Stone, 1)), 0); public static DustMaterial Pyrite = new DustMaterial(148, "pyrite", "Pyrite", 0x967828, ROUGH, of(new MaterialStack(Iron, 1), new MaterialStack(Sulfur, 2)), GENERATE_ORE); public static DustMaterial Pyrolusite = new DustMaterial(149, "pyrolusite", "Pyrolusite", 0x9696AA, DULL, of(new MaterialStack(Manganese, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); public static DustMaterial Pyrope = new DustMaterial(150, "pyrope", "Pyrope", 0x783264, METALLIC, of(new MaterialStack(Aluminium, 2), new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)), GENERATE_ORE); public static DustMaterial RockSalt = new DustMaterial(151, "rock_salt", "Rock Salt", 0xF0C8C8, FINE, of(new MaterialStack(Potassium, 1), new MaterialStack(Chlorine, 1)), GENERATE_ORE); - public static SolidMaterial Rubber = new SolidMaterial(152, "rubber", "Rubber", 0x000000, SHINY, of(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), STD_SOLID | GENERATE_GEAR | GENERATE_FOIL, null, 1.5F, 0, 16); + public static SolidMaterial Rubber = new SolidMaterial(152, "rubber", "Rubber", 0x000000, SHINY, of(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), GENERATE_PLATE | GENERATE_GEAR | FLAMMABLE | NO_SMASHING, null, 1.5F, 0, 16); public static DustMaterial RawRubber = new DustMaterial(153, "raw_rubber", "Raw Rubber", 0xCCC789, DULL, of(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), 0); public static GemMaterial Ruby = new GemMaterial(154, "ruby", "Ruby", 0xFF6464, RUBY, of(new MaterialStack(Chrome, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), STD_GEM, 7.0F, 2, 256); public static DustMaterial Salt = new DustMaterial(155, "salt", "Salt", 0xFFFFFF, FINE, of(new MaterialStack(Sodium, 1), new MaterialStack(Chlorine, 1)), GENERATE_ORE); @@ -274,7 +274,7 @@ public class Materials { public static SolidMaterial Graphite = new SolidMaterial(204, "graphite", "Graphite", 0x808080, DULL, of(), GENERATE_ORE | NO_SMASHING |NO_SMELTING |FLAMMABLE, null, 5.0F, 2, 32); public static SolidMaterial Graphene = new SolidMaterial(205, "graphene", "Graphene", 0x808080, DULL, of(), 0, null, 6.0F, 1, 32); public static GemMaterial Jasper = new GemMaterial(206, "jasper", "Jasper", 0xC85050, EMERALD, of(), STD_GEM); - public static MetalMaterial Osmiridium = new MetalMaterial(207, "osmiridium", "Osmiridium", 0x6464FF, METALLIC, of(new MaterialStack(Iridium, 3), new MaterialStack(Osmium, 1)), EXT2_METAL, null, 7.0F, 3, 1600, 2500); + public static MetalMaterial Osmiridium = new MetalMaterial(207, "osmiridium", "Osmiridium", 0x6464FF, METALLIC, of(new MaterialStack(Iridium, 3), new MaterialStack(Osmium, 1)), EXT2_METAL, null,7.0F, 3, 1600, 2500); /** * Second Degree Compounds @@ -283,12 +283,12 @@ public class Materials { public static GemMaterial Glass = new GemMaterial(209, "glass", "Glass", 0xFFFFFF, GLASS, of(new MaterialStack(SiliconDioxide, 1)), GENERATE_PLATE | GENERATE_LENSE); public static DustMaterial Perlite = new DustMaterial(210, "perlite", "Perlite", 0x1E141E, DULL, of(new MaterialStack(Obsidian, 2), new MaterialStack(Water, 1)), 0); public static DustMaterial Borax = new DustMaterial(210, "borax", "Borax", 0xFFFFFF, FINE, of(new MaterialStack(Sodium, 2), new MaterialStack(Boron, 4), new MaterialStack(Water, 10), new MaterialStack(Oxygen, 7)), 0); - public static RoughMaterial Lignite = new RoughMaterial(211, "lignite", "Lignite Coal", 0x644646, LIGNITE, of(new MaterialStack(Carbon, 2), new MaterialStack(Water, 4), new MaterialStack(DarkAsh, 1)), GENERATE_ORE); + public static RoughMaterial Lignite = new RoughMaterial(211, "lignite", "Lignite Coal", 0x644646, LIGNITE, of(new MaterialStack(Carbon, 2), new MaterialStack(Water, 4), new MaterialStack(DarkAsh, 1)), GENERATE_ORE | FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE); public static GemMaterial Olivine = new GemMaterial(212, "olivine", "Olivine", 0x96FF96, RUBY, of(new MaterialStack(Magnesium, 2), new MaterialStack(Iron, 1), new MaterialStack(SiliconDioxide, 2)), STD_GEM, 7.0F, 2, 256); public static GemMaterial Opal = new GemMaterial(213, "opal", "Opal", 0x0000FF, OPAL, of(new MaterialStack(SiliconDioxide, 1)), STD_GEM, 7.0F, 2, 256); public static GemMaterial Amethyst = new GemMaterial(214, "amethyst", "Amethyst", 0xD232D2, FLINT, of(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Iron, 1)), STD_GEM, 7.0F, 3, 256); public static DustMaterial Redstone = new DustMaterial(215, "redstone", "Redstone", 0xC80000, ROUGH, of(new MaterialStack(Silicon, 1), new MaterialStack(Pyrite, 5), new MaterialStack(Ruby, 1), new MaterialStack(Mercury, 3)), GENERATE_ORE); - public static GemMaterial Lapis = new GemMaterial(216, "lapis", "Lapis", 0x4646DC, LAPIS, of(new MaterialStack(Lazurite, 12), new MaterialStack(Sodalite, 2), new MaterialStack(Pyrite, 1), new MaterialStack(Calcite, 1)), STD_GEM); + public static GemMaterial Lapis = new GemMaterial(216, "lapis", "Lapis", 0x4646DC, LAPIS, of(new MaterialStack(Lazurite, 12), new MaterialStack(Sodalite, 2), new MaterialStack(Pyrite, 1), new MaterialStack(Calcite, 1)), STD_GEM); public static DustMaterial Blaze = new DustMaterial(217, "blaze", "Blaze", 0xFFC800, POWDER, of(new MaterialStack(DarkAsh, 1), new MaterialStack(Sulfur, 1)), 0); public static GemMaterial EnderPearl = new GemMaterial(218, "ender_pearl", "Enderpearl", 0x6CDCC8, SHINY, of(new MaterialStack(Beryllium, 1), new MaterialStack(Potassium, 4), new MaterialStack(Nitrogen, 5)), GENERATE_PLATE | GENERATE_LENSE, null, 1.0F, 1, 16); public static GemMaterial EnderEye = new GemMaterial(219, "ender_eye", "Endereye", 0xFAE600, SHINY, of(new MaterialStack(EnderPearl, 1), new MaterialStack(Blaze, 1)), GENERATE_PLATE | GENERATE_LENSE, null, 1.0F, 1, 16); @@ -308,7 +308,7 @@ public class Materials { public static MetalMaterial BlueSteel = new MetalMaterial(233, "blue_steel", "Blue Steel", 0x64648C, METALLIC, of(new MaterialStack(RoseGold, 1), new MaterialStack(Brass, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4)), EXT_METAL, null, 7.5F, 2, 1024, 1400); public static MetalMaterial DamascusSteel = new MetalMaterial(234, "damascus_steel", "Damascus Steel", 0x6E6E6E, METALLIC, of(new MaterialStack(Steel, 1)), EXT_METAL, null, 8.0F, 2, 1280, 1500); public static MetalMaterial TungstenSteel = new MetalMaterial(235, "tungsten_steel", "Tungstensteel", 0x6464A0, METALLIC, of(new MaterialStack(Steel, 1), new MaterialStack(Tungsten, 1)), EXT2_METAL, null, 8.0F, 4, 2560, 3000); - public static FluidMaterial NitroFuel = new FluidMaterial(236, "nitro_fuel", "Nitro-Diesel", 0xC8FF00, FLUID, of(new MaterialStack(Glyceryl, 1), new MaterialStack(Fuel, 4)), 0); + public static FluidMaterial NitroFuel = new FluidMaterial(236, "nitro_fuel", "Nitro-Diesel", 0xC8FF00, FLUID, of(new MaterialStack(Glyceryl, 1), new MaterialStack(Fuel, 4)), FLAMMABLE | EXPLOSIVE | NO_SMELTING | NO_SMASHING); public static MetalMaterial RedAlloy = new MetalMaterial(237, "red_alloy", "Red Alloy", 0xC80000, DULL, of(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 4)), GENERATE_PLATE | GENERATE_FINE_WIRE); public static MetalMaterial CobaltBrass = new MetalMaterial(238, "cobalt_brass", "Cobalt Brass", 0xB4B4A0, METALLIC, of(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1)), EXT2_METAL, null, 8.0F, 2, 256); public static RoughMaterial Phosphorus = new RoughMaterial(239, "phosphorus", "Phosphorus", 0xFFFF00, FLINT, of(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2)), GENERATE_ORE); @@ -423,13 +423,13 @@ public class Materials { static { initSubTags(); + Iron.oreReRegistrations.add(AnyIron); PigIron.oreReRegistrations.add(AnyIron); WroughtIron.oreReRegistrations.add(AnyIron); Copper.oreReRegistrations.add(AnyCopper); AnnealedCopper.oreReRegistrations.add(AnyCopper); - Bronze.oreReRegistrations.add(AnyBronze); WoodSealed.macerateInto = Wood; @@ -441,225 +441,225 @@ public class Materials { SteelMagnetic.smeltInto = Steel; SteelMagnetic.macerateInto = Steel; SteelMagnetic.arcSmeltInto = Steel; - Iron .setSmeltingInto(Iron ).setArcSmeltingInto(WroughtIron ).setMaceratingInto(Iron ); - PigIron .setSmeltingInto(Iron ).setArcSmeltingInto(WroughtIron ).setMaceratingInto(Iron ); - WroughtIron .setSmeltingInto(Iron ).setArcSmeltingInto(WroughtIron ).setMaceratingInto(Iron ); - IronMagnetic .setSmeltingInto(Iron ).setArcSmeltingInto(WroughtIron ).setMaceratingInto(Iron ); - Copper .setSmeltingInto(Copper ).setArcSmeltingInto(AnnealedCopper ).setMaceratingInto(Copper ); - AnnealedCopper .setSmeltingInto(Copper ).setArcSmeltingInto(AnnealedCopper ).setMaceratingInto(Copper ); + + Iron.setSmeltingInto(Iron).setArcSmeltingInto(WroughtIron).setMaceratingInto(Iron); + PigIron.setSmeltingInto(Iron).setArcSmeltingInto(WroughtIron).setMaceratingInto(Iron); + WroughtIron.setSmeltingInto(Iron).setArcSmeltingInto(WroughtIron).setMaceratingInto(Iron); + IronMagnetic.setSmeltingInto(Iron).setArcSmeltingInto(WroughtIron).setMaceratingInto(Iron); + Copper.setSmeltingInto(Copper).setArcSmeltingInto(AnnealedCopper).setMaceratingInto(Copper); + AnnealedCopper.setSmeltingInto(Copper).setArcSmeltingInto(AnnealedCopper).setMaceratingInto(Copper); - Cinnabar .setDirectSmelting(Mercury ).add(INDUCTION_SMELTING_LOW_OUTPUT); - Tetrahedrite .setDirectSmelting(Copper ).add(INDUCTION_SMELTING_LOW_OUTPUT); - Chalcopyrite .setDirectSmelting(Copper ).add(INDUCTION_SMELTING_LOW_OUTPUT); - Malachite .setDirectSmelting(Copper ).add(INDUCTION_SMELTING_LOW_OUTPUT); - Pentlandite .setDirectSmelting(Nickel ).add(INDUCTION_SMELTING_LOW_OUTPUT); - Sphalerite .setDirectSmelting(Zinc ).add(INDUCTION_SMELTING_LOW_OUTPUT); - Pyrite .setDirectSmelting(Iron ).add(INDUCTION_SMELTING_LOW_OUTPUT); - BasalticMineralSand .setDirectSmelting(Iron ).add(INDUCTION_SMELTING_LOW_OUTPUT); - GraniticMineralSand .setDirectSmelting(Iron ).add(INDUCTION_SMELTING_LOW_OUTPUT); - YellowLimonite .setDirectSmelting(Iron ).add(INDUCTION_SMELTING_LOW_OUTPUT); - BrownLimonite .setDirectSmelting(Iron ); - BandedIron .setDirectSmelting(Iron ); - Cassiterite .setDirectSmelting(Tin ); - CassiteriteSand .setDirectSmelting(Tin ); - Chromite .setDirectSmelting(Chrome ); - Garnierite .setDirectSmelting(Nickel ); - Cobaltite .setDirectSmelting(Cobalt ); - Stibnite .setDirectSmelting(Antimony ); - Cooperite .setDirectSmelting(Platinum ); - Pyrolusite .setDirectSmelting(Manganese ); - Magnesite .setDirectSmelting(Magnesium ); - Molybdenite .setDirectSmelting(Molybdenum ); + Tetrahedrite.setDirectSmelting(Copper).add(INDUCTION_SMELTING_LOW_OUTPUT); + Chalcopyrite.setDirectSmelting(Copper).add(INDUCTION_SMELTING_LOW_OUTPUT); + Malachite.setDirectSmelting(Copper).add(INDUCTION_SMELTING_LOW_OUTPUT); + Pentlandite.setDirectSmelting(Nickel).add(INDUCTION_SMELTING_LOW_OUTPUT); + Sphalerite.setDirectSmelting(Zinc).add(INDUCTION_SMELTING_LOW_OUTPUT); + Pyrite.setDirectSmelting(Iron).add(INDUCTION_SMELTING_LOW_OUTPUT); + BasalticMineralSand.setDirectSmelting(Iron).add(INDUCTION_SMELTING_LOW_OUTPUT); + GraniticMineralSand.setDirectSmelting(Iron).add(INDUCTION_SMELTING_LOW_OUTPUT); + YellowLimonite.setDirectSmelting(Iron).add(INDUCTION_SMELTING_LOW_OUTPUT); + BrownLimonite.setDirectSmelting(Iron); + BandedIron.setDirectSmelting(Iron); + Cassiterite.setDirectSmelting(Tin); + CassiteriteSand.setDirectSmelting(Tin); + Chromite.setDirectSmelting(Chrome); + Garnierite.setDirectSmelting(Nickel); + Cobaltite.setDirectSmelting(Cobalt); + Stibnite.setDirectSmelting(Antimony); + Cooperite.setDirectSmelting(Platinum); + Pyrolusite.setDirectSmelting(Manganese); + Magnesite.setDirectSmelting(Magnesium); + Molybdenite.setDirectSmelting(Molybdenum); - Salt .setOreMultiplier( 2).setSmeltingMultiplier( 2); - RockSalt .setOreMultiplier( 2).setSmeltingMultiplier( 2); - Scheelite .setOreMultiplier( 2).setSmeltingMultiplier( 2); - Tungstate .setOreMultiplier( 2).setSmeltingMultiplier( 2); - Cassiterite .setOreMultiplier( 2).setSmeltingMultiplier( 2); - CassiteriteSand .setOreMultiplier( 2).setSmeltingMultiplier( 2); - NetherQuartz .setOreMultiplier( 2).setSmeltingMultiplier( 2); - CertusQuartz .setOreMultiplier( 2).setSmeltingMultiplier( 2); - Phosphorus .setOreMultiplier( 3).setSmeltingMultiplier( 3); - Saltpeter .setOreMultiplier( 4).setSmeltingMultiplier( 4); - Apatite .setOreMultiplier( 4).setSmeltingMultiplier( 4).setByProductMultiplier(2); - Redstone .setOreMultiplier( 5).setSmeltingMultiplier( 5); - Glowstone .setOreMultiplier( 5).setSmeltingMultiplier( 5); - Lapis .setOreMultiplier( 6).setSmeltingMultiplier( 6).setByProductMultiplier(4); - Sodalite .setOreMultiplier( 6).setSmeltingMultiplier( 6).setByProductMultiplier(4); - Lazurite .setOreMultiplier( 6).setSmeltingMultiplier( 6).setByProductMultiplier(4); - Monazite .setOreMultiplier( 8).setSmeltingMultiplier( 8).setByProductMultiplier(2); + Salt.setOreMultiplier(2).setSmeltingMultiplier(2); + RockSalt.setOreMultiplier(2).setSmeltingMultiplier(2); + Scheelite.setOreMultiplier(2).setSmeltingMultiplier(2); + Tungstate.setOreMultiplier(2).setSmeltingMultiplier(2); + Cassiterite.setOreMultiplier(2).setSmeltingMultiplier(2); + CassiteriteSand.setOreMultiplier(2).setSmeltingMultiplier(2); + NetherQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); + CertusQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); + Phosphorus.setOreMultiplier(3).setSmeltingMultiplier(3); + Saltpeter.setOreMultiplier(4).setSmeltingMultiplier(4); + Apatite.setOreMultiplier(4).setSmeltingMultiplier(4).setByProductMultiplier(2); + Redstone.setOreMultiplier(5).setSmeltingMultiplier(5); + Glowstone.setOreMultiplier(5).setSmeltingMultiplier(5); + Lapis.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); + Sodalite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); + Lazurite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); + Monazite.setOreMultiplier(8).setSmeltingMultiplier(8).setByProductMultiplier(2); - Plastic .addEnchantmentForTools(Enchantments.KNOCKBACK, 1); - Rubber .addEnchantmentForTools(Enchantments.KNOCKBACK, 2); + Plastic.addEnchantmentForTools(Enchantments.KNOCKBACK, 1); + Rubber.addEnchantmentForTools(Enchantments.KNOCKBACK, 2); - Vinteum .addEnchantmentForTools(Enchantments.FORTUNE, 1); + Vinteum.addEnchantmentForTools(Enchantments.FORTUNE, 1); - Flint .addEnchantmentForTools(Enchantments.FIRE_ASPECT, 1); - EnderPearl .addEnchantmentForTools(Enchantments.SILK_TOUCH, 1); - NetherStar .addEnchantmentForTools(Enchantments.SILK_TOUCH, 1); + Flint.addEnchantmentForTools(Enchantments.FIRE_ASPECT, 1); + EnderPearl.addEnchantmentForTools(Enchantments.SILK_TOUCH, 1); + NetherStar.addEnchantmentForTools(Enchantments.SILK_TOUCH, 1); - BlackBronze .addEnchantmentForTools(Enchantments.SMITE, 2); - Gold .addEnchantmentForTools(Enchantments.SMITE, 3); - RoseGold .addEnchantmentForTools(Enchantments.SMITE, 4); - Platinum .addEnchantmentForTools(Enchantments.SMITE, 5); + BlackBronze.addEnchantmentForTools(Enchantments.SMITE, 2); + Gold.addEnchantmentForTools(Enchantments.SMITE, 3); + RoseGold.addEnchantmentForTools(Enchantments.SMITE, 4); + Platinum.addEnchantmentForTools(Enchantments.SMITE, 5); - Lead .addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 2); - Nickel .addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 2); - Invar .addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 3); - Antimony .addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 3); - BatteryAlloy .addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 4); - Bismuth .addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 4); - BismuthBronze .addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 5); + Lead.addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 2); + Nickel.addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 2); + Invar.addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 3); + Antimony.addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 3); + BatteryAlloy.addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 4); + Bismuth.addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 4); + BismuthBronze.addEnchantmentForTools(Enchantments.BANE_OF_ARTHROPODS, 5); - Iron .addEnchantmentForTools(Enchantments.SHARPNESS, 1); - Bronze .addEnchantmentForTools(Enchantments.SHARPNESS, 1); - Brass .addEnchantmentForTools(Enchantments.SHARPNESS, 2); - Steel .addEnchantmentForTools(Enchantments.SHARPNESS, 2); - WroughtIron .addEnchantmentForTools(Enchantments.SHARPNESS, 2); - StainlessSteel .addEnchantmentForTools(Enchantments.SHARPNESS, 3); - BlackSteel .addEnchantmentForTools(Enchantments.SHARPNESS, 4); - RedSteel .addEnchantmentForTools(Enchantments.SHARPNESS, 4); - BlueSteel .addEnchantmentForTools(Enchantments.SHARPNESS, 5); - DamascusSteel .addEnchantmentForTools(Enchantments.SHARPNESS, 5); - TungstenCarbide .addEnchantmentForTools(Enchantments.SHARPNESS, 5); - HSSE .addEnchantmentForTools(Enchantments.SHARPNESS, 5); - HSSG .addEnchantmentForTools(Enchantments.SHARPNESS, 4); - HSSS .addEnchantmentForTools(Enchantments.SHARPNESS, 5); + Iron.addEnchantmentForTools(Enchantments.SHARPNESS, 1); + Bronze.addEnchantmentForTools(Enchantments.SHARPNESS, 1); + Brass.addEnchantmentForTools(Enchantments.SHARPNESS, 2); + Steel.addEnchantmentForTools(Enchantments.SHARPNESS, 2); + WroughtIron.addEnchantmentForTools(Enchantments.SHARPNESS, 2); + StainlessSteel.addEnchantmentForTools(Enchantments.SHARPNESS, 3); + BlackSteel.addEnchantmentForTools(Enchantments.SHARPNESS, 4); + RedSteel.addEnchantmentForTools(Enchantments.SHARPNESS, 4); + BlueSteel.addEnchantmentForTools(Enchantments.SHARPNESS, 5); + DamascusSteel.addEnchantmentForTools(Enchantments.SHARPNESS, 5); + TungstenCarbide.addEnchantmentForTools(Enchantments.SHARPNESS, 5); + HSSE.addEnchantmentForTools(Enchantments.SHARPNESS, 5); + HSSG.addEnchantmentForTools(Enchantments.SHARPNESS, 4); + HSSS.addEnchantmentForTools(Enchantments.SHARPNESS, 5); - Chalcopyrite .addOreByProducts(Pyrite , Cobalt , Cadmium , Gold ); - Sphalerite .addOreByProducts(GarnetYellow , Cadmium , Gallium , Zinc ); - GlauconiteSand .addOreByProducts(Sodium , Aluminium , Iron ); - Glauconite .addOreByProducts(Sodium , Aluminium , Iron ); - Vermiculite .addOreByProducts(Iron , Aluminium , Magnesium ); - FullersEarth .addOreByProducts(Aluminium , Silicon , Magnesium ); - Bentonite .addOreByProducts(Aluminium , Calcium , Magnesium ); - Uraninite .addOreByProducts(Uranium , Thorium , Uranium235 ); - Pitchblende .addOreByProducts(Thorium , Uranium , Lead ); - Galena .addOreByProducts(Sulfur , Silver , Lead ); - Lapis .addOreByProducts(Lazurite , Sodalite , Pyrite ); - Pyrite .addOreByProducts(Sulfur , Phosphorus , Iron ); - Copper .addOreByProducts(Cobalt , Gold , Nickel ); - Nickel .addOreByProducts(Cobalt , Platinum , Iron ); - GarnetRed .addOreByProducts(Spessartine , Pyrope , Almandine ); - GarnetYellow .addOreByProducts(Andradite , Grossular , Uvarovite ); - Cooperite .addOreByProducts(Palladium , Nickel , Iridium ); - Cinnabar .addOreByProducts(Redstone , Sulfur , Glowstone ); - Tantalite .addOreByProducts(Manganese , Niobium , Tantalum ); - Pollucite .addOreByProducts(Caesium , Aluminium , Rubidium ); - Chrysotile .addOreByProducts(Asbestos , Silicon , Magnesium ); - Asbestos .addOreByProducts(Asbestos , Silicon , Magnesium ); - Pentlandite .addOreByProducts(Iron , Sulfur , Cobalt ); - Uranium .addOreByProducts(Lead , Uranium235 , Thorium ); - Scheelite .addOreByProducts(Manganese , Molybdenum , Calcium ); - Tungstate .addOreByProducts(Manganese , Silver , Lithium ); - Bauxite .addOreByProducts(Grossular , Rutile , Gallium ); - QuartzSand .addOreByProducts(CertusQuartz , Quartzite , Barite ); - Quartzite .addOreByProducts(CertusQuartz , Barite ); - CertusQuartz .addOreByProducts(Quartzite , Barite ); - Redstone .addOreByProducts(Cinnabar , RareEarth , Glowstone ); - Monazite .addOreByProducts(Thorium , Neodymium , RareEarth ); - Malachite .addOreByProducts(Copper , BrownLimonite , Calcite ); - YellowLimonite .addOreByProducts(Nickel , BrownLimonite , Cobalt ); - BrownLimonite .addOreByProducts(Malachite , YellowLimonite ); - Neodymium .addOreByProducts(Monazite , RareEarth ); - Bastnasite .addOreByProducts(Neodymium , RareEarth ); - Glowstone .addOreByProducts(Redstone , Gold ); - Zinc .addOreByProducts(Tin , Gallium ); - Tungsten .addOreByProducts(Manganese , Molybdenum ); - Diatomite .addOreByProducts(BandedIron , Sapphire ); - Iron .addOreByProducts(Nickel , Tin ); - Lepidolite .addOreByProducts(Lithium , Caesium ); - Gold .addOreByProducts(Copper , Nickel ); - Tin .addOreByProducts(Iron , Zinc ); - Antimony .addOreByProducts(Zinc , Iron ); - Silver .addOreByProducts(Lead , Sulfur ); - Lead .addOreByProducts(Silver , Sulfur ); - Thorium .addOreByProducts(Uranium , Lead ); - Plutonium .addOreByProducts(Uranium , Lead ); - Electrum .addOreByProducts(Gold , Silver ); - Bronze .addOreByProducts(Copper , Tin ); - Brass .addOreByProducts(Copper , Zinc ); - Coal .addOreByProducts(Lignite , Thorium ); - Ilmenite .addOreByProducts(Iron , Rutile ); - Manganese .addOreByProducts(Chrome , Iron ); - Sapphire .addOreByProducts(Aluminium , GreenSapphire ); - GreenSapphire .addOreByProducts(Aluminium , Sapphire ); - Platinum .addOreByProducts(Nickel , Iridium ); - Emerald .addOreByProducts(Beryllium , Aluminium ); - Olivine .addOreByProducts(Pyrope , Magnesium ); - Chrome .addOreByProducts(Iron , Magnesium ); - Chromite .addOreByProducts(Iron , Magnesium ); - Tetrahedrite .addOreByProducts(Antimony , Zinc ); - GarnetSand .addOreByProducts(GarnetRed , GarnetYellow ); - Magnetite .addOreByProducts(Iron , Gold ); - GraniticMineralSand .addOreByProducts(GraniteBlack , Magnetite ); - BasalticMineralSand .addOreByProducts(Basalt , Magnetite ); - Basalt .addOreByProducts(Olivine , DarkAsh ); - VanadiumMagnetite .addOreByProducts(Magnetite , Vanadium ); - Lazurite .addOreByProducts(Sodalite , Lapis ); - Sodalite .addOreByProducts(Lazurite , Lapis ); - Spodumene .addOreByProducts(Aluminium , Lithium ); - Ruby .addOreByProducts(Chrome , GarnetRed ); - Phosphorus .addOreByProducts(Apatite , Phosphate ); - Iridium .addOreByProducts(Platinum , Osmium ); - Pyrope .addOreByProducts(GarnetRed , Magnesium ); - Almandine .addOreByProducts(GarnetRed , Aluminium ); - Spessartine .addOreByProducts(GarnetRed , Manganese ); - Andradite .addOreByProducts(GarnetYellow , Iron ); - Grossular .addOreByProducts(GarnetYellow , Calcium ); - Uvarovite .addOreByProducts(GarnetYellow , Chrome ); - Calcite .addOreByProducts(Andradite , Malachite ); - NaquadahEnriched .addOreByProducts(Naquadah , Naquadria ); - Naquadah .addOreByProducts(NaquadahEnriched ); - Pyrolusite .addOreByProducts(Manganese ); - Molybdenite .addOreByProducts(Molybdenum ); - Stibnite .addOreByProducts(Antimony ); - Garnierite .addOreByProducts(Nickel ); - Lignite .addOreByProducts(Coal ); - Diamond .addOreByProducts(Graphite ); - Beryllium .addOreByProducts(Emerald ); - Apatite .addOreByProducts(Phosphorus ); - Magnesite .addOreByProducts(Magnesium ); - NetherQuartz .addOreByProducts(Netherrack ); - PigIron .addOreByProducts(Iron ); - Steel .addOreByProducts(Iron ); - Graphite .addOreByProducts(Carbon ); - Netherrack .addOreByProducts(Sulfur ); - Flint .addOreByProducts(Obsidian ); - Cobaltite .addOreByProducts(Cobalt ); - Cobalt .addOreByProducts(Cobaltite ); - Sulfur .addOreByProducts(Sulfur ); - Saltpeter .addOreByProducts(Saltpeter ); - Endstone .addOreByProducts(Helium3 ); - Osmium .addOreByProducts(Iridium ); - Magnesium .addOreByProducts(Olivine ); - Aluminium .addOreByProducts(Bauxite ); - Titanium .addOreByProducts(Almandine ); - Obsidian .addOreByProducts(Olivine ); - Ash .addOreByProducts(Carbon ); - DarkAsh .addOreByProducts(Carbon ); - Redrock .addOreByProducts(Clay ); - Marble .addOreByProducts(Calcite ); - Clay .addOreByProducts(Clay ); - Cassiterite .addOreByProducts(Tin ); - CassiteriteSand .addOreByProducts(Tin ); - GraniteBlack .addOreByProducts(Biotite ); - GraniteRed .addOreByProducts(PotassiumFeldspar ); - Phosphate .addOreByProducts(Phosphor ); - Phosphor .addOreByProducts(Phosphate ); - Tanzanite .addOreByProducts(Opal ); - Opal .addOreByProducts(Tanzanite ); - Amethyst .addOreByProducts(Amethyst ); - Topaz .addOreByProducts(BlueTopaz ); - BlueTopaz .addOreByProducts(Topaz ); - Niter .addOreByProducts(Saltpeter ); - Vinteum .addOreByProducts(Vinteum ); - Lithium .addOreByProducts(Lithium ); - Silicon .addOreByProducts(SiliconDioxide ); - Salt .addOreByProducts(RockSalt ); - RockSalt .addOreByProducts(Salt ); - Andesite .addOreByProducts(Basalt ); - Diorite .addOreByProducts(NetherQuartz ); + Chalcopyrite.addOreByProducts(Pyrite, Cobalt, Cadmium, Gold); + Sphalerite.addOreByProducts(GarnetYellow, Cadmium, Gallium, Zinc); + GlauconiteSand.addOreByProducts(Sodium, Aluminium, Iron); + Glauconite.addOreByProducts(Sodium, Aluminium, Iron); + Vermiculite.addOreByProducts(Iron, Aluminium, Magnesium); + FullersEarth.addOreByProducts(Aluminium, Silicon, Magnesium); + Bentonite.addOreByProducts(Aluminium, Calcium, Magnesium); + Uraninite.addOreByProducts(Uranium, Thorium, Uranium235); + Pitchblende.addOreByProducts(Thorium, Uranium, Lead); + Galena.addOreByProducts(Sulfur, Silver, Lead); + Lapis.addOreByProducts(Lazurite, Sodalite, Pyrite); + Pyrite.addOreByProducts(Sulfur, Phosphorus, Iron); + Copper.addOreByProducts(Cobalt, Gold, Nickel); + Nickel.addOreByProducts(Cobalt, Platinum, Iron); + GarnetRed.addOreByProducts(Spessartine, Pyrope, Almandine); + GarnetYellow.addOreByProducts(Andradite, Grossular, Uvarovite); + Cooperite.addOreByProducts(Palladium, Nickel, Iridium); + Cinnabar.addOreByProducts(Redstone, Sulfur, Glowstone); + Tantalite.addOreByProducts(Manganese, Niobium, Tantalum); + Pollucite.addOreByProducts(Caesium, Aluminium, Rubidium); + Chrysotile.addOreByProducts(Asbestos, Silicon, Magnesium); + Asbestos.addOreByProducts(Asbestos, Silicon, Magnesium); + Pentlandite.addOreByProducts(Iron, Sulfur, Cobalt); + Uranium.addOreByProducts(Lead, Uranium235, Thorium); + Scheelite.addOreByProducts(Manganese, Molybdenum, Calcium); + Tungstate.addOreByProducts(Manganese, Silver, Lithium); + Bauxite.addOreByProducts(Grossular, Rutile, Gallium); + QuartzSand.addOreByProducts(CertusQuartz, Quartzite, Barite); + Quartzite.addOreByProducts(CertusQuartz, Barite); + CertusQuartz.addOreByProducts(Quartzite, Barite); + Redstone.addOreByProducts(Cinnabar, RareEarth, Glowstone); + Monazite.addOreByProducts(Thorium, Neodymium, RareEarth); + Malachite.addOreByProducts(Copper, BrownLimonite, Calcite); + YellowLimonite.addOreByProducts(Nickel, BrownLimonite, Cobalt); + BrownLimonite.addOreByProducts(Malachite, YellowLimonite); + Neodymium.addOreByProducts(Monazite, RareEarth); + Bastnasite.addOreByProducts(Neodymium, RareEarth); + Glowstone.addOreByProducts(Redstone, Gold); + Zinc.addOreByProducts(Tin, Gallium); + Tungsten.addOreByProducts(Manganese, Molybdenum); + Diatomite.addOreByProducts(BandedIron, Sapphire); + Iron.addOreByProducts(Nickel, Tin); + Lepidolite.addOreByProducts(Lithium, Caesium); + Gold.addOreByProducts(Copper, Nickel); + Tin.addOreByProducts(Iron, Zinc); + Antimony.addOreByProducts(Zinc, Iron); + Silver.addOreByProducts(Lead, Sulfur); + Lead.addOreByProducts(Silver, Sulfur); + Thorium.addOreByProducts(Uranium, Lead); + Plutonium.addOreByProducts(Uranium, Lead); + Electrum.addOreByProducts(Gold, Silver); + Bronze.addOreByProducts(Copper, Tin); + Brass.addOreByProducts(Copper, Zinc); + Coal.addOreByProducts(Lignite, Thorium); + Ilmenite.addOreByProducts(Iron, Rutile); + Manganese.addOreByProducts(Chrome, Iron); + Sapphire.addOreByProducts(Aluminium, GreenSapphire); + GreenSapphire.addOreByProducts(Aluminium, Sapphire); + Platinum.addOreByProducts(Nickel, Iridium); + Emerald.addOreByProducts(Beryllium, Aluminium); + Olivine.addOreByProducts(Pyrope, Magnesium); + Chrome.addOreByProducts(Iron, Magnesium); + Chromite.addOreByProducts(Iron, Magnesium); + Tetrahedrite.addOreByProducts(Antimony, Zinc); + GarnetSand.addOreByProducts(GarnetRed, GarnetYellow); + Magnetite.addOreByProducts(Iron, Gold); + GraniticMineralSand.addOreByProducts(GraniteBlack, Magnetite); + BasalticMineralSand.addOreByProducts(Basalt, Magnetite); + Basalt.addOreByProducts(Olivine, DarkAsh); + VanadiumMagnetite.addOreByProducts(Magnetite, Vanadium); + Lazurite.addOreByProducts(Sodalite, Lapis); + Sodalite.addOreByProducts(Lazurite, Lapis); + Spodumene.addOreByProducts(Aluminium, Lithium); + Ruby.addOreByProducts(Chrome, GarnetRed); + Phosphorus.addOreByProducts(Apatite, Phosphate); + Iridium.addOreByProducts(Platinum, Osmium); + Pyrope.addOreByProducts(GarnetRed, Magnesium); + Almandine.addOreByProducts(GarnetRed, Aluminium); + Spessartine.addOreByProducts(GarnetRed, Manganese); + Andradite.addOreByProducts(GarnetYellow, Iron); + Grossular.addOreByProducts(GarnetYellow, Calcium); + Uvarovite.addOreByProducts(GarnetYellow, Chrome); + Calcite.addOreByProducts(Andradite, Malachite); + NaquadahEnriched.addOreByProducts(Naquadah, Naquadria); + Naquadah.addOreByProducts(NaquadahEnriched); + Pyrolusite.addOreByProducts(Manganese); + Molybdenite.addOreByProducts(Molybdenum); + Stibnite.addOreByProducts(Antimony); + Garnierite.addOreByProducts(Nickel); + Lignite.addOreByProducts(Coal); + Diamond.addOreByProducts(Graphite); + Beryllium.addOreByProducts(Emerald); + Apatite.addOreByProducts(Phosphorus); + Magnesite.addOreByProducts(Magnesium); + NetherQuartz.addOreByProducts(Netherrack); + PigIron.addOreByProducts(Iron); + Steel.addOreByProducts(Iron); + Graphite.addOreByProducts(Carbon); + Netherrack.addOreByProducts(Sulfur); + Flint.addOreByProducts(Obsidian); + Cobaltite.addOreByProducts(Cobalt); + Cobalt.addOreByProducts(Cobaltite); + Sulfur.addOreByProducts(Sulfur); + Saltpeter.addOreByProducts(Saltpeter); + Endstone.addOreByProducts(Helium3); + Osmium.addOreByProducts(Iridium); + Magnesium.addOreByProducts(Olivine); + Aluminium.addOreByProducts(Bauxite); + Titanium.addOreByProducts(Almandine); + Obsidian.addOreByProducts(Olivine); + Ash.addOreByProducts(Carbon); + DarkAsh.addOreByProducts(Carbon); + Redrock.addOreByProducts(Clay); + Marble.addOreByProducts(Calcite); + Clay.addOreByProducts(Clay); + Cassiterite.addOreByProducts(Tin); + CassiteriteSand.addOreByProducts(Tin); + GraniteBlack.addOreByProducts(Biotite); + GraniteRed.addOreByProducts(PotassiumFeldspar); + Phosphate.addOreByProducts(Phosphor); + Phosphor.addOreByProducts(Phosphate); + Tanzanite.addOreByProducts(Opal); + Opal.addOreByProducts(Tanzanite); + Amethyst.addOreByProducts(Amethyst); + Topaz.addOreByProducts(BlueTopaz); + BlueTopaz.addOreByProducts(Topaz); + Niter.addOreByProducts(Saltpeter); + Vinteum.addOreByProducts(Vinteum); + Lithium.addOreByProducts(Lithium); + Silicon.addOreByProducts(SiliconDioxide); + Salt.addOreByProducts(RockSalt); + RockSalt.addOreByProducts(Salt); + Andesite.addOreByProducts(Basalt); + Diorite.addOreByProducts(NetherQuartz); } private static void initSubTags() { @@ -684,27 +684,6 @@ public class Materials { for(DustMaterial dustMaterial : new DustMaterial[] {Zinc, Nickel, Copper, Cobalt, Cobaltite, Tetrahedrite}) { dustMaterial.washedIn = SodiumPersulfate; } - - Paper.add(FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE); - Coal.add(FLAMMABLE |NO_SMELTING |NO_SMASHING |MORTAR_GRINDABLE); - Charcoal.add(FLAMMABLE |NO_SMELTING |NO_SMASHING |MORTAR_GRINDABLE); - Lignite.add(FLAMMABLE |NO_SMELTING |NO_SMASHING |MORTAR_GRINDABLE); - - Rubber.add(FLAMMABLE | NO_SMASHING); - Plastic.add(FLAMMABLE | NO_SMASHING); - Silicone.add(FLAMMABLE | NO_SMASHING); - - Gunpowder.add(FLAMMABLE | EXPLOSIVE | NO_SMELTING | NO_SMASHING); - Glyceryl.add(FLAMMABLE | EXPLOSIVE | NO_SMELTING | NO_SMASHING); - NitroFuel.add(FLAMMABLE | EXPLOSIVE | NO_SMELTING | NO_SMASHING); - NitroCarbon.add(FLAMMABLE | EXPLOSIVE | NO_SMELTING | NO_SMASHING); - - Lead.add(MORTAR_GRINDABLE); - Tin.add(MORTAR_GRINDABLE); - SolderingAlloy.add(MORTAR_GRINDABLE); - - Cheese.add(SMELT_INTO_FLUID); - Sugar.add(SMELT_INTO_FLUID); Concrete.add(NO_SMASHING | SMELT_INTO_FLUID); ConstructionFoam.add(NO_SMASHING |EXPLOSIVE |NO_SMELTING);