Skip to content

Commit 186f607

Browse files
TechLord22TechLord22
authored
Deprecate the Phosphate material (GregTechCEu#2798)
1 parent da95680 commit 186f607

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎src/main/java/gregtech/api/unification/material/Materials.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import gregtech.api.unification.material.materials.*;
55
import gregtech.api.unification.ore.OrePrefix;
66

7+
import org.jetbrains.annotations.ApiStatus;
8+
79
import java.util.ArrayList;
810
import java.util.Arrays;
911
import java.util.List;
@@ -302,6 +304,9 @@ public static void register() {
302304
public static Material NiobiumNitride;
303305
public static Material NiobiumTitanium;
304306
public static Material Obsidian;
307+
@ApiStatus.Obsolete
308+
@ApiStatus.ScheduledForRemoval(inVersion = "2.10")
309+
@Deprecated
305310
public static Material Phosphate;
306311
public static Material SterlingSilver;
307312
public static Material RoseGold;

‎src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ public static void register() {
904904
PhosphorusPentoxide = new Material.Builder(359, gregtechId("phosphorus_pentoxide"))
905905
.dust(1)
906906
.color(0xDCDC00)
907-
.flags(DECOMPOSITION_BY_CENTRIFUGING)
907+
.flags(DECOMPOSITION_BY_ELECTROLYZING)
908908
.components(Phosphorus, 4, Oxygen, 10)
909909
.build();
910910

‎src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,10 @@ public static void register() {
315315
oreProp.setOreByProducts(Lazurite, Sodalite, Pyrite);
316316

317317
oreProp = Apatite.getProperty(PropertyKey.ORE);
318-
oreProp.setOreByProducts(TricalciumPhosphate, Phosphate, Pyrochlore);
318+
oreProp.setOreByProducts(TricalciumPhosphate, Phosphorus, Pyrochlore);
319319

320320
oreProp = TricalciumPhosphate.getProperty(PropertyKey.ORE);
321-
oreProp.setOreByProducts(Apatite, Phosphate, Pyrochlore);
321+
oreProp.setOreByProducts(Apatite, Phosphorus, Pyrochlore);
322322

323323
oreProp = GarnetRed.getProperty(PropertyKey.ORE);
324324
oreProp.setOreByProducts(Spessartine, Pyrope, Almandine);

‎src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ public static void register() {
8888
Apatite = new Material.Builder(2010, gregtechId("apatite"))
8989
.gem(1).ore(2, 2)
9090
.color(0xC8C8FF).iconSet(DIAMOND)
91-
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_BOLT_SCREW, DISABLE_DECOMPOSITION)
92-
.components(Calcium, 5, Phosphate, 3, Chlorine, 1)
93-
.build();
91+
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_BOLT_SCREW)
92+
.components(Calcium, 5, Phosphorus, 3, Oxygen, 12, Chlorine, 1)
93+
.build()
94+
.setFormula("Ca5(PO4)3Cl", true);
9495

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

152154
GarnetRed = new Material.Builder(2016, gregtechId("garnet_red"))
153155
.gem().ore(4, 1)
@@ -232,8 +234,8 @@ public static void register() {
232234
Monazite = new Material.Builder(2029, gregtechId("monazite"))
233235
.gem(1).ore(4, 2, true)
234236
.color(0x324632).iconSet(DIAMOND)
235-
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE)
236-
.components(RareEarth, 1, Phosphate, 1)
237+
.flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, DECOMPOSITION_BY_CENTRIFUGING)
238+
.components(RareEarth, 1, Phosphorus, 1)
237239
.build();
238240

239241
Mirabilite = new Material.Builder(2030, gregtechId("mirabilite"))

‎src/main/java/gregtech/integration/forestry/recipes/CombRecipes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static void initGTCombs() {
117117

118118
// Gem
119119
addProcessGT(GTCombType.STONE, new Material[] { Materials.Soapstone, Materials.Talc, Materials.Apatite,
120-
Materials.Phosphate, Materials.TricalciumPhosphate }, Voltage.LV);
120+
Materials.TricalciumPhosphate }, Voltage.LV);
121121
addProcessGT(GTCombType.CERTUS,
122122
new Material[] { Materials.CertusQuartz, Materials.Quartzite, Materials.Barite }, Voltage.LV);
123123
addProcessGT(GTCombType.REDSTONE, new Material[] { Materials.Redstone, Materials.Cinnabar }, Voltage.LV);

‎src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public static void init() {
427427
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
428428
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, TricalciumPhosphate)
429429
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
430-
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, Phosphate).fluidInputs(Water.getFluid(1000))
430+
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, Phosphorus).fluidInputs(Water.getFluid(1000))
431431
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
432432
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcite).input(dust, Ash, 3).fluidInputs(Water.getFluid(1000))
433433
.output(FERTILIZER, 1).duration(100).EUt(VA[LV]).buildAndRegister();
@@ -437,7 +437,7 @@ public static void init() {
437437
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
438438
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, TricalciumPhosphate)
439439
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 4).duration(400).EUt(VA[LV]).buildAndRegister();
440-
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, Phosphate).fluidInputs(Water.getFluid(1000))
440+
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, Phosphorus).fluidInputs(Water.getFluid(1000))
441441
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
442442
CHEMICAL_RECIPES.recipeBuilder().input(dust, Calcium).input(dust, Ash, 3).fluidInputs(Water.getFluid(1000))
443443
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
@@ -447,7 +447,7 @@ public static void init() {
447447
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
448448
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, TricalciumPhosphate)
449449
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 4).duration(400).EUt(VA[LV]).buildAndRegister();
450-
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, Phosphate).fluidInputs(Water.getFluid(1000))
450+
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, Phosphorus).fluidInputs(Water.getFluid(1000))
451451
.output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
452452
CHEMICAL_RECIPES.recipeBuilder().input(dust, Apatite).input(dust, Ash, 3).fluidInputs(Water.getFluid(1000))
453453
.output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();
@@ -457,7 +457,7 @@ public static void init() {
457457
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
458458
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, TricalciumPhosphate)
459459
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 4).duration(400).EUt(VA[LV]).buildAndRegister();
460-
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, Phosphate)
460+
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, Phosphorus)
461461
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 3).duration(300).EUt(VA[LV]).buildAndRegister();
462462
CHEMICAL_RECIPES.recipeBuilder().input(dust, GlauconiteSand).input(dust, Ash, 3)
463463
.fluidInputs(Water.getFluid(1000)).output(FERTILIZER, 2).duration(200).EUt(VA[LV]).buildAndRegister();

‎src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -413,13 +413,6 @@ public static void init() {
413413
.fluidOutputs(Water.getFluid(1000))
414414
.duration(64).EUt(VA[LV]).buildAndRegister();
415415

416-
ELECTROLYZER_RECIPES.recipeBuilder()
417-
.input(dust, Apatite, 9)
418-
.output(dust, Calcium, 5)
419-
.output(dust, Phosphorus, 3)
420-
.fluidOutputs(Chlorine.getFluid(1000))
421-
.duration(288).EUt(60).buildAndRegister();
422-
423416
ELECTROLYZER_RECIPES.recipeBuilder()
424417
.fluidInputs(Propane.getFluid(1000))
425418
.output(dust, Carbon, 3)

‎src/main/resources/assets/gregtech/lang/en_us.lang‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,7 @@ gregtech.material.nichrome=Nichrome
17381738
gregtech.material.niobium_nitride=Niobium Nitride
17391739
gregtech.material.niobium_titanium=Niobium-Titanium
17401740
gregtech.material.obsidian=Obsidian
1741-
gregtech.material.phosphate=Phosphate
1741+
gregtech.material.phosphate=Phosphate [DEPRECATED]
17421742
gregtech.material.sterling_silver=Sterling Silver
17431743
gregtech.material.rose_gold=Rose Gold
17441744
gregtech.material.black_bronze=Black Bronze

0 commit comments

Comments
 (0)