Random recipes (#7)

See PR description for more details
GregTechCEu · Jun 27, 2021 · 4b6dc0d · 4b6dc0d
1 parent 16fe063
commit 4b6dc0d
Show file tree

Hide file tree

Showing 24 changed files with 529 additions and 156 deletions.
diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java
@@ -238,7 +238,7 @@ public static void register() {
     public static DustMaterial Spessartine = new DustMaterial(195, "spessartine", 0xFF6464, DULL, 2, of(new MaterialStack(Aluminium, 2), new MaterialStack(Manganese, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)), GENERATE_ORE);
     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", 0x505050, 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 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 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);
@@ -534,7 +534,7 @@ public static void register() {
     public static IngotMaterial SteelMagnetic = new IngotMaterial(327, "steel_magnetic", 0x808080, MAGNETIC, 2, of(new MaterialStack(Steel, 1)), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | MORTAR_GRINDABLE, null, 1000);
     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", 0x0C0C0, 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 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 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);

diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java
@@ -293,7 +293,8 @@ public void registerSubItems() {
 
     public void registerRecipes() {
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-            .input(OrePrefix.dust, Materials.Redstone).input(OrePrefix.plate, Materials.Tin, 2)
+            .input(OrePrefix.dust, Materials.Redstone)
+            .inputs(MetaItems.FLUID_CELL.getStackForm())
             .outputs(SPRAY_EMPTY.getStackForm())
             .duration(200).EUt(8)
             .buildAndRegister();
@@ -322,25 +323,29 @@ public void registerRecipes() {
 
         // Matches/lighters recipes
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-            .input(OrePrefix.stick, Materials.Wood).input(OrePrefix.dustSmall, Materials.Phosphorus)
+            .input(OrePrefix.bolt, Materials.Wood)
+            .input(OrePrefix.dustSmall, Materials.Phosphorus)
             .outputs(TOOL_MATCHES.getStackForm())
             .duration(16).EUt(16)
             .buildAndRegister();
 
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-            .input(OrePrefix.stick, Materials.Wood).input(OrePrefix.dustSmall, Materials.TricalciumPhosphate)
+            .input(OrePrefix.bolt, Materials.Wood)
+            .input(OrePrefix.dustSmall, Materials.TricalciumPhosphate)
             .outputs(TOOL_MATCHES.getStackForm())
             .duration(16).EUt(16)
             .buildAndRegister();
 
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-            .input(OrePrefix.stick, Materials.Wood, 4).input(OrePrefix.dust, Materials.Phosphorus)
+            .input(OrePrefix.bolt, Materials.Wood, 4)
+            .input(OrePrefix.dust, Materials.Phosphorus)
             .outputs(TOOL_MATCHES.getStackForm(4))
             .duration(64).EUt(16)
             .buildAndRegister();
 
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
-            .input(OrePrefix.stick, Materials.Wood, 4).input(OrePrefix.dust, Materials.TricalciumPhosphate)
+            .input(OrePrefix.bolt, Materials.Wood, 4)
+            .input(OrePrefix.dust, Materials.TricalciumPhosphate)
             .outputs(TOOL_MATCHES.getStackForm(4))
             .duration(64)
             .EUt(16)

diff --git a/src/main/java/gregtech/common/items/MetaItem2.java b/src/main/java/gregtech/common/items/MetaItem2.java
@@ -124,6 +124,7 @@ public void registerSubItems() {
         RANDOM_ACCESS_MEMORY_WAFER = addItem(471, "wafer.random_access_memory");
         SYSTEM_ON_CHIP_WAFER = addItem(472, "wafer.system_on_chip");
 
+        RAW_CRYSTAL_CHIP = addItem(473, "crystal.raw");
         CRYSTAL_CENTRAL_PROCESSING_UNIT = addItem(474, "crystal.central_processing_unit");
         CRYSTAL_SYSTEM_ON_CHIP = addItem(475, "crystal.system_on_chip");
         ADVANCED_SYSTEM_ON_CHIP = addItem(476, "plate.advanced_system_on_chip");
@@ -178,7 +179,8 @@ public void registerSubItems() {
         }
 
         NEURO_PROCESSOR = addItem(523, "processor.neuro");
-        STEM_CELLS = addItem(524, "stemcells");
+        STEM_CELLS = addItem(524, "stem_cells");
+        PETRI_DISH = addItem(525, "petri_dish");
     }
 
     public void registerRecipes() {

diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java
@@ -250,6 +250,7 @@ private MetaItems() {
     public static MetaItem<?>.MetaValueItem QBIT_CENTRAL_PROCESSING_UNIT;
     public static MetaItem<?>.MetaValueItem RANDOM_ACCESS_MEMORY;
     public static MetaItem<?>.MetaValueItem SYSTEM_ON_CHIP;
+    public static MetaItem<?>.MetaValueItem RAW_CRYSTAL_CHIP;
     public static MetaItem<?>.MetaValueItem CRYSTAL_CENTRAL_PROCESSING_UNIT;
     public static MetaItem<?>.MetaValueItem CRYSTAL_SYSTEM_ON_CHIP;
 
@@ -388,6 +389,7 @@ private MetaItems() {
     public static MetaItem<?>.MetaValueItem MAX_BATTERY;
     public static MetaItem<?>.MetaValueItem NEURO_PROCESSOR;
     public static MetaItem<?>.MetaValueItem STEM_CELLS;
+    public static MetaItem<?>.MetaValueItem PETRI_DISH;
 
     public static void init() {
         MetaItem1 first = new MetaItem1();

diff --git a/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java
@@ -355,7 +355,7 @@ public static void processTurbine(OrePrefix toolPrefix, IngotMaterial material)
 
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
             .input(OrePrefix.turbineBlade, material, 8)
-            .input(OrePrefix.stickLong, Materials.Titanium)
+            .input(OrePrefix.stickLong, Materials.Magnalium)
             .outputs(rotorStack)
             .duration(200)
             .EUt(400)