diff --git a/AntimatterAPI b/AntimatterAPI index b341457ec..dc73eb506 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit b341457ec7c275013e116dfd6706f374b7ea460e +Subproject commit dc73eb5068d0cd33b7dfea97c45b3314f325a826 diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java index ec19d3391..fad7ed355 100644 --- a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java +++ b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java @@ -209,6 +209,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ /** * Inorganic **/ + event.setMaterial(AluminiumHydroxide).asDust(); event.setMaterial(AluminiumTrichloride).asDust(); event.setMaterial(Aluminosilicate).asDust(); event.setMaterial(AmmoniumChloride).asDust(); @@ -247,6 +248,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ event.setMaterial(ReactionCatalyst).asDust(); event.setMaterial(RedGranite).asDust(ROCK); event.setMaterial(SiliconDioxide).asDust(); + event.setMaterial(SodiumAluminate).asDust(); event.setMaterial(SodiumBisulfate).asDust(); event.setMaterial(SodiumHydroxide).asDust(); event.setMaterial(SodiumSulfate).asDust(); @@ -628,11 +630,12 @@ private static void processInto(GregTechMaterialEvent event){ /** * Inorganic **/ + event.setMaterial(AluminiumHydroxide).mats(of(Aluminium, 1, Oxygen, 3, Hydrogen, 3)); event.setMaterial(AluminiumTrichloride).mats(of(Aluminium,1,Chlorine,3)); event.setMaterial(Aluminosilicate).mats(of(Aluminium, 2, Silicon, 1, Oxygen, 5)); event.setMaterial(AmmoniumChloride).mats(of(Nitrogen,1, Hydrogen,4,Chlorine,1)); event.setMaterial(ArsenicTrioxide).mats(of(Arsenic, 2, Oxygen, 3)).elecTicks(180); - event.setMaterial(Biotite).mats(b -> b.put(Potassium, 1).put(Magnesium, 3).put(Aluminium, 3).put(Fluorine, 2).put(Silicon, 3).put(Oxygen, 10)).elecTicks(440); + event.setMaterial(Biotite).mats(b -> b.put(Potassium, 2).put(Magnesium, 6).put(Alumina, 15).put(SiliconDioxide, 18).put(Fluorine, 4)).elecTicks(440); event.setMaterial(BlackGranite).mats(of(SiliconDioxide, 4, Biotite, 1)); event.setMaterial(BorosilicateGlass).mats(of(Boron, 1, Silicon, 7, Oxygen,14)); event.setMaterial(Brick).mats(of(Aluminium, 4, Silicon, 3, Oxygen, 12)); @@ -654,7 +657,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Obsidian).mats(of(Magnesium, 1, Iron, 1, Silicon, 2, Oxygen, 8)).elecTicks(240); event.setMaterial(PhosphorousPentoxide).mats(of(Phosphor, 4, Oxygen, 10)).elecTicks(560); event.setMaterial(Potash).mats(of(Potassium, 2, Oxygen, 1)).elecTicks(90); - event.setMaterial(PotassiumFeldspar).mats(of(Potassium, 1, Aluminium, 1, Silicon, 3, Oxygen, 8)).elecTicks(260); + event.setMaterial(PotassiumFeldspar).mats(of(Potassium, 2, Alumina, 5, SiliconDioxide, 18, Oxygen, 1)).elecTicks(260); event.setMaterial(Powellite).mats(of(Calcium, 1, Molybdenum, 1, Oxygen, 4)); //event.setMaterial(Pyrochlore).asDust(ORE).addComposition(of(Calcium, 2, Niobium, 2, Oxygen, 7)); event.setMaterial(Quartzite).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(60); @@ -662,6 +665,7 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(ReactionCatalyst).mats(of(Copper,1,Zinc,1,Aluminium,2,Oxygen,4)); event.setMaterial(RedGranite).mats(of(Aluminium, 2, PotassiumFeldspar, 1, Oxygen, 3)).elecTicks(120); event.setMaterial(SiliconDioxide).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(240); + event.setMaterial(SodiumAluminate).mats(of(Sodium, 1, Aluminium, 1, Oxygen, 2)); event.setMaterial(SodiumBisulfate).mats(of(Sodium, 1, Hydrogen, 1, Sulfur, 1, Oxygen, 4)).elecTicks(600); event.setMaterial(SodiumHydroxide).mats(of(Sodium, 1, Oxygen, 1, Hydrogen, 1)).elecTicks(36); event.setMaterial(SodiumSulfate).mats(of(Sodium, 2, Sulfur, 1, Oxygen, 4)); @@ -671,7 +675,7 @@ private static void processInto(GregTechMaterialEvent event){ /** ** Ores **/ - event.setMaterial(Almandine).mats(of(Aluminium, 2, Iron, 3, Silicon, 3, Oxygen, 12)).elecTicks(480); + event.setMaterial(Almandine).mats(of(Alumina, 5, Iron, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(480); event.setMaterial(Alumina).mats(of(Aluminium, 2, Oxygen, 3)).elecTicks(480); event.setMaterial(Andradite).mats(of(Calcium, 3, Iron, 2, Silicon, 3, Oxygen, 12)).elecTicks(480); event.setMaterial(BandedIron).mats(of(Iron, 2, Oxygen, 3)).elecTicks(150); @@ -689,10 +693,10 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Galena).mats(of(Lead, 3, Silver, 3, Sulfur, 2)).elecTicks(832); event.setMaterial(Garnierite).mats(of(Nickel, 1, Oxygen, 1), 1).elecTicks(72); event.setMaterial(Graphite).mats(of(Carbon, 4), 1).elecTicks(100); - event.setMaterial(Glauconite).mats(of(Potassium, 1, Magnesium, 2, Aluminium, 4, Hydrogen, 2, Oxygen, 12)).elecTicks(378); // TODO: Ore Gen; - event.setMaterial(Grossular).mats(of(Calcium, 3, Aluminium, 2, Silicon, 3, Oxygen, 12)).elecTicks(440); + event.setMaterial(Glauconite).mats(of(Alumina, 10, Potassium, 1, Magnesium, 2, DistilledWater, 3, Oxygen, 7)).elecTicks(378); // TODO: Ore Gen; + event.setMaterial(Grossular).mats(of(Alumina, 5, Calcium, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(440); event.setMaterial(Ilmenite).mats(of(Iron, 1, Titanium, 1, Oxygen, 3)); - event.setMaterial(Lepidolite).mats(of(Potassium, 1, Lithium, 3, Aluminium, 4, Fluorine, 2, Oxygen, 10)).elecTicks(320); // TODO: Ore Gen; + event.setMaterial(Lepidolite).mats(of(Alumina, 10, Potassium, 1, Lithium, 3, Fluorine, 2, Oxygen, 6)).elecTicks(320); // TODO: Ore Gen; event.setMaterial(Rutile).mats(of(Cobalt, 1, Arsenic, 1, Sulfur, 1)); event.setMaterial(Magnesite).mats(of(Magnesium, 1, Carbon, 1, Oxygen, 3)).elecTicks(80); event.setMaterial(Magnetite).mats(of(Iron, 3, Oxygen, 4)).elecTicks(210); @@ -703,12 +707,12 @@ private static void processInto(GregTechMaterialEvent event){ event.setMaterial(Pitchblende).mats(of(Uraninite, 3, Thorium, 1, Lead, 1)); event.setMaterial(Pyrite).mats(of(Iron, 1, Sulfur, 2)).elecTicks(114); event.setMaterial(Pyrolusite).mats(of(Manganese, 1, Oxygen, 2)).elecTicks(78); - event.setMaterial(Pyrope).mats(of(Aluminium, 2, Magnesium, 3, Silicon, 3, Oxygen, 12)).elecTicks(400); + event.setMaterial(Pyrope).mats(of(Alumina, 5, Magnesium, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(400); event.setMaterial(Saltpeter).mats(of(Potassium, 1, Nitrogen, 1, Oxygen, 3)).elecTicks(100); event.setMaterial(Scheelite).mats(of(Tungsten, 1, Calcium, 2, Oxygen, 4)).elecTicks(120); event.setMaterial(Soapstone).mats(of(Magnesium, 3, Silicon, 4, Hydrogen, 2, Oxygen, 12)).elecTicks(378); // TODO: Ore Gen; - event.setMaterial(Spodumene).mats(of(Lithium, 1, Aluminium, 1, Silicon, 2, Oxygen, 6)).elecTicks(180); - event.setMaterial(Spessartine).mats(of(Aluminium, 2, Manganese, 3, Silicon, 3, Oxygen, 12)).elecTicks(440); + event.setMaterial(Spodumene).mats(of(Lithium, 2, Alumina, 5, SiliconDioxide, 12, Oxygen, 1)).elecTicks(180); + event.setMaterial(Spessartine).mats(of(Alumina, 5, Manganese, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(440); event.setMaterial(Sphalerite).mats(of(Zinc, 1, Sulfur, 1)).elecTicks(92); event.setMaterial(Stibnite).mats(of(Antimony, 2, Sulfur, 3)); event.setMaterial(Tantalite).mats(of(Manganese, 1, Tantalum, 2, Oxygen, 6)).elecTicks(432); @@ -723,7 +727,7 @@ private static void processInto(GregTechMaterialEvent event){ /** ** Ore Stones **/ - event.setMaterial(Bauxite).mats(of(Rutile, 2, Aluminium, 16, Hydrogen, 10, Oxygen, 11)).elecTicks(702); + event.setMaterial(Bauxite).mats(of(Rutile, 2, Aluminium, 16, Hydrogen, 10, Oxygen, 11)); event.setMaterial(Lignite).mats(of(Carbon, 3, Water, 1)).elecTicks(40); event.setMaterial(RockSalt).mats(of(Potassium, 1, Chlorine, 1)).elecTicks(72); event.setMaterial(Salt).mats(of(Sodium, 1, Chlorine, 1)).elecTicks(320); @@ -734,20 +738,20 @@ private static void processInto(GregTechMaterialEvent event){ * Regular **/ event.setMaterial(Amethyst).mats(of(SiliconDioxide, 4, Iron, 1)).elecTicks(130); - event.setMaterial(Sapphire).mats(of(Aluminium, 2, Oxygen, 3)).elecTicks(100); - event.setMaterial(BlueTopaz).mats(of(Aluminium, 2, Silicon, 1, Fluorine, 2, Hydrogen, 2, Oxygen, 6)).elecTicks(208); + event.setMaterial(Sapphire).mats(of(Alumina, 5, Iron, 1)).elecTicks(100); + event.setMaterial(BlueTopaz).mats(of(Alumina, 5, SiliconDioxide, 3, Fluorine, 2, DistilledWater, 3)).elecTicks(208); event.setMaterial(Glass).mats(of(SiliconDioxide, 1)); - event.setMaterial(GreenSapphire).mats(of(Aluminium, 2, Oxygen, 3)).elecTicks(100); - event.setMaterial(Lazurite).mats(of(Aluminium, 6, Silicon, 6, Calcium, 8, Sodium, 8)).elecTicks(392); + event.setMaterial(GreenSapphire).mats(of(Alumina, 5, Magnesium, 1)).elecTicks(100); + event.setMaterial(Lazurite).mats(of(Alumina, 3, SiliconDioxide, 3, Calcium, 4, Sodium, 4)).elecTicks(392); event.setMaterial(Olivine).mats(of(Magnesium, 2, Iron, 1, SiliconDioxide, 2)).elecTicks(140); event.setMaterial(Opal).mats(of(SiliconDioxide, 1)).elecTicks(20); event.setMaterial(Phosphorus).mats(of(Calcium, 3, Phosphate, 2)); event.setMaterial(MilkyQuartz).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(60); event.setMaterial(RedGarnet).mats(of(Pyrope, 3, Almandine, 5, Spessartine, 8)); - event.setMaterial(Ruby).mats(of(Chrome, 1, Aluminium, 2, Oxygen, 3)).elecTicks(144); - event.setMaterial(Sodalite).mats(of(Aluminium, 3, Silicon, 3, Sodium, 4, Chlorine, 1)).elecTicks(264); - event.setMaterial(Tanzanite).mats(of(Calcium, 2, Aluminium, 3, Silicon, 3, Hydrogen, 1, Oxygen, 13)).elecTicks(440); - event.setMaterial(Topaz).mats(of(Aluminium, 2, Silicon, 1, Fluorine, 2, Hydrogen, 2, Oxygen, 6)).elecTicks(208); + event.setMaterial(Ruby).mats(of(Chrome, 1, Alumina, 5)).elecTicks(144); + event.setMaterial(Sodalite).mats(of(Alumina, 3, SiliconDioxide, 3, Sodium, 4, Chlorine, 1)).elecTicks(264); + event.setMaterial(Tanzanite).mats(of(Alumina, 15, Calcium, 4, SiliconDioxide, 18, DistilledWater, 3, Oxygen, 4)).elecTicks(440); + event.setMaterial(Topaz).mats(of(Alumina, 5, SiliconDioxide, 3, Fluorine, 2, DistilledWater, 3)).elecTicks(208); event.setMaterial(YellowGarnet).mats(of(Andradite, 5, Grossular, 8, Uvarovite, 3)); /** * Basic @@ -1474,7 +1478,7 @@ private static void flags(GregTechMaterialEvent event){ Chloromethane, Malachite, /*Borax, */ /*Kaolinite,*/ Obsidian, NitricAcid, VinylChloride, Acetone, /*Asbestos,*/ PotassiumFeldspar, MethylAcetate, Sodalite, AllylChloride, Dichlorobenzene, Phenol, Glycerol, Talc, Soapstone, PhosphoricAcid, Chlorobenzene, SulfuricAcid, Pyrope, SodiumPersulfate, Chloroform, Grossular, Spessartine, Almandine, Uvarovite, Andradite, - Emerald, Bauxite, Tetranitromethane, Galena); + Emerald, Tetranitromethane, Galena); ELEC120.add(Clay, /*Trona,*/ BlueTopaz, Topaz, /*Pollucite,*/ CarbonDioxide, SulfurDioxide, Epichlorohydrin, Lepidolite, /*FullersEarth, Alunite,*/ Glauconite, /*Mica,*/ Lazurite, Tanzanite, Biotite, StainlessSteel, Bentonite, Ultimet, CalciumAcetateSolution, Dimethyldichlorosilane, /*Vermiculate, Zeolite,*/ GlycerylTrinitrate, LeadZincSolution, Tungstate, Scheelite); @@ -1622,7 +1626,7 @@ private static void antimatterMaterials(GregTechMaterialEvent event){ event.setMaterial(Coal).asGemBasic(false).flags(ORE_STONE).mats(of(Carbon, 2)); event.setMaterial(Copper).flags(PLATE, ROD, FOIL, WIRE_FINE, GEAR, BOLT); event.setMaterial(Diamond).asGem(true).mats(of(Carbon, 64), 1).elecTicks(768); - event.setMaterial(Emerald).asGem(true).mats(of(Beryllium, 3, Aluminium, 2, Silicon, 3, Oxygen, 18)).elecTicks(540).addTools(3.0F, 9.0F, 590, 3, of(Data.IMPLOSION, 5)); + event.setMaterial(Emerald).asGem(true).mats(of(Alumina, 5, Beryllium, 3, SiliconDioxide, 18, Oxygen, 3)).elecTicks(540).addTools(3.0F, 9.0F, 590, 3, of(Data.IMPLOSION, 5)); event.setMaterial(EnderEye).asGemBasic(false, ROD, PLATE).mats(of(EnderPearl, 1, Blaze, 1)); event.setMaterial(EnderPearl).mats(of(Beryllium, 1, Potassium, 4, Nitrogen, 5, Chlorine, 6)).elecTicks(220); event.setMaterial(Flint).flags(ROCK); diff --git a/common/src/main/java/muramasa/gregtech/data/Guis.java b/common/src/main/java/muramasa/gregtech/data/Guis.java index 0087bd9e7..bbb4973b6 100644 --- a/common/src/main/java/muramasa/gregtech/data/Guis.java +++ b/common/src/main/java/muramasa/gregtech/data/Guis.java @@ -112,7 +112,7 @@ public static void init(Side side) { .add(FL_OUT, 44, 63).add(FL_OUT, 62, 63).add(FL_OUT, 80, 63) .add(FL_OUT, 98, 63).add(FL_OUT, 116, 63).add(FL_OUT, 134, 63) .add(ENERGY, 17, 25).getGui().getMachineData().setProgressLocation("extractor"); - ELECTROLYZER.add(CENTRIFUGE).getGui().getMachineData().setProgressLocation("extractor"); + ELECTROLYZER.add(CENTRIFUGE).add(IT_IN, 35, 43).add(FL_IN,53, 43).getGui().getMachineData().setProgressLocation("extractor"); THERMAL_CENTRIFUGE.add(IT_IN, 53, 25).add(IT_OUT, 107, 25).add(IT_OUT, 125, 25).add(IT_OUT, 143, 25).add(ENERGY, 80, 63); ORE_WASHER.add(THERMAL_CENTRIFUGE).add(FL_IN, 53, 63).add(FL_OUT, 107, 63) @@ -138,7 +138,7 @@ public static void init(Side side) { FLUID_SOLIDIFIER.add(COMPRESSOR).add(FL_IN, 53, 63); DISTILLERY.add(FLUID_CANNER).getGui().getMachineData().setProgressLocation("chemical_reactor"); CHEMICAL_BATH.add(THERMAL_CENTRIFUGE).add(FL_IN, 53, 63).getGui().getMachineData().setProgressLocation("ore_washer"); - AUTOCLAVE.add(COMPRESSOR).add(FL_IN, 53, 63); + AUTOCLAVE.add(ALLOY_SMELTER).add(FL_IN, 53, 63); PACKAGER.add(COMPRESSOR); POLARIZER.add(COMPRESSOR).getGui().getMachineData().setProgressLocation("electromagnetic_separator"); MIXER.add(IT_IN, 35, 16).add(IT_IN, 53, 16).add(IT_IN, 35, 34).add(IT_IN, 53, 34).add(FL_IN, 44, 63) diff --git a/common/src/main/java/muramasa/gregtech/data/Materials.java b/common/src/main/java/muramasa/gregtech/data/Materials.java index 048392595..37cb2849a 100644 --- a/common/src/main/java/muramasa/gregtech/data/Materials.java +++ b/common/src/main/java/muramasa/gregtech/data/Materials.java @@ -335,6 +335,7 @@ public class Materials { ** Dusts **/ + public static Material AluminiumHydroxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID,"aluminium_hydroxide", 0xbebec8, DULL)); public static Material AluminiumTrichloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "aluminium_trichloride", 0xf0d77d, FINE)); public static Material Aluminosilicate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "aluminosilicate", 0xbfbdb0, FINE)); public static Material AmmoniumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "ammonium_chloride", 0xffffff, DULL)); @@ -381,6 +382,7 @@ public class Materials { public static Material Rubber = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "rubber", 0x000000, SHINY)); public static Material SiliconDioxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "silicon_dioxide", 0xc8c8c8, QUARTZ)); public static Material SodaAsh = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "soda_ash", 0xdcdcff, DULL)); + public static Material SodiumAluminate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "sodium_aluminate", 0xE6E6FA, NONE)); public static Material SodiumBisulfate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "sodium_bisulfate", 0x004455, NONE)); public static Material SodiumHydroxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "sodium_hydroxide", 0x003380, DULL)); public static Material SodiumSulfate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "sodium_sulfate", 0x004455, NONE)); diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Smelting.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Smelting.java index 0ebeae090..92cd4444e 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/Smelting.java +++ b/common/src/main/java/muramasa/gregtech/loader/crafting/Smelting.java @@ -21,5 +21,6 @@ public static void loadRecipes(Consumer output, AntimatterRecipe SimpleCookingRecipeBuilder.blasting(Ingredient.of(Items.IRON_NUGGET), NUGGET.get(Materials.WroughtIron), 0.5f, 100).unlockedBy("has_nugget_iron", provider.hasSafeItem(Items.IRON_NUGGET)).save(output, "blasting_nugget_wrought_iron"); MaterialRecipes.addSmeltingRecipe(output, provider, CRUSHED, NUGGET, 7, Cassiterite, Tin); MaterialRecipes.addSmeltingRecipe(output, provider, CRUSHED, NUGGET, 7, Garnierite, Nickel); + MaterialRecipes.addSmeltingRecipe(output, provider, DUST, DUST, 1, AluminiumHydroxide, Alumina); } } diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java b/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java index 3c87ae2cc..8c8e8df26 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java @@ -7,8 +7,7 @@ import net.minecraft.world.item.Items; import static muramasa.antimatter.Ref.L; -import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; -import static muramasa.antimatter.data.AntimatterMaterialTypes.GEM; +import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Water; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; import static muramasa.gregtech.data.GregTechData.EnergyCrystal; @@ -30,6 +29,8 @@ public static void init() { } AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(m, 1)).fi(Water.getLiquid(200)).io(GEM.get(m, 1)).add(m.getId(), dur,8); }); + AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Bauxite, 2), DUST.getMaterialIngredient(SodiumHydroxide, 3)).fi(DistilledWater.getLiquid(1000)).io(DUST.get(SodiumAluminate, 4), DUST_TINY.get(Ilmenite, 1), DUST_TINY.get(Rutile, 1)).chances(1.0, 0.25, 0.5).add("bauxite_distilled_water", 1500, 16); + AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Bauxite, 2), DUST.getMaterialIngredient(SodiumHydroxide, 3)).fi(Water.getLiquid(1000)).io(DUST.get(SodiumAluminate, 4), DUST_TINY.get(Ilmenite, 1), DUST_TINY.get(Rutile, 1)).chances(1.0, 0.25, 0.5).add("bauxite", 3000, 16); AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Platinum.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre", 150, 5); AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Lutetium.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre_1", 150, 5); AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Palladium.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre_2", 150, 5); diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java index 59e74eb88..22d99a875 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java +++ b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalBath.java @@ -6,9 +6,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import static muramasa.antimatter.Ref.L; +import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterialTypes.GEM; -import static muramasa.antimatter.data.AntimatterMaterials.Netherite; -import static muramasa.antimatter.data.AntimatterMaterials.NetherizedDiamond; +import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.gregtech.data.GregTechMaterialTags.CHEMBATH_MERCURY; import static muramasa.gregtech.data.GregTechMaterialTags.CHEMBATH_PERSULFATE; import static muramasa.gregtech.data.Materials.*; @@ -36,6 +36,8 @@ public static void init() { .fi(Netherite.getLiquid(L/4)) .io(GEM.get(NetherizedDiamond)) .add("netherized_diamond_recipe",144,384); + CHEMICAL_BATHING.RB().ii(DUST.getMaterialIngredient(SodiumAluminate, 4)).fi(Water.getLiquid(6000)).io(DUST.get(AluminiumHydroxide, 7), DUST.get(SodiumHydroxide, 3)).add("aluminium_hydroxide", 102 * 20, 2); + CHEMICAL_BATHING.RB().ii(DUST.getMaterialIngredient(SodiumAluminate, 4)).fi(DistilledWater.getLiquid(6000)).io(DUST.get(AluminiumHydroxide, 7), DUST.get(SodiumHydroxide, 3)).add("aluminium_hydroxide_distilled_water", 102 * 20, 2); mercurybathing(); persulfatebathing(); }