Skip to content

Deprecate the Phosphate material #2798

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 3 commits into from
May 18, 2025
Merged

Deprecate the Phosphate material #2798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfdcfd0
remove the phosphate material
TechLord22 May 17, 2025
02200a5
re-add Phosphate as a deprecated material
TechLord22 May 18, 2025
e5fdf2f
update 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
5 changes: 5 additions & 0 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 @@ -4,6 +4,8 @@
import gregtech.api.unification.material.materials.*;
import gregtech.api.unification.ore.OrePrefix;

import org.jetbrains.annotations.ApiStatus;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -302,6 +304,9 @@ public static void register() {
public static Material NiobiumNitride;
public static Material NiobiumTitanium;
public static Material Obsidian;
@ApiStatus.Obsolete
@ApiStatus.ScheduledForRemoval(inVersion = "2.10")
@Deprecated
public static Material Phosphate;
public static Material SterlingSilver;
public static Material RoseGold;
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -904,7 +904,7 @@ public static void register() {
PhosphorusPentoxide = new Material.Builder(359, gregtechId("phosphorus_pentoxide"))
.dust(1)
.color(0xDCDC00)
.flags(DECOMPOSITION_BY_CENTRIFUGING)
.flags(DECOMPOSITION_BY_ELECTROLYZING)
.components(Phosphorus, 4, Oxygen, 10)
.build();

Expand Down
4 changes: 2 additions & 2 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 @@ -315,10 +315,10 @@ public static void register() {
oreProp.setOreByProducts(Lazurite, Sodalite, Pyrite);

oreProp = Apatite.getProperty(PropertyKey.ORE);
oreProp.setOreByProducts(TricalciumPhosphate, Phosphate, Pyrochlore);
oreProp.setOreByProducts(TricalciumPhosphate, Phosphorus, Pyrochlore);

oreProp = TricalciumPhosphate.getProperty(PropertyKey.ORE);
oreProp.setOreByProducts(Apatite, Phosphate, Pyrochlore);
oreProp.setOreByProducts(Apatite, Phosphorus, Pyrochlore);

oreProp = GarnetRed.getProperty(PropertyKey.ORE);
oreProp.setOreByProducts(Spessartine, Pyrope, Almandine);
Expand Down
18 changes: 10 additions & 8 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 @@ -88,9 +88,10 @@ public static void register() {
Apatite = new Material.Builder(2010, gregtechId("apatite"))
.gem(1).ore(2, 2)
.color(0xC8C8FF).iconSet(DIAMOND)
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_BOLT_SCREW, DISABLE_DECOMPOSITION)
.components(Calcium, 5, Phosphate, 3, Chlorine, 1)
.build();
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_BOLT_SCREW)
.components(Calcium, 5, Phosphorus, 3, Oxygen, 12, Chlorine, 1)
.build()
.setFormula("Ca5(PO4)3Cl", true);

BlackSteel = new Material.Builder(2011, gregtechId("black_steel"))
.ingot().fluid()
Expand Down Expand Up @@ -145,9 +146,10 @@ public static void register() {
TricalciumPhosphate = new Material.Builder(2015, gregtechId("tricalcium_phosphate"))
.dust().ore(3, 1)
.color(0xFFFF00).iconSet(FLINT)
.flags(NO_SMASHING, NO_SMELTING, FLAMMABLE, EXPLOSIVE, DECOMPOSITION_BY_CENTRIFUGING)
.components(Calcium, 3, Phosphate, 2)
.build();
.flags(NO_SMASHING, NO_SMELTING, FLAMMABLE, EXPLOSIVE)
.components(Calcium, 3, Phosphorus, 2, Oxygen, 8)
.build()
.setFormula("Ca3(PO4)2", true);

GarnetRed = new Material.Builder(2016, gregtechId("garnet_red"))
.gem().ore(4, 1)
Expand Down Expand Up @@ -232,8 +234,8 @@ public static void register() {
Monazite = new Material.Builder(2029, gregtechId("monazite"))
.gem(1).ore(4, 2, true)
.color(0x324632).iconSet(DIAMOND)
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE)
.components(RareEarth, 1, Phosphate, 1)
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, DECOMPOSITION_BY_CENTRIFUGING)
.components(RareEarth, 1, Phosphorus, 1)
.build();

Mirabilite = new Material.Builder(2030, gregtechId("mirabilite"))
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/integration/forestry/recipes/CombRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public static void initGTCombs() {

// Gem
addProcessGT(GTCombType.STONE, new Material[] { Materials.Soapstone, Materials.Talc, Materials.Apatite,
Materials.Phosphate, Materials.TricalciumPhosphate }, Voltage.LV);
Materials.TricalciumPhosphate }, Voltage.LV);
addProcessGT(GTCombType.CERTUS,
new Material[] { Materials.CertusQuartz, Materials.Quartzite, Materials.Barite }, Voltage.LV);
addProcessGT(GTCombType.REDSTONE, new Material[] { Materials.Redstone, Materials.Cinnabar }, Voltage.LV);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public static void init() {
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, TricalciumPhosphate)
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, Phosphate).fluidInputs(Water.getFluid(1000))
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, Phosphorus).fluidInputs(Water.getFluid(1000))
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, Ash, 3).fluidInputs(Water.getFluid(1000))
.output(FERTILIZER, 1).duration(100).EUt(VA[LV]).buildAndRegister();
Expand All @@ -437,7 +437,7 @@ public static void init() {
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, TricalciumPhosphate)
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 4).duration(400).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, Phosphate).fluidInputs(Water.getFluid(1000))
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, Phosphorus).fluidInputs(Water.getFluid(1000))
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, Ash, 3).fluidInputs(Water.getFluid(1000))
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
Expand All @@ -447,7 +447,7 @@ public static void init() {
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, TricalciumPhosphate)
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 4).duration(400).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, Phosphate).fluidInputs(Water.getFluid(1000))
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, Phosphorus).fluidInputs(Water.getFluid(1000))
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, Ash, 3).fluidInputs(Water.getFluid(1000))
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
Expand All @@ -457,7 +457,7 @@ public static void init() {
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, TricalciumPhosphate)
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 4).duration(400).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, Phosphate)
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, Phosphorus)
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, Ash, 3)
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,6 @@ public static void init() {
.fluidOutputs(Water.getFluid(1000))
.duration(64).EUt(VA[LV]).buildAndRegister();

ELECTROLYZER_RECIPES.recipeBuilder()
.input(dust, Apatite, 9)
.output(dust, Calcium, 5)
.output(dust, Phosphorus, 3)
.fluidOutputs(Chlorine.getFluid(1000))
.duration(288).EUt(60).buildAndRegister();

ELECTROLYZER_RECIPES.recipeBuilder()
.fluidInputs(Propane.getFluid(1000))
.output(dust, Carbon, 3)
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -1738,7 +1738,7 @@ gregtech.material.nichrome=Nichrome
gregtech.material.niobium_nitride=Niobium Nitride
gregtech.material.niobium_titanium=Niobium-Titanium
gregtech.material.obsidian=Obsidian
gregtech.material.phosphate=Phosphate
gregtech.material.phosphate=Phosphate [DEPRECATED]
gregtech.material.sterling_silver=Sterling Silver
gregtech.material.rose_gold=Rose Gold
gregtech.material.black_bronze=Black Bronze
Expand Down
Loading