diff --git a/src/main/java/gregtech/api/unification/Elements.java b/src/main/java/gregtech/api/unification/Elements.java index cbb99fb9162..816c2ce4297 100644 --- a/src/main/java/gregtech/api/unification/Elements.java +++ b/src/main/java/gregtech/api/unification/Elements.java @@ -2,7 +2,6 @@ import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; import java.util.HashMap; @@ -146,7 +145,7 @@ public static void register() { add(120, 180, -1, null, "Duranium", "Dr", false); add(121, 172, 140, null, "Naquadah", "Nq", true); add(0, 5000, -1, null, "Neutronium", "Nt", false); - add(1000, 1000, -1, null, "Trinium", "Ke", false); + add(1000, 1500, -1, null, "Trinium", "Ke", false); add(750, 1000, -1, null, "Adamantium", "Ad", false); add(850, 900, -1, null, "Vibranium", "Vb", false); add(550, 670, -1, null, "Taranium", "Tn", false); diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index c2a667c58b7..0121797f7c1 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -58,7 +58,7 @@ public static void register() { public static IngotMaterial Chrome = new IngotMaterial(22, "chrome", 0xFFE6E6, SHINY, 3, of(), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR, Elements.get("Chrome"), 12.0f, 3.0f, 512, 1700); public static IngotMaterial Cobalt = new IngotMaterial(23, "cobalt", 0x5050FA, METALLIC, 2, of(), GENERATE_ORE | STD_METAL, Elements.get("Cobalt"), 10.0F, 3.0f, 256); public static IngotMaterial Copernicium = new IngotMaterial(24, "copernicium", 0xFFFEFF, DULL, 4, of(), 0, Elements.get("Copernicium")); - public static IngotMaterial Copper = new IngotMaterial(25, "copper", 0xFF6400, SHINY, 1, of(), EXT2_METAL | GENERATE_ORE | MORTAR_GRINDABLE | GENERATE_DENSE, Elements.get("Copper")); + public static IngotMaterial Copper = new IngotMaterial(25, "copper", 0xFF6400, SHINY, 1, of(), EXT2_METAL | GENERATE_ORE | MORTAR_GRINDABLE | GENERATE_DENSE | GENERATE_SPRING, Elements.get("Copper")); public static IngotMaterial Curium = new IngotMaterial(26, "curium", 0x7B544E, METALLIC, 3, of(), EXT2_METAL, Elements.get("Curium")); public static IngotMaterial Darmstadtium = new IngotMaterial(27, "darmstadtium", 0xAAAAAA, METALLIC, 2, of(), 0, Elements.get("Darmstadtium")); public static FluidMaterial Deuterium = new FluidMaterial(28, "deuterium", 0xFFFFFF, FLUID, of(), STATE_GAS, Elements.get("Deuterium")); @@ -185,7 +185,7 @@ public static void register() { 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 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); + public static IngotMaterial Cupronickel = new IngotMaterial(148, "cupronickel", 0xE39680, METALLIC, 1, of(new MaterialStack(Copper, 1), new MaterialStack(Nickel, 1)), EXT_METAL| GENERATE_SPRING); public static DustMaterial DarkAsh = new DustMaterial(149, "dark_ash", 0x323232, DULL, 1, of(new MaterialStack(Carbon, 1)), DISABLE_DECOMPOSITION); public static GemMaterial Diamond = new GemMaterial(150, "diamond", 0xC8FFFF, DIAMOND, 3, of(new MaterialStack(Carbon, 1)), GENERATE_ROD | GENERATE_BOLT_SCREW | GENERATE_LENSE | GENERATE_GEAR | NO_SMASHING | NO_SMELTING | FLAMMABLE | HIGH_SIFTER_OUTPUT | GENERATE_ORE | DISABLE_DECOMPOSITION | EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, 8.0F, 3.0f, 1280); public static IngotMaterial Electrum = new IngotMaterial(151, "electrum", 0xFFFF64, SHINY, 2, of(new MaterialStack(Silver, 1), new MaterialStack(Gold, 1)), EXT2_METAL | MORTAR_GRINDABLE); @@ -199,13 +199,13 @@ public static void register() { public static GemMaterial Rutile = new GemMaterial(159, "rutile", 0xD40D5C, GEM_HORIZONTAL, 2, of(new MaterialStack(Titanium, 1), new MaterialStack(Oxygen, 2)), STD_GEM | DISABLE_DECOMPOSITION); public static DustMaterial Bauxite = new DustMaterial(160, "bauxite", 0xC86400, DULL, 1, of(new MaterialStack(Rutile, 2), new MaterialStack(Aluminium, 16), new MaterialStack(Hydrogen, 10), new MaterialStack(Oxygen, 11)), GENERATE_ORE | DISABLE_DECOMPOSITION); public static IngotMaterial Invar = new IngotMaterial(161, "invar", 0xB4B478, METALLIC, 2, of(new MaterialStack(Iron, 2), new MaterialStack(Nickel, 1)), EXT2_METAL | MORTAR_GRINDABLE | GENERATE_RING | GENERATE_FRAME, 7.0F, 3.0f, 512); - public static IngotMaterial Kanthal = new IngotMaterial(162, "kanthal", 0xC2D2DF, METALLIC, 2, of(new MaterialStack(Iron, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Chrome, 1)), EXT_METAL, null, 1800); + public static IngotMaterial Kanthal = new IngotMaterial(162, "kanthal", 0xC2D2DF, METALLIC, 2, of(new MaterialStack(Iron, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Chrome, 1)), EXT_METAL| GENERATE_SPRING, null, 1800); public static GemMaterial Lazurite = new GemMaterial(163, "lazurite", 0x6478FF, LAPIS, 1, of(new MaterialStack(Aluminium, 6), new MaterialStack(Silicon, 6), new MaterialStack(Calcium, 8), new MaterialStack(Sodium, 8)), GENERATE_PLATE | GENERATE_ORE | NO_SMASHING | NO_SMELTING | CRYSTALLISABLE | GENERATE_ROD | DECOMPOSITION_BY_ELECTROLYZING); public static IngotMaterial Magnalium = new IngotMaterial(164, "magnalium", 0xC8BEFF, DULL, 2, of(new MaterialStack(Magnesium, 1), new MaterialStack(Aluminium, 2)), EXT2_METAL | GENERATE_LONG_ROD, 6.0F, 2.0f, 256); public static DustMaterial Magnesite = new DustMaterial(165, "magnesite", 0xFAFAB4, METALLIC, 2, of(new MaterialStack(Magnesium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)), GENERATE_ORE); public static DustMaterial Magnetite = new DustMaterial(166, "magnetite", 0x1E1E1E, METALLIC, 2, of(new MaterialStack(Iron, 3), new MaterialStack(Oxygen, 4)), GENERATE_ORE); public static DustMaterial Molybdenite = new DustMaterial(167, "molybdenite", 0x191919, METALLIC, 2, of(new MaterialStack(Molybdenum, 1), new MaterialStack(Sulfur, 2)), GENERATE_ORE); - public static IngotMaterial Nichrome = new IngotMaterial(168, "nichrome", 0xCDCEF6, METALLIC, 2, of(new MaterialStack(Nickel, 4), new MaterialStack(Chrome, 1)), EXT_METAL, null, 2700); + public static IngotMaterial Nichrome = new IngotMaterial(168, "nichrome", 0xCDCEF6, METALLIC, 2, of(new MaterialStack(Nickel, 4), new MaterialStack(Chrome, 1)), EXT_METAL| GENERATE_SPRING, null, 2700); public static IngotMaterial NiobiumNitride = new IngotMaterial(169, "niobium_nitride", 0x1D291D, DULL, 2, of(new MaterialStack(Niobium, 1), new MaterialStack(Nitrogen, 1)), EXT_METAL, null, 2573); public static IngotMaterial NiobiumTitanium = new IngotMaterial(170, "niobium_titanium", 0x1D1D29, DULL, 2, of(new MaterialStack(Niobium, 1), new MaterialStack(Titanium, 1)), EXT2_METAL, null, 4500); public static DustMaterial Obsidian = new DustMaterial(171, "obsidian", 0x503264, DULL, 3, of(new MaterialStack(Magnesium, 1), new MaterialStack(Iron, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 8)), NO_SMASHING | EXCLUDE_BLOCK_CRAFTING_RECIPES); @@ -477,7 +477,7 @@ public static void register() { public static IngotMaterial RedSteel = new IngotMaterial(271, "red_steel", 0x8C6464, METALLIC, 2, of(new MaterialStack(SterlingSilver, 1), new MaterialStack(BismuthBronze, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4)), EXT_METAL, null, 7.0F, 4.5f, 896, 1300); public static IngotMaterial BlueSteel = new IngotMaterial(272, "blue_steel", 0x64648C, METALLIC, 2, of(new MaterialStack(RoseGold, 1), new MaterialStack(Brass, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4)), EXT_METAL | GENERATE_FRAME, null, 7.5F, 5.0f, 1024, 1400); public static IngotMaterial DamascusSteel = new IngotMaterial(273, "damascus_steel", 0x6E6E6E, METALLIC, 2, of(new MaterialStack(Steel, 1)), EXT_METAL, null, 8.0F, 5.0f, 1280, 1500); - 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, null, 8.0F, 4.0f, 2560, 3000); + 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); @@ -534,7 +534,7 @@ public static void register() { public static IngotMaterial NeodymiumMagnetic = new IngotMaterial(328, "neodymium_magnetic", 0x646464, MAGNETIC, 2, of(new MaterialStack(Neodymium, 1)), EXT2_METAL | GENERATE_LONG_ROD, null, 1297); public static IngotMaterial TungstenCarbide = new IngotMaterial(329, "tungsten_carbide", 0x330066, METALLIC, 4, of(new MaterialStack(Tungsten, 1), new MaterialStack(Carbon, 1)), EXT2_METAL, null, 12.0F, 4.0f, 1280, 2460); public static IngotMaterial VanadiumSteel = new IngotMaterial(330, "vanadium_steel", 0xc0c0c0, METALLIC, 3, of(new MaterialStack(Vanadium, 1), new MaterialStack(Chrome, 1), new MaterialStack(Steel, 7)), EXT2_METAL, null, 7.0F, 3.0f, 1920, 1453); - public static IngotMaterial HSSG = new IngotMaterial(331, "hssg", 0x999900, METALLIC, 3, of(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, null, 10.0F, 5.5f, 4000, 4200); + public static IngotMaterial HSSG = new IngotMaterial(331, "hssg", 0x999900, METALLIC, 3, of(new MaterialStack(TungstenSteel, 5), new MaterialStack(Chrome, 1), new MaterialStack(Molybdenum, 2), new MaterialStack(Vanadium, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME| GENERATE_SPRING, null, 10.0F, 5.5f, 4000, 4200); public static IngotMaterial HSSE = new IngotMaterial(332, "hsse", 0x336600, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Cobalt, 1), new MaterialStack(Manganese, 1), new MaterialStack(Silicon, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, null, 10.0F, 8.0f, 5120, 5000); public static IngotMaterial HSSS = new IngotMaterial(333, "hsss", 0x660033, METALLIC, 4, of(new MaterialStack(HSSG, 6), new MaterialStack(Iridium, 2), new MaterialStack(Osmium, 1)), EXT2_METAL | GENERATE_GEAR, null, 15.0F, 7.0f, 3000, 5000); /* @@ -544,8 +544,8 @@ public static void register() { /** * Fantasy materials */ - public static IngotMaterial Naquadah = new IngotMaterial(334, "naquadah", 0x323232, METALLIC, 4, of(), EXT_METAL | GENERATE_ORE | GENERATE_FOIL, Elements.get("Naquadah"), 6.0F, 4.0f, 1280, 5400); - public static IngotMaterial NaquadahAlloy = new IngotMaterial(335, "naquadah_alloy", 0x282828, METALLIC, 5, of(new MaterialStack(Naquadah, 1), new MaterialStack(Osmiridium, 1)), EXT2_METAL, null, 8.0F, 5.0f, 5120, 7200); + public static IngotMaterial Naquadah = new IngotMaterial(334, "naquadah", 0x323232, METALLIC, 4, of(), EXT_METAL | GENERATE_ORE | GENERATE_FOIL| GENERATE_SPRING, Elements.get("Naquadah"), 6.0F, 4.0f, 1280, 5400); + public static IngotMaterial NaquadahAlloy = new IngotMaterial(335, "naquadah_alloy", 0x282828, METALLIC, 5, of(new MaterialStack(Naquadah, 1), new MaterialStack(Osmiridium, 1)), EXT2_METAL| GENERATE_SPRING, null, 8.0F, 5.0f, 5120, 7200); public static IngotMaterial NaquadahEnriched = new IngotMaterial(336, "naquadah_enriched", 0x323232, METALLIC, 4, of(), EXT_METAL | GENERATE_ORE | GENERATE_FOIL, null, 6.0F, 4.0f, 1280, 4500); public static IngotMaterial Naquadria = new IngotMaterial(337, "naquadria", 0x1E1E1E, SHINY, 3, of(), EXT_METAL, Elements.get("Naquadah"), 9000); public static IngotMaterial Neutronium = new IngotMaterial(338, "neutronium", 0xFAFAFA, DULL, 6, of(), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, Elements.get("Neutronium"), 24.0F, 12F, 655360); diff --git a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java index b48d1806a5d..cd39f89bf46 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java @@ -26,7 +26,8 @@ public class CraftingComponent { public static Component WIRE; public static Component CABLE_QUAD; public static Component HULL; - public static Component PIPE; + public static Component PIPE_MEDIUM; + public static Component PIPE_LARGE; public static Component GLASS; public static Component PLATE; public static Component MOTOR; @@ -39,13 +40,14 @@ public class CraftingComponent { public static Component CONVEYOR; public static Component ROBOT_ARM; public static Component COIL_HEATING; + public static Component COIL_HEATING_DOUBLE; public static Component COIL_ELECTRIC; public static Component STICK_MAGNETIC; public static Component STICK_DISTILLATION; public static Component FIELD_GENERATOR; - public static Component COIL_HEATING_DOUBLE; public static Component STICK_ELECTROMAGNETIC; public static Component STICK_RADIOACTIVE; + public static Component PIPE_REACTOR; public static void initializeComponents() { @@ -162,7 +164,7 @@ public static void initializeComponents() { }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); } - PIPE = new Component(Stream.of(new Object[][]{ + PIPE_MEDIUM = new Component(Stream.of(new Object[][]{ {0, new UnificationEntry(OrePrefix.pipeMedium, Materials.Bronze)}, {1, new UnificationEntry(OrePrefix.pipeMedium, Materials.Bronze)}, @@ -170,18 +172,34 @@ public static void initializeComponents() { {3, new UnificationEntry(OrePrefix.pipeMedium, Materials.StainlessSteel)}, {4, new UnificationEntry(OrePrefix.pipeMedium, Materials.Titanium)}, {5, new UnificationEntry(OrePrefix.pipeMedium, Materials.TungstenSteel)}, - {6, new UnificationEntry(OrePrefix.pipeSmall, Materials.Ultimet)}, + {6, new UnificationEntry(OrePrefix.pipeMedium, Materials.NiobiumTitanium)}, {7, new UnificationEntry(OrePrefix.pipeMedium, Materials.Ultimet)}, - {8, new UnificationEntry(OrePrefix.pipeLarge, Materials.Ultimet)}, + {8, new UnificationEntry(OrePrefix.pipeMedium, Materials.Naquadah)}, + + }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); + + PIPE_LARGE = new Component(Stream.of(new Object[][]{ + + {0, new UnificationEntry(OrePrefix.pipeLarge, Materials.Bronze)}, + {1, new UnificationEntry(OrePrefix.pipeLarge, Materials.Bronze)}, + {2, new UnificationEntry(OrePrefix.pipeLarge, Materials.Steel)}, + {3, new UnificationEntry(OrePrefix.pipeLarge, Materials.StainlessSteel)}, + {4, new UnificationEntry(OrePrefix.pipeLarge, Materials.Titanium)}, + {5, new UnificationEntry(OrePrefix.pipeLarge, Materials.TungstenSteel)}, + {6, new UnificationEntry(OrePrefix.pipeLarge, Materials.NiobiumTitanium)}, + {7, new UnificationEntry(OrePrefix.pipeLarge, Materials.Ultimet)}, + {8, new UnificationEntry(OrePrefix.pipeLarge, Materials.Naquadah)}, }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); GLASS = new Component(Stream.of(new Object[][]{ {GTValues.FALLBACK, new ItemStack(Blocks.GLASS, 1, GTValues.W)}, + {4, MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS)}, + {5, MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS)}, {6, MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS)}, {7, MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS)}, - {8, MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS)}, + {8, MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockTransparentCasing.CasingType.REINFORCED_GLASS)} }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); @@ -244,7 +262,10 @@ public static void initializeComponents() { {0, new UnificationEntry(OrePrefix.gem, Materials.Diamond)}, {1, new UnificationEntry(OrePrefix.gem, Materials.Diamond)}, {2, new UnificationEntry(OrePrefix.gem, Materials.Diamond)}, - {GTValues.FALLBACK, OreDictNames.craftingGrinder}, + {3, OreDictNames.craftingGrinder}, + {4, OreDictNames.craftingGrinder}, + {5, MetaItems.COMPONENT_GRINDER_TUNGSTEN.getStackForm()}, + {GTValues.FALLBACK, MetaItems.COMPONENT_GRINDER_TUNGSTEN.getStackForm()}, }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); @@ -320,6 +341,21 @@ public static void initializeComponents() { }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); + COIL_HEATING_DOUBLE = new Component(Stream.of(new Object[][]{ + + {0, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Copper)}, + {1, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Copper)}, + {2, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Cupronickel)}, + {3, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Kanthal)}, + {4, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Nichrome)}, + {5, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.TungstenSteel)}, + {6, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.HSSG)}, + {7, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Naquadah)}, + {8, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.NaquadahAlloy)}, + + }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); + + COIL_ELECTRIC = new Component(Stream.of(new Object[][]{ {0, new UnificationEntry(OrePrefix.wireGtSingle, Materials.Tin)}, @@ -350,6 +386,15 @@ public static void initializeComponents() { STICK_DISTILLATION = new Component(Stream.of(new Object[][]{ + {0, new UnificationEntry(OrePrefix.stick, Materials.Blaze)}, + {1, new UnificationEntry(OrePrefix.spring, Materials.Copper)}, + {2, new UnificationEntry(OrePrefix.spring, Materials.Cupronickel)}, + {3, new UnificationEntry(OrePrefix.spring, Materials.Kanthal)}, + {4, new UnificationEntry(OrePrefix.spring, Materials.Nichrome)}, + {5, new UnificationEntry(OrePrefix.spring, Materials.TungstenSteel)}, + {6, new UnificationEntry(OrePrefix.spring, Materials.HSSG)}, + {7, new UnificationEntry(OrePrefix.spring, Materials.Naquadah)}, + {8, new UnificationEntry(OrePrefix.spring, Materials.NaquadahAlloy)}, {GTValues.FALLBACK, new UnificationEntry(OrePrefix.stick, Materials.Blaze)}, }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); @@ -367,20 +412,6 @@ public static void initializeComponents() { }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); - COIL_HEATING_DOUBLE = new Component(Stream.of(new Object[][]{ - - {0, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Copper)}, - {1, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Copper)}, - {2, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Cupronickel)}, - {3, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Kanthal)}, - {4, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Nichrome)}, - {5, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.TungstenSteel)}, - {6, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.HSSG)}, - {7, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.Naquadah)}, - {8, new UnificationEntry(OrePrefix.wireGtQuadruple, Materials.NaquadahAlloy)}, - - }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); - STICK_ELECTROMAGNETIC = new Component(Stream.of(new Object[][]{ {0, new UnificationEntry(OrePrefix.stick, Materials.Iron)}, @@ -401,6 +432,21 @@ public static void initializeComponents() { {GTValues.FALLBACK, new UnificationEntry(OrePrefix.stick, Materials.Tritanium)}, }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); + + PIPE_REACTOR = new Component(Stream.of(new Object[][]{ + + {0, new ItemStack(Blocks.GLASS, 1, GTValues.W)}, + {1, new ItemStack(Blocks.GLASS, 1, GTValues.W)}, + {2, new ItemStack(Blocks.GLASS, 1, GTValues.W)}, + {3, new UnificationEntry(OrePrefix.pipeMedium, Materials.Polyethylene)}, + {4, new UnificationEntry(OrePrefix.pipeLarge, Materials.Polyethylene)}, + {5, new UnificationEntry(OrePrefix.pipeHuge, Materials.Polyethylene)}, + {6, new UnificationEntry(OrePrefix.pipeMedium, Materials.Polytetrafluoroethylene)}, + {7, new UnificationEntry(OrePrefix.pipeLarge, Materials.Polytetrafluoroethylene)}, + {8, new UnificationEntry(OrePrefix.pipeHuge, Materials.Polytetrafluoroethylene)}, + {GTValues.FALLBACK, new UnificationEntry(OrePrefix.pipeMedium, Materials.Polyethylene)}, + + }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); } public static class Component { diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index 339284d2d30..37294d0194e 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -363,7 +363,7 @@ public static void init() { registerMachineRecipe(MetaTileEntities.CUTTER, "WCG", "VMB", "CWE", 'M', HULL, 'E', MOTOR, 'V', CONVEYOR, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS, 'B', OreDictNames.craftingDiamondBlade); registerMachineRecipe(MetaTileEntities.ELECTRIC_FURNACE, "ECE", "CMC", "WCW", 'M', HULL, 'E', CIRCUIT, 'W', CABLE, 'C', COIL_HEATING); registerMachineRecipe(MetaTileEntities.EXTRACTOR, "GCG", "EMP", "WCW", 'M', HULL, 'E', PISTON, 'P', PUMP, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS); - registerMachineRecipe(MetaTileEntities.EXTRUDER, "CCE", "XMP", "CCE", 'M', HULL, 'X', PISTON, 'E', CIRCUIT, 'P', PIPE, 'C', COIL_HEATING_DOUBLE); + registerMachineRecipe(MetaTileEntities.EXTRUDER, "CCE", "XMP", "CCE", 'M', HULL, 'X', PISTON, 'E', CIRCUIT, 'P', PIPE_MEDIUM, 'C', COIL_HEATING_DOUBLE); registerMachineRecipe(MetaTileEntities.LATHE, "WCW", "EMD", "CWP", 'M', HULL, 'E', MOTOR, 'P', PISTON, 'C', CIRCUIT, 'W', CABLE, 'D', DIAMOND); registerMachineRecipe(MetaTileEntities.MACERATOR, "PEG", "WWM", "CCW", 'M', HULL, 'E', MOTOR, 'P', PISTON, 'C', CIRCUIT, 'W', CABLE, 'G', GRINDER); registerMachineRecipe(MetaTileEntities.MICROWAVE, "LWC", "LMR", "LEC", 'M', HULL, 'E', MOTOR, 'R', EMITTER, 'C', CIRCUIT, 'W', CABLE, 'L', new UnificationEntry(OrePrefix.plate, Materials.Lead)); @@ -374,9 +374,9 @@ public static void init() { registerMachineRecipe(MetaTileEntities.ORE_WASHER, "RGR", "CEC", "WMW", 'M', HULL, 'R', ROTOR, 'E', MOTOR, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS); registerMachineRecipe(MetaTileEntities.PACKER, "BCB", "RMV", "WCW", 'M', HULL, 'R', ROBOT_ARM, 'V', CONVEYOR, 'C', CIRCUIT, 'W', CABLE, 'B', OreDictNames.chestWood); registerMachineRecipe(MetaTileEntities.UNPACKER, "BCB", "VMR", "WCW", 'M', HULL, 'R', ROBOT_ARM, 'V', CONVEYOR, 'C', CIRCUIT, 'W', CABLE, 'B', OreDictNames.chestWood); - registerMachineRecipe(MetaTileEntities.CHEMICAL_REACTOR, "GRG", "WEW", "CMC", 'M', HULL, 'R', ROTOR, 'E', MOTOR, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS); + registerMachineRecipe(MetaTileEntities.CHEMICAL_REACTOR, "GRG", "WEW", "CMC", 'M', HULL, 'R', ROTOR, 'E', MOTOR, 'C', CIRCUIT, 'W', CABLE, 'G', PIPE_REACTOR); registerMachineRecipe(MetaTileEntities.FLUID_CANNER, "GCG", "GMG", "WPW", 'M', HULL, 'P', PUMP, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS); - registerMachineRecipe(MetaTileEntities.BREWERY, "GPG", "WMW", "CBC", 'M', HULL, 'P', PUMP, 'B', STICK_DISTILLATION, 'C', CIRCUIT, 'W', CABLE, 'G', new ItemStack(Blocks.GLASS)); + registerMachineRecipe(MetaTileEntities.BREWERY, "GPG", "WMW", "CBC", 'M', HULL, 'P', PUMP, 'B', STICK_DISTILLATION, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS); registerMachineRecipe(MetaTileEntities.FERMENTER, "WPW", "GMG", "WCW", 'M', HULL, 'P', PUMP, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS); registerMachineRecipe(MetaTileEntities.FLUID_EXTRACTOR, "GCG", "PME", "WCW", 'M', HULL, 'E', PISTON, 'P', PUMP, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS); registerMachineRecipe(MetaTileEntities.FLUID_SOLIDIFIER, "PGP", "WMW", "CBC", 'M', HULL, 'P', PUMP, 'C', CIRCUIT, 'W', CABLE, 'G', GLASS, 'B', OreDictNames.chestWood); @@ -395,11 +395,11 @@ public static void init() { registerMachineRecipe(MetaTileEntities.PLASMA_ARC_FURNACE, "WGW", "CMC", "TPT", 'M', HULL, 'P', PLATE, 'C', BETTER_CIRCUIT, 'W', CABLE_QUAD, 'T', PUMP, 'G', new UnificationEntry(OrePrefix.ingot, Materials.Graphite)); registerMachineRecipe(MetaTileEntities.CLUSTER_MILL, "MMM", "CHC", "MMM", 'M', MOTOR, 'C', CIRCUIT, 'H', HULL); - registerMachineRecipe(MetaTileEntities.PUMP, "WGW", "GMG", "TGT", 'M', HULL, 'W', CIRCUIT, 'G', PUMP, 'T', PIPE); + registerMachineRecipe(MetaTileEntities.PUMP, "WGW", "GMG", "TGT", 'M', HULL, 'W', CIRCUIT, 'G', PUMP, 'T', PIPE_LARGE); registerMachineRecipe(MetaTileEntities.FISHER, "WTW", "PMP", "TGT", 'M', HULL, 'W', CIRCUIT, 'G', PUMP, 'T', MOTOR, 'P', PISTON); registerMachineRecipe(MetaTileEntities.AIR_COLLECTOR, "WFW", "PHP", "WCW", 'W', Blocks.IRON_BARS, 'F', MetaItems.ITEM_FILTER, 'P', PUMP, 'H', HULL, 'C', CIRCUIT); registerMachineRecipe(MetaTileEntities.ITEM_COLLECTOR, "MRM", "RHR", "CWC", 'M', MOTOR, 'R', ROTOR, 'H', HULL, 'C', CIRCUIT, 'W', CABLE); - registerMachineRecipe(MetaTileEntities.BLOCK_BREAKER, "MGM", "CHC", "WSW", 'M', MOTOR, 'H', HULL, 'C', CIRCUIT, 'W', CABLE, 'S', Blocks.CHEST, 'G', MetaItems.COMPONENT_GRINDER_DIAMOND); + registerMachineRecipe(MetaTileEntities.BLOCK_BREAKER, "MGM", "CHC", "WSW", 'M', MOTOR, 'H', HULL, 'C', CIRCUIT, 'W', CABLE, 'S', Blocks.CHEST, 'G', GRINDER); registerMachineRecipe(MetaTileEntities.QUANTUM_CHEST, "CPC", "PHP", "CFC", 'C', CIRCUIT, 'P', PLATE, 'F', FIELD_GENERATOR, 'H', HULL); registerMachineRecipe(MetaTileEntities.QUANTUM_TANK, "CFC", "PHP", "CPC", 'C', CIRCUIT, 'P', PLATE, 'F', FIELD_GENERATOR, 'H', HULL);