diff --git a/src/main/java/gregtech/api/unification/Elements.java b/src/main/java/gregtech/api/unification/Elements.java index 816c2ce4297..c902641fb2c 100644 --- a/src/main/java/gregtech/api/unification/Elements.java +++ b/src/main/java/gregtech/api/unification/Elements.java @@ -45,7 +45,7 @@ public static void register() { add(24, 28, -1, null, "Chrome", "Cr", false); add(25, 30, -1, null, "Manganese", "Mn", false); add(26, 30, -1, null, "Iron", "Fe", false); - add(27, 32, -1, null, "Cobalt", "Cp", false); + add(27, 32, -1, null, "Cobalt", "Co", false); add(28, 30, -1, null, "Nickel", "Ni", false); add(29, 34, -1, null, "Copper", "Cu", false); add(30, 35, -1, null, "Zinc", "Zn", false); @@ -67,7 +67,7 @@ public static void register() { add(46, 60, -1, null, "Palladium", "Pd", false); add(47, 60, -1, null, "Silver", "Ag", false); add(48, 64, -1, null, "Cadmium", "Cd", false); - add(49, 65, -1, null, "Indium", "I", false); + add(49, 65, -1, null, "Indium", "In", false); add(50, 68, -1, null, "Tin", "Sn", false); add(51, 70, -1, null, "Antimony", "Sb", false); add(52, 75, -1, null, "Tellurium", "Te", false); @@ -111,9 +111,11 @@ public static void register() { add(90, 140, -1, null, "Thorium", "Th", false); add(91, 138, -1, null, "Protactinium", "Pa", false); add(92, 146, -1, null, "Uranium", "U", false); + add(92, 146, -1, null, "Uranium-238", "U_238", false); add(92, 143, -1, null, "Uranium-235", "U_235", true); add(93, 144, -1, null, "Neptunium", "Np", false); add(94, 152, -1, null, "Plutonium", "Pu", false); + add(94, 145, -1, null, "Plutonium-239", "Pu_239", false); add(94, 149, -1, null, "Plutonium-241", "Pu_241", true); add(95, 150, -1, null, "Americium", "Am", false); add(96, 153, -1, null, "Curium", "Cm", false); diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 0121797f7c1..8f5cae5c45d 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -114,7 +114,7 @@ public static void register() { public static DustMaterial Phosphorus = new DustMaterial(78, "phosphorus", 0xFFFF00, DULL, 2, of(), 0, Elements.get("Phosphorus")); public static IngotMaterial Polonium = new IngotMaterial(79, "polonium", 0xC9D47E, DULL, 4, of(), 0, Elements.get("Polonium")); public static IngotMaterial Platinum = new IngotMaterial(80, "platinum", 0xFFFFC8, SHINY, 2, of(), EXT2_METAL | GENERATE_ORE | GENERATE_FLUID_BLOCK, Elements.get("Platinum")); - public static IngotMaterial Plutonium = new IngotMaterial(81, "plutonium", 0xF03232, METALLIC, 3, of(), EXT_METAL, Elements.get("Plutonium")); + public static IngotMaterial Plutonium239 = new IngotMaterial(81, "plutonium", 0xF03232, METALLIC, 3, of(), EXT_METAL, Elements.get("Plutonium-239")); public static IngotMaterial Plutonium241 = new IngotMaterial(82, "plutonium241", 0xFA4646, SHINY, 3, of(), EXT_METAL, Elements.get("Plutonium-241")); public static IngotMaterial Potassium = new IngotMaterial(83, "potassium", 0xFAFAFA, METALLIC, 1, of(), EXT_METAL, Elements.get("Potassium")); public static IngotMaterial Praseodymium = new IngotMaterial(84, "praseodymium", 0xCECECE, METALLIC, 2, of(), EXT_METAL, Elements.get("Praseodymium"), 1208); @@ -149,7 +149,7 @@ public static void register() { public static IngotMaterial Titanium = new IngotMaterial(113, "titanium", 0xDCA0F0, METALLIC, 3, of(), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_SPRING | GENERATE_FRAME | GENERATE_DENSE, Elements.get("Titanium"), 7.0F, 3.0f, 1600, 1941); public static FluidMaterial Tritium = new FluidMaterial(114, "tritium", 0xFFFFFF, METALLIC, of(), STATE_GAS, Elements.get("Tritium")); public static IngotMaterial Tungsten = new IngotMaterial(115, "tungsten", 0x323232, METALLIC, 3, of(), EXT2_METAL, Elements.get("Tungsten"), 7.0F, 3.0f, 2560, 3000); - public static IngotMaterial Uranium = new IngotMaterial(116, "uranium", 0x32F032, METALLIC, 3, of(), STD_METAL | GENERATE_ORE, Elements.get("Uranium"), 6.0F, 3.0f, 512); + public static IngotMaterial Uranium238 = new IngotMaterial(116, "uranium", 0x32F032, METALLIC, 3, of(), STD_METAL | GENERATE_ORE, Elements.get("Uranium-238"), 6.0F, 3.0f, 512); public static IngotMaterial Uranium235 = new IngotMaterial(117, "uranium235", 0x46FA46, SHINY, 3, of(), STD_METAL | GENERATE_ORE | GENERATE_ROD, Elements.get("Uranium-235"), 6.0F, 3.0f, 512); public static IngotMaterial Vanadium = new IngotMaterial(118, "vanadium", 0x323232, METALLIC, 2, of(), STD_METAL, Elements.get("Vanadium"), 2183); public static FluidMaterial Xenon = new FluidMaterial(119, "xenon", 0x270095, FLUID, of(), 0, Elements.get("Xenon")); @@ -172,17 +172,17 @@ public static void register() { public static DustMaterial Bone = new DustMaterial(132, "bone", 0xFAFAFA, DULL, 1, of(new MaterialStack(Calcium, 1)), MORTAR_GRINDABLE | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES); public static IngotMaterial Brass = new IngotMaterial(133, "brass", 0xFFB400, METALLIC, 1, of(new MaterialStack(Zinc, 1), new MaterialStack(Copper, 3)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING, 8.0F, 3.0f, 152); public static IngotMaterial Bronze = new IngotMaterial(134, "bronze", 0xFF8000, METALLIC, 2, of(new MaterialStack(Tin, 1), new MaterialStack(Copper, 3)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING | GENERATE_ROTOR | GENERATE_FRAME | GENERATE_LONG_ROD, 6.0F, 2.5f, 192); - public static DustMaterial BrownLimonite = new DustMaterial(135, "brown_limonite", 0xC86400, METALLIC, 1, of(new MaterialStack(Iron, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); + public static DustMaterial BrownLimonite = new DustMaterial(135, "brown_limonite", 0xC86400, METALLIC, 1, of(new MaterialStack(Iron, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial Calcite = new DustMaterial(136, "calcite", 0xFAE6DC, DULL, 1, of(new MaterialStack(Calcium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)), GENERATE_ORE); public static DustMaterial Cassiterite = new DustMaterial(137, "cassiterite", 0xDCDCDC, METALLIC, 1, of(new MaterialStack(Tin, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); public static DustMaterial CassiteriteSand = new DustMaterial(138, "cassiterite_sand", 0xDCDCDC, SAND, 1, of(new MaterialStack(Tin, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); public static DustMaterial Chalcopyrite = new DustMaterial(139, "chalcopyrite", 0xA07828, DULL, 1, of(new MaterialStack(Copper, 1), new MaterialStack(Iron, 1), new MaterialStack(Sulfur, 2)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT); public static GemMaterial Charcoal = new GemMaterial(140, "charcoal", 0x644646, FINE, 1, of(new MaterialStack(Carbon, 1)), FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE); public static DustMaterial Chromite = new DustMaterial(141, "chromite", 0x23140F, METALLIC, 1, of(new MaterialStack(Iron, 1), new MaterialStack(Chrome, 2), new MaterialStack(Oxygen, 4)), GENERATE_ORE, null); - public static GemMaterial Cinnabar = new GemMaterial(142, "cinnabar", 0x960000, EMERALD, 1, of(new MaterialStack(Mercury, 1), new MaterialStack(Sulfur, 1)), GENERATE_ORE | CRYSTALLISABLE); + public static GemMaterial Cinnabar = new GemMaterial(142, "cinnabar", 0x960000, EMERALD, 1, of(new MaterialStack(Mercury, 1), new MaterialStack(Sulfur, 1)), GENERATE_ORE | CRYSTALLISABLE | DECOMPOSITION_BY_CENTRIFUGING); public static FluidMaterial Water = new FluidMaterial(143, "water", 0x0000FF, FLUID, of(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), NO_RECYCLING | DISABLE_DECOMPOSITION); public static DustMaterial Clay = new DustMaterial(144, "clay", 0xC8C8DC, ROUGH, 1, of(new MaterialStack(Sodium, 2), new MaterialStack(Lithium, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 2), new MaterialStack(Water, 6)), MORTAR_GRINDABLE); - public static GemMaterial Coal = new GemMaterial(145, "coal", 0x464646, LIGNITE, 1, of(new MaterialStack(Carbon, 1)), GENERATE_ORE | FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES); + public static GemMaterial Coal = new GemMaterial(145, "coal", 0x464646, LIGNITE, 1, of(new MaterialStack(Carbon, 1)), GENERATE_ORE | FLAMMABLE | NO_SMELTING | NO_SMASHING | MORTAR_GRINDABLE | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES | DISABLE_DECOMPOSITION); public static DustMaterial Cobaltite = new DustMaterial(146, "cobaltite", 0x5050FA, METALLIC, 1, of(new MaterialStack(Cobalt, 1), new MaterialStack(Arsenic, 1), new MaterialStack(Sulfur, 1)), GENERATE_ORE); public static DustMaterial Cooperite = new DustMaterial(147, "cooperite", 0xFFFFC8, METALLIC, 1, of(new MaterialStack(Platinum, 3), new MaterialStack(Nickel, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Palladium, 1)), GENERATE_ORE); public static IngotMaterial Cupronickel = new IngotMaterial(148, "cupronickel", 0xE39680, METALLIC, 1, of(new MaterialStack(Copper, 1), new MaterialStack(Nickel, 1)), EXT_METAL| GENERATE_SPRING); @@ -212,16 +212,16 @@ public static void register() { public static DustMaterial Phosphate = new DustMaterial(172, "phosphate", 0xFFFF00, DULL, 1, of(new MaterialStack(Phosphorus, 1), new MaterialStack(Oxygen, 4)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE | EXPLOSIVE); public static IngotMaterial PigIron = new IngotMaterial(173, "pig_iron", 0xC8B4B4, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT_METAL | GENERATE_RING, 6.0F, 4.0f, 384); public static IngotMaterial Polyethylene = new IngotMaterial(174, "plastic", 0xC8C8C8, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); //todo add polyethylene oredicts - public static IngotMaterial Epoxy = new IngotMaterial(175, "epoxy", 0xC88C14, DULL, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)), EXT2_METAL | DISABLE_DECOMPOSITION); + public static IngotMaterial Epoxy = new IngotMaterial(175, "epoxy", 0xC88C14, DULL, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)), EXT2_METAL | DISABLE_DECOMPOSITION | NO_SMASHING); public static DustMaterial Polysiloxane = new DustMaterial(176, "polysiloxane", 0xDCDCDC, DULL, 1, of(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | FLAMMABLE | NO_SMASHING | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION); - public static IngotMaterial Polycaprolactam = new IngotMaterial(177, "polycaprolactam", 0x323232, DULL, 1, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | DISABLE_DECOMPOSITION); - public static IngotMaterial Polytetrafluoroethylene = new IngotMaterial(178, "polytetrafluoroethylene", 0x646464, DULL, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)), GENERATE_PLATE | GENERATE_FRAME | SMELT_INTO_FLUID | NO_SMASHING | DISABLE_DECOMPOSITION); + public static IngotMaterial Polycaprolactam = new IngotMaterial(177, "polycaprolactam", 0x323232, DULL, 1, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | DISABLE_DECOMPOSITION | NO_SMASHING); + public static IngotMaterial Polytetrafluoroethylene = new IngotMaterial(178, "polytetrafluoroethylene", 0x646464, DULL, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)), GENERATE_PLATE | GENERATE_FRAME | SMELT_INTO_FLUID | DISABLE_DECOMPOSITION | NO_SMASHING); public static DustMaterial Powellite = new DustMaterial(179, "powellite", 0xFFFF00, DULL, 2, of(new MaterialStack(Calcium, 1), new MaterialStack(Molybdenum, 1), new MaterialStack(Oxygen, 4)), GENERATE_ORE); public static DustMaterial Pyrite = new DustMaterial(180, "pyrite", 0x967828, ROUGH, 1, of(new MaterialStack(Iron, 1), new MaterialStack(Sulfur, 2)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT); public static DustMaterial Pyrolusite = new DustMaterial(181, "pyrolusite", 0x9696AA, DULL, 2, of(new MaterialStack(Manganese, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE); public static DustMaterial Pyrope = new DustMaterial(182, "pyrope", 0x783264, METALLIC, 2, 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(183, "rock_salt", 0xF0C8C8, FINE, 1, of(new MaterialStack(Potassium, 1), new MaterialStack(Chlorine, 1)), GENERATE_ORE | NO_SMASHING); - public static IngotMaterial Rubber = new IngotMaterial(184, "rubber", 0x000000, SHINY, 0, of(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), GENERATE_PLATE | GENERATE_GEAR | GENERATE_RING | FLAMMABLE | NO_SMASHING | GENERATE_RING | NO_WORKING | DISABLE_DECOMPOSITION); + public static IngotMaterial Rubber = new IngotMaterial(184, "rubber", 0x000000, SHINY, 0, of(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), GENERATE_PLATE | GENERATE_GEAR | GENERATE_RING | FLAMMABLE | NO_SMASHING | GENERATE_RING | DISABLE_DECOMPOSITION); public static GemMaterial Ruby = new GemMaterial(185, "ruby", 0xFF6464, RUBY, 2, of(new MaterialStack(Chrome, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), STD_GEM | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, 8.5F, 3.0f, 256); public static DustMaterial Salt = new DustMaterial(186, "salt", 0xFAFAFA, FINE, 1, of(new MaterialStack(Sodium, 1), new MaterialStack(Chlorine, 1)), GENERATE_ORE | NO_SMASHING); public static DustMaterial Saltpeter = new DustMaterial(187, "saltpeter", 0xE6E6E6, FINE, 1, of(new MaterialStack(Potassium, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 3)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE); @@ -238,19 +238,19 @@ public static void register() { public static DustMaterial Sphalerite = new DustMaterial(196, "sphalerite", 0xFFFFFF, DULL, 1, of(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT | DISABLE_DECOMPOSITION); public static IngotMaterial StainlessSteel = new IngotMaterial(197, "stainless_steel", 0xC8C8DC, SHINY, 2, of(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_FRAME | GENERATE_LONG_ROD, null, 7.0F, 4.0f, 480, 1700); public static IngotMaterial Steel = new IngotMaterial(198, "steel", 0x808080, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_DENSE | DISABLE_DECOMPOSITION | GENERATE_FRAME | GENERATE_LONG_ROD, null, 6.0F, 3.0f, 512, 1000); - public static DustMaterial Stibnite = new DustMaterial(199, "stibnite", 0x464646, METALLIC, 2, of(new MaterialStack(Antimony, 2), new MaterialStack(Sulfur, 3)), GENERATE_ORE); + public static DustMaterial Stibnite = new DustMaterial(199, "stibnite", 0x464646, METALLIC, 2, of(new MaterialStack(Antimony, 2), new MaterialStack(Sulfur, 3)), GENERATE_ORE | DECOMPOSITION_BY_CENTRIFUGING); public static GemMaterial Tanzanite = new GemMaterial(200, "tanzanite", 0x4000C8, GEM_VERTICAL, 2, of(new MaterialStack(Calcium, 2), new MaterialStack(Aluminium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 13)), EXT_METAL | GENERATE_ORE | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, null, 7.0F, 2.0f, 256); public static DustMaterial Tetrahedrite = new DustMaterial(201, "tetrahedrite", 0xC82000, DULL, 2, of(new MaterialStack(Copper, 3), new MaterialStack(Antimony, 1), new MaterialStack(Sulfur, 3), new MaterialStack(Iron, 1)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT); public static IngotMaterial TinAlloy = new IngotMaterial(202, "tin_alloy", 0xC8C8C8, METALLIC, 2, of(new MaterialStack(Tin, 1), new MaterialStack(Iron, 1)), EXT2_METAL, null); public static GemMaterial Topaz = new GemMaterial(203, "topaz", 0xFF8000, GEM_HORIZONTAL, 3, of(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), STD_GEM | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, null, 7.0F, 2.0f, 256); public static DustMaterial Tungstate = new DustMaterial(204, "tungstate", 0x373223, DULL, 3, of(new MaterialStack(Tungsten, 1), new MaterialStack(Lithium, 2), new MaterialStack(Oxygen, 4)), GENERATE_ORE | DECOMPOSITION_REQUIRES_HYDROGEN, null); public static IngotMaterial Ultimet = new IngotMaterial(205, "ultimet", 0xB4B4E6, SHINY, 4, of(new MaterialStack(Cobalt, 5), new MaterialStack(Chrome, 2), new MaterialStack(Nickel, 1), new MaterialStack(Molybdenum, 1)), EXT2_METAL, null, 9.0F, 4.0f, 2048, 2700); - public static DustMaterial Uraninite = new DustMaterial(206, "uraninite", 0x232323, METALLIC, 3, of(new MaterialStack(Uranium, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE | DISABLE_DECOMPOSITION); + public static DustMaterial Uraninite = new DustMaterial(206, "uraninite", 0x232323, METALLIC, 3, of(new MaterialStack(Uranium238, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE | DISABLE_DECOMPOSITION); public static DustMaterial Uvarovite = new DustMaterial(207, "uvarovite", 0xB4FFB4, DIAMOND, 2, of(new MaterialStack(Calcium, 3), new MaterialStack(Chrome, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)), 0); public static IngotMaterial VanadiumGallium = new IngotMaterial(208, "vanadium_gallium", 0x80808C, SHINY, 2, of(new MaterialStack(Vanadium, 3), new MaterialStack(Gallium, 1)), STD_METAL | GENERATE_FOIL | GENERATE_ROD, null, 4500); public static IngotMaterial WroughtIron = new IngotMaterial(209, "wrought_iron", 0xC8B4B4, METALLIC, 2, of(new MaterialStack(Iron, 1)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING | GENERATE_LONG_ROD | DISABLE_DECOMPOSITION, null, 6.0F, 3.5f, 384); public static DustMaterial Wulfenite = new DustMaterial(210, "wulfenite", 0xFF8000, DULL, 3, of(new MaterialStack(Lead, 1), new MaterialStack(Molybdenum, 1), new MaterialStack(Oxygen, 4)), GENERATE_ORE); - public static DustMaterial YellowLimonite = new DustMaterial(211, "yellow_limonite", 0xC8C800, METALLIC, 2, of(new MaterialStack(Iron, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT); + public static DustMaterial YellowLimonite = new DustMaterial(211, "yellow_limonite", 0xC8C800, METALLIC, 2, of(new MaterialStack(Iron, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Oxygen, 2)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT | DECOMPOSITION_BY_CENTRIFUGING); public static IngotMaterial YttriumBariumCuprate = new IngotMaterial(212, "yttrium_barium_cuprate", 0x504046, METALLIC, 2, of(new MaterialStack(Yttrium, 1), new MaterialStack(Barium, 2), new MaterialStack(Copper, 3), new MaterialStack(Oxygen, 7)), EXT_METAL | GENERATE_FOIL | GENERATE_FINE_WIRE, null, 4500); public static GemMaterial NetherQuartz = new GemMaterial(213, "nether_quartz", 0xE6D2D2, QUARTZ, 1, of(), STD_SOLID | NO_SMELTING | CRYSTALLISABLE | GENERATE_ORE | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES); public static GemMaterial CertusQuartz = new GemMaterial(214, "certus_quartz", 0xD2D2E6, QUARTZ, 1, of(), STD_SOLID | NO_SMELTING | CRYSTALLISABLE | GENERATE_ORE); @@ -295,7 +295,7 @@ public static void register() { public static FluidMaterial NitricAcid = new FluidMaterial(982, "nitric_acid", 0xCCCC00, FLUID, of(new MaterialStack(Hydrogen, 1), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 3)), 0); public static FluidMaterial SulfuricAcid = new FluidMaterial(981, "sulfuric_acid", 0xFFFFFF, FLUID, of(new MaterialStack(Hydrogen, 2), new MaterialStack(Sulfur, 1), new MaterialStack(Oxygen, 4)), 0); public static FluidMaterial NitrationMixture = new FluidMaterial(980, "nitration_mixture", 0xE6E2AB, FLUID, of(new MaterialStack(NitricAcid, 1), new MaterialStack(SulfuricAcid, 1)), DISABLE_DECOMPOSITION); - public static DustMaterial PhosphorusPentoxide = new DustMaterial(979, "phosphorus_pentoxide", 0xDCDC00, DULL, 1, of(new MaterialStack(Phosphorus, 4), new MaterialStack(Oxygen, 10)), 0); + public static DustMaterial PhosphorusPentoxide = new DustMaterial(979, "phosphorus_pentoxide", 0xDCDC00, DULL, 1, of(new MaterialStack(Phosphorus, 4), new MaterialStack(Oxygen, 10)), DISABLE_DECOMPOSITION); public static FluidMaterial PhosphoricAcid = new FluidMaterial(978, "phosphoric_acid", 0xDCDC01, FLUID, of(new MaterialStack(Hydrogen, 3), new MaterialStack(Phosphorus, 1), new MaterialStack(Oxygen, 4)), 0); public static DustMaterial SodiumHydroxide = new DustMaterial(977, "sodium_hydroxide", 0x003380, DULL, 1, of(new MaterialStack(Sodium, 1), new MaterialStack(Oxygen, 1), new MaterialStack(Hydrogen, 1)), 0); public static DustMaterial Quicklime = new DustMaterial(976, "quicklime", 0xF0F0F0, DULL, 1, of(new MaterialStack(Calcium, 1), new MaterialStack(Oxygen, 1)), 0); @@ -422,12 +422,12 @@ public static void register() { * Organic chemistry */ public static IngotMaterial SiliconeRubber = new IngotMaterial(231, "silicon_rubber", 0xDCDCDC, DULL, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1), new MaterialStack(Silicon, 1)), GENERATE_PLATE | GENERATE_GEAR | GENERATE_RING | FLAMMABLE | NO_SMASHING | GENERATE_FOIL | DISABLE_DECOMPOSITION); - public static IngotMaterial Polystyrene = new IngotMaterial(232, "polystyrene", 0xBEB4AA, DULL, 1, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 8)), DISABLE_DECOMPOSITION | GENERATE_FOIL); + public static IngotMaterial Polystyrene = new IngotMaterial(232, "polystyrene", 0xBEB4AA, DULL, 1, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 8)), DISABLE_DECOMPOSITION | GENERATE_FOIL | NO_SMASHING); public static IngotMaterial StyreneButadieneRubber = new IngotMaterial(233, "styrene_butadiene_rubber", 0x211A18, SHINY, 1, of(new MaterialStack(Carbon, 8), new MaterialStack(Hydrogen, 8), new MaterialStack(Butadiene, 3)), GENERATE_PLATE | GENERATE_GEAR | GENERATE_RING | FLAMMABLE | NO_SMASHING | DISABLE_DECOMPOSITION); public static FluidMaterial PolyvinylAcetate = new FluidMaterial(234, "polyvinyl_acetate", 0xFF9955, FLUID, of(new MaterialStack(Carbon, 4), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 2)), DISABLE_DECOMPOSITION); - public static IngotMaterial ReinforcedEpoxyResin = new IngotMaterial(235, "reinforced_epoxy_resin", 0xA07A10, DULL, 1, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | DISABLE_DECOMPOSITION); - public static IngotMaterial BorosilicateGlass = new IngotMaterial(236, "borosilicate_glass", 0xE6F3E6, SHINY, 1, of(new MaterialStack(Boron, 1), new MaterialStack(SiliconDioxide, 7)), DISABLE_DECOMPOSITION); - public static IngotMaterial PolyvinylChloride = new IngotMaterial(237, "polyvinyl_chloride", 0xD7E6E6, DULL, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 3), new MaterialStack(Chlorine, 1)), EXT_METAL | GENERATE_FOIL | DISABLE_DECOMPOSITION); + public static IngotMaterial ReinforcedEpoxyResin = new IngotMaterial(235, "reinforced_epoxy_resin", 0xA07A10, DULL, 1, of(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)), GENERATE_PLATE | DISABLE_DECOMPOSITION | NO_SMASHING); + public static IngotMaterial BorosilicateGlass = new IngotMaterial(236, "borosilicate_glass", 0xE6F3E6, SHINY, 1, of(new MaterialStack(Boron, 1), new MaterialStack(SiliconDioxide, 7)), 0); + public static IngotMaterial PolyvinylChloride = new IngotMaterial(237, "polyvinyl_chloride", 0xD7E6E6, DULL, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 3), new MaterialStack(Chlorine, 1)), EXT_METAL | GENERATE_FOIL | DISABLE_DECOMPOSITION | NO_SMASHING); /** * Not possible to determine exact Components @@ -452,21 +452,21 @@ public static void register() { /** * Second Degree Compounds */ - public static GemMaterial Glass = new GemMaterial(249, "glass", 0xFAFAFA, GLASS, 0, of(new MaterialStack(SiliconDioxide, 1)), GENERATE_PLATE | GENERATE_LENSE | NO_SMASHING | NO_RECYCLING | SMELT_INTO_FLUID | EXCLUDE_BLOCK_CRAFTING_RECIPES); + public static GemMaterial Glass = new GemMaterial(249, "glass", 0xFAFAFA, GLASS, 0, of(new MaterialStack(SiliconDioxide, 1)), GENERATE_PLATE | GENERATE_LENSE | NO_SMASHING | NO_RECYCLING | SMELT_INTO_FLUID | EXCLUDE_BLOCK_CRAFTING_RECIPES | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial Perlite = new DustMaterial(250, "perlite", 0x1E141E, DULL, 1, of(new MaterialStack(Obsidian, 2), new MaterialStack(Water, 1)), 0); public static DustMaterial Borax = new DustMaterial(251, "borax", 0xFAFAFA, FINE, 1, of(new MaterialStack(Sodium, 2), new MaterialStack(Boron, 4), new MaterialStack(Water, 10), new MaterialStack(Oxygen, 7)), 0); public static GemMaterial Lignite = new GemMaterial(252, "lignite", 0x644646, LIGNITE, 0, 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(253, "olivine", 0x96FF96, RUBY, 2, of(new MaterialStack(Magnesium, 2), new MaterialStack(Iron, 1), new MaterialStack(SiliconDioxide, 2)), STD_GEM | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, 7.5F, 3.0f, 312); - public static GemMaterial Opal = new GemMaterial(254, "opal", 0x0000FF, OPAL, 2, of(new MaterialStack(SiliconDioxide, 1)), STD_GEM | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, 7.5F, 3.0f, 312); + public static GemMaterial Opal = new GemMaterial(254, "opal", 0x0000FF, OPAL, 2, of(new MaterialStack(SiliconDioxide, 1)), STD_GEM | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT | DECOMPOSITION_BY_CENTRIFUGING, 7.5F, 3.0f, 312); public static GemMaterial Amethyst = new GemMaterial(255, "amethyst", 0xD232D2, RUBY, 3, of(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Iron, 1)), STD_GEM | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT, 7.5F, 3.0f, 312); - public static DustMaterial Redstone = new DustMaterial(256, "redstone", 0xC80000, ROUGH, 2, of(new MaterialStack(Silicon, 1), new MaterialStack(Pyrite, 5), new MaterialStack(Ruby, 1), new MaterialStack(Mercury, 3)), GENERATE_PLATE | GENERATE_ORE | NO_SMASHING | SMELT_INTO_FLUID | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES); - public static GemMaterial Lapis = new GemMaterial(257, "lapis", 0x4646DC, LAPIS, 1, of(new MaterialStack(Lazurite, 12), new MaterialStack(Sodalite, 2), new MaterialStack(Pyrite, 1), new MaterialStack(Calcite, 1)), STD_GEM | NO_SMASHING | NO_SMELTING | CRYSTALLISABLE | NO_WORKING | DECOMPOSITION_BY_ELECTROLYZING | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES); - public static DustMaterial Blaze = new DustMaterial(258, "blaze", 0xFFC800, FINE, 1, of(new MaterialStack(DarkAsh, 1), new MaterialStack(Sulfur, 1)), NO_SMELTING | SMELT_INTO_FLUID | MORTAR_GRINDABLE | BURNING); + public static DustMaterial Redstone = new DustMaterial(256, "redstone", 0xC80000, ROUGH, 2, of(new MaterialStack(Silicon, 1), new MaterialStack(Pyrite, 5), new MaterialStack(Ruby, 1), new MaterialStack(Mercury, 3)), GENERATE_PLATE | GENERATE_ORE | NO_SMASHING | SMELT_INTO_FLUID | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES | DECOMPOSITION_BY_CENTRIFUGING); + public static GemMaterial Lapis = new GemMaterial(257, "lapis", 0x4646DC, LAPIS, 1, of(new MaterialStack(Lazurite, 12), new MaterialStack(Sodalite, 2), new MaterialStack(Pyrite, 1), new MaterialStack(Calcite, 1)), STD_GEM | NO_SMASHING | NO_SMELTING | CRYSTALLISABLE | NO_WORKING | DECOMPOSITION_BY_ELECTROLYZING | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES | DECOMPOSITION_BY_CENTRIFUGING); + public static DustMaterial Blaze = new DustMaterial(258, "blaze", 0xFFC800, FINE, 1, of(new MaterialStack(DarkAsh, 1), new MaterialStack(Sulfur, 1)), NO_SMELTING | SMELT_INTO_FLUID | MORTAR_GRINDABLE | BURNING | DECOMPOSITION_BY_CENTRIFUGING); public static GemMaterial EnderPearl = new GemMaterial(259, "ender_pearl", 0x6CDCC8, GEM_VERTICAL, 1, of(new MaterialStack(Beryllium, 1), new MaterialStack(Potassium, 4), new MaterialStack(Nitrogen, 5)), GENERATE_PLATE | GENERATE_LENSE | NO_SMASHING | NO_SMELTING); - public static GemMaterial EnderEye = new GemMaterial(260, "ender_eye", 0x66FF66, GEM_VERTICAL, 1, of(new MaterialStack(EnderPearl, 1), new MaterialStack(Blaze, 1)), GENERATE_PLATE | GENERATE_LENSE | NO_SMASHING | NO_SMELTING); - public static RoughSolidMaterial Flint = new RoughSolidMaterial(261, "flint", 0x002040, FLINT, 1, of(new MaterialStack(SiliconDioxide, 1)), NO_SMASHING | MORTAR_GRINDABLE, () -> OrePrefix.gem); + public static GemMaterial EnderEye = new GemMaterial(260, "ender_eye", 0x66FF66, GEM_VERTICAL, 1, of(new MaterialStack(EnderPearl, 1), new MaterialStack(Blaze, 1)), GENERATE_PLATE | GENERATE_LENSE | NO_SMASHING | NO_SMELTING | DECOMPOSITION_BY_CENTRIFUGING); + public static RoughSolidMaterial Flint = new RoughSolidMaterial(261, "flint", 0x002040, FLINT, 1, of(new MaterialStack(SiliconDioxide, 1)), NO_SMASHING | MORTAR_GRINDABLE | DECOMPOSITION_BY_CENTRIFUGING, () -> OrePrefix.gem); public static DustMaterial Diatomite = new DustMaterial(262, "diatomite", 0xE1E1E1, DULL, 1, of(new MaterialStack(Flint, 8), new MaterialStack(BandedIron, 1), new MaterialStack(Sapphire, 1)), 0); - public static DustMaterial Niter = new DustMaterial(263, "niter", 0xFFC8C8, FLINT, 1, of(new MaterialStack(Saltpeter, 1)), NO_SMASHING | NO_SMELTING); + public static DustMaterial Niter = new DustMaterial(263, "niter", 0xFFC8C8, FLINT, 1, of(new MaterialStack(Saltpeter, 1)), NO_SMASHING | NO_SMELTING | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial Tantalite = new DustMaterial(264, "tantalite", 0x915028, METALLIC, 3, of(new MaterialStack(Manganese, 1), new MaterialStack(Tantalum, 2), new MaterialStack(Oxygen, 6)), GENERATE_ORE); public static GemMaterial Apatite = new GemMaterial(265, "apatite", 0xC8C8FF, DIAMOND, 1, of(new MaterialStack(Calcium, 5), new MaterialStack(Phosphate, 3), new MaterialStack(Chlorine, 1)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | CRYSTALLISABLE); public static IngotMaterial SterlingSilver = new IngotMaterial(266, "sterling_silver", 0xFADCE1, SHINY, 2, of(new MaterialStack(Copper, 1), new MaterialStack(Silver, 4)), EXT2_METAL, null, 13.0F, 2.0f, 196, 1700); @@ -480,24 +480,24 @@ public static void register() { public static IngotMaterial TungstenSteel = new IngotMaterial(274, "tungsten_steel", 0x6464A0, METALLIC, 4, of(new MaterialStack(Steel, 1), new MaterialStack(Tungsten, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_DENSE | GENERATE_FRAME| GENERATE_SPRING, null, 8.0F, 4.0f, 2560, 3000); public static IngotMaterial RedAlloy = new IngotMaterial(275, "red_alloy", 0xC80000, DULL, 0, of(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 1)), GENERATE_PLATE | GENERATE_FINE_WIRE); public static IngotMaterial CobaltBrass = new IngotMaterial(276, "cobalt_brass", 0xB4B4A0, METALLIC, 2, of(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1)), EXT2_METAL, null, 8.0F, 2.0f, 256); - public static DustMaterial TricalciumPhosphate = new DustMaterial(277, "tricalcium_phosphate", 0xFFFF00, FLINT, 2, of(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE | EXPLOSIVE); - public static DustMaterial Basalt = new DustMaterial(278, "basalt", 0x1E1414, ROUGH, 1, of(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), NO_SMASHING); + public static DustMaterial TricalciumPhosphate = new DustMaterial(277, "tricalcium_phosphate", 0xFFFF00, FLINT, 2, of(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | FLAMMABLE | EXPLOSIVE | DECOMPOSITION_BY_CENTRIFUGING); + public static DustMaterial Basalt = new DustMaterial(278, "basalt", 0x1E1414, ROUGH, 1, of(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), NO_SMASHING | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial Andesite = new DustMaterial(279, "andesite", 0xBEBEBE, ROUGH, 2, of(), NO_SMASHING); public static DustMaterial Diorite = new DustMaterial(280, "diorite", 0xFFFFFF, ROUGH, 2, of(), NO_SMASHING); public static DustMaterial Granite = new DustMaterial(281, "granite", 0xCFA18C, ROUGH, 2, of(), NO_SMASHING); - public static GemMaterial GarnetRed = new GemMaterial(282, "garnet_red", 0xC85050, RUBY, 2, of(new MaterialStack(Pyrope, 3), new MaterialStack(Almandine, 5), new MaterialStack(Spessartine, 8)), STD_SOLID | GENERATE_LENSE | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT | GENERATE_ORE, null, 7.5F, 3.0f, 156); - public static GemMaterial GarnetYellow = new GemMaterial(283, "garnet_yellow", 0xC8C850, RUBY, 2, of(new MaterialStack(Andradite, 5), new MaterialStack(Grossular, 8), new MaterialStack(Uvarovite, 3)), STD_SOLID | GENERATE_LENSE | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT | GENERATE_ORE, null, 7.5F, 3.0f, 156); - public static DustMaterial Marble = new DustMaterial(284, "marble", 0xC8C8C8, FINE, 1, of(new MaterialStack(Magnesium, 1), new MaterialStack(Calcite, 7)), NO_SMASHING); + public static GemMaterial GarnetRed = new GemMaterial(282, "garnet_red", 0xC85050, RUBY, 2, of(new MaterialStack(Pyrope, 3), new MaterialStack(Almandine, 5), new MaterialStack(Spessartine, 8)), STD_SOLID | GENERATE_LENSE | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT | GENERATE_ORE | DECOMPOSITION_BY_CENTRIFUGING, null, 7.5F, 3.0f, 156); + public static GemMaterial GarnetYellow = new GemMaterial(283, "garnet_yellow", 0xC8C850, RUBY, 2, of(new MaterialStack(Andradite, 5), new MaterialStack(Grossular, 8), new MaterialStack(Uvarovite, 3)), STD_SOLID | GENERATE_LENSE | NO_SMASHING | NO_SMELTING | HIGH_SIFTER_OUTPUT | GENERATE_ORE | DECOMPOSITION_BY_CENTRIFUGING, null, 7.5F, 3.0f, 156); + public static DustMaterial Marble = new DustMaterial(284, "marble", 0xC8C8C8, FINE, 1, of(new MaterialStack(Magnesium, 1), new MaterialStack(Calcite, 7)), NO_SMASHING | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial Sugar = new DustMaterial(285, "sugar", 0xFAFAFA, FINE, 1, of(new MaterialStack(Carbon, 2), new MaterialStack(Water, 5), new MaterialStack(Oxygen, 25)), 0); public static GemMaterial Vinteum = new GemMaterial(286, "vinteum", 0x64C8FF, EMERALD, 3, of(), STD_GEM | NO_SMASHING | NO_SMELTING, 12.0F, 3.0f, 128); - public static DustMaterial Redrock = new DustMaterial(287, "redrock", 0xFF5032, ROUGH, 1, of(new MaterialStack(Calcite, 2), new MaterialStack(Flint, 1), new MaterialStack(Clay, 1)), NO_SMASHING); + public static DustMaterial Redrock = new DustMaterial(287, "redrock", 0xFF5032, ROUGH, 1, of(new MaterialStack(Calcite, 2), new MaterialStack(Flint, 1), new MaterialStack(Clay, 1)), NO_SMASHING | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial PotassiumFeldspar = new DustMaterial(288, "potassium_feldspar", 0x782828, FINE, 1, of(new MaterialStack(Potassium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 8)), 0); public static DustMaterial Biotite = new DustMaterial(289, "biotite", 0x141E14, METALLIC, 1, of(new MaterialStack(Potassium, 1), new MaterialStack(Magnesium, 3), new MaterialStack(Aluminium, 3), new MaterialStack(Fluorine, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 10)), 0); - public static DustMaterial GraniteBlack = new DustMaterial(290, "granite_black", 0x0A0A0A, ROUGH, 3, of(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Biotite, 1)), NO_SMASHING); + public static DustMaterial GraniteBlack = new DustMaterial(290, "granite_black", 0x0A0A0A, ROUGH, 3, of(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Biotite, 1)), NO_SMASHING | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial GraniteRed = new DustMaterial(291, "granite_red", 0xFF0080, ROUGH, 3, of(new MaterialStack(Aluminium, 2), new MaterialStack(PotassiumFeldspar, 1), new MaterialStack(Oxygen, 3)), NO_SMASHING); public static DustMaterial Chrysotile = new DustMaterial(292, "chrysotile", 0x6E8C6E, ROUGH, 2, of(new MaterialStack(Asbestos, 1)), 0); - public static DustMaterial Realgar = new DustMaterial(293, "realgar", 0x8C6464, DULL, 2, of(new MaterialStack(Arsenic, 4), new MaterialStack(Sulfur, 4)), 0); - public static DustMaterial VanadiumMagnetite = new DustMaterial(294, "vanadium_magnetite", 0x23233C, METALLIC, 2, of(new MaterialStack(Magnetite, 1), new MaterialStack(Vanadium, 1)), GENERATE_ORE); + public static DustMaterial Realgar = new DustMaterial(293, "realgar", 0x8C6464, DULL, 2, of(new MaterialStack(Arsenic, 4), new MaterialStack(Sulfur, 4)), DISABLE_DECOMPOSITION); + public static DustMaterial VanadiumMagnetite = new DustMaterial(294, "vanadium_magnetite", 0x23233C, METALLIC, 2, of(new MaterialStack(Magnetite, 1), new MaterialStack(Vanadium, 1)), GENERATE_ORE | DECOMPOSITION_BY_CENTRIFUGING); public static DustMaterial BasalticMineralSand = new DustMaterial(295, "basaltic_mineral_sand", 0x283228, SAND, 1, of(new MaterialStack(Magnetite, 1), new MaterialStack(Basalt, 1)), INDUCTION_SMELTING_LOW_OUTPUT); public static DustMaterial GraniticMineralSand = new DustMaterial(296, "granitic_mineral_sand", 0x283C3C, SAND, 1, of(new MaterialStack(Magnetite, 1), new MaterialStack(GraniteBlack, 1)), INDUCTION_SMELTING_LOW_OUTPUT); public static DustMaterial GarnetSand = new DustMaterial(297, "garnet_sand", 0xC86400, SAND, 1, of(new MaterialStack(GarnetRed, 1), new MaterialStack(GarnetYellow, 1)), 0); @@ -512,7 +512,7 @@ public static void register() { public static DustMaterial Vermiculite = new DustMaterial(306, "vermiculite", 0xC8B40F, METALLIC, 2, of(new MaterialStack(Iron, 3), new MaterialStack(Aluminium, 4), new MaterialStack(Silicon, 4), new MaterialStack(Hydrogen, 2), new MaterialStack(Water, 4), new MaterialStack(Oxygen, 12)), 0); public static DustMaterial Bentonite = new DustMaterial(307, "bentonite", 0xF5D7D2, ROUGH, 2, of(new MaterialStack(Sodium, 1), new MaterialStack(Magnesium, 6), new MaterialStack(Silicon, 12), new MaterialStack(Hydrogen, 4), new MaterialStack(Water, 5), new MaterialStack(Oxygen, 36)), GENERATE_ORE); public static DustMaterial FullersEarth = new DustMaterial(308, "fullers_earth", 0xA0A078, FINE, 2, of(new MaterialStack(Magnesium, 1), new MaterialStack(Silicon, 4), new MaterialStack(Hydrogen, 1), new MaterialStack(Water, 4), new MaterialStack(Oxygen, 11)), 0); - public static DustMaterial Pitchblende = new DustMaterial(309, "pitchblende", 0xC8D200, DULL, 3, of(new MaterialStack(Uraninite, 3), new MaterialStack(Thorium, 1), new MaterialStack(Lead, 1)), GENERATE_ORE); + public static DustMaterial Pitchblende = new DustMaterial(309, "pitchblende", 0xC8D200, DULL, 3, of(new MaterialStack(Uraninite, 3), new MaterialStack(Thorium, 1), new MaterialStack(Lead, 1)), GENERATE_ORE | DECOMPOSITION_BY_CENTRIFUGING); public static GemMaterial Monazite = new GemMaterial(310, "monazite", 0x324632, DIAMOND, 1, of(new MaterialStack(RareEarth, 1), new MaterialStack(Phosphate, 1)), GENERATE_ORE | NO_SMASHING | NO_SMELTING | CRYSTALLISABLE); public static DustMaterial Malachite = new DustMaterial(311, "malachite", 0x055F05, DULL, 2, of(new MaterialStack(Copper, 2), new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 5)), GENERATE_ORE | INDUCTION_SMELTING_LOW_OUTPUT); public static DustMaterial Mirabilite = new DustMaterial(312, "mirabilite", 0xF0FAD2, DULL, 2, of(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 1), new MaterialStack(Water, 10), new MaterialStack(Oxygen, 4)), 0); @@ -582,10 +582,10 @@ public static void register() { for (DustMaterial dustMaterial : new DustMaterial[]{Iron, PigIron, WroughtIron, BrownLimonite}) { dustMaterial.addFlag(BLAST_FURNACE_CALCITE_TRIPLE); } - for (DustMaterial dustMaterial : new DustMaterial[]{Gold, Silver, Osmium, Platinum, Cooperite, Chalcopyrite, Bornite}) { + for (DustMaterial dustMaterial : new DustMaterial[]{Gold, Silver, Osmium, Platinum, Cooperite, Chalcopyrite, Bornite, Tungstate, Lead, Nickel, Magnetite, Iridium, Galena, Copper}) { dustMaterial.washedIn = Mercury; } - for (DustMaterial dustMaterial : new DustMaterial[]{Zinc, Nickel, Copper, Cobalt, Cobaltite, Tetrahedrite, Sphalerite}) { + for (DustMaterial dustMaterial : new DustMaterial[]{Zinc, Cobalt, Cobaltite, Tetrahedrite, Sphalerite, Iron, Malachite, Tin, Garnierite, YellowLimonite, Antimony, Pentlandite}) { dustMaterial.washedIn = SodiumPersulfate; } @@ -703,33 +703,33 @@ public static void register() { 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); + Uraninite.addOreByProducts(Uranium238, Thorium, Uranium235); + Pitchblende.addOreByProducts(Thorium, Uranium238, Lead); + Galena.addOreByProducts(Sulfur, Silver, Lead, Silver); Lapis.addOreByProducts(Lazurite, Sodalite, Pyrite); Pyrite.addOreByProducts(Sulfur, TricalciumPhosphate, Iron); - Copper.addOreByProducts(Cobalt, Gold, Nickel); - Nickel.addOreByProducts(Cobalt, Platinum, Iron); + Copper.addOreByProducts(Cobalt, Gold, Nickel, Gold); + Nickel.addOreByProducts(Cobalt, Platinum, Iron, Platinum); GarnetRed.addOreByProducts(Spessartine, Pyrope, Almandine); GarnetYellow.addOreByProducts(Andradite, Grossular, Uvarovite); - Cooperite.addOreByProducts(Palladium, Nickel, Iridium); + Cooperite.addOreByProducts(Palladium, Nickel, Iridium, Cooperite); 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); + Uranium238.addOreByProducts(Lead, Uranium235, Thorium); Scheelite.addOreByProducts(Manganese, Molybdenum, Calcium); - Tungstate.addOreByProducts(Manganese, Silver, Lithium); + Tungstate.addOreByProducts(Manganese, Silver, Lithium, Silver); 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); + Malachite.addOreByProducts(Copper, BrownLimonite, Calcite, Copper); + YellowLimonite.addOreByProducts(Nickel, BrownLimonite, Cobalt, Nickel); BrownLimonite.addOreByProducts(Malachite, YellowLimonite); Neodymium.addOreByProducts(Monazite, RareEarth); Bastnasite.addOreByProducts(Neodymium, RareEarth); @@ -737,15 +737,15 @@ public static void register() { Zinc.addOreByProducts(Tin, Gallium); Tungsten.addOreByProducts(Manganese, Molybdenum); Diatomite.addOreByProducts(BandedIron, Sapphire); - Iron.addOreByProducts(Nickel, Tin); + Iron.addOreByProducts(Nickel, Tin, Nickel); Lepidolite.addOreByProducts(Lithium, Caesium); - Gold.addOreByProducts(Copper, Nickel); + Gold.addOreByProducts(Copper, Nickel, Gold); Tin.addOreByProducts(Iron, Zinc); - Antimony.addOreByProducts(Zinc, Iron); - Silver.addOreByProducts(Lead, Sulfur); - Lead.addOreByProducts(Silver, Sulfur); - Thorium.addOreByProducts(Uranium, Lead); - Plutonium.addOreByProducts(Uranium, Lead); + Antimony.addOreByProducts(Zinc, Iron, Zinc); + Silver.addOreByProducts(Lead, Sulfur, Silver); + Lead.addOreByProducts(Silver, Sulfur, Silver); + Thorium.addOreByProducts(Uranium238, Lead); + Plutonium239.addOreByProducts(Uranium238, Lead); Electrum.addOreByProducts(Gold, Silver); Bronze.addOreByProducts(Copper, Tin); Brass.addOreByProducts(Copper, Zinc); @@ -759,7 +759,7 @@ public static void register() { Olivine.addOreByProducts(Pyrope, Magnesium, Manganese); Chrome.addOreByProducts(Iron, Magnesium); Chromite.addOreByProducts(Iron, Magnesium); - Tetrahedrite.addOreByProducts(Antimony, Zinc); + Tetrahedrite.addOreByProducts(Antimony, Zinc, Tetrahedrite); GarnetSand.addOreByProducts(GarnetRed, GarnetYellow); Magnetite.addOreByProducts(Iron, Gold); GraniticMineralSand.addOreByProducts(GraniteBlack, Magnetite); @@ -771,7 +771,7 @@ public static void register() { Spodumene.addOreByProducts(Aluminium, Lithium); Ruby.addOreByProducts(Chrome, GarnetRed); TricalciumPhosphate.addOreByProducts(Apatite, Phosphate); - Iridium.addOreByProducts(Platinum, Osmium); + Iridium.addOreByProducts(Platinum, Osmium, Platinum); Pyrope.addOreByProducts(GarnetRed, Magnesium); Almandine.addOreByProducts(GarnetRed, Aluminium); Spessartine.addOreByProducts(GarnetRed, Manganese); @@ -796,12 +796,12 @@ public static void register() { Graphite.addOreByProducts(Carbon); Netherrack.addOreByProducts(Sulfur); Flint.addOreByProducts(Obsidian); - Cobaltite.addOreByProducts(Cobalt); + Cobaltite.addOreByProducts(Cobalt, Cobaltite); Cobalt.addOreByProducts(Cobaltite); Sulfur.addOreByProducts(Sulfur); Saltpeter.addOreByProducts(Saltpeter); Endstone.addOreByProducts(Helium3); - Osmium.addOreByProducts(Iridium); + Osmium.addOreByProducts(Iridium, Osmium); Magnesium.addOreByProducts(Olivine); Aluminium.addOreByProducts(Bauxite); Titanium.addOreByProducts(Almandine); diff --git a/src/main/java/gregtech/api/unification/material/type/DustMaterial.java b/src/main/java/gregtech/api/unification/material/type/DustMaterial.java index 2304da0fcec..262bb92ea05 100644 --- a/src/main/java/gregtech/api/unification/material/type/DustMaterial.java +++ b/src/main/java/gregtech/api/unification/material/type/DustMaterial.java @@ -47,6 +47,7 @@ public static final class MatFlags { /** * Add to material if it is outputting less in an Induction Smelter. + * todo remove */ public static final long INDUCTION_SMELTING_LOW_OUTPUT = createFlag(16); diff --git a/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java b/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java index 28be43d33b5..8a1d4d2202a 100644 --- a/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java +++ b/src/main/java/gregtech/api/unification/material/type/IngotMaterial.java @@ -156,6 +156,10 @@ protected long verifyMaterialBits(long generationBits) { if ((generationBits & GENERATE_FRAME) > 0) { generationBits |= GENERATE_ROD; } + if ((generationBits & GENERATE_DOUBLE_PLATE) > 0) { + generationBits |= GENERATE_PLATE; + } + return super.verifyMaterialBits(generationBits); } diff --git a/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java b/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java index 438c0e2b91a..2ebc1955847 100644 --- a/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java +++ b/src/main/java/gregtech/common/blocks/wood/BlockGregLeaves.java @@ -85,4 +85,12 @@ public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World wo public List onSheared(@Nonnull ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { return Lists.newArrayList(new ItemStack(this, 1, world.getBlockState(pos).getValue(VARIANT).ordinal())); } + + public ItemStack getItem(LogVariant variant) { + return new ItemStack(this, 1, variant.ordinal() * 2); + } + + public ItemStack getItem(LogVariant variant, int amount) { + return new ItemStack(this, amount, variant.ordinal() * 2); + } } diff --git a/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java b/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java index 0f5f8455484..4ba4325fd97 100644 --- a/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java +++ b/src/main/java/gregtech/common/blocks/wood/BlockGregLog.java @@ -50,6 +50,10 @@ public ItemStack getItem(LogVariant variant) { return new ItemStack(this, 1, variant.ordinal() * 2); } + public ItemStack getItem(LogVariant variant, int amount) { + return new ItemStack(this, amount, variant.ordinal() * 2); + } + @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState() diff --git a/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java b/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java index 1afb5a3866a..135983eb674 100644 --- a/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java +++ b/src/main/java/gregtech/common/blocks/wood/BlockGregSapling.java @@ -131,6 +131,14 @@ public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random } } + public ItemStack getItem(LogVariant variant) { + return new ItemStack(this, 1, variant.ordinal() * 2); + } + + public ItemStack getItem(LogVariant variant, int amount) { + return new ItemStack(this, amount, variant.ordinal() * 2); + } + public static class WorldGenBigTreeCustom extends WorldGenBigTree { private final IBlockState logBlock; diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 600c13c5c3b..5d8804eef1e 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -101,17 +101,18 @@ public void registerSubItems() { SHAPE_EXTRUDERS[8] = SHAPE_EXTRUDER_PIPE_SMALL = addItem(359, "shape.extruder.pipe.small"); SHAPE_EXTRUDERS[9] = SHAPE_EXTRUDER_PIPE_MEDIUM = addItem(360, "shape.extruder.pipe.medium"); SHAPE_EXTRUDERS[10] = SHAPE_EXTRUDER_PIPE_LARGE = addItem(361, "shape.extruder.pipe.large"); - SHAPE_EXTRUDERS[11] = SHAPE_EXTRUDER_BLOCK = addItem(363, "shape.extruder.block"); - SHAPE_EXTRUDERS[12] = SHAPE_EXTRUDER_SWORD = addItem(364, "shape.extruder.sword"); - SHAPE_EXTRUDERS[13] = SHAPE_EXTRUDER_PICKAXE = addItem(365, "shape.extruder.pickaxe"); - SHAPE_EXTRUDERS[14] = SHAPE_EXTRUDER_SHOVEL = addItem(366, "shape.extruder.shovel"); - SHAPE_EXTRUDERS[15] = SHAPE_EXTRUDER_AXE = addItem(367, "shape.extruder.axe"); - SHAPE_EXTRUDERS[16] = SHAPE_EXTRUDER_HOE = addItem(368, "shape.extruder.hoe"); - SHAPE_EXTRUDERS[17] = SHAPE_EXTRUDER_HAMMER = addItem(369, "shape.extruder.hammer"); - SHAPE_EXTRUDERS[18] = SHAPE_EXTRUDER_FILE = addItem(370, "shape.extruder.file"); - SHAPE_EXTRUDERS[19] = SHAPE_EXTRUDER_SAW = addItem(371, "shape.extruder.saw"); - SHAPE_EXTRUDERS[20] = SHAPE_EXTRUDER_GEAR = addItem(372, "shape.extruder.gear"); - SHAPE_EXTRUDERS[21] = SHAPE_EXTRUDER_BOTTLE = addItem(373, "shape.extruder.bottle"); + SHAPE_EXTRUDERS[11] = SHAPE_EXTRUDER_PIPE_HUGE = addItem(362, "shape.extruder.pipe.huge"); + SHAPE_EXTRUDERS[12] = SHAPE_EXTRUDER_BLOCK = addItem(363, "shape.extruder.block"); + SHAPE_EXTRUDERS[13] = SHAPE_EXTRUDER_SWORD = addItem(364, "shape.extruder.sword"); + SHAPE_EXTRUDERS[14] = SHAPE_EXTRUDER_PICKAXE = addItem(365, "shape.extruder.pickaxe"); + SHAPE_EXTRUDERS[15] = SHAPE_EXTRUDER_SHOVEL = addItem(366, "shape.extruder.shovel"); + SHAPE_EXTRUDERS[16] = SHAPE_EXTRUDER_AXE = addItem(367, "shape.extruder.axe"); + SHAPE_EXTRUDERS[17] = SHAPE_EXTRUDER_HOE = addItem(368, "shape.extruder.hoe"); + SHAPE_EXTRUDERS[18] = SHAPE_EXTRUDER_HAMMER = addItem(369, "shape.extruder.hammer"); + SHAPE_EXTRUDERS[19] = SHAPE_EXTRUDER_FILE = addItem(370, "shape.extruder.file"); + SHAPE_EXTRUDERS[20] = SHAPE_EXTRUDER_SAW = addItem(371, "shape.extruder.saw"); + SHAPE_EXTRUDERS[21] = SHAPE_EXTRUDER_GEAR = addItem(372, "shape.extruder.gear"); + SHAPE_EXTRUDERS[22] = SHAPE_EXTRUDER_BOTTLE = addItem(373, "shape.extruder.bottle"); SPRAY_EMPTY = addItem(402, "spray.empty") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Tin, OrePrefix.plate.materialAmount * 2L), new MaterialStack(Materials.Redstone, OrePrefix.dust.materialAmount))); diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 2c21f3f54e2..ee164b75df3 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -64,7 +64,7 @@ private MetaItems() { public static MetaItem.MetaValueItem SHAPE_MOLD_GEAR_SMALL; public static MetaItem.MetaValueItem SHAPE_MOLD_ROTOR; - public static MetaItem.MetaValueItem[] SHAPE_EXTRUDERS = new MetaValueItem[22]; + public static MetaItem.MetaValueItem[] SHAPE_EXTRUDERS = new MetaValueItem[23]; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PLATE; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_ROD; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_BOLT; @@ -76,6 +76,7 @@ private MetaItems() { public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PIPE_SMALL; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PIPE_MEDIUM; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PIPE_LARGE; + public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PIPE_HUGE; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_BLOCK; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_SWORD; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PICKAXE; diff --git a/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java index 05f0bf3c3a1..c835a3ab1d3 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java +++ b/src/main/java/gregtech/loaders/oreprocessing/MaterialRecipeHandler.java @@ -197,13 +197,15 @@ public static void processIngot(OrePrefix ingotPrefix, IngotMaterial material) { OreDictUnifier.get(OrePrefix.stick, material, 1), "f ", " X", 'X', new UnificationEntry(ingotPrefix, material)); - RecipeMaps.EXTRUDER_RECIPES.recipeBuilder() - .input(ingotPrefix, material) - .notConsumable(MetaItems.SHAPE_EXTRUDER_ROD) - .outputs(OreDictUnifier.get(OrePrefix.stick, material, 2)) - .duration((int) material.getAverageMass() * 2) - .EUt(6 * getVoltageMultiplier(material)) - .buildAndRegister(); + if (!material.hasFlag(NO_WORKING)) { + RecipeMaps.EXTRUDER_RECIPES.recipeBuilder() + .input(ingotPrefix, material) + .notConsumable(MetaItems.SHAPE_EXTRUDER_ROD) + .outputs(OreDictUnifier.get(OrePrefix.stick, material, 2)) + .duration((int) material.getAverageMass() * 2) + .EUt(6 * getVoltageMultiplier(material)) + .buildAndRegister(); + } } if (material.shouldGenerateFluid()) { @@ -225,20 +227,36 @@ public static void processIngot(OrePrefix ingotPrefix, IngotMaterial material) { .buildAndRegister(); } - if (material.hasFlag(MatFlags.GENERATE_PLATE) && !material.hasFlag(NO_SMASHING)) { - ItemStack plateStack = OreDictUnifier.get(OrePrefix.plate, material); - RecipeMaps.BENDER_RECIPES.recipeBuilder() - .circuitMeta(0) - .input(ingotPrefix, material) - .outputs(plateStack) - .EUt(24).duration((int) (material.getAverageMass())) - .buildAndRegister(); + if (material.hasFlag(MatFlags.GENERATE_PLATE) && !material.hasFlag(NO_WORKING)) { - RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder() - .input(ingotPrefix, material, 3) - .outputs(GTUtility.copyAmount(2, plateStack)) - .EUt(16).duration((int) (material.getAverageMass() * 2)) - .buildAndRegister(); + if (!material.hasFlag(NO_SMASHING)) { + ItemStack plateStack = OreDictUnifier.get(OrePrefix.plate, material); + RecipeMaps.BENDER_RECIPES.recipeBuilder() + .circuitMeta(0) + .input(ingotPrefix, material) + .outputs(plateStack) + .EUt(24).duration((int) (material.getAverageMass())) + .buildAndRegister(); + + RecipeMaps.FORGE_HAMMER_RECIPES.recipeBuilder() + .input(ingotPrefix, material, 3) + .outputs(GTUtility.copyAmount(2, plateStack)) + .EUt(16).duration((int) (material.getAverageMass() * 2)) + .buildAndRegister(); + + ModHandler.addShapedRecipe(String.format("plate_%s", material.toString()), + plateStack, "h", "I", "I", 'I', new UnificationEntry(ingotPrefix, material)); + + if (material.hasFlag(IngotMaterial.MatFlags.GENERATE_DENSE)) { + ItemStack denseStack = OreDictUnifier.get(OrePrefix.plateDense, material); + RecipeMaps.BENDER_RECIPES.recipeBuilder() + .input(ingotPrefix, material, 9) + .outputs(denseStack) + .circuitMeta(5) + .EUt(96).duration((int) (material.getAverageMass() * 9)) + .buildAndRegister(); + } + } int voltageMultiplier = getVoltageMultiplier(material); RecipeMaps.EXTRUDER_RECIPES.recipeBuilder() @@ -248,27 +266,6 @@ public static void processIngot(OrePrefix ingotPrefix, IngotMaterial material) { .duration((int) material.getAverageMass()) .EUt(8 * voltageMultiplier) .buildAndRegister(); - - RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder() - .input(ingotPrefix, material, 2) - .notConsumable(MetaItems.SHAPE_MOLD_PLATE) - .outputs(OreDictUnifier.get(OrePrefix.plate, material)) - .duration((int) material.getAverageMass() * 2) - .EUt(2 * voltageMultiplier) - .buildAndRegister(); - - ModHandler.addShapedRecipe(String.format("plate_%s", material.toString()), - plateStack, "h", "I", "I", 'I', new UnificationEntry(ingotPrefix, material)); - - if (material.hasFlag(IngotMaterial.MatFlags.GENERATE_DENSE)) { - ItemStack denseStack = OreDictUnifier.get(OrePrefix.plateDense, material); - RecipeMaps.BENDER_RECIPES.recipeBuilder() - .input(ingotPrefix, material, 9) - .outputs(denseStack) - .circuitMeta(5) - .EUt(96).duration((int) (material.getAverageMass() * 9)) - .buildAndRegister(); - } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java index 55a7aece822..730f96546ca 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java +++ b/src/main/java/gregtech/loaders/oreprocessing/PipeRecipeHandler.java @@ -3,6 +3,7 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.Materials; import gregtech.api.unification.material.type.IngotMaterial; import gregtech.api.unification.material.type.Material; import gregtech.api.unification.ore.OrePrefix; @@ -18,30 +19,36 @@ public static void register() { OrePrefix.pipeSmall.addProcessingHandler(IngotMaterial.class, PipeRecipeHandler::processPipeSmall); OrePrefix.pipeMedium.addProcessingHandler(IngotMaterial.class, PipeRecipeHandler::processPipeNormal); OrePrefix.pipeLarge.addProcessingHandler(IngotMaterial.class, PipeRecipeHandler::processPipeLarge); + OrePrefix.pipeHuge.addProcessingHandler(IngotMaterial.class, PipeRecipeHandler::processPipeHuge); } private static void processPipeTiny(OrePrefix pipePrefix, IngotMaterial material) { + ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material); RecipeMaps.EXTRUDER_RECIPES.recipeBuilder() - .input(OrePrefix.ingot, material, 3) + .input(OrePrefix.ingot, material, 1) .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_TINY) - .outputs(GTUtility.copyAmount(4, OreDictUnifier.get(pipePrefix, material))) - .duration((int) (material.getAverageMass() * 4)) + .outputs(GTUtility.copyAmount(2, pipeStack)) + .duration((int) (material.getAverageMass())) .EUt(6 * getVoltageMultiplier(material)) .buildAndRegister(); + + ModHandler.addShapedRecipe(String.format("tiny_%s_pipe", material.toString()), + GTUtility.copyAmount(8, pipeStack), "XXX", "h w", "XXX", + 'X', new UnificationEntry(OrePrefix.plate, material)); } private static void processPipeSmall(OrePrefix pipePrefix, IngotMaterial material) { ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material); RecipeMaps.EXTRUDER_RECIPES.recipeBuilder() - .input(OrePrefix.ingot, material, 3) + .input(OrePrefix.ingot, material, 1) .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_SMALL) - .outputs(GTUtility.copyAmount(2, pipeStack)) - .duration((int) (material.getAverageMass() * 2)) + .outputs(pipeStack) + .duration((int) (material.getAverageMass())) .EUt(6 * getVoltageMultiplier(material)) .buildAndRegister(); ModHandler.addShapedRecipe(String.format("small_%s_pipe", material.toString()), - GTUtility.copyAmount(4, pipeStack), "XXX", "h f", "XXX", + GTUtility.copyAmount(6, pipeStack), "XwX", "X X", "XhX", 'X', new UnificationEntry(OrePrefix.plate, material)); } @@ -51,23 +58,43 @@ private static void processPipeNormal(OrePrefix pipePrefix, IngotMaterial materi .input(OrePrefix.ingot, material, 3) .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_MEDIUM) .outputs(pipeStack) - .duration((int) material.getAverageMass()) + .duration((int) material.getAverageMass() * 3) .EUt(6 * getVoltageMultiplier(material)) .buildAndRegister(); ModHandler.addShapedRecipe(String.format("medium_%s_pipe", material.toString()), - GTUtility.copyAmount(2, pipeStack), "XXX", "f h", "XXX", + GTUtility.copyAmount(2, pipeStack), "XXX", "w h", "XXX", 'X', new UnificationEntry(OrePrefix.plate, material)); } private static void processPipeLarge(OrePrefix pipePrefix, IngotMaterial material) { + ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material); RecipeMaps.EXTRUDER_RECIPES.recipeBuilder() .input(OrePrefix.ingot, material, 6) .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_LARGE) - .outputs(OreDictUnifier.get(pipePrefix, material)) - .duration((int) material.getAverageMass()) + .outputs(pipeStack) + .duration((int) material.getAverageMass() * 6) .EUt(6 * getVoltageMultiplier(material)) .buildAndRegister(); + + ModHandler.addShapedRecipe(String.format("large_%s_pipe", material.toString()), + pipeStack, "XhX", "X X", "XwX", + 'X', new UnificationEntry(OrePrefix.plate, material)); + } + + private static void processPipeHuge(OrePrefix pipePrefix, IngotMaterial material) { + ItemStack pipeStack = OreDictUnifier.get(pipePrefix, material); + RecipeMaps.EXTRUDER_RECIPES.recipeBuilder() + .input(OrePrefix.ingot, material, 12) + .notConsumable(MetaItems.SHAPE_EXTRUDER_PIPE_HUGE) + .outputs(pipeStack) + .duration((int) material.getAverageMass() * 24) + .EUt(6 * getVoltageMultiplier(material)) + .buildAndRegister(); + + ModHandler.addShapedRecipe(String.format("huge_%s_pipe", material.toString()), + pipeStack, "XhX", "X X", "XwX", + 'X', new UnificationEntry(OrePrefix.plateDouble, material)); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java index e6c5ce4c29e..5b48e513d39 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java +++ b/src/main/java/gregtech/loaders/oreprocessing/PolarizingRecipeHandler.java @@ -1,9 +1,11 @@ package gregtech.loaders.oreprocessing; +import gregtech.api.GTValues; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.type.IngotMaterial; +import gregtech.api.unification.material.type.Material; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.UnificationEntry; import net.minecraft.item.ItemStack; @@ -26,7 +28,8 @@ public static void processPolarizing(OrePrefix polarizingPrefix, IngotMaterial m RecipeMaps.POLARIZER_RECIPES.recipeBuilder() //polarizing .input(polarizingPrefix, material) .outputs(magneticStack) - .duration(16).EUt(16) + .duration((int) ((int) material.getAverageMass() * polarizingPrefix.materialAmount / GTValues.M)) + .EUt(8 * getVoltageMultiplier(material)) .buildAndRegister(); ModHandler.addSmeltingRecipe(new UnificationEntry(polarizingPrefix, material.magneticMaterial), @@ -34,4 +37,9 @@ public static void processPolarizing(OrePrefix polarizingPrefix, IngotMaterial m } } + private static int getVoltageMultiplier(Material material) { + return material instanceof IngotMaterial && ((IngotMaterial) material) + .blastFurnaceTemperature >= 1200 ? 32 : 2; + } + } diff --git a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java index 4a508834337..aa3db20a3f6 100644 --- a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java +++ b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java @@ -27,13 +27,13 @@ public static void init() { RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Beryllium.getFluid(16), Materials.Tungsten.getFluid(16)).fluidOutputs(Materials.Platinum.getFluid(16)).duration(32).EUt(32768).EUToStart(150000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Neodymium.getFluid(16), Materials.Hydrogen.getFluid(48)).fluidOutputs(Materials.Europium.getFluid(16)).duration(64).EUt(24576).EUToStart(150000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Lutetium.getFluid(16), Materials.Chrome.getFluid(16)).fluidOutputs(Materials.Americium.getFluid(16)).duration(96).EUt(49152).EUToStart(200000000).buildAndRegister(); - RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Plutonium.getFluid(16), Materials.Thorium.getFluid(16)).fluidOutputs(Materials.Naquadah.getFluid(16)).duration(64).EUt(32768).EUToStart(300000000).buildAndRegister(); + RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Plutonium239.getFluid(16), Materials.Thorium.getFluid(16)).fluidOutputs(Materials.Naquadah.getFluid(16)).duration(64).EUt(32768).EUToStart(300000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Americium.getFluid(16), Materials.Naquadria.getFluid(16)).fluidOutputs(Materials.Neutronium.getFluid(2)).duration(200).EUt(98304).EUToStart(600000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Tungsten.getFluid(16), Materials.Helium.getFluid(16)).fluidOutputs(Materials.Osmium.getFluid(16)).duration(64).EUt(24578).EUToStart(150000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Manganese.getFluid(16), Materials.Hydrogen.getFluid(16)).fluidOutputs(Materials.Iron.getFluid(16)).duration(64).EUt(8192).EUToStart(120000000).buildAndRegister(); - RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getFluid(16)).fluidOutputs(Materials.Uranium.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister(); - RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Gold.getFluid(16), Materials.Aluminium.getFluid(16)).fluidOutputs(Materials.Uranium.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister(); - RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Uranium.getFluid(16), Materials.Helium.getFluid(16)).fluidOutputs(Materials.Plutonium.getFluid(16)).duration(128).EUt(49152).EUToStart(480000000).buildAndRegister(); + RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getFluid(16)).fluidOutputs(Materials.Uranium238.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister(); + RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Gold.getFluid(16), Materials.Aluminium.getFluid(16)).fluidOutputs(Materials.Uranium238.getFluid(16)).duration(64).EUt(49152).EUToStart(240000000).buildAndRegister(); + RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Uranium238.getFluid(16), Materials.Helium.getFluid(16)).fluidOutputs(Materials.Plutonium239.getFluid(16)).duration(128).EUt(49152).EUToStart(480000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Vanadium.getFluid(16), Materials.Hydrogen.getFluid(125)).fluidOutputs(Materials.Chrome.getFluid(16)).duration(64).EUt(24576).EUToStart(140000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Gallium.getFluid(16), Materials.Radon.getFluid(125)).fluidOutputs(Materials.Duranium.getFluid(16)).duration(64).EUt(16384).EUToStart(140000000).buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder().fluidInputs(Materials.Titanium.getFluid(48), Materials.Duranium.getFluid(32)).fluidOutputs(Materials.Tritanium.getFluid(16)).duration(64).EUt(32768).EUToStart(200000000).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java index 581c1b2ca47..a87a8b2db49 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java @@ -125,9 +125,9 @@ private static void loadCraftingRecipes() { ModHandler.addShapedRecipe("torch_phosphor", new ItemStack(Blocks.TORCH, 6), "C", "S", 'C', new UnificationEntry(OrePrefix.dust, Materials.Phosphorus), 'S', new UnificationEntry(OrePrefix.stick, Materials.Wood)); ModHandler.addShapedRecipe("piston_bronze", new ItemStack(Blocks.PISTON, 1), "WWW", "CBC", "CRC", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood), 'C', OrePrefix.stoneCobble, 'R', new UnificationEntry(OrePrefix.dust, Materials.Redstone), 'B', new UnificationEntry(OrePrefix.ingot, Materials.Bronze)); - ModHandler.addShapedRecipe("piston_aluminium", new ItemStack(Blocks.PISTON, 1), "WWW", "CBC", "CRC", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood), 'C', OrePrefix.stoneCobble, 'R', new UnificationEntry(OrePrefix.dust, Materials.Redstone), 'B', new UnificationEntry(OrePrefix.ingot, Materials.Aluminium)); - ModHandler.addShapedRecipe("piston_steel", new ItemStack(Blocks.PISTON, 1), "WWW", "CBC", "CRC", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood), 'C', OrePrefix.stoneCobble, 'R', new UnificationEntry(OrePrefix.dust, Materials.Redstone), 'B', new UnificationEntry(OrePrefix.ingot, Materials.Steel)); - ModHandler.addShapedRecipe("piston_titanium", new ItemStack(Blocks.PISTON, 1), "WWW", "CBC", "CRC", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood), 'C', OrePrefix.stoneCobble, 'R', new UnificationEntry(OrePrefix.dust, Materials.Redstone), 'B', new UnificationEntry(OrePrefix.ingot, Materials.Titanium)); + ModHandler.addShapedRecipe("piston_aluminium", new ItemStack(Blocks.PISTON, 4), "WWW", "CBC", "CRC", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood), 'C', OrePrefix.stoneCobble, 'R', new UnificationEntry(OrePrefix.dust, Materials.Redstone), 'B', new UnificationEntry(OrePrefix.ingot, Materials.Aluminium)); + ModHandler.addShapedRecipe("piston_steel", new ItemStack(Blocks.PISTON, 2), "WWW", "CBC", "CRC", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood), 'C', OrePrefix.stoneCobble, 'R', new UnificationEntry(OrePrefix.dust, Materials.Redstone), 'B', new UnificationEntry(OrePrefix.ingot, Materials.Steel)); + ModHandler.addShapedRecipe("piston_titanium", new ItemStack(Blocks.PISTON, 8), "WWW", "CBC", "CRC", 'W', new UnificationEntry(OrePrefix.plank, Materials.Wood), 'C', OrePrefix.stoneCobble, 'R', new UnificationEntry(OrePrefix.dust, Materials.Redstone), 'B', new UnificationEntry(OrePrefix.ingot, Materials.Titanium)); ModHandler.addShapelessRecipe("dynamite", MetaItems.DYNAMITE.getStackForm(), Items.STRING, Items.PAPER, Items.GUNPOWDER); GTLog.logger.info("Modifying vanilla recipes according to config. DON'T BE SCARED OF FML's WARNING ABOUT DANGEROUS ALTERNATIVE PREFIX."); @@ -242,6 +242,7 @@ private static void loadCraftingRecipes() { ModHandler.addShapedRecipe("solar_panel/solar_panel_ulv", MetaItems.COVER_SOLAR_PANEL_ULV.getStackForm(), "WGW", "CAC", "P P", 'W', MetaItems.GLOWSTONE_WAFER.getStackForm(), 'G', "paneGlass", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Advanced), 'P', OreDictUnifier.get(OrePrefix.plate, GalliumArsenide), 'A', OreDictUnifier.get(OrePrefix.wireGtQuadruple, Graphene)); ModHandler.addShapedRecipe("solar_panel/solar_panel_lv", MetaItems.COVER_SOLAR_PANEL_LV.getStackForm(), "WGW", "CAC", "P P", 'W', MetaItems.NAQUADAH_WAFER.getStackForm(), 'G', MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS), 'C', new UnificationEntry(OrePrefix.circuit, Tier.Master), 'P', OreDictUnifier.get(OrePrefix.plate, IndiumGalliumPhosphide), 'A', OreDictUnifier.get(OrePrefix.wireGtHex, Graphene)); + ModHandler.addShapedRecipe("plate_rubber", OreDictUnifier.get(OrePrefix.plate, Materials.Rubber), " h ", " I ", " I ", 'I', OreDictUnifier.get(OrePrefix.ingot, Materials.Rubber)); /////////////////////////////////////////////////// // Shapes and Molds // diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index a67486ec2bd..f19985fce04 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -54,6 +54,7 @@ import static gregtech.api.GTValues.L; import static gregtech.api.GTValues.M; +import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.ore.OrePrefix.*; import static gregtech.api.util.DyeUtil.getOrdictColorName; import static gregtech.common.items.MetaItems.*; @@ -170,15 +171,15 @@ private static void registerBendingCompressingRecipes() { .duration(200).EUt(30) .buildAndRegister(); - RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().duration(400).EUt(2) - .input(OrePrefix.dust, Materials.NetherQuartz) - .output(OrePrefix.plate, Materials.NetherQuartz) - .buildAndRegister(); + RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder() + .input(OrePrefix.dust, Materials.NetherQuartz) + .output(OrePrefix.plate, Materials.NetherQuartz) + .duration(400).EUt(2).buildAndRegister(); - RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().duration(400).EUt(2) - .input(OrePrefix.dust, Materials.CertusQuartz) - .output(OrePrefix.plate, Materials.CertusQuartz) - .buildAndRegister(); + RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder() + .input(OrePrefix.dust, Materials.CertusQuartz) + .output(OrePrefix.plate, Materials.CertusQuartz) + .duration(400).EUt(2).buildAndRegister(); } private static void registerPrimitiveBlastFurnaceRecipes() { @@ -249,7 +250,7 @@ private static void registerCircuitRecipes() { RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(1200).EUt(1920).inputs(MetaItems.POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm()).input(OrePrefix.dust, Materials.IndiumGalliumPhosphide, 2).fluidInputs(Materials.RedAlloy.getFluid(288)).outputs(MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT_WAFER.getStackForm()).buildAndRegister(); RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(480).inputs(MetaItems.CENTRAL_PROCESSING_UNIT_WAFER.getStackForm(), MetaItems.CARBON_FIBERS.getStackForm(16)).fluidInputs(Materials.Glowstone.getFluid(576)).outputs(MetaItems.NANO_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm()).buildAndRegister(); RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(400).EUt(1920).inputs(MetaItems.NANO_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm(), MetaItems.QUANTUM_EYE.getStackForm(2)).fluidInputs(Materials.GalliumArsenide.getFluid(288)).outputs(MetaItems.QBIT_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm()).buildAndRegister(); - RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(1920).inputs(MetaItems.NANO_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm()).input(OrePrefix.cableGtSingle, Tier.Superconductor, 8).outputs(MetaItems.QBIT_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm()).buildAndRegister(); + RecipeMaps.CHEMICAL_RECIPES.recipeBuilder().duration(600).EUt(1920).inputs(MetaItems.NANO_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm()).input(OrePrefix.dust, Materials.IndiumGalliumPhosphide).fluidInputs(Materials.Radon.getFluid(50)).outputs(MetaItems.QBIT_CENTRAL_PROCESSING_UNIT_WAFER.getStackForm()).buildAndRegister(); //Wafer cutting recipes RecipeMaps.CUTTER_RECIPES.recipeBuilder().duration(200).EUt(8).inputs(MetaItems.SILICON_BOULE.getStackForm()).outputs(MetaItems.SILICON_WAFER.getStackForm(16)).buildAndRegister(); @@ -452,6 +453,26 @@ private static void registerMixingCrystallizationRecipes() { .outputs(MetaItems.ENERGY_CRYSTAL.getStackForm()) .duration(1500).EUt(120) .buildAndRegister(); + + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder() + .input(OrePrefix.dust, Materials.SiliconDioxide) + .fluidInputs(ModHandler.getDistilledWater(200)) + .chancedOutput(OreDictUnifier.get(OrePrefix.gem, Materials.Quartzite), 1000, 1000) + .duration(1500).EUt(24).buildAndRegister(); + + RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder() + .input(OrePrefix.dust, Materials.NetherStar) + .fluidInputs(Materials.UUMatter.getFluid(576)) + .chancedOutput(new ItemStack(Items.NETHER_STAR), 3333, 3333) + .duration(72000).EUt(480).buildAndRegister(); + + RecipeMaps.MIXER_RECIPES.recipeBuilder() + .input(OrePrefix.crushedPurified, Materials.Sphalerite) + .input(OrePrefix.crushedPurified, Materials.Galena) + .fluidInputs(Materials.SulfuricAcid.getFluid(4000)) + .fluidOutputs(Materials.IndiumConcentrate.getFluid(1000)) + .duration(60).EUt(150).buildAndRegister(); + } private static void registerOrganicRecyclingRecipes() { @@ -570,6 +591,9 @@ private static void registerAlloyRecipes() { RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(400).EUt(4).input(OrePrefix.dust, Materials.Glass, 3).inputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS, 4)).buildAndRegister(); RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(400).EUt(4).inputs(new ItemStack(Blocks.GLASS)).inputs(MetaItems.ADVANCED_ALLOY_PLATE.getStackForm()).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS, 4)).buildAndRegister(); + + RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(10).EUt(8).input(OrePrefix.ingot, Materials.Rubber, 2).notConsumable(MetaItems.SHAPE_MOLD_PLATE).output(OrePrefix.plate, Materials.Rubber).buildAndRegister(); + RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(100).EUt(1).input(OrePrefix.dust, Materials.Sulfur).input(OrePrefix.dust, Materials.RawRubber, 3).output(OrePrefix.ingot, Materials.Rubber).buildAndRegister(); } private static void registerAssemblerRecipes() { @@ -585,7 +609,7 @@ private static void registerAssemblerRecipes() { for (IngotMaterial cableMaterial : new IngotMaterial[]{Materials.YttriumBariumCuprate, Materials.NiobiumTitanium, Materials.VanadiumGallium, Materials.Naquadah}) { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.wireGtSingle, cableMaterial, 3) - .input(OrePrefix.plate, Materials.TungstenSteel, 3) + .input(OrePrefix.pipeTiny, Materials.TungstenSteel, 2) .inputs(MetaItems.ELECTRIC_PUMP_LV.getStackForm(2)) .fluidInputs(Materials.Nitrogen.getFluid(2000)) .outputs(OreDictUnifier.get(OrePrefix.wireGtSingle, Tier.Superconductor, 3)) @@ -726,7 +750,6 @@ private static void registerAssemblerRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(2).inputs(new ItemStack(Blocks.TRAPPED_CHEST, 1, OreDictionary.WILDCARD_VALUE)).input(OrePrefix.plate, Materials.Iron, 5).outputs(new ItemStack(Blocks.HOPPER)).duration(800).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(2).inputs(new ItemStack(Blocks.CHEST, 1, OreDictionary.WILDCARD_VALUE)).input(OrePrefix.plate, Materials.WroughtIron, 5).outputs(new ItemStack(Blocks.HOPPER)).duration(800).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(2).inputs(new ItemStack(Blocks.TRAPPED_CHEST, 1, OreDictionary.WILDCARD_VALUE)).input(OrePrefix.plate, Materials.WroughtIron, 5).outputs(new ItemStack(Blocks.HOPPER)).duration(800).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(2).inputs(new ItemStack(Items.BLAZE_POWDER)).input(OrePrefix.gem, Materials.EnderPearl, 1).outputs(new ItemStack(Items.ENDER_EYE, 1, 0)).duration(400).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(2).inputs(new ItemStack(Items.BLAZE_ROD)).input(OrePrefix.gem, Materials.EnderPearl, 6).outputs(new ItemStack(Items.ENDER_EYE, 6, 0)).duration(2500).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(2).input(OrePrefix.gear, Materials.CobaltBrass, 1).input(OrePrefix.dust, Materials.Diamond, 1).outputs(MetaItems.COMPONENT_SAW_BLADE_DIAMOND.getStackForm(1)).duration(1600).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(1).input(OrePrefix.dust, Materials.Redstone, 4).input(OrePrefix.dust, Materials.Glowstone, 4).outputs(new ItemStack(Blocks.REDSTONE_LAMP, 1)).duration(400).buildAndRegister(); @@ -775,7 +798,27 @@ private static void registerDecompositionRecipes() { RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() .inputs(RUBBER_DROP.getStackForm()) .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.RawRubber, 4)) - .duration(200).EUt(5) + .duration(300).EUt(2) + .buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().duration(300).EUt(2) + .inputs(MetaBlocks.LEAVES.getItem(LogVariant.RUBBER_WOOD, 16)) + .output(dust, Materials.RawRubber) + .buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().duration(300).EUt(2) + .inputs(MetaBlocks.LOG.getItem(LogVariant.RUBBER_WOOD)) + .output(dust, Materials.RawRubber) + .buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().duration(300).EUt(2) + .inputs(MetaBlocks.SAPLING.getItem(LogVariant.RUBBER_WOOD)) + .output(dust, Materials.RawRubber) + .buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().duration(150).EUt(2) + .inputs(new ItemStack(Items.SLIME_BALL)) + .output(dust, Materials.RawRubber, 2) .buildAndRegister(); RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(400).EUt(5) @@ -817,6 +860,7 @@ private static void registerDecompositionRecipes() { .buildAndRegister(); //electromagnetic separation recipes + //todo add to ore byproducts page RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.BrownLimonite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.BrownLimonite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 600).buildAndRegister(); RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.YellowLimonite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.YellowLimonite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 600).buildAndRegister(); RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Nickel).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Nickel)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Iron), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Iron), 2000, 600).buildAndRegister(); @@ -830,14 +874,19 @@ private static void registerDecompositionRecipes() { RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Bastnasite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Bastnasite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Neodymium), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Neodymium), 2000, 600).buildAndRegister(); RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.VanadiumMagnetite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.VanadiumMagnetite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Gold), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Gold), 2000, 600).buildAndRegister(); RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Magnetite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Magnetite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Gold), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.nugget, Materials.Gold), 2000, 600).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Naquadah).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Naquadah)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.NaquadahEnriched), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Trinium), 2000, 600).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Iridium).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Iridium)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Osmium), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Trinium), 2000, 600).buildAndRegister(); + RecipeMaps.ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder().duration(400).EUt(24).input(OrePrefix.dustPure, Materials.Wulfenite).outputs(OreDictUnifier.get(OrePrefix.dust, Materials.Wulfenite)).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Trinium), 4000, 900).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Trinium), 2000, 600).buildAndRegister(); + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(240).EUt(30) .input(OrePrefix.dust, Materials.Ash) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Quicklime, 2), 9900, 0) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Potash), 6400, 0) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Magnesia), 6000, 0) - .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.PhosphorusPentoxide), 500, 0) - .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.SodaAsh), 5000, 0) + .chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.PhosphorusPentoxide), 500, 0) + .chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.SodaAsh), 5000, 0) + .chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.BandedIron), 2500, 0) .buildAndRegister(); @@ -853,8 +902,25 @@ private static void registerDecompositionRecipes() { OreDictUnifier.get(OrePrefix.dustSmall, Materials.Gold, 2)) .buildAndRegister(); - RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(800).EUt(320).input(OrePrefix.dust, Materials.Uranium, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium, 1), 200, 80).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium235, 1), 2000, 350).buildAndRegister(); - RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(1600).EUt(320).input(OrePrefix.dust, Materials.Plutonium, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium, 1), 3000, 450).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium241, 1), 2000, 300).buildAndRegister(); + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(424).EUt(10) + .input(OrePrefix.dust, Materials.Realgar, 2) + .output(OrePrefix.dust, Materials.Arsenic) + .output(OrePrefix.dust, Materials.Sulfur) + .buildAndRegister(); + + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(36).EUt(30) + .input(OrePrefix.dust, Materials.Coal) + .output(OrePrefix.dust, Materials.Carbon, 2) + .buildAndRegister(); + + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(140).EUt(30) + .input(OrePrefix.dust, Materials.PhosphorusPentoxide, 7) + .output(OrePrefix.dust, Materials.Phosphorus, 2) + .fluidOutputs(Materials.Oxygen.getFluid(5000)) + .buildAndRegister(); + + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(800).EUt(320).input(OrePrefix.dust, Materials.Uranium238, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium239, 1), 200, 80).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium235, 1), 2000, 350).buildAndRegister(); + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(1600).EUt(320).input(OrePrefix.dust, Materials.Plutonium239, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Uranium238, 1), 3000, 450).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Plutonium241, 1), 2000, 300).buildAndRegister(); RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(3200).EUt(320).input(OrePrefix.dust, Materials.Naquadah, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Naquadria, 1), 1000, 300).chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.NaquadahEnriched, 1), 5000, 750).buildAndRegister(); RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(6400).EUt(640).input(OrePrefix.dust, Materials.NaquadahEnriched, 1).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Naquadah, 1), 3000, 400).chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Naquadria, 1), 2000, 450).buildAndRegister(); @@ -863,7 +929,7 @@ private static void registerDecompositionRecipes() { .chancedOutput(new ItemStack(Blocks.SAND), 9000, 300) .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Tungstate, 1), 1250, 450) .chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Platinum, 1), 625, 150) - .fluidOutputs(Materials.Helium.getFluid(140)) + .fluidOutputs(Materials.Helium.getFluid(120)) .buildAndRegister(); RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(160).EUt(20) @@ -879,7 +945,7 @@ private static void registerDecompositionRecipes() { .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Saltpeter, 1), 8000, 480) .chancedOutput(new ItemStack(Blocks.SAND), 9000, 130) .chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Coal, 1), 2000, 340) - .fluidOutputs(Materials.Oil.getFluid(100)) + .fluidOutputs(Materials.Oil.getFluid(80)) .buildAndRegister(); RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(80).EUt(80) @@ -913,6 +979,13 @@ private static void registerDecompositionRecipes() { .chancedOutput(OreDictUnifier.get(OrePrefix.dustTiny, Materials.Osmium), 6000, 850) .buildAndRegister(); + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(50).EUt(30) + .inputs(new ItemStack(Blocks.SAND, 1, 1)) + .chancedOutput(OreDictUnifier.get(dust, Iron), 5000, 500) + .chancedOutput(OreDictUnifier.get(dustTiny, Diamond), 100, 100) + .chancedOutput(new ItemStack(Blocks.SAND, 1, 0), 5000, 5000) + .buildAndRegister(); + RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(160).EUt(20).fluidInputs(Materials.Hydrogen.getFluid(160)).fluidOutputs(Materials.Deuterium.getFluid(40)).buildAndRegister(); RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(160).EUt(80).fluidInputs(Materials.Deuterium.getFluid(160)).fluidOutputs(Materials.Tritium.getFluid(40)).buildAndRegister(); RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().duration(160).EUt(80).fluidInputs(Materials.Helium.getFluid(80)).fluidOutputs(Materials.Helium3.getFluid(5)).buildAndRegister(); @@ -1008,7 +1081,7 @@ private static void registerRecyclingRecipes() { RecipeMaps.MACERATOR_RECIPES.recipeBuilder() .input(OrePrefix.stone, Materials.GraniteRed) .outputs(OreDictUnifier.get(OrePrefix.dust, Materials.GraniteRed, 1)) - .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Uranium, 1), 100, 40) + .chancedOutput(OreDictUnifier.get(OrePrefix.dustSmall, Materials.Uranium238, 1), 100, 40) .buildAndRegister(); RecipeMaps.MACERATOR_RECIPES.recipeBuilder() @@ -1064,6 +1137,26 @@ private static void registerRecyclingRecipes() { .output(dust, Materials.Meat) .output(dustTiny, Materials.Bone) .duration(102).EUt(4).buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.BRICK_BLOCK)) + .outputs(new ItemStack(Items.BRICK, 4)) + .duration(300).EUt(2).buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.CLAY)) + .outputs(new ItemStack(Items.CLAY_BALL, 4)) + .duration(300).EUt(2).buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.NETHER_BRICK)) + .outputs(new ItemStack(Items.NETHERBRICK, 4)) + .duration(300).EUt(2).buildAndRegister(); + + RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.BOOKSHELF)) + .outputs(new ItemStack(Items.BOOK, 3)) + .duration(300).EUt(2).buildAndRegister(); } private static void registerFluidRecipes() { @@ -1143,7 +1236,7 @@ private static & IStringSerializable> void registerChiselingR } else { ModHandler.addSmeltingRecipe(stoneBlock.getItemVariant(variant, ChiselingVariant.NORMAL), stoneBlock.getItemVariant(variant, ChiselingVariant.CRACKED)); } - RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(12).EUt(4) + RecipeMaps.CHEMICAL_BATH_RECIPES.recipeBuilder().duration(12).EUt(4) .inputs(stoneBlock.getItemVariant(variant, !isBricksVariant ? ChiselingVariant.CRACKED : ChiselingVariant.NORMAL)) .fluidInputs(Materials.Water.getFluid(144)) .outputs(stoneBlock.getItemVariant(variant, ChiselingVariant.MOSSY)) diff --git a/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java index 3b17d58f531..22d914c6353 100644 --- a/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java @@ -9,6 +9,7 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.items.MetaItems; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import static gregtech.api.recipes.RecipeMaps.FORMING_PRESS_RECIPES; @@ -90,5 +91,42 @@ public static void init() { .notConsumable(SHAPE_MOLD_BLOCK.getStackForm()) .outputs(new ItemStack(Blocks.GLASS, 1)) .buildAndRegister(); + + RecipeMaps.ALLOY_SMELTER_RECIPES.recipeBuilder().duration(64).EUt(4) + .input(dust, Materials.Glass) + .notConsumable(MetaItems.SHAPE_MOLD_BOTTLE) + .outputs(new ItemStack(Items.GLASS_BOTTLE)) + .buildAndRegister(); + + RecipeMaps.EXTRUDER_RECIPES.recipeBuilder().duration(32).EUt(16) + .input(dust, Materials.Glass) + .notConsumable(MetaItems.SHAPE_EXTRUDER_BOTTLE) + .outputs(new ItemStack(Items.GLASS_BOTTLE)) + .buildAndRegister(); + + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(12).EUt(4) + .fluidInputs(Materials.Glass.getFluid(144)) + .notConsumable(MetaItems.SHAPE_MOLD_BOTTLE) + .outputs(new ItemStack(Items.GLASS_BOTTLE)) + .buildAndRegister(); + + RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(100).EUt(8) + .input(dust, Sugar) + .inputs(new ItemStack(Blocks.BROWN_MUSHROOM)) + .inputs(new ItemStack(Items.SPIDER_EYE)) + .outputs(new ItemStack(Items.FERMENTED_SPIDER_EYE)) + .buildAndRegister(); + + RecipeMaps.MIXER_RECIPES.recipeBuilder().duration(100).EUt(8) + .input(dust, Sugar) + .inputs(new ItemStack(Blocks.RED_MUSHROOM)) + .inputs(new ItemStack(Items.SPIDER_EYE)) + .outputs(new ItemStack(Items.FERMENTED_SPIDER_EYE)) + .buildAndRegister(); + + RecipeMaps.SIFTER_RECIPES.recipeBuilder().duration(800).EUt(16) + .inputs(new ItemStack(Blocks.GRAVEL)) + .outputs(new ItemStack(Items.FLINT)) + .buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/WoodMachineRecipes.java b/src/main/java/gregtech/loaders/recipe/WoodMachineRecipes.java index c1852f85833..d43d3cb1a64 100644 --- a/src/main/java/gregtech/loaders/recipe/WoodMachineRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/WoodMachineRecipes.java @@ -1,5 +1,6 @@ package gregtech.loaders.recipe; +import gregtech.api.GTValues; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; @@ -48,6 +49,19 @@ private static void initializeWoodRecipes() { .duration(160).EUt(8) .buildAndRegister(); + RecipeMaps.LATHE_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.SAPLING, 1, GTValues.W)) + .outputs(new ItemStack(Items.STICK)) + .output(OrePrefix.dustTiny, Materials.Wood) + .duration(16).EUt(8) + .buildAndRegister(); + + RecipeMaps.LATHE_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.WOODEN_SLAB, 1, GTValues.W)) + .outputs(new ItemStack(Items.BOWL)) + .output(OrePrefix.dustSmall, Materials.Wood) + .duration(50).EUt(8) + .buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder() .input(OrePrefix.plank, Materials.Wood, 6) diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java index 9c7d6491d43..3c1d488afb8 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ChemicalBathRecipes.java @@ -1,11 +1,12 @@ package gregtech.loaders.recipe.chemistry; +import gregtech.api.unification.OreDictUnifier; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import static gregtech.api.recipes.RecipeMaps.CHEMICAL_BATH_RECIPES; import static gregtech.api.unification.material.Materials.*; -import static gregtech.api.unification.ore.OrePrefix.dust; +import static gregtech.api.unification.ore.OrePrefix.*; public class ChemicalBathRecipes { @@ -87,5 +88,54 @@ public static void init() { .fluidInputs(Chlorine.getFluid(20)) .output(Blocks.GLASS_PANE) .duration(400).EUt(2).buildAndRegister(); + + //todo add these to ore byproducts + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(crushed, Gold) + .fluidInputs(SodiumPersulfate.getFluid(100)) + .output(crushedPurified, Gold) + .chancedOutput(OreDictUnifier.get(dust, Copper), 7000, 580) + .chancedOutput(OreDictUnifier.get(dust, Stone), 4000, 650) + .duration(800).EUt(8).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(crushed, Nickel) + .fluidInputs(SodiumPersulfate.getFluid(100)) + .output(crushedPurified, Nickel) + .chancedOutput(OreDictUnifier.get(dust, Nickel), 7000, 580) + .chancedOutput(OreDictUnifier.get(dust, Stone), 4000, 650) + .duration(800).EUt(8).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(crushed, Cooperite) + .fluidInputs(SodiumPersulfate.getFluid(100)) + .output(crushedPurified, Cooperite) + .chancedOutput(OreDictUnifier.get(dust, Nickel), 7000, 580) + .chancedOutput(OreDictUnifier.get(dust, Stone), 4000, 650) + .duration(800).EUt(8).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(crushed, Copper) + .fluidInputs(SodiumPersulfate.getFluid(100)) + .output(crushedPurified, Copper) + .chancedOutput(OreDictUnifier.get(dust, Copper), 7000, 580) + .chancedOutput(OreDictUnifier.get(dust, Stone), 4000, 650) + .duration(800).EUt(8).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(crushed, Platinum) + .fluidInputs(SodiumPersulfate.getFluid(100)) + .output(crushedPurified, Platinum) + .chancedOutput(OreDictUnifier.get(dust, Nickel), 7000, 580) + .chancedOutput(OreDictUnifier.get(dust, Stone), 4000, 650) + .duration(800).EUt(8).buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(crushed, Chalcopyrite) + .fluidInputs(SodiumPersulfate.getFluid(100)) + .output(crushedPurified, Chalcopyrite) + .chancedOutput(OreDictUnifier.get(dust, Cobalt), 7000, 580) + .chancedOutput(OreDictUnifier.get(dust, Stone), 4000, 650) + .duration(800).EUt(8).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java index 91b3d1f281b..d2d65bd7beb 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/DistillationRecipes.java @@ -1,5 +1,9 @@ package gregtech.loaders.recipe.chemistry; +import gregtech.api.recipes.ModHandler; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import static gregtech.api.recipes.RecipeMaps.DISTILLATION_RECIPES; import static gregtech.api.recipes.RecipeMaps.DISTILLERY_RECIPES; import static gregtech.api.unification.material.Materials.*; @@ -55,11 +59,11 @@ public static void init() { .duration(120).EUt(120).buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder() - .fluidInputs(SteamCrackedPropane.getFluid(2000)) - .output(dustSmall, Carbon, 3) - .fluidOutputs(Ethylene.getFluid(500)) - .fluidOutputs(Methane.getFluid(3500)) - .duration(240).EUt(120).buildAndRegister(); + .fluidInputs(SteamCrackedPropane.getFluid(1000)) + .output(dustSmall, Carbon, 2) + .fluidOutputs(Ethylene.getFluid(750)) + .fluidOutputs(Methane.getFluid(1250)) + .duration(120).EUt(120).buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder() .fluidInputs(HydroCrackedLightFuel.getFluid(1000)) @@ -72,7 +76,7 @@ public static void init() { DISTILLATION_RECIPES.recipeBuilder() .fluidInputs(SteamCrackedLightFuel.getFluid(1000)) - .output(dustTiny, Carbon) + .output(dustTiny, Carbon, 3) .fluidOutputs(HeavyFuel.getFluid(50)) .fluidOutputs(Naphtha.getFluid(100)) .fluidOutputs(Toluene.getFluid(30)) @@ -94,12 +98,12 @@ public static void init() { .duration(90).EUt(120).buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder() - .fluidInputs(SteamCrackedButane.getFluid(2000)) - .output(dustSmall, Carbon, 9) - .fluidOutputs(Propane.getFluid(250)) - .fluidOutputs(Ethane.getFluid(250)) - .fluidOutputs(Ethylene.getFluid(250)) - .fluidOutputs(Methane.getFluid(4000)) + .fluidInputs(SteamCrackedButane.getFluid(1000)) + .output(dustTiny, Carbon, 11) + .fluidOutputs(Propane.getFluid(125)) + .fluidOutputs(Ethane.getFluid(125)) + .fluidOutputs(Ethylene.getFluid(125)) + .fluidOutputs(Methane.getFluid(2000)) .duration(240).EUt(120).buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder() @@ -220,7 +224,7 @@ public static void init() { .fluidOutputs(SulfuricHeavyFuel.getFluid(250)) .fluidOutputs(SulfuricLightFuel.getFluid(45)) .fluidOutputs(SulfuricNaphtha.getFluid(15)) - .fluidOutputs(SulfuricGas.getFluid(600)) + .fluidOutputs(SulfuricGas.getFluid(60)) .duration(20).EUt(288).buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder() @@ -273,6 +277,12 @@ public static void init() { .fluidOutputs(DistilledWater.getFluid(520)) .duration(160).EUt(120).buildAndRegister(); + DISTILLERY_RECIPES.recipeBuilder() + .fluidInputs(Water.getFluid(5)) + .circuitMeta(5) + .fluidOutputs(ModHandler.getDistilledWater(5)) + .duration(16).EUt(10).buildAndRegister(); + DISTILLATION_RECIPES.recipeBuilder() .fluidInputs(Acetone.getFluid(1000)) .fluidOutputs(Ethenone.getFluid(1000)) @@ -304,6 +314,7 @@ public static void init() { DISTILLATION_RECIPES.recipeBuilder() .fluidInputs(FermentedBiomass.getFluid(1000)) + .outputs(new ItemStack(Items.DYE, 1, 15)) .fluidOutputs(AceticAcid.getFluid(25)) .fluidOutputs(Water.getFluid(375)) .fluidOutputs(Ethanol.getFluid(150)) @@ -314,10 +325,19 @@ public static void init() { .duration(75).EUt(180).buildAndRegister(); DISTILLATION_RECIPES.recipeBuilder() - .fluidInputs(Biomass.getFluid(1000)) + .fluidInputs(RefineryGas.getFluid(1000)) + .fluidOutputs(Butane.getFluid(60)) + .fluidOutputs(Propane.getFluid(70)) + .fluidOutputs(Ethane.getFluid(100)) + .fluidOutputs(Methane.getFluid(750)) + .fluidOutputs(Helium.getFluid(20)) + .duration(240).EUt(120).buildAndRegister(); + + DISTILLATION_RECIPES.recipeBuilder() + .fluidInputs(Biomass.getFluid(600)) .output(dustSmall, Wood, 2) - .fluidOutputs(Ethanol.getFluid(600)) - .fluidOutputs(Water.getFluid(300)) + .fluidOutputs(Ethanol.getFluid(240)) + .fluidOutputs(Water.getFluid(240)) .duration(32).EUt(400).buildAndRegister(); DISTILLERY_RECIPES.recipeBuilder() diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index 3227420652d..b14e8b380c0 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -2,6 +2,8 @@ import gregtech.api.recipes.ingredients.IntCircuitIngredient; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.Materials; +import gregtech.api.unification.ore.OrePrefix; import gregtech.common.items.MetaItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -30,18 +32,18 @@ public static void init() { .duration(160).EUt(30).buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder() - .fluidInputs(Butadiene.getFluid(108)) - .fluidInputs(Styrene.getFluid(36)) - .fluidInputs(Air.getFluid(2000)) - .output(dust, RawStyreneButadieneRubber) - .duration(160).EUt(240).buildAndRegister(); + .fluidInputs(Butadiene.getFluid(3000)) + .fluidInputs(Styrene.getFluid(1000)) + .fluidInputs(Air.getFluid(15000)) + .output(dust, RawStyreneButadieneRubber, 27) + .duration(480).EUt(240).buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder() - .fluidInputs(Butadiene.getFluid(108)) - .fluidInputs(Styrene.getFluid(36)) - .fluidInputs(Oxygen.getFluid(2000)) - .output(dust, RawStyreneButadieneRubber, 3) - .duration(160).EUt(240).buildAndRegister(); + .fluidInputs(Butadiene.getFluid(3000)) + .fluidInputs(Styrene.getFluid(1000)) + .fluidInputs(Oxygen.getFluid(15000)) + .output(dust, RawStyreneButadieneRubber, 41) + .duration(480).EUt(240).buildAndRegister(); CHEMICAL_RECIPES.recipeBuilder() .input(dust, RawStyreneButadieneRubber, 9) @@ -747,13 +749,6 @@ public static void init() { .fluidOutputs(Chloromethane.getFluid(1000)) .duration(160).EUt(30).buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder() - .input(crushedPurified, Sphalerite) - .input(crushedPurified, Galena) - .fluidInputs(SulfuricAcid.getFluid(4000)) - .fluidOutputs(IndiumConcentrate.getFluid(1000)) - .duration(60).EUt(150).buildAndRegister(); - CHEMICAL_RECIPES.recipeBuilder() .notConsumable(new IntCircuitIngredient(1)) .input(dust, Phosphorus, 4) @@ -925,7 +920,7 @@ public static void init() { CHEMICAL_RECIPES.recipeBuilder() .input(dust, Uraninite, 3) .input(dust, Aluminium) - .output(dust, Uranium) + .output(dust, Uranium238) .fluidOutputs(Aluminium.getFluid(144)) .fluidOutputs(Oxygen.getFluid(2000)) .duration(360).EUt(120).buildAndRegister(); @@ -933,7 +928,7 @@ public static void init() { CHEMICAL_RECIPES.recipeBuilder() .input(dust, Uraninite, 3) .input(dust, Magnesium) - .output(dust, Uranium) + .output(dust, Uranium238) .fluidOutputs(Magnesium.getFluid(144)) .fluidOutputs(Oxygen.getFluid(2000)) .duration(360).EUt(120).buildAndRegister(); @@ -1021,6 +1016,18 @@ public static void init() { .outputs(new ItemStack(Items.GOLDEN_APPLE, 1, 1)) .duration(50).EUt(30).buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.BLAZE_POWDER)) + .inputs(new ItemStack(Items.SLIME_BALL)) + .outputs(new ItemStack(Items.MAGMA_CREAM)) + .duration(50).EUt(30).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .inputs(new ItemStack(Items.BLAZE_POWDER)) + .input(OrePrefix.gem, Materials.EnderPearl) + .outputs(new ItemStack(Items.ENDER_EYE)) + .duration(50).EUt(30).buildAndRegister(); + CHEMICAL_RECIPES.recipeBuilder() .inputs(MetaItems.GELLED_TOLUENE.getStackForm(4)) .fluidInputs(SulfuricAcid.getFluid(250)) @@ -1062,5 +1069,13 @@ public static void init() { .fluidOutputs(AceticAcid.getFluid(1000)) .fluidOutputs(Methanol.getFluid(1000)) .duration(264).EUt(60).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input(ingot, Plutonium239, 8) + .input(dustTiny, Uranium238) + .fluidInputs(Air.getFluid(1000)) + .output(dust, Plutonium239, 8) + .fluidOutputs(Radon.getFluid(100)) + .duration(12000).EUt(8).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java index b34b4048b34..4060d932e3e 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java @@ -1,15 +1,15 @@ package gregtech.loaders.recipe.chemistry; +import gregtech.api.GTValues; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.ore.OrePrefix; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import static gregtech.api.recipes.RecipeMaps.CENTRIFUGE_RECIPES; -import static gregtech.api.recipes.RecipeMaps.ELECTROLYZER_RECIPES; +import static gregtech.api.recipes.RecipeMaps.*; import static gregtech.api.unification.material.Materials.*; -import static gregtech.api.unification.ore.OrePrefix.dust; -import static gregtech.api.unification.ore.OrePrefix.dustTiny; +import static gregtech.api.unification.ore.OrePrefix.*; public class SeparationRecipes { @@ -55,6 +55,17 @@ public static void init() { .fluidOutputs(SulfuricAcid.getFluid(1000)) .duration(192).EUt(30).buildAndRegister(); + CENTRIFUGE_RECIPES.recipeBuilder() + .input(dust, ReinforcedEpoxyResin) + .output(dust, Epoxy) + .duration(24).EUt(5).buildAndRegister(); + + CENTRIFUGE_RECIPES.recipeBuilder() + .input(OrePrefix.ore, Oilsands) + .chancedOutput(new ItemStack(Blocks.SAND), 5000, 5000) + .fluidOutputs(Oil.getFluid(500)) + .duration(1000).EUt(5).buildAndRegister(); + // Electrolyzer ELECTROLYZER_RECIPES.recipeBuilder() @@ -131,5 +142,40 @@ public static void init() { .fluidOutputs(Propane.getFluid(1000)) .fluidOutputs(Water.getFluid(2000)) .duration(480).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Butane.getFluid(1000)) + .fluidOutputs(Butene.getFluid(1000)) + .fluidOutputs(Hydrogen.getFluid(2000)) + .duration(240).EUt(120).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Butene.getFluid(1000)) + .fluidOutputs(Butadiene.getFluid(1000)) + .fluidOutputs(Hydrogen.getFluid(2000)) + .duration(240).EUt(120).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Propane.getFluid(1000)) + .fluidOutputs(Propene.getFluid(1000)) + .fluidOutputs(Hydrogen.getFluid(2000)) + .duration(640).EUt(120).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .input(dust, Diamond) + .output(dust, Carbon, 64) + .duration(768).EUt(30).buildAndRegister(); + + // Thermal Centrifuge + THERMAL_CENTRIFUGE_RECIPES.recipeBuilder() + .inputs(new ItemStack(Blocks.COBBLESTONE, 1, GTValues.W)) + .output(dust, Stone) + .duration(500).EUt(48).buildAndRegister(); + + // Fluid Extractor + FLUID_EXTRACTION_RECIPES.recipeBuilder() + .input(dust, Monazite) + .fluidOutputs(Helium.getFluid(200)) + .duration(64).EUt(64).buildAndRegister(); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 0cadda7edf0..ece997bbade 100755 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -526,6 +526,7 @@ metaitem.circuit.wetware_mainframe.name=Wetware Mainframe metaitem.stem_cells.name=Stem Cells metaitem.stem_cells.tooltip=Raw Intelligence metaitem.processor.neuro.name=Neuro Processing Unit +metaitem.processor.neuro.tooltip=Neuro CPU metaitem.petri_dish.name=Petri Dish metaitem.carbon.fibers.name=Raw Carbon Fibers @@ -1010,7 +1011,7 @@ material.hassium=Hassium material.holmium=Holmium material.hydrogen=Hydrogen material.helium=Helium -material.helium3=Helium 3 +material.helium3=Helium-3 material.indium=Indium material.iodine=Iodine material.iridium=Iridium @@ -1044,7 +1045,7 @@ material.oxygen=Oxygen material.palladium=Palladium material.phosphorus=Phosphorus material.platinum=Platinum -material.plutonium=Plutonium 244 +material.plutonium=Plutonium 239 material.plutonium241=Plutonium 241 material.polonium=Polonium material.potassium=Potassium @@ -1533,14 +1534,14 @@ item.plastic.dust=Polyethylene (PE) Pulp item.plastic.plate=Polyethylene (PE) Sheet item.plastic.nugget=Polyethylene (PE) Chip item.plastic.ingot=Polyethylene (PE) Bar -item.epoxy.ingot=Epoxy Bar -item.epoxy.dustTiny=Tiny Pile of Epoxy Pulp -item.epoxy.dustSmall=Small Pile of Epoxy Pulp -item.epoxy.dust=Epoxy Pulp -item.epoxy.nugget=Epoxy Chip -item.epoxy.plateDense=Dense Epoxy Sheet -item.epoxy.plate=Epoxy Sheet -item.epoxy.foil=Thin Epoxy Sheet +item.epoxy.ingot=Epoxy Resin Bar +item.epoxy.dustTiny=Tiny Pile of Epoxy Resin Pulp +item.epoxy.dustSmall=Small Pile of Epoxy Resin Pulp +item.epoxy.dust=Epoxy Resin Pulp +item.epoxy.nugget=Epoxy Resin Chip +item.epoxy.plateDense=Dense Epoxy Resin Sheet +item.epoxy.plate=Epoxy Resin Sheet +item.epoxy.foil=Thin Epoxy Resin Sheet item.reinforced_epoxy_resin.ingot=Fiber-Reinforced Epoxy Resin Bar item.reinforced_epoxy_resin.dustTiny=Tiny Pile of Fiber-Reinforced Epoxy Resin Pulp item.reinforced_epoxy_resin.dustSmall=Small Pile of Fiber-Reinforced Epoxy Resin Pulp @@ -2040,20 +2041,27 @@ gregtech.machine.steam_boiler_lava_steel.tooltip=Faster than Small Steam Lava Bo gregtech.machine.steam_extractor_bronze.name=Steam Extractor gregtech.machine.steam_extractor_bronze.tooltip=Extracting your first Rubber gregtech.machine.steam_extractor_steel.name=High Pressure Steam Extractor +gregtech.machine.steam_extractor_steel.tooltip=Extracting your first Rubber gregtech.machine.steam_macerator_bronze.name=Steam Macerator gregtech.machine.steam_macerator_bronze.tooltip=Macerating your Ores gregtech.machine.steam_macerator_steel.name=High Pressure Steam Macerator gregtech.machine.steam_macerator_steel.tooltip=Macerating your Ores gregtech.machine.steam_compressor_bronze.name=Steam Compressor +gregtech.machine.steam_compressor_bronze.tooltip=Compressing Items gregtech.machine.steam_compressor_steel.name=High Pressure Steam Compressor +gregtech.machine.steam_compressor_steel.tooltip=Compressing Items gregtech.machine.steam_hammer_bronze.name=Steam Forge Hammer +gregtech.machine.steam_hammer_bronze.tooltip=Forge Hammer gregtech.machine.steam_hammer_steel.name=High Pressure Steam Forge Hammer +gregtech.machine.steam_hammer_steel.tooltip=Forge Hammer gregtech.machine.steam_furnace_bronze.name=Steam Furnace -gregtech.machine.steam_furnace_bronze.tooltip=Smelting things with Steam +gregtech.machine.steam_furnace_bronze.tooltip=Smelting things with compressed Steam gregtech.machine.steam_furnace_steel.name=High Pressure Steam Furnace -gregtech.machine.steam_furnace_steel.tooltip=Smelting things with pressured Steam +gregtech.machine.steam_furnace_steel.tooltip=Smelting things with compressed Steam gregtech.machine.steam_alloy_smelter_bronze.name=Steam Alloy Smelter +gregtech.machine.steam_alloy_smelter_bronze.tooltip=Combination Smelter gregtech.machine.steam_alloy_smelter_steel.name=High Pressure Steam Alloy Smelter +gregtech.machine.steam_alloy_smelter_steel.tooltip=Combination Smelter # Generators gregtech.machine.combustion_generator.lv.name=Basic Combustion Generator