Skip to content

remove EBF pyrometallurgy and associated materials #2804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TechLord22 merged 2 commits into from
May 19, 2025
Merged

remove EBF pyrometallurgy and associated materials #2804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cadcc97
remove EBF pyrometallurgy and associated materials
TechLord22 May 15, 2025
60933a9
remove lang
TechLord22 May 18, 2025
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: 0 additions & 3 deletions src/main/java/gregtech/api/unification/material/Materials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,9 @@ public static void register() {
public static Material ChromiumTrioxide;
public static Material AntimonyTrioxide;
public static Material Zincite;
public static Material CupricOxide;
public static Material CobaltOxide;
public static Material ArsenicTrioxide;
public static Material Massicot;
public static Material Ferrosilite;
public static Material MetalMixture;
public static Material SodiumHydroxide;
public static Material SodiumPersulfate;
Expand Down Expand Up @@ -690,7 +688,6 @@ public static void register() {
* Second Degree Compounds
*/
public static Material Glass;
public static Material Perlite;
public static Material Borax;
public static Material Olivine;
public static Material Opal;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ public static void register() {
Cobalt = new Material.Builder(23, gregtechId("cobalt"))
.ingot()
.liquid(new FluidBuilder().temperature(1768))
.ore() // leave for TiCon ore processing
.color(0x5050FA).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_DOUBLE_PLATE, GENERATE_FINE_WIRE)
.element(Elements.Co)
Expand Down
12 changes: 2 additions & 10 deletions src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,11 +978,7 @@ public static void register() {
.components(Zinc, 1, Oxygen, 1)
.build();

CupricOxide = new Material.Builder(371, gregtechId("cupric_oxide"))
.dust(1)
.color(0x0F0F0F)
.components(Copper, 1, Oxygen, 1)
.build();
// FREE ID 371

CobaltOxide = new Material.Builder(372, gregtechId("cobalt_oxide"))
.dust(1)
Expand All @@ -1002,11 +998,7 @@ public static void register() {
.components(Lead, 1, Oxygen, 1)
.build();

Ferrosilite = new Material.Builder(375, gregtechId("ferrosilite"))
.dust(1)
.color(0x97632A)
.components(Iron, 1, Silicon, 1, Oxygen, 3)
.build();
// FREE ID 375

MetalMixture = new Material.Builder(376, gregtechId("metal_mixture"))
.dust(1)
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ public static void register() {
oreProp = Beryllium.getProperty(PropertyKey.ORE);
oreProp.setOreByProducts(Emerald, Emerald, Thorium);

oreProp = Cobalt.getProperty(PropertyKey.ORE);
oreProp.setOreByProducts(CobaltOxide, Cobaltite);
oreProp.setWashedIn(SodiumPersulfate);

oreProp = Copper.getProperty(PropertyKey.ORE);
oreProp.setOreByProducts(Cobalt, Gold, Nickel, Gold);
oreProp.setWashedIn(Mercury);
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ public static void register() {
.components(SiliconDioxide, 1)
.build();

Perlite = new Material.Builder(2001, gregtechId("perlite"))
.dust(1)
.color(0x1E141E)
.components(Obsidian, 2, Water, 1)
.build();
// FREE ID 2001

Borax = new Material.Builder(2002, gregtechId("borax"))
.dust(1)
Expand Down
49 changes: 0 additions & 49 deletions src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,44 +1042,6 @@ private static void registerBlastFurnaceRecipes() {
}

private static void registerBlastFurnaceMetallurgyRecipes() {
createSulfurDioxideRecipe(Stibnite, AntimonyTrioxide, 1500);
createSulfurDioxideRecipe(Sphalerite, Zincite, 1000);
createSulfurDioxideRecipe(Pyrite, BandedIron, 2000);
createSulfurDioxideRecipe(Pentlandite, Garnierite, 1000);

BLAST_RECIPES.recipeBuilder().duration(120).EUt(VA[MV]).blastFurnaceTemp(1200)
.input(dust, Tetrahedrite)
.fluidInputs(Oxygen.getFluid(3000))
.output(dust, CupricOxide)
.output(dustTiny, AntimonyTrioxide, 3)
.fluidOutputs(SulfurDioxide.getFluid(2000))
.buildAndRegister();

BLAST_RECIPES.recipeBuilder().duration(120).EUt(VA[MV]).blastFurnaceTemp(1200)
.input(dust, Cobaltite)
.fluidInputs(Oxygen.getFluid(3000))
.output(dust, CobaltOxide)
.output(dust, ArsenicTrioxide)
.fluidOutputs(SulfurDioxide.getFluid(1000))
.buildAndRegister();

BLAST_RECIPES.recipeBuilder().duration(120).EUt(VA[MV]).blastFurnaceTemp(1200)
.input(dust, Galena)
.fluidInputs(Oxygen.getFluid(3000))
.output(dust, Massicot)
.output(nugget, Silver, 6)
.fluidOutputs(SulfurDioxide.getFluid(1000))
.buildAndRegister();

BLAST_RECIPES.recipeBuilder().duration(120).EUt(VA[MV]).blastFurnaceTemp(1200)
.input(dust, Chalcopyrite)
.input(dust, SiliconDioxide)
.fluidInputs(Oxygen.getFluid(3000))
.output(dust, CupricOxide)
.output(dust, Ferrosilite)
.fluidOutputs(SulfurDioxide.getFluid(2000))
.buildAndRegister();

BLAST_RECIPES.recipeBuilder().duration(240).EUt(VA[MV]).blastFurnaceTemp(2273)
.input(dust, SiliconDioxide, 3)
.input(dust, Carbon, 2)
Expand All @@ -1089,17 +1051,6 @@ private static void registerBlastFurnaceMetallurgyRecipes() {
.buildAndRegister();
}

private static void createSulfurDioxideRecipe(Material inputMaterial, Material outputMaterial,
int sulfurDioxideAmount) {
BLAST_RECIPES.recipeBuilder().duration(120).EUt(VA[MV]).blastFurnaceTemp(1200)
.input(dust, inputMaterial)
.fluidInputs(Oxygen.getFluid(3000))
.output(dust, outputMaterial)
.chancedOutput(dust, Ash, 1111, 0)
.fluidOutputs(SulfurDioxide.getFluid(sulfurDioxideAmount))
.buildAndRegister();
}

private static void registerDecompositionRecipes() {
EXTRACTOR_RECIPES.recipeBuilder()
.inputs(STICKY_RESIN.getStackForm())
Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/assets/gregtech/lang/en_us.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1811,11 +1811,9 @@ gregtech.material.potassium_dichromate=Potassium Dichromate
gregtech.material.chromium_trioxide=Chromium Trioxide
gregtech.material.antimony_trioxide=Antimony Trioxide
gregtech.material.zincite=Zincite
gregtech.material.cupric_oxide=Cupric Oxide
gregtech.material.cobalt_oxide=Cobalt Oxide
gregtech.material.arsenic_trioxide=Arsenic Trioxide
gregtech.material.massicot=Massicot
gregtech.material.ferrosilite=Ferrosilite
gregtech.material.metal_mixture=Metal Mixture
gregtech.material.sodium_hydroxide=Sodium Hydroxide
gregtech.material.sodium_persulfate=Sodium Persulfate
Expand Down Expand Up @@ -2118,7 +2116,6 @@ gregtech.material.bauxite_slag=Bauxite Slag

# Second Degree Materials
gregtech.material.glass=Glass
gregtech.material.perlite=Perlite
gregtech.material.borax=Borax
gregtech.material.olivine=Olivine
gregtech.material.opal=Opal
Expand Down
Loading