Browse Source

Added two more almost identical types of Black Sand

Gregorius Techneticies 3 months ago
parent
commit
9f15964e84
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 0
CHANGELOG.md View File

@@ -24,6 +24,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
24 24
 [ADDED] Iron and Hydrochloric Acid now have a few more Chemical Reactions. This will improve Hematite extraction from Limonite. Oh and Limonite now smelts into Hematite, like it does in real Life, so it is no longer an easy Shortcut, like it was before.
25 25
 [ADDED] Vanadiumsteel Fluid Pipe that can handle Acids and otherwise has the same Stats as Tungstensteel (which cannot handle Acids).
26 26
 [ADDED] Porcelain Cup Recipe. Now you dont need to rely on Loot anymore to get those small Cups.
27
+[ADDED] Two more variants of Black Sand. They are essentially identical in function when it comes to getting Iron, Vanadium and Gold, so it is not much of a change. They also came from PFAA and were dormant and only somewhat compatible until now.
27 28
 [ADDED]
28 29
 Bentonite Clay, Kaolinite Clay and Palygorskite Clay (try to say that 3 times fast), which are Yellow, White and Blue Clay.
29 30
 The only reason I did this, is because I noticed PFAA added those, and they were long dormant in my Ore Materials Section (I did not think of them as Clays back then), so now I gave them Life!

+ 22
- 18
src/main/java/gregapi/GT_API_Post.java View File

@@ -124,24 +124,28 @@ public class GT_API_Post extends Abstract_Mod {
124 124
 		new LoaderUnificationTargets().run();
125 125
 		
126 126
 		if (MD.MET.mLoaded) {
127
-			MT.OREMATS.Bauxite      .addOreByProducts(MT.Alduorite      );
128
-			MT.OREMATS.Chalcopyrite .addOreByProducts(MT.Infuscolium    );
129
-			MT.OREMATS.Scheelite    .addOreByProducts(MT.Rubracium      );
130
-			MT.OREMATS.Pentlandite  .addOreByProducts(MT.Meutoite       );
131
-			MT.MgCO3                .addOreByProducts(MT.Lemurite       );
132
-			MT.OREMATS.Stibnite     .addOreByProducts(MT.Ceruclase      );
133
-			MT.OREMATS.Garnierite   .addOreByProducts(MT.Oureclase      );
134
-			MT.OREMATS.Cooperite    .addOreByProducts(MT.Kalendrite     );
135
-			MT.OREMATS.Ilmenite     .addOreByProducts(MT.Orichalcum     );
136
-			MT.OREMATS.Sphalerite   .addOreByProducts(MT.Carmot         );
137
-			MT.OREMATS.Cinnabar     .addOreByProducts(MT.Sanguinite     );
138
-			MT.OREMATS.Malachite    .addOreByProducts(MT.Vyroxeres      );
139
-			MT.MnO2                 .addOreByProducts(MT.Eximite        );
140
-			MT.OREMATS.Cobaltite    .addOreByProducts(MT.Prometheum     );
141
-			MT.OREMATS.Cassiterite  .addOreByProducts(MT.Ignatius       );
142
-			MT.OREMATS.Wolframite   .addOreByProducts(MT.Vulcanite      );
143
-			MT.Fe2O3                .addOreByProducts(MT.DeepIron       );
144
-			MT.OREMATS.Magnetite    .addOreByProducts(MT.ShadowIron     );
127
+			MT.OREMATS.Bauxite            .addOreByProducts(MT.Alduorite      );
128
+			MT.OREMATS.Chalcopyrite       .addOreByProducts(MT.Infuscolium    );
129
+			MT.OREMATS.Scheelite          .addOreByProducts(MT.Rubracium      );
130
+			MT.OREMATS.Pentlandite        .addOreByProducts(MT.Meutoite       );
131
+			MT.MgCO3                      .addOreByProducts(MT.Lemurite       );
132
+			MT.OREMATS.Stibnite           .addOreByProducts(MT.Ceruclase      );
133
+			MT.OREMATS.Garnierite         .addOreByProducts(MT.Oureclase      );
134
+			MT.OREMATS.Cooperite          .addOreByProducts(MT.Kalendrite     );
135
+			MT.OREMATS.Ilmenite           .addOreByProducts(MT.Orichalcum     );
136
+			MT.OREMATS.Sphalerite         .addOreByProducts(MT.Carmot         );
137
+			MT.OREMATS.Cinnabar           .addOreByProducts(MT.Sanguinite     );
138
+			MT.OREMATS.Malachite          .addOreByProducts(MT.Vyroxeres      );
139
+			MT.MnO2                       .addOreByProducts(MT.Eximite        );
140
+			MT.OREMATS.Cobaltite          .addOreByProducts(MT.Prometheum     );
141
+			MT.OREMATS.Cassiterite        .addOreByProducts(MT.Ignatius       );
142
+			MT.OREMATS.Wolframite         .addOreByProducts(MT.Vulcanite      );
143
+			MT.Fe2O3                      .addOreByProducts(MT.DeepIron       );
144
+			MT.OREMATS.BrownLimonite      .addOreByProducts(MT.DeepIron       );
145
+			MT.OREMATS.YellowLimonite     .addOreByProducts(MT.DeepIron       );
146
+			MT.OREMATS.Magnetite          .addOreByProducts(MT.ShadowIron     );
147
+			MT.OREMATS.BasalticMineralSand.addOreByProducts(MT.ShadowIron     );
148
+			MT.OREMATS.GraniticMineralSand.addOreByProducts(MT.ShadowIron     );
145 149
 		}
146 150
 		if (MD.Mek.mLoaded) {
147 151
 			MT.Pb.addOreByProducts(MT.FakeOsmium);

+ 17
- 15
src/main/java/gregapi/data/MT.java View File

@@ -1098,7 +1098,7 @@ public class MT {
1098 1098
 	Kaolinite               = clay          ( 9167, "Kaolinite"                                     , 245, 235, 235, Ca )                                                                                                                                                                                                                                                                                                       .setLocal("Kaolinite Clay"),    // Al2Si2O5(OH)4
1099 1099
 	
1100 1100
 	
1101
-	Porcelain               = mixdust       ( 8273, "Porcelain"             , SET_ROUGH             , 195, 195, 222, 255, PLATES, BRITTLE, MORTAR)                                                                                                                  .uumMcfg( 0, Ceramic        , 2*U, SiO2             , 1*U, PotassiumFeldspar, 1*U)                                                                          .heat(1800).setCompressing(null, 0).setBending(null, 0).setForging(null, 0).setSmashing(null, 0),
1101
+	Porcelain               = mixdust       ( 8273, "Porcelain"             , SET_ROUGH             , 235, 235, 245, 255, PLATES, BRITTLE, MORTAR)                                                                                                                  .uumMcfg( 0, Ceramic        , 2*U, SiO2             , 1*U, PotassiumFeldspar, 1*U)                                                                          .heat(1800).setCompressing(null, 0).setBending(null, 0).setForging(null, 0).setSmashing(null, 0),
1102 1102
 	
1103 1103
 	
1104 1104
 	Graphite                = oredustdcmp   ( 9174, "Graphite"              , SET_DULL              , 128, 128, 128, 255, BLACKLISTED_SMELTER, BRITTLE, MORTAR, STICKS)                                                                                             .uumMcfg( 0, C              , 1*U)                                                                                                                          .qual(1, 5.0, 32, 2).setSmelting(C, U2).setBurning(Ash, U4).heat(1700, C.mBoilingPoint),
@@ -2320,9 +2320,11 @@ public class MT {
2320 2320
 			DarkIron                .put(MD.FZ).visDefault();
2321 2321
 			
2322 2322
 			
2323
-			Bentonite               .put(MD.PFAA);
2324
-			Palygorskite            .put(MD.PFAA);
2325
-			Kaolinite               .put(MD.PFAA);
2323
+			Bentonite                  .put(MD.PFAA);
2324
+			Palygorskite               .put(MD.PFAA);
2325
+			Kaolinite                  .put(MD.PFAA);
2326
+			OREMATS.BasalticMineralSand.put(MD.PFAA);
2327
+			OREMATS.GraniticMineralSand.put(MD.PFAA);
2326 2328
 			
2327 2329
 			
2328 2330
 			Angmallen               .put(MD.MET);
@@ -2625,7 +2627,7 @@ public class MT {
2625 2627
 			OREMATS.Ilmenite                .addOreByProducts(TiO2                      , Fe2O3                     , Mg                    , MnO2                  );
2626 2628
 			TiO2                            .addOreByProducts(Fe2O3                     , Nb                        , OREMATS.Tantalite     , Zircon                );
2627 2629
 			Ti                              .addOreByProducts(Fe2O3                     , Nb                        , OREMATS.Tantalite     , Zircon                );
2628
-			Fe2O3                           .addOreByProducts(OREMATS.Ilmenite          , OREMATS.Magnetite         , MnO2                  , ClayRed               );
2630
+			Fe2O3                           .addOreByProducts(OREMATS.Ilmenite          , OREMATS.GraniticMineralSand, MnO2                 , ClayRed               );
2629 2631
 			OREMATS.Galena                  .addOreByProducts(OREMATS.Sphalerite        , Ag                        , Pb                    , Se                    , FluoriteRed, CaCO3);
2630 2632
 			OREMATS.Arsenopyrite            .addOreByProducts(Au                        , FluoriteOrange            , OREMATS.Cassiterite   , OREMATS.Huebnerite    );
2631 2633
 			Cu                              .addOreByProducts(Co                        , Au                        , Ni                    );
@@ -2767,9 +2769,9 @@ public class MT {
2767 2769
 			Al2O3                           .addOreByProducts(OREMATS.Bauxite           , Al2O3                     , AlO3H3                );
2768 2770
 			Cr                              .addOreByProducts(Fe2O3                     , Mg                        );
2769 2771
 			OREMATS.Ferrovanadium           .addOreByProducts(OREMATS.Magnetite         , VanadiumPentoxide         );
2770
-			OREMATS.Magnetite               .addOreByProducts(Fe2O3                     , Au                        );
2771
-			OREMATS.GraniticMineralSand     .addOreByProducts(Granite                   , OREMATS.Magnetite         );
2772
-			OREMATS.BasalticMineralSand     .addOreByProducts(Gabbro                    , OREMATS.Magnetite         );
2772
+			OREMATS.Magnetite               .addOreByProducts(Fe2O3                     , Au                        , Stone);
2773
+			OREMATS.GraniticMineralSand     .addOreByProducts(Fe2O3                     , Au                        , GraniteBlack);
2774
+			OREMATS.BasalticMineralSand     .addOreByProducts(Fe2O3                     , Au                        , Basalt);
2773 2775
 			OREMATS.Celestine               .addOreByProducts(Sr                        , S                         );
2774 2776
 			Lazurite                        .addOreByProducts(Sodalite                  , Lapis                     );
2775 2777
 			Sodalite                        .addOreByProducts(Lazurite                  , Lapis                     );
@@ -2779,8 +2781,8 @@ public class MT {
2779 2781
 			Zircon                          .addOreByProducts(TiO2                      , Hf                        , OREMATS.Uraninite     );
2780 2782
 			Eudialyte                       .addOreByProducts(Zircon                    , RareEarth                 , Hf                    , Ta                    , Nb                    , Pb                    );
2781 2783
 			Azurite                         .addOreByProducts(Zircon                    , OREMATS.Malachite         , Hf                    ); // TODO: Niccolite
2782
-			Ad                              .addOreByProducts(OREMATS.Magnetite         , Adamantine                );
2783
-			Adamantine                      .addOreByProducts(OREMATS.Magnetite         , Ad                        );
2784
+			Ad                              .addOreByProducts(OREMATS.GraniticMineralSand, Adamantine               );
2785
+			Adamantine                      .addOreByProducts(OREMATS.GraniticMineralSand, Ad                       );
2784 2786
 			OREMATS.Stibnite                .addOreByProducts(Sb                        );
2785 2787
 			Diamond                         .addOreByProducts(Graphite                  , DiamondPink               );
2786 2788
 			DiamondPink                     .addOreByProducts(Graphite                  , Diamond                   );
@@ -2878,9 +2880,9 @@ public class MT {
2878 2880
 // TODO     Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(OREMATS.Chalcopyrite          , 8*U), OM.stack(C                  , 1*U)));
2879 2881
 			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(Fe2O3                         , 5*U), OM.stack(C                  , 1*U), OM.stack(CaCO3, 1*U)));
2880 2882
 			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.Magnetite             ,14*U), OM.stack(C                  , 3*U)));
2883
+			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.BasalticMineralSand   ,14*U), OM.stack(C                  , 3*U)));
2884
+			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.GraniticMineralSand   ,14*U), OM.stack(C                  , 3*U)));
2881 2885
 			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.Ferrovanadium         ,28*U), OM.stack(C                  , 3*U)));
2882
-			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.BasalticMineralSand   ,28*U), OM.stack(C                  , 3*U)));
2883
-			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.GraniticMineralSand   ,28*U), OM.stack(C                  , 3*U)));
2884 2886
 			
2885 2887
 			Si                      .addAlloyingRecipe(new OreDictConfigurationComponent( 1, OM.stack(SiO2                          , 3*U), OM.stack(C                  , 1*U)));
2886 2888
 			
@@ -3225,11 +3227,13 @@ public class MT {
3225 3227
 		public static final OreDictMaterial Pyrolusite = MnO2, Rutile = TiO2, Hematite = Fe2O3, Magnesite = MgCO3, Gypsum = MT.Gypsum, Bentonite = MT.Bentonite, FullersEarth = Palygorskite, Kaolinite = MT.Kaolinite;
3226 3228
 		
3227 3229
 		public static final OreDictMaterial
3228
-		Magnetite               = oredustelec( 9122, "Magnetite"                 , SET_METALLIC  ,  30,  30,  30, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .uumMcfg( 0, Fe             , 3*U, O                , 4*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3229 3230
 		Cassiterite             = oredustelec( 9108, "Cassiterite"               , SET_METALLIC  , 220, 220, 220, 255, MORTAR, FURNACE, "CassiteriteSand"                                             ).setSmelting(Sn   , 3*U4).uumMcfg( 1, Sn             , 1*U, O                , 2*U)                                                                                                .heat(3 * Sn.mMeltingPoint / 2), CassiteriteSand = Cassiterite,
3230 3231
 //      CassiteriteSand         = oredustelec( 9109, "Cassiterite Sand"          , SET_SAND      , 220, 220, 220, 255, MORTAR, FURNACE                                                                ).setSmelting(Sn   , 3*U4).uumMcfg( 1, Sn             , 1*U, O                , 2*U)                                                                                                .heat(3 * Sn.mMeltingPoint / 2),
3231 3232
 		Garnierite              = oredustelec( 9118, "Garnierite"                , SET_METALLIC  ,  50, 200,  70, 255, MORTAR, BLACKLISTED_SMELTER, MAGNETIC_PASSIVE, WASHING_PERSULFATE              ).setSmelting(Ni   , 3*U4).uumMcfg( 1, Ni             , 1*U, O                , 1*U)                                                                                                .qual(0),
3232 3233
 		Uraninite               = oredustelec( 9134, "Uraninite"                 , SET_RAD       ,  35,  35,  35, 255, BLACKLISTED_SMELTER                                                            ).setSmelting(U_238,   U3).setMcfg( 1, U_238          , 1*U, O                , 2*U)                                                                                                ,
3234
+		Magnetite               = oredustelec( 9122, "Magnetite"                 , SET_METALLIC  ,  30,  30,  30, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .uumMcfg( 0, Fe             , 3*U, O                , 4*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3235
+		BasalticMineralSand     = oredustcent( 9003, "Basaltic Mineral Sand"     , SET_METALLIC  ,  40,  50,  40, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 1, Magnetite      , 1*U, Gabbro           , 1*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3236
+		GraniticMineralSand     = oredustcent( 9004, "Granitic Mineral Sand"     , SET_METALLIC  ,  40,  60,  60, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 1, Magnetite      , 1*U, Granite          , 1*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3233 3237
 		
3234 3238
 		Cinnabar                = oredustcent( 9114, "Cinnabar"                  , SET_REDSTONE  , 150,   0,   0, 255, G_GEM_ORES_TRANSPARENT, MORTAR, BRITTLE, FURNACE, PULVERIZING_CINNABAR, CRYSTAL).setSmelting(Hg   ,   U3).uumMcfg( 0, Hg             , 1*U, S                , 1*U)                                                                                                ,
3235 3239
 		Molybdenite             = oredustdcmp( 9123, "Molybdenite"               , SET_METALLIC  ,  25,  25,  25, 255, G_GEM_ORES, MORTAR, BLACKLISTED_SMELTER                                        ).setSmelting(Mo   ,   U4).uumMcfg( 0, Mo             , 1*U, S                , 2*U)                                                                                                ,
@@ -3296,8 +3300,6 @@ public class MT {
3296 3300
 		Kyanite                 = oredustelec( 9166, "Kyanite"                   , SET_FLINT     , 110, 110, 250, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          , 5*U, SiO2             , 3*U)                                                                                                , // Al2SiO5
3297 3301
 		Alunite                 = oredustelec( 9162, "Alunite"                   , SET_METALLIC  , 225, 180,  65, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,15*U, KOH              , 6*U, SO3              ,16*U, H2O              ,15*U, O                , 9*U)                        , // KAl3(SO4)2(OH)6
3298 3302
 		
3299
-		BasalticMineralSand     = oredustcent( 9003, "Basaltic Mineral Sand"     , SET_SAND      ,  40,  50,  40, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 0, Magnetite      , 1*U, Gabbro           , 1*U)                                                                                                .aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3300
-		GraniticMineralSand     = oredustcent( 9004, "Granitic Mineral Sand"     , SET_SAND      ,  40,  60,  60, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 0, Magnetite      , 1*U, Granite          , 1*U)                                                                                                .aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3301 3303
 		GarnetSand              = oredustcent( 9005, "Garnet Sand"               , SET_SAND      , 200, 100,   0, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Almandine      , 2*U, Andradite        , 2*U, Grossular        , 2*U, Pyrope           , 2*U, Spessartine      , 2*U, Uvarovite        , 1*U),
3302 3304
 		QuartzSand              = oredustcent( 9006, "Quartz Sand"               , SET_SAND      , 200, 200, 200, 255, MORTAR, BLACKLISTED_SMELTER, QUARTZ                                            ).setSmelting(SiO2 ,   U3).setMcfg( 0, CertusQuartz   , 1*U, MilkyQuartz      , 1*U)                                                                                                ,
3303 3305
 		

+ 1
- 1
src/main/java/gregapi/lang/LanguageHandler.java View File

@@ -489,7 +489,7 @@ public class LanguageHandler {
489 489
 			if (aPrefix == OP.plantGtFiber)                                 return aMaterial.mNameLocal + " String";
490 490
 			if (aPrefix.mNameInternal.startsWith("dust"))                   return aPrefix.mMaterialPre + aMaterial.mNameLocal + " Dye";
491 491
 		} else
492
-		if (aMaterial == MT.Wax || aMaterial == MT.WaxMagic || aMaterial == MT.WaxAmnesic || aMaterial == MT.WaxSoulful || aMaterial == MT.WaxBee || aMaterial == MT.WaxRefractory || aMaterial == MT.WaxPlant || aMaterial == MT.WaxParaffin || aMaterial == MT.Ash || aMaterial == MT.DarkAsh || aMaterial == MT.VolcanicAsh || aMaterial == MT.ArcaneAsh || aMaterial == MT.ArcaneCompound || aMaterial == MT.OREMATS.Vermiculite || aMaterial == MT.Talc || aMaterial == MT.OREMATS.BasalticMineralSand || aMaterial == MT.OREMATS.GraniticMineralSand || aMaterial == MT.OREMATS.GarnetSand || aMaterial == MT.SluiceSand || aMaterial == MT.OREMATS.QuartzSand || aMaterial == MT.OREMATS.Pitchblende || aMaterial == MT.Bentonite || aMaterial == MT.Palygorskite || aMaterial == MT.RareEarth || aMaterial == MT.Oilsands) {
492
+		if (aMaterial == MT.Wax || aMaterial == MT.WaxMagic || aMaterial == MT.WaxAmnesic || aMaterial == MT.WaxSoulful || aMaterial == MT.WaxBee || aMaterial == MT.WaxRefractory || aMaterial == MT.WaxPlant || aMaterial == MT.WaxParaffin || aMaterial == MT.Ash || aMaterial == MT.DarkAsh || aMaterial == MT.VolcanicAsh || aMaterial == MT.ArcaneAsh || aMaterial == MT.ArcaneCompound || aMaterial == MT.OREMATS.Vermiculite || aMaterial == MT.Talc || aMaterial == MT.OREMATS.Magnetite || aMaterial == MT.OREMATS.BasalticMineralSand || aMaterial == MT.OREMATS.GraniticMineralSand || aMaterial == MT.OREMATS.GarnetSand || aMaterial == MT.SluiceSand || aMaterial == MT.OREMATS.QuartzSand || aMaterial == MT.OREMATS.Pitchblende || aMaterial == MT.Bentonite || aMaterial == MT.Palygorskite || aMaterial == MT.RareEarth || aMaterial == MT.Oilsands) {
493 493
 			if (aPrefix.mNameInternal.startsWith("ore"))                    return aPrefix.mMaterialPre + aMaterial.mNameLocal;
494 494
 			if (aPrefix.mNameInternal.startsWith("dust"))                   return aPrefix.mMaterialPre + aMaterial.mNameLocal;
495 495
 			if (aPrefix == OP.crushed)                                      return "Ground " + aMaterial.mNameLocal;

+ 2
- 2
src/main/java/gregapi/load/LoaderItemList.java View File

@@ -828,7 +828,7 @@ public class LoaderItemList implements Runnable {
828 828
 		if (IL.TF_Lamp_of_Cinders.exists()) IL.TF_Lamp_of_Cinders.item().setContainerItem(IL.TF_Lamp_of_Cinders.getItem());
829 829
 		
830 830
 		
831
-		IL.RH_Sand_Magnetite                    .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 0), new OreDictItemData(MT.OREMATS.Magnetite, U));
831
+		IL.RH_Sand_Magnetite                    .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 0), new OreDictItemData(MT.OREMATS.GraniticMineralSand, U));
832 832
 		IL.RH_Sand_Olivine                      .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 1), new OreDictItemData(MT.Olivine, U));
833 833
 		IL.RH_Sand_Coral                        .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 2), new OreDictItemData(MT.Sand, U));
834 834
 		IL.RH_Sand_Gypsum                       .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 3), new OreDictItemData(MT.Gypsum, U));
@@ -836,7 +836,7 @@ public class LoaderItemList implements Runnable {
836 836
 		
837 837
 		IL.TROPIC_Sand_Coral                    .set(ST.make(MD.TROPIC, "tile.mineralSand"                  , 1, 0), new OreDictItemData(MT.Sand, U));
838 838
 		IL.TROPIC_Sand_Foamy                    .set(ST.make(MD.TROPIC, "tile.mineralSand"                  , 1, 1), new OreDictItemData(MT.Sand, U));
839
-		IL.TROPIC_Sand_Black                    .set(ST.make(MD.TROPIC, "tile.mineralSand"                  , 1, 2), new OreDictItemData(MT.OREMATS.Magnetite, U));
839
+		IL.TROPIC_Sand_Black                    .set(ST.make(MD.TROPIC, "tile.mineralSand"                  , 1, 2), new OreDictItemData(MT.OREMATS.BasalticMineralSand, U));
840 840
 		IL.TROPIC_Sand_Mineral                  .set(ST.make(MD.TROPIC, "tile.mineralSand"                  , 1, 3), new OreDictItemData(MT.OREMATS.Cassiterite, U));
841 841
 		IL.TROPIC_Sand_Pure                     .set(ST.make(MD.TROPIC, "tile.purifiedSand"                 , 1, 0), new OreDictItemData(MT.Sand, U));
842 842
 		IL.TROPIC_Log_Palm                      .set(ST.make(MD.TROPIC, "tile.log"                          , 1, 0), new OreDictItemData(MT.WOODS.Palm    , U*8, MT.Bark, U), OD.logWood);

+ 3
- 3
src/main/java/gregapi/old/Textures.java View File

@@ -44,7 +44,7 @@ public class Textures {
44 44
 		, DUCT_TAPE
45 45
 		
46 46
 		, MUD, CLAY_BROWN, TURF, CLAY_RED, CLAY_YELLOW, CLAY_BLUE, CLAY_WHITE
47
-		, SAND_MAGNETITE
47
+		, SAND_MAGNETITE, SAND_BASALT_MAGNETITE, SAND_GRANITE_MAGNETITE
48 48
 		
49 49
 		, PATH_TOP, PATH_SIDE
50 50
 		, GRASSBLOCK_TOP_MEDIUM , GRASSBLOCK_TOP_LIGHT , GRASSBLOCK_TOP_DARK , GRASSBLOCK_TOP_NORMAL
@@ -386,8 +386,8 @@ public class Textures {
386 386
 		},
387 387
 		SANDS = {
388 388
 			SAND_MAGNETITE,
389
-			SAND_MAGNETITE,
390
-			SAND_MAGNETITE,
389
+			SAND_BASALT_MAGNETITE,
390
+			SAND_GRANITE_MAGNETITE,
391 391
 			SAND_MAGNETITE,
392 392
 			SAND_MAGNETITE,
393 393
 			SAND_MAGNETITE,

+ 2
- 2
src/main/java/gregapi/worldgen/dungeon/DungeonChunkPillar.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -47,7 +47,7 @@ public class DungeonChunkPillar implements IDungeonChunk {
47 47
 			temp = F;
48 48
 			for (int tX = 6; tX <= 9 && !temp; tX++) for (int tZ = 6; tZ <= 9 && !temp; tZ++) {
49 49
 				Block tBlock = aData.mWorld.getBlock(aData.mX+tX, aData.mY+tY, aData.mZ+tZ);
50
-				if (tBlock instanceof BlockFalling || !tBlock.isOpaqueCube() || tBlock == BlocksGT.Sands) temp = T;
50
+				if (tBlock instanceof BlockFalling || !tBlock.isOpaqueCube() || tBlock == BlocksGT.Sands || tBlock == BlocksGT.Diggables) temp = T;
51 51
 			}
52 52
 			if (temp) {
53 53
 				for (int tX =  6; tX <=  9; tX++) for (int tZ =  6; tZ <=  9; tZ++) {

+ 6
- 2
src/main/java/gregtech/blocks/BlockSands.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -33,10 +33,14 @@ import net.minecraft.world.World;
33 33
 
34 34
 public class BlockSands extends BlockBaseMeta {
35 35
 	public BlockSands(String aUnlocalised) {
36
-		super(null, aUnlocalised, Material.sand, soundTypeSand, 1, Textures.BlockIcons.SANDS);
36
+		super(null, aUnlocalised, Material.sand, soundTypeSand, 3, Textures.BlockIcons.SANDS);
37 37
 		LH.add(getUnlocalizedName()+ ".0.name", "Black Sand");
38
+		LH.add(getUnlocalizedName()+ ".1.name", "Basaltic Black Sand");
39
+		LH.add(getUnlocalizedName()+ ".2.name", "Granitic Black Sand");
38 40
 		
39 41
 		OM.data(ST.make(this, 1, 0), MT.OREMATS.Magnetite, U);
42
+		OM.data(ST.make(this, 1, 1), MT.OREMATS.BasalticMineralSand, U);
43
+		OM.data(ST.make(this, 1, 2), MT.OREMATS.GraniticMineralSand, U);
40 44
 	}
41 45
 	
42 46
 	@Override public boolean useGravity(byte aMeta) {return T;}

+ 4
- 4
src/main/java/gregtech/compat/Compat_Recipes_Tropicraft.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -48,9 +48,9 @@ public class Compat_Recipes_Tropicraft extends CompatMods {
48 48
 		CR.delate(MD.TROPIC, "pineappleCubes", "tile.blockOre", "tile.singleSlabs", "tile.plank", "tile.sifter", "ore", "tikiTorch", "chair", "umbrella", "waterWand", "blowGun", "portalEnchanter", "coconutBomb");
49 49
 		RM.biomass(ST.make(MD.TROPIC, "tile.flower", 16, W));
50 50
 		
51
-		RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.TROPIC_Sand_Black.get(1), dust.mat(MT.OREMATS.Magnetite, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
52
-		RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.TROPIC_Sand_Black.get(1), dust.mat(MT.OREMATS.Magnetite, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
53
-		RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.TROPIC_Sand_Black.get(1), dust.mat(MT.OREMATS.Magnetite, 1), dust.mat(MT.V2O5, 1));
51
+		RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.TROPIC_Sand_Black.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
52
+		RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.TROPIC_Sand_Black.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
53
+		RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.TROPIC_Sand_Black.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), dust.mat(MT.V2O5, 1));
54 54
 		
55 55
 		RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.TROPIC_Sand_Mineral.get(1), dust.mat(MT.OREMATS.Cassiterite, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Sn, 1));
56 56
 		RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.TROPIC_Sand_Mineral.get(1), dust.mat(MT.OREMATS.Cassiterite, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Ni, 1), dustTiny.mat(MT.Ni, 2));

+ 1
- 1
src/main/java/gregtech/loaders/a/Loader_Tools.java View File

@@ -251,7 +251,7 @@ public class Loader_Tools implements Runnable {
251 251
 		CR.shaped(ToolsGT.sMetaTool.getToolWithStats(ToolsGT.FLINT_AND_TINDER, tMaterial, MT.Flint), CR.DEF_MIR, "T ", " F", 'F', OD.itemFlint, 'T', stone.dat(tMaterial));
252 252
 		CR.shaped(ToolsGT.sMetaTool.getToolWithStats(ToolsGT.FLINT_AND_TINDER, tMaterial, MT.Flint), CR.DEF_MIR, "T ", " F", 'F', OD.itemFlint, 'T', rockGt.dat(tMaterial));
253 253
 		}
254
-		for (OreDictMaterial tMaterial : new OreDictMaterial[] {MT.Pyrite, MT.Fe2O3, MT.OREMATS.Cobaltite, MT.OREMATS.Garnierite, MT.OREMATS.Pentlandite, MT.OREMATS.Chromite, MT.OREMATS.Ilmenite, MT.OREMATS.BrownLimonite, MT.OREMATS.YellowLimonite, MT.OREMATS.Magnetite, MT.OREMATS.Arsenopyrite, MT.OREMATS.Chalcopyrite}) {
254
+		for (OreDictMaterial tMaterial : new OreDictMaterial[] {MT.Pyrite, MT.Fe2O3, MT.OREMATS.Cobaltite, MT.OREMATS.Garnierite, MT.OREMATS.Pentlandite, MT.OREMATS.Chromite, MT.OREMATS.Ilmenite, MT.OREMATS.BrownLimonite, MT.OREMATS.YellowLimonite, MT.OREMATS.Magnetite, MT.OREMATS.BasalticMineralSand, MT.OREMATS.GraniticMineralSand, MT.OREMATS.Arsenopyrite, MT.OREMATS.Chalcopyrite}) {
255 255
 		CR.shaped(ToolsGT.sMetaTool.getToolWithStats(ToolsGT.FLINT_AND_TINDER, tMaterial, MT.Flint), CR.DEF_MIR, "T ", " F", 'F', OD.itemFlint, 'T', rockGt.dat(tMaterial));
256 256
 		}
257 257
 		

+ 10
- 5
src/main/java/gregtech/loaders/c/Loader_Recipes_Ores.java View File

@@ -113,7 +113,7 @@ public class Loader_Recipes_Ores implements Runnable {
113 113
 		RM.Bath         .addRecipe1(T,  0,  256, new long[] {10000, 5000, 5000, 5000, 5000, 5000}, crushedPurified    .mat(tMat, 1), FL.array(MT.H2SO4.fluid(7* U2, T)), FL.array(MT.GrayVitriol.fluid(3*U, F), MT.H.gas(U, F)), crushedCentrifuged.mat(tMat, 1), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2));
114 114
 		RM.Bath         .addRecipe1(T,  0,  256, new long[] {10000, 5000, 5000, 5000, 5000, 5000}, crushedPurifiedTiny.mat(tMat, 9), FL.array(MT.H2SO4.fluid(7* U2, T)), FL.array(MT.GrayVitriol.fluid(3*U, F), MT.H.gas(U, F)), crushedCentrifuged.mat(tMat, 1), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2));
115 115
 		}
116
-		for (OreDictMaterial tMat : new OreDictMaterial[] {MT.Fe, MT.Cr, MT.Ad, MT.Pyrite, MT.Andradite, MT.PigIron, MT.Steel, MT.DarkIron, MT.DeepIron, MT.ShadowIron, MT.MeteoricIron, MT.OREMATS.Ilmenite, MT.OREMATS.Wolframite, MT.OREMATS.Chromite, MT.OREMATS.Magnetite}) {
116
+		for (OreDictMaterial tMat : new OreDictMaterial[] {MT.Fe, MT.Cr, MT.Ad, MT.Pyrite, MT.Andradite, MT.PigIron, MT.Steel, MT.DarkIron, MT.DeepIron, MT.ShadowIron, MT.MeteoricIron, MT.OREMATS.Ilmenite, MT.OREMATS.Wolframite, MT.OREMATS.Chromite, MT.OREMATS.Magnetite, MT.OREMATS.BasalticMineralSand, MT.OREMATS.GraniticMineralSand}) {
117 117
 		RM.Bath         .addRecipe1(T,  0,  256, new long[] {10000, 5000, 5000, 5000, 5000, 5000}, crushedPurified    .mat(tMat, 1), FL.array(MT.H2SO4.fluid(7* U2, T)), FL.array(MT.GreenVitriol.fluid(3*U, F), MT.H.gas(U, F)), crushedCentrifuged.mat(tMat, 1), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2));
118 118
 		RM.Bath         .addRecipe1(T,  0,  256, new long[] {10000, 5000, 5000, 5000, 5000, 5000}, crushedPurifiedTiny.mat(tMat, 9), FL.array(MT.H2SO4.fluid(7* U2, T)), FL.array(MT.GreenVitriol.fluid(3*U, F), MT.H.gas(U, F)), crushedCentrifuged.mat(tMat, 1), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2), crushedCentrifugedTiny.mat(tMat, 2));
119 119
 		}
@@ -231,10 +231,15 @@ public class Loader_Recipes_Ores implements Runnable {
231 231
 		RM.Sifting      .addRecipe1(T, 16,  128, new long[] {      8000, 5000}, crushedPurifiedTiny.mat(MT.Fluix              , 9), gem.mat(MT.Fluix              , 1), dust.mat(MT.Fluix, 1));
232 232
 		
233 233
 		
234
-		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite, 1), rockGt.mat(MT.Stone, 1), nugget.mat(MT.Au, 1));
235
-		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite, 1), rockGt.mat(MT.Stone, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
236
-		RM.Centrifuge       .addRecipe1(T, 16,  256, new long[] {9000, 1000}         , ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite, 1), dust.mat(MT.V2O5, 1));
237
-		
234
+		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite          , 1), rockGt.mat(MT.Stone, 1), nugget.mat(MT.Au, 1));
235
+		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite          , 1), rockGt.mat(MT.Stone, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
236
+		RM.Centrifuge       .addRecipe1(T, 16,  256, new long[] {9000, 1000}         , ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite          , 1), dust.mat(MT.V2O5, 1));
237
+		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
238
+		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
239
+		RM.Centrifuge       .addRecipe1(T, 16,  256, new long[] {9000, 1000}         , ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), dust.mat(MT.V2O5, 1));
240
+		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 2), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1));
241
+		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 2), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
242
+		RM.Centrifuge       .addRecipe1(T, 16,  256, new long[] {9000, 1000}         , ST.make(BlocksGT.Sands, 1, 2), dust.mat(MT.OREMATS.GraniticMineralSand, 1), dust.mat(MT.V2O5, 1));
238 243
 		
239 244
 		
240 245
 		RM.Smelter      .addRecipe1(T, 64, 1440, 5000, OM.dust(MT.Monazite     ), NF, MT.He.gas(U2 , F), OM.dust(MT.RareEarth     ));

+ 19
- 3
src/main/java/gregtech/loaders/c/Loader_Recipes_Temporary.java View File

@@ -428,14 +428,30 @@ public class Loader_Recipes_Temporary implements Runnable {
428 428
 			}
429 429
 		}
430 430
 		
431
+		/*
432
+		if (MD.PFAA.mLoaded) {
433
+			// TODO Basaltic Mineral Sand
434
+			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
435
+			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
436
+			RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), dust.mat(MT.V2O5, 1));
437
+			// TODO Granitic Mineral Sand
438
+			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1));
439
+			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
440
+			RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), dust.mat(MT.V2O5, 1));
441
+			// TODO Cassiterite Sand
442
+			RM.Sifting          .addRecipe1(T, 16, 128, new long[] {10000, 10, 40, 150, 200, 400, 500}, crushedPurified.mat(MT.OREMATS.Cassiterite, 1), crushedCentrifuged.mat(MT.OREMATS.Cassiterite, 1), gemExquisite.mat(MT.Zircon, 1), gemFlawless.mat(MT.Zircon, 1), gem.mat(MT.Zircon, 1), gemFlawed.mat(MT.Zircon, 1), gemChipped.mat(MT.Zircon, 1), dust.mat(MT.Zircon, 1));
443
+			// TODO Garnet Sand
444
+			// Centrifuge? Sifting? Unsure.
445
+		}
446
+		*/
431 447
 		
432 448
 		if (MD.RH.mLoaded) {
433 449
 			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {5000, 5000}, IL.RH_Sand_Olivine.get(1), OP.gem.mat(MT.Olivine, 1), OP.dust.mat(MT.Olivine, 1));
434 450
 			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9000, 1000}, IL.RH_Sand_Gypsum .get(1), OP.dust.mat(MT.Gypsum, 1), OP.dust.mat(MT.S, 1));
435 451
 			
436
-			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.Magnetite, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
437
-			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.Magnetite, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
438
-			RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.Magnetite, 1), dust.mat(MT.V2O5, 1));
452
+			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1));
453
+			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
454
+			RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), dust.mat(MT.V2O5, 1));
439 455
 			
440 456
 			if (MD.TROPIC.mLoaded) {
441 457
 				RM.Sifting      .addRecipe1(T, 16, 200, new long[] {9900, 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000, 200, 100, 50}, IL.RH_Sand_Coral.get(1), IL.TROPIC_Sand_Pure.get(1), ST.make(MD.TROPIC, "shell", 1, 0), ST.make(MD.TROPIC, "shell", 1, 1), ST.make(MD.TROPIC, "shell", 1, 2), ST.make(MD.TROPIC, "shell", 1, 3), ST.make(MD.TROPIC, "shell", 1, 4), ST.make(MD.TROPIC, "shell", 1, 5), ST.make(MD.TROPIC, "pearl", 1, 0), ST.make(MD.TROPIC, "pearl", 1, 1), OP.gem.mat(MT.Azurite, 1), OP.gem.mat(MT.Eudialyte, 1), OP.gem.mat(MT.Zr, 1));

+ 3
- 3
src/main/java/gregtech/worldgen/WorldgenBlackSand.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -52,7 +52,7 @@ public class WorldgenBlackSand extends WorldgenObject {
52 52
 		for (String tName : aBiomeNames) if (BIOMES_RIVER.contains(tName)) {temp = F; break;}
53 53
 		if (temp) return F;
54 54
 		
55
-		int tX = aMinX-16, tZ = aMinZ-16, tUpperBound = WD.waterLevel(aWorld)+1, tLowerBound = WD.waterLevel(aWorld)-12;
55
+		int tX = aMinX-16, tZ = aMinZ-16, tUpperBound = WD.waterLevel(aWorld)+1, tLowerBound = WD.waterLevel(aWorld)-12, aMeta = aRandom.nextInt(3);
56 56
 		for (int i = 0; i < 48; i++) for (int j = 0; j < 48; j++) if (WorldgenPit.SHAPE[i][j]) {
57 57
 			Block tBlock = NB, tLastBlock = aWorld.getBlock(tX+i, 64, tZ+j);
58 58
 			for (int tY = tUpperBound, tGenerated = 0; tY >= tLowerBound && tGenerated < 2; tY--, tLastBlock = tBlock) {
@@ -68,7 +68,7 @@ public class WorldgenBlackSand extends WorldgenObject {
68 68
 						continue;
69 69
 					}
70 70
 				}
71
-				aWorld.setBlock(tX+i, tY, tZ+j, BlocksGT.Sands, 0, 3);
71
+				aWorld.setBlock(tX+i, tY, tZ+j, BlocksGT.Sands, aMeta, 3);
72 72
 				tGenerated++;
73 73
 			}
74 74
 		}

BIN
src/main/resources/assets/gregtech/textures/blocks/iconsets/SAND_BASALT_MAGNETITE.png View File


BIN
src/main/resources/assets/gregtech/textures/blocks/iconsets/SAND_GRANITE_MAGNETITE.png View File


Loading…
Cancel
Save