cherry pick

Commit: f0326b831726515ce71dd4f1a0a86b1c902b5af7 [f0326b8]

Made Niobium more accessible

Niobium can now be obtained from Apatite and Pyrolusite as Byproducts.
apatite veins now also contain Pyrochlore (new materials, contains
Niobium) instead of Phosphate (PO4).

2 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 88cb1f952f..63f4e4c873 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -532,6 +532,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials HeavyFuel               = new Materials( 741, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 255,   0,   0,   "HeavyFuel"               ,   "Heavy Fuel"                    ,     3,    240,         -1,    0, false, false,   1,   1,   1, Dyes.dyeBlack).setCanBeCracked(true);
     public static Materials LPG                     = new Materials( 742, TextureSet.SET_FLUID             ,   1.0F,      0,  0,         16                , 255, 255,   0,   0,   "LPG"                     ,   "LPG"                           ,    1,     320,         -1,    0, false, false,   1,   1,   1, Dyes.dyeYellow      );
 
+    public static Materials Pyrochlore = new MaterialBuilder(607, TextureSet.SET_METALLIC, "Pyrochlore").addDustItems().addOreItems().setRGB(43, 17, 0).setColor(Dyes.dyeBlack).setMaterialList(new MaterialStack(Calcium, 2), new MaterialStack(Niobium, 2), new MaterialStack(Oxygen, 7)).addElectrolyzerRecipe().constructMaterial();
+
     public static Materials GrowthMediumRaw = new MaterialBuilder(608, TextureSet.SET_FLUID, "Raw Growth Medium").setName("GrowthMediumRaw").addCell().addFluid().setRGB(211, 141, 95).setColor(Dyes.dyeOrange).constructMaterial();
     public static Materials GrowthMediumSterilized = new MaterialBuilder(609, TextureSet.SET_FLUID, "Sterilized Growth Medium").setName("GrowthMediumSterilized").addCell().addFluid().setRGB(222, 170, 135).setColor(Dyes.dyeOrange).constructMaterial();
 
@@ -950,7 +952,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         Cobaltite               .setDirectSmelting(Cobalt       );
         Stibnite                .setDirectSmelting(Antimony     );
         Cooperite				.setDirectSmelting(Platinum		).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
-        Pyrolusite				.setDirectSmelting(Manganese	).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
         Magnesite				.setDirectSmelting(Magnesium	).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
         Molybdenite				.setDirectSmelting(Molybdenum	).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
         Galena 					.setDirectSmelting(Lead			);
@@ -1113,6 +1114,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         YellowLimonite          .addOreByProducts(Nickel                , BrownLimonite         , Cobalt                );
         Lepidolite              .addOreByProducts(Lithium               , Caesium               );
         Andradite               .addOreByProducts(GarnetYellow          , Iron                  );
+        Pyrolusite              .addOreByProducts(Manganese             , Tantalite             , Niobium               ).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
+        Phosphorus              .addOreByProducts(Apatite               , Phosphate             , Pyrochlore            );
+        Apatite                 .addOreByProducts(Phosphorus            , Phosphate             , Pyrochlore            );
+        Pyrochlore              .addOreByProducts(Apatite               , Calcite               , Niobium               );
         Quartzite               .addOreByProducts(CertusQuartz          , Barite                );
         CertusQuartz            .addOreByProducts(Quartzite             , Barite                );
         BrownLimonite           .addOreByProducts(Malachite             , YellowLimonite        );
@@ -1155,7 +1160,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         Sodalite                .addOreByProducts(Lazurite              , Lapis                 );
         Spodumene               .addOreByProducts(Aluminium             , Lithium               );
         Ruby                    .addOreByProducts(Chrome                , GarnetRed             );
-        Phosphorus              .addOreByProducts(Apatite               , Phosphate             );
         Iridium                 .addOreByProducts(Platinum              , Osmium                );
         Pyrope                  .addOreByProducts(GarnetRed             , Magnesium             );
         Almandine               .addOreByProducts(GarnetRed             , Aluminium             );
@@ -1167,14 +1171,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         Salt                    .addOreByProducts(RockSalt              , Borax                 );
         RockSalt                .addOreByProducts(Salt                  , Borax                 );
         Naquadah                .addOreByProducts(NaquadahEnriched      );
-        Pyrolusite              .addOreByProducts(Manganese             );
         Molybdenite             .addOreByProducts(Molybdenum            );
         Stibnite                .addOreByProducts(Antimony              );
         Garnierite              .addOreByProducts(Nickel                );
         Lignite                 .addOreByProducts(Coal                  );
         Diamond                 .addOreByProducts(Graphite              );
         Beryllium               .addOreByProducts(Emerald               );
-        Apatite                 .addOreByProducts(Phosphorus            );
         Electrotine             .addOreByProducts(Diamond               );
         Teslatite               .addOreByProducts(Diamond               );
         Magnesite               .addOreByProducts(Magnesium             );
diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
index 6e3e89a8f7..0ac26dd309 100644
--- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
@@ -136,7 +136,7 @@ public class GT_Worldgenloader
         new GT_Worldgen_GT_Ore_Layer("ore.mix.quartz", true, 40, 80, 60, 3, 16, !tPFAA, tPFAA, false, true, true, true, Materials.Quartzite, Materials.Barite, Materials.CertusQuartz, Materials.CertusQuartz);

         new GT_Worldgen_GT_Ore_Layer("ore.mix.diamond", true, 5, 20, 40, 2, 16, !tPFAA, false, false, true, true, true, Materials.Graphite, Materials.Graphite, Materials.Diamond, Materials.Coal);

         new GT_Worldgen_GT_Ore_Layer("ore.mix.olivine", true, 10, 40, 60, 3, 16, !tPFAA, false, true, true, true, true, Materials.Bentonite, Materials.Magnesite, Materials.Olivine, Materials.Glauconite);

-        new GT_Worldgen_GT_Ore_Layer("ore.mix.apatite", true, 40, 60, 60, 3, 16, !tPFAA, false, false, false, false, false, Materials.Apatite, Materials.Apatite, Materials.Phosphorus, Materials.Phosphate);

+        new GT_Worldgen_GT_Ore_Layer("ore.mix.apatite", true, 40, 60, 60, 3, 16, !tPFAA, false, false, false, false, false, Materials.Apatite, Materials.Apatite, Materials.Phosphorus, Materials.Pyrochlore);

         new GT_Worldgen_GT_Ore_Layer("ore.mix.galena", true, 30, 60, 40, 5, 16, !tPFAA, false, false, true, true, true, Materials.Galena, Materials.Galena, Materials.Silver, Materials.Lead);

         new GT_Worldgen_GT_Ore_Layer("ore.mix.lapis", true, 20, 50, 40, 5, 16, !tPFAA, false, true, true, true, true, Materials.Lazurite, Materials.Sodalite, Materials.Lapis, Materials.Calcite);

         new GT_Worldgen_GT_Ore_Layer("ore.mix.beryllium", true, 5, 30, 30, 3, 16, !tPFAA, false, true, true, true, true, Materials.Beryllium, Materials.Beryllium, Materials.Emerald, Materials.Thorium);