Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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ıꞀ",
Expand Down Expand Up @@ -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ɹ⅁ ʍɐᴚ",
Expand Down
3 changes: 3 additions & 0 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
SeparationRecipes.init(provider);
AntidoteRecipes.init(provider);
TitaniumRecipes.init(provider);
RareEarthRecipes.init(provider);

// A Few Random Recipes
FLUID_HEATER_RECIPES.recipeBuilder("ethenone")
Expand Down
Original file line number Diff line number Diff line change
@@ -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<FinishedRecipe> 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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,6 @@ public static void init(Consumer<FinishedRecipe> 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)
Expand Down
Loading