From cfdcfd01bc6f7ec0b63846b5b741d0141e0d8e22 Mon Sep 17 00:00:00 2001 From: Tech22 <37029404+techlord22@users.noreply.github.com> Date: Sat, 17 May 2025 18:20:09 -0400 Subject: [PATCH 1/3] remove the phosphate material --- .../api/unification/material/Materials.java | 1 - .../materials/FirstDegreeMaterials.java | 9 ++------- .../materials/MaterialFlagAddition.java | 4 ++-- .../materials/SecondDegreeMaterials.java | 18 ++++++++++-------- .../forestry/recipes/CombRecipes.java | 2 +- .../loaders/recipe/MiscRecipeLoader.java | 8 ++++---- .../recipe/chemistry/SeparationRecipes.java | 7 ------- 7 files changed, 19 insertions(+), 30 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 7c58bc76c37..e5ad2ed4e81 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -302,7 +302,6 @@ public static void register() { public static Material NiobiumNitride; public static Material NiobiumTitanium; public static Material Obsidian; - public static Material Phosphate; public static Material SterlingSilver; public static Material RoseGold; public static Material BlackBronze; diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java index 3eaaeab5eef..24d435f5789 100644 --- a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java @@ -398,12 +398,7 @@ public static void register() { .components(Magnesium, 1, Iron, 1, Silicon, 2, Oxygen, 4) .build(); - Phosphate = new Material.Builder(298, gregtechId("phosphate")) - .dust(1) - .color(0xFFFF00) - .flags(NO_SMASHING, NO_SMELTING, FLAMMABLE, EXPLOSIVE) - .components(Phosphorus, 1, Oxygen, 4) - .build(); + // Free ID: 298 PlatinumRaw = new Material.Builder(299, gregtechId("platinum_raw")) .dust() @@ -904,7 +899,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(); diff --git a/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java b/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java index bd132ca9d3c..64fbd76e252 100644 --- a/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java +++ b/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java @@ -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); diff --git a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java index 5e39016c570..7e84fdab0b5 100644 --- a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java @@ -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() @@ -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) @@ -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")) diff --git a/src/main/java/gregtech/integration/forestry/recipes/CombRecipes.java b/src/main/java/gregtech/integration/forestry/recipes/CombRecipes.java index d0b851af4ac..e28e3ec9748 100644 --- a/src/main/java/gregtech/integration/forestry/recipes/CombRecipes.java +++ b/src/main/java/gregtech/integration/forestry/recipes/CombRecipes.java @@ -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); diff --git a/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java index 9ee9e40aa44..d5f8bab55d6 100644 --- a/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MiscRecipeLoader.java @@ -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(); @@ -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(); @@ -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(); @@ -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(); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java index 59f27762319..c93e8f355d4 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java @@ -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) From 02200a5ef7dc33b8f7de0c804cbebf3431de7191 Mon Sep 17 00:00:00 2001 From: Tech22 <37029404+techlord22@users.noreply.github.com> Date: Sat, 17 May 2025 22:43:24 -0400 Subject: [PATCH 2/3] re-add Phosphate as a deprecated material --- .../java/gregtech/api/unification/material/Materials.java | 6 ++++++ .../material/materials/FirstDegreeMaterials.java | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index e5ad2ed4e81..23b99ddd218 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -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; @@ -302,6 +304,10 @@ 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; public static Material BlackBronze; diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java index 24d435f5789..c6940f5f487 100644 --- a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java @@ -398,7 +398,12 @@ public static void register() { .components(Magnesium, 1, Iron, 1, Silicon, 2, Oxygen, 4) .build(); - // Free ID: 298 + Phosphate = new Material.Builder(298, gregtechId("phosphate")) + .dust(1) + .color(0xFFFF00) + .flags(NO_SMASHING, NO_SMELTING, FLAMMABLE, EXPLOSIVE) + .components(Phosphorus, 1, Oxygen, 4) + .build(); PlatinumRaw = new Material.Builder(299, gregtechId("platinum_raw")) .dust() From e5fdf2fa61b468380b1a2858775b4dc3e8d27685 Mon Sep 17 00:00:00 2001 From: Tech22 <37029404+techlord22@users.noreply.github.com> Date: Sat, 17 May 2025 22:48:11 -0400 Subject: [PATCH 3/3] update lang --- src/main/resources/assets/gregtech/lang/en_us.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 0a4692bd420..3754303a704 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -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