diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 370dabb5b6e..c53b17a6906 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -5402,6 +5402,7 @@ "material.gtceu.hastelloy_c_276": "9ㄥᄅ-Ɔ ʎoןןǝʇsɐH", "material.gtceu.hastelloy_x": "X ʎoןןǝʇsɐH", "material.gtceu.heavy_fuel": "ןǝnℲ ʎʌɐǝH", + "material.gtceu.heavy_rare_earth_sludge": "ǝbpnןS ɥʇɹɐƎ ǝɹɐᴚ ʎʌɐǝH", "material.gtceu.helium": "ɯnıןǝH", "material.gtceu.helium_3": "Ɛ ɯnıןǝH", "material.gtceu.hematite": "ǝʇıʇɐɯǝH", @@ -5461,6 +5462,7 @@ "material.gtceu.light_blue_dye": "ǝʎᗡ ǝnןᗺ ʇɥbıꞀ", "material.gtceu.light_fuel": "ןǝnℲ ʇɥbıꞀ", "material.gtceu.light_gray_dye": "ǝʎᗡ ʎɐɹ⅁ ʇɥbıꞀ", + "material.gtceu.light_rare_earth_sludge": "ǝbpnןS ɥʇɹɐƎ ǝɹɐᴚ ʇɥbıꞀ", "material.gtceu.lightly_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", "material.gtceu.lightly_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", "material.gtceu.lightly_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", @@ -5631,6 +5633,7 @@ "material.gtceu.radium": "ɯnıpɐᴚ", "material.gtceu.radon": "uopɐᴚ", "material.gtceu.rare_earth": "ɥʇɹɐƎ ǝɹɐᴚ", + "material.gtceu.rare_earth_sludge_mixture": "ǝɹnʇxıW ǝbpnןS ɥʇɹɐƎ ǝɹɐᴚ", "material.gtceu.rarest_metal_mixture": "ǝɹnʇxıW ןɐʇǝW ʇsǝɹɐᴚ", "material.gtceu.raw_gasoline": "ǝuıןosɐ⅁ ʍɐᴚ", "material.gtceu.raw_growth_medium": "ɯnıpǝW ɥʇʍoɹ⅁ ʍɐᴚ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 20a7a484b07..7bd13251954 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -5402,6 +5402,7 @@ "material.gtceu.hastelloy_c_276": "Hastelloy C-276", "material.gtceu.hastelloy_x": "Hastelloy X", "material.gtceu.heavy_fuel": "Heavy Fuel", + "material.gtceu.heavy_rare_earth_sludge": "Heavy Rare Earth Sludge", "material.gtceu.helium": "Helium", "material.gtceu.helium_3": "Helium 3", "material.gtceu.hematite": "Hematite", @@ -5461,6 +5462,7 @@ "material.gtceu.light_blue_dye": "Light Blue Dye", "material.gtceu.light_fuel": "Light Fuel", "material.gtceu.light_gray_dye": "Light Gray Dye", + "material.gtceu.light_rare_earth_sludge": "Light Rare Earth Sludge", "material.gtceu.lightly_hydro_cracked_gas": "Lightly Hydro-Cracked Gas", "material.gtceu.lightly_hydro_cracked_heavy_fuel": "Lightly Hydro-Cracked Heavy Fuel", "material.gtceu.lightly_hydro_cracked_light_fuel": "Lightly Hydro-Cracked Light Fuel", @@ -5631,6 +5633,7 @@ "material.gtceu.radium": "Radium", "material.gtceu.radon": "Radon", "material.gtceu.rare_earth": "Rare Earth", + "material.gtceu.rare_earth_sludge_mixture": "Rare Earth Sludge Mixture", "material.gtceu.rarest_metal_mixture": "Rarest Metal Mixture", "material.gtceu.raw_gasoline": "Raw Gasoline", "material.gtceu.raw_growth_medium": "Raw Growth Medium", diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java index 855c7665f35..48154325e2c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java @@ -903,6 +903,9 @@ private static void excludeAllGemsButNormal(Material material) { public static Material BauxiteSludge; public static Material DecalcifiedBauxiteSludge; public static Material BauxiteSlag; + public static Material RareEarthSludgeMixture; + public static Material LightRareEarthSludge; + public static Material HeavyRareEarthSludge; /** * Second Degree Compounds diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java index b0d8a6e4a87..52e35eae9bc 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java @@ -179,7 +179,7 @@ public class GTRecipeTypes { .addCustomRecipeLogic(CannerLogic.INSTANCE) .setSound(GTSoundEntries.BATH); - public final static GTRecipeType CENTRIFUGE_RECIPES = register("centrifuge", ELECTRIC).setMaxIOSize(2, 6, 1, 6) + public final static GTRecipeType CENTRIFUGE_RECIPES = register("centrifuge", ELECTRIC).setMaxIOSize(2, 6, 2, 6) .setEUIO(IO.IN) .prepareBuilder(recipeBuilder -> recipeBuilder.EUt(5)) .UI(builder -> builder.setProgressBar(GTGuiTextures.PROGRESS_EXTRACT) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java index 2c0550e18f3..316d5730007 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java @@ -636,5 +636,20 @@ public static void register() { .dust() .color(0x6F2DA8).iconSet(SAND) .buildAndRegister(); + + RareEarthSludgeMixture = new Material.Builder(GTCEu.id("rare_earth_sludge_mixture")) + .liquid() + .color(0xF0C267) + .buildAndRegister(); + + LightRareEarthSludge = new Material.Builder(GTCEu.id("light_rare_earth_sludge")) + .dust() + .color(0x47464A).secondaryColor(0x44315E).iconSet(ROUGH) + .buildAndRegister(); + + HeavyRareEarthSludge = new Material.Builder(GTCEu.id("heavy_rare_earth_sludge")) + .dust() + .color(0x47464A).secondaryColor(0x6F2DA8).iconSet(ROUGH) + .buildAndRegister(); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java index 150170312e6..36024237871 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java @@ -35,6 +35,7 @@ public static void init(Consumer provider) { SeparationRecipes.init(provider); AntidoteRecipes.init(provider); TitaniumRecipes.init(provider); + RareEarthRecipes.init(provider); // A Few Random Recipes FLUID_HEATER_RECIPES.recipeBuilder("ethenone") diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/RareEarthRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/RareEarthRecipes.java new file mode 100644 index 00000000000..00b79e574d4 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/RareEarthRecipes.java @@ -0,0 +1,44 @@ +package com.gregtechceu.gtceu.data.recipe.serialized.chemistry; + +import net.minecraft.data.recipes.FinishedRecipe; + +import java.util.function.Consumer; + +import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.dust; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; + +public class RareEarthRecipes { + + // TODO: Rare Earths for some reason gives *cadmium*, fix it at a later date or keep it here. + public static void init(Consumer provider) { + // Ln2O3 + 6HCl + 3H2O -> [2LnCl3 + 6H2O]aq + MIXER_RECIPES.recipeBuilder("rare_earth_sludge_mixture_from_pure_rare_earth") + .inputItems(dust, RareEarth, 4) + .inputFluids(HydrochloricAcid.getFluid(6000)) + .inputFluids(Water.getFluid(3000)) + .outputFluids(RareEarthSludgeMixture.getFluid(1000)) + .duration(480).EUt(VA[HV]).save(provider); + // [2LnCl3 + 6H2O]aq + 6NH3 -> LowLn(OH)3 + HighLn(OH)3 + 6NH4Cl + CENTRIFUGE_RECIPES.recipeBuilder("rare_earth_sludge_dust_washing_from_sludge_mixture") + .inputFluids(RareEarthSludgeMixture.getFluid(1000)) + .inputFluids(Ammonia.getFluid(6000)) + .outputItems(dust, AmmoniumChloride, 12) + .outputItems(dust, LightRareEarthSludge, 2) + .outputItems(dust, HeavyRareEarthSludge, 2) + .duration(360).EUt(VA[HV]).save(provider); + ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder("sift_light_rare_earth_sludge") + .inputItems(dust, LightRareEarthSludge, 1) + .chancedOutput(dust, Cerium, 2800) + .chancedOutput(dust, Neodymium, 3200) + .chancedOutput(dust, Lanthanum, 1500) + .duration(70).EUt(VA[EV]).save(provider); + ELECTROMAGNETIC_SEPARATOR_RECIPES.recipeBuilder("sift_heavy_rare_earth_sludge") + .inputItems(dust, HeavyRareEarthSludge, 1) + .chancedOutput(dust, Cadmium, 1800) + .chancedOutput(dust, Samarium, 2700) + .chancedOutput(dust, Yttrium, 1800) + .duration(70).EUt(VA[EV]).save(provider); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java index 45abc9e9e85..5f5bd03361b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java @@ -214,16 +214,6 @@ public static void init(Consumer provider) { .chancedOutput(dust, Tantalite, 125) .save(provider); - CENTRIFUGE_RECIPES.recipeBuilder("rare_earth_separation").duration(64).EUt(20) - .inputItems(dust, RareEarth) - .chancedOutput(dustSmall, Cadmium, 3500) - .chancedOutput(dustSmall, Neodymium, 4500) - .chancedOutput(dustSmall, Samarium, 3500) - .chancedOutput(dustSmall, Cerium, 5500) - .chancedOutput(dustSmall, Yttrium, 3500) - .chancedOutput(dustSmall, Lanthanum, 2500) - .save(provider); - CENTRIFUGE_RECIPES.recipeBuilder("red_sand_separation").duration(50).EUt(VA[LV]) .inputItems(Blocks.RED_SAND.asItem()) .chancedOutput(dust, Iron, 5000)