Browse Source

Fixed that Black Sand replaces Podzol, also fixed Soapstone/Talc

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

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

@@ -1046,8 +1046,7 @@ public class MT {
1046 1046
 	Chalk                   = oredustelec   ( 9112, "Chalk"                 , SET_FINE              , 250, 250, 250, 255, FURNACE, MORTAR).setSmelting(CaCO3, 2*U3)                                                                                                 .setMcfg( 0, CaCO3          , 1*U)                                                                                                                          ,
1047 1047
 	Dolomite                = oredustcent   ( 9163, "Dolomite"              , SET_FLINT             , 225, 205, 205, 255, FURNACE, MORTAR).setSmelting(CaCO3, U2)                                                                                                   .setMcfg( 0, CaCO3          , 1*U, MgCO3            , 1*U)                                                                                                  , // CaMg(CO3)2
1048 1048
 	Asbestos                = oredustelec   ( 9103, "Asbestos"              , SET_LAPIS             , 230, 230, 230, 255, PLATES, "Chrysotile")                                                                                                                     .uumMcfg( 0, Mg             , 3*U, SiO2             , 6*U, H2O              , 6*U, O                , 3*U)                                                  , // Mg3Si2O5(OH)4
1049
-	Talc                    = oredustelec   ( 9168, "Talc"                  , SET_DULL              ,  90, 180,  90, 255)                                                                                                                                           .uumMcfg( 0, Mg             , 3*U, SiO2             ,12*U, H2O              , 3*U, O                , 3*U)                                                  , // H2Mg3(SiO3)4
1050
-	Soapstone               = oredustelec   ( 9169, "Soapstone"             , SET_DULL              ,  95, 145,  95, 255)                                                                                                                                           .uumMcfg( 0, Mg             , 3*U, SiO2             ,12*U, H2O              , 3*U, O                , 3*U)                                                  , // H2Mg3(SiO3)4
1049
+	Talc                    = oredustelec   ( 9169, "Talc"                  , SET_DULL              ,  95, 145,  95, 255, "Soapstone")                                                                                                                              .uumMcfg( 0, Mg             , 3*U, SiO2             ,12*U, H2O              , 3*U, O                , 3*U)                                                  , // H2Mg3(SiO3)4
1051 1050
 	Pyrite                  = oredustdcmp   ( 9125, "Pyrite"                , SET_SHINY             , 255, 230,  80, 255, G_GEM_ORES, BLACKLISTED_SMELTER, MORTAR, MAGNETIC_PASSIVE)                                                                                .uumMcfg( 0, Fe             , 1*U, S                , 2*U)                                                                                                  .qual(0),
1052 1051
 	PotassiumFeldspar       = oredustelec   ( 9140, "Potassium Feldspar"    , SET_FINE              , 120,  40,  40, 255)                                                                                                                                           .uumMcfg( 0, K              , 2*U, Al2O3            , 5*U, SiO2             ,18*U, O                , 1*U)                                                  ,
1053 1052
 	Biotite                 = oredustelec   ( 9141, "Biotite"               , SET_METALLIC          ,  20,  30,  20, 255)                                                                                                                                           .setMcfg( 0, K              , 2*U, Mg               , 6*U, Al2O3            ,15*U, F                , 4*U, SiO2             ,18*U)                          , // releases Argon when heated.
@@ -1718,7 +1717,7 @@ public class MT {
1718 1717
 	}
1719 1718
 	
1720 1719
 	/** I had to remove the full length names of Elements from this List, but in order to keep Compat with Mods that used some, such as IHL or Tinkers Gregworks, I got a few of them here. */
1721
-	@Deprecated public static final OreDictMaterial Trinium = Ke, Vibranium = Vb, Naquadah = Nq, NaquadahEnriched = Nq_528, Naquadria = Nq_522, Adamantium = Ad, Silver = Ag, Aluminium = Al, Bismuth = Bi, Lead = Pb, Argon = Ar, Copper = Cu, Gold = Au, Iron = Fe, Titanium = Ti, Calcite = CaCO3, Tungsten = W, Beryllium = Be, Chromium = Cr, Manganese = Mn, Cobalt = Co, Cobalt60 = Co_60, Nickel = Ni, Arsenic = As, Zirconium = Zr, Molybdenum = Mo, Technetium = Tc, Palladium = Pd, Neodymium = Nd, Osmium = Os, Iridium = Ir, Platinum = Pt, Thorium = Th, Uranium = U_238, Uranium235 = U_235, Plutonium = Pu, Plutonium241 = Pu_241, Plutonium243 = Pu_243, Americium = Am, Americium241 = Am_241, Alumina = Al2O3, AluminiumFluoride = AlF3, AluminiumHydroxide = AlO3H3, Gibbsite = AlO3H3,Fluorite = CaF2;
1720
+	@Deprecated public static final OreDictMaterial Trinium = Ke, Vibranium = Vb, Naquadah = Nq, NaquadahEnriched = Nq_528, Naquadria = Nq_522, Adamantium = Ad, Silver = Ag, Aluminium = Al, Bismuth = Bi, Lead = Pb, Argon = Ar, Copper = Cu, Gold = Au, Iron = Fe, Titanium = Ti, Calcite = CaCO3, Tungsten = W, Beryllium = Be, Chromium = Cr, Manganese = Mn, Cobalt = Co, Cobalt60 = Co_60, Nickel = Ni, Arsenic = As, Zirconium = Zr, Molybdenum = Mo, Technetium = Tc, Palladium = Pd, Neodymium = Nd, Osmium = Os, Iridium = Ir, Platinum = Pt, Thorium = Th, Uranium = U_238, Uranium235 = U_235, Plutonium = Pu, Plutonium241 = Pu_241, Plutonium243 = Pu_243, Americium = Am, Americium241 = Am_241, Alumina = Al2O3, AluminiumFluoride = AlF3, AluminiumHydroxide = AlO3H3, Gibbsite = AlO3H3, Fluorite = CaF2, Soapstone = Talc;
1722 1721
 	
1723 1722
 	/** Technical Materials, which are only there for Recipes and such. */
1724 1723
 	public static class TECH {
@@ -1738,6 +1737,7 @@ public class MT {
1738 1737
 			OreDictMaterial.MATERIAL_ARRAY[9151] = MT.OREMATS.Glauconite;
1739 1738
 			OreDictMaterial.MATERIAL_ARRAY[9142] = MT.Asbestos;
1740 1739
 			OreDictMaterial.MATERIAL_ARRAY[9121] = MT.MgCO3;
1740
+			OreDictMaterial.MATERIAL_ARRAY[9168] = MT.Talc;
1741 1741
 			
1742 1742
 			Ad                      .visDefault(Adamantine);
1743 1743
 			
@@ -2640,8 +2640,8 @@ public class MT {
2640 2640
 			OREMATS.Mica                    .addOreByProducts(OREMATS.Vermiculite       , Asbestos                  , Biotite               , OREMATS.Perlite       );
2641 2641
 			OREMATS.Vermiculite             .addOreByProducts(OREMATS.Mica              , Asbestos                  , Biotite               , OREMATS.Diatomite     );
2642 2642
 			Biotite                         .addOreByProducts(OREMATS.Mica              , OREMATS.Vermiculite       , Asbestos              , OREMATS.Perlite       );
2643
-			Asbestos                        .addOreByProducts(OREMATS.Mica              , Biotite                   , Soapstone             , Talc                  );
2644
-			Gypsum                          .addOreByProducts(OREMATS.Trona             , OREMATS.Mirabilite        , Asbestos              , Talc                  , S, Soapstone);
2643
+			Asbestos                        .addOreByProducts(OREMATS.Mica              , Biotite                   , Talc                  );
2644
+			Gypsum                          .addOreByProducts(OREMATS.Trona             , OREMATS.Mirabilite        , Asbestos              , Talc                  , S);
2645 2645
 			OREMATS.Mirabilite              .addOreByProducts(OREMATS.Trona             , Gypsum                    );
2646 2646
 			OREMATS.Trona                   .addOreByProducts(OREMATS.Mirabilite        , Gypsum                    );
2647 2647
 			

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

@@ -379,6 +379,9 @@ public class LanguageHandler {
379 379
 		if (aMaterial == MT.Asbestos) {
380 380
 			if (aPrefix.containsAny(TD.Prefix.ORE, TD.Prefix.ORE_PROCESSING_BASED)) return aPrefix.mMaterialPre + "Chrysotile" + aPrefix.mMaterialPost;
381 381
 		} else
382
+		if (aMaterial == MT.Talc) {
383
+			if (aPrefix.containsAny(TD.Prefix.ORE, TD.Prefix.ORE_PROCESSING_BASED)) return aPrefix.mMaterialPre + "Soapstone" + aPrefix.mMaterialPost;
384
+		} else
382 385
 		if (aMaterial == MT.AlO3H3) {
383 386
 			if (aPrefix.containsAny(TD.Prefix.ORE, TD.Prefix.ORE_PROCESSING_BASED)) return aPrefix.mMaterialPre + "Gibbsite" + aPrefix.mMaterialPost;
384 387
 		} else

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

@@ -876,7 +876,7 @@ public class LoaderItemData implements Runnable {
876 876
 				OM.reg(OP.stone, MT.Quartzite                   , ST.make(MD.UB, tName, 1,  3));
877 877
 				OM.reg(OP.stone, MT.Blueschist                  , ST.make(MD.UB, tName, 1,  4));
878 878
 				OM.reg(OP.stone, MT.Greenschist                 , ST.make(MD.UB, tName, 1,  5));
879
-				OM.reg(OP.stone, MT.Soapstone                   , ST.make(MD.UB, tName, 1,  6));
879
+				OM.reg(OP.stone, MT.Talc                        , ST.make(MD.UB, tName, 1,  6));
880 880
 				OM.reg(OP.stone, MT.Migmatite                   , ST.make(MD.UB, tName, 1,  7));
881 881
 				OM.reg(OP.stone, MT.Gneiss                      , ST.make(MD.UB, tName, 1,  8));
882 882
 				OM.reg(OP.stone, MT.Eclogite                    , ST.make(MD.UB, tName, 1,  9));
@@ -884,7 +884,7 @@ public class LoaderItemData implements Runnable {
884 884
 				OM.reg(OP.stone, MT.Quartzite                   , ST.make(MD.UB, tName, 1, 11));
885 885
 				OM.reg(OP.stone, MT.Blueschist                  , ST.make(MD.UB, tName, 1, 12));
886 886
 				OM.reg(OP.stone, MT.Greenschist                 , ST.make(MD.UB, tName, 1, 13));
887
-				OM.reg(OP.stone, MT.Soapstone                   , ST.make(MD.UB, tName, 1, 14));
887
+				OM.reg(OP.stone, MT.Talc                        , ST.make(MD.UB, tName, 1, 14));
888 888
 				OM.reg(OP.stone, MT.Migmatite                   , ST.make(MD.UB, tName, 1, 15));
889 889
 			}
890 890
 		}

+ 1
- 1
src/main/java/gregapi/load/LoaderOreDictReRegistrations.java View File

@@ -1399,7 +1399,7 @@ public class LoaderOreDictReRegistrations implements Runnable {
1399 1399
 		OreDictManager.INSTANCE.setAutomaticItemData(OP.stone.dat(MT.Dolomite ), new OreDictItemData(MT.Dolomite , U, MT.Bone        , U9));
1400 1400
 		OreDictManager.INSTANCE.setAutomaticItemData(OP.stone.dat(MT.Eclogite ), new OreDictItemData(MT.Eclogite , U, MT.TiO2        , U72));
1401 1401
 		OreDictManager.INSTANCE.setAutomaticItemData(OP.stone.dat(MT.CaCO3    ), new OreDictItemData(MT.CaCO3    , U));
1402
-		OreDictManager.INSTANCE.setAutomaticItemData(OP.stone.dat(MT.Soapstone), new OreDictItemData(MT.Soapstone, U));
1402
+		OreDictManager.INSTANCE.setAutomaticItemData(OP.stone.dat(MT.Talc     ), new OreDictItemData(MT.Talc     , U));
1403 1403
 		OreDictManager.INSTANCE.setAutomaticItemData(OP.stone.dat(MT.Chalk    ), new OreDictItemData(MT.Chalk    , U));
1404 1404
 		OreDictManager.INSTANCE.setAutomaticItemData(OP.stone.dat(MT.Lignite  ), new OreDictItemData(MT.Lignite  , U));
1405 1405
 	}

+ 2
- 2
src/main/java/gregtech/loaders/a/Loader_Ores.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
  *
@@ -166,7 +166,7 @@ public class Loader_Ores implements Runnable {
166 166
 		for (int i = 0; i < 8; i++) rockset(MD.UB, "igneousStone", i, i+8, "igneousCobblestone", i, "ub.igneous."+i, tPrefix[i], tDrops[i]);
167 167
 		
168 168
 		tPrefix = new OreDictPrefix[] {OP.oreVanillastone, OP.oreVanillastone, OP.oreMarble, OP.oreQuartzite, OP.oreBlueschist, OP.oreGreenschist, OP.oreVanillastone, OP.oreVanillastone};
169
-		tDrops  = new OreDictMaterial[] {MT.Gneiss, MT.Eclogite, MT.Marble, MT.Quartzite, MT.Blueschist, MT.Greenschist, MT.Soapstone, MT.Migmatite};
169
+		tDrops  = new OreDictMaterial[] {MT.Gneiss, MT.Eclogite, MT.Marble, MT.Quartzite, MT.Blueschist, MT.Greenschist, MT.Talc, MT.Migmatite};
170 170
 		for (int i = 0; i < 8; i++) rockset(MD.UB, "metamorphicStone", i, i+8, "metamorphicCobblestone", i, "ub.metamorphic."+i, tPrefix[i], tDrops[i]);
171 171
 		
172 172
 		tPrefix = new OreDictPrefix[] {OP.oreLimestone, OP.oreVanillastone, OP.oreShale, OP.oreSiltstone, OP.oreVanillastone, OP.oreVanillastone, OP.oreVanillastone, OP.oreVanillastone};

+ 3
- 4
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -405,7 +405,7 @@ public class Loader_Worldgen implements Runnable {
405 405
 		StoneLayer.LAYERS.add(new StoneLayer(tStone, 3+8, tCobble, 3, MT.Quartzite   ));
406 406
 		StoneLayer.LAYERS.add(new StoneLayer(tStone, 4+8, tCobble, 4, MT.Blueschist  ));
407 407
 		StoneLayer.LAYERS.add(new StoneLayer(tStone, 5+8, tCobble, 5, MT.Greenschist ));
408
-		StoneLayer.LAYERS.add(new StoneLayer(tStone, 6+8, tCobble, 6, MT.Soapstone   ));
408
+		StoneLayer.LAYERS.add(new StoneLayer(tStone, 6+8, tCobble, 6, MT.Talc        ));
409 409
 		StoneLayer.LAYERS.add(new StoneLayer(tStone, 7+8, tCobble, 7, MT.Migmatite   ));
410 410
 		tStone = ST.block(MD.UB, "sedimentaryStone");
411 411
 		StoneLayer.LAYERS.add(new StoneLayer(tStone, 0+8, MT.Limestone));
@@ -439,8 +439,7 @@ public class Loader_Worldgen implements Runnable {
439 439
 		);
440 440
 		StoneLayer.bothsides(MT.Marble, MT.Quartzite
441 441
 		, new StoneLayerOres(MT.Asbestos                , U4 ,  0, 48)
442
-		, new StoneLayerOres(MT.Soapstone               , U4 ,  0, 80)
443
-		, new StoneLayerOres(MT.Talc                    , U4 , 16, 64)
442
+		, new StoneLayerOres(MT.Talc                    , U4 ,  0, 80)
444 443
 		, new StoneLayerOres(MT.OREMATS.Glauconite      , U4 , 32, 80)
445 444
 		);
446 445
 		StoneLayer.bothsides(MT.Limestone, MT.NaCl
@@ -856,7 +855,7 @@ public class Loader_Worldgen implements Runnable {
856 855
 		new WorldgenOresLarge("ore.large.bauxite"     , T, T, 50,  90,  80, 4, 24, MT.OREMATS.Bauxite              , MT.OREMATS.Bauxite             , MT.OREMATS.Bauxite             , MT.OREMATS.Ilmenite            , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS);
857 856
 		new WorldgenOresLarge("ore.large.iodinesalt"  , T, T, 50,  60,  30, 3, 24, MT.KIO3                         , MT.NaCl                        , MT.OREMATS.Borax               , MT.OREMATS.Zeolite             , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS);
858 857
 		new WorldgenOresLarge("ore.large.rocksalt"    , T, T, 50,  60,  30, 3, 24, MT.KCl                          , MT.NaCl                        , MT.OREMATS.Lepidolite          , MT.OREMATS.Spodumene           , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS);
859
-		new WorldgenOresLarge("ore.large.asbestos"    , T, T, 10,  40,  30, 3, 16, MT.Soapstone                    , MT.Talc                        , MT.Gypsum                      , MT.Asbestos                    , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS);
858
+		new WorldgenOresLarge("ore.large.asbestos"    , T, T, 10,  40,  30, 3, 16, MT.OREMATS.Chromite             , MT.Talc                        , MT.Gypsum                      , MT.Asbestos                    , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS);
860 859
 		new WorldgenOresLarge("ore.large.sapphire"    , T, T, 10,  40,  30, 3, 16, MT.BlueSapphire                 , MT.OrangeSapphire              , MT.YellowSapphire              , MT.Ruby                        , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS);
861 860
 		new WorldgenOresLarge("ore.large.sapphire2"   , T, T, 10,  40,  30, 3, 16, MT.GreenSapphire                , MT.Ruby                        , MT.BlueSapphire                , MT.PurpleSapphire              , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS);
862 861
 		new WorldgenOresLarge("ore.large.garnet"      , T, T, 10,  40,  60, 3, 16, MT.Almandine                    , MT.Pyrope                      , MT.Andradite                   , MT.Uvarovite                   , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS);

+ 2
- 2
src/main/java/gregtech/loaders/c/Loader_Recipes_Other.java View File

@@ -213,7 +213,7 @@ public class Loader_Recipes_Other implements Runnable {
213 213
 		RM.Mixer        .addRecipe1(T, 16,   16, OM.dust(MT.ConstructionFoam), FL.mul(tWater, 1,10, T), FL.CFoam.make(100), ZL_IS);
214 214
 		
215 215
 		for (OreDictMaterial tClay : ANY.Clay.mToThis) {
216
-		for (OreDictMaterial tRock : new OreDictMaterial[] {MT.Stone, MT.Concrete, MT.Gravel, MT.Soapstone, MT.Rhyolite, MT.Gneiss, MT.Shale, MT.Dolomite, MT.Chert, MT.Asbestos}) {
216
+		for (OreDictMaterial tRock : new OreDictMaterial[] {MT.Stone, MT.Concrete, MT.Gravel, MT.Talc, MT.Rhyolite, MT.Gneiss, MT.Shale, MT.Dolomite, MT.Chert, MT.Asbestos}) {
217 217
 		for (OreDictMaterial tMat : ANY.SiO2.mToThis) {
218 218
 		RM.Mixer.addRecipeX(T, 16,  256, ST.array(OM.dust(tRock, U* 6), OM.dust(tMat        , U * 2), OM.dust(tClay, U4)), FL.mul(tWater, 1), FL.CFoam.make(1000), ZL_IS);
219 219
 		RM.Mixer.addRecipeX(T, 16,  256, ST.array(OM.dust(tRock, U*24), OM.dust(tMat        , U * 8), OM.dust(tClay, U )), FL.mul(tWater, 4), FL.CFoam.make(4000), ZL_IS);
@@ -339,7 +339,7 @@ public class Loader_Recipes_Other implements Runnable {
339 339
 		RM.Drying           .addRecipe1(T, 16,   16, ST.tag(0)           , FL.Concrete.make(L), FL.DistW.make(8), ST.make(BlocksGT.Concrete              , 1, DYE_INDEX_LightGray));
340 340
 		
341 341
 		// Asphalt
342
-		for (OreDictMaterial tRock : new OreDictMaterial[] {MT.Stone, MT.Concrete, MT.Gravel, MT.Soapstone, MT.Rhyolite, MT.Gneiss, MT.Shale, MT.Dolomite, MT.Chert})
342
+		for (OreDictMaterial tRock : new OreDictMaterial[] {MT.Stone, MT.Concrete, MT.Gravel, MT.Talc, MT.Rhyolite, MT.Gneiss, MT.Shale, MT.Dolomite, MT.Chert})
343 343
 		RM.Mixer            .addRecipe1(T, 16,   16, OM.dust(tRock), MT.Asphalt.liquid(U, T), NF, ST.make(BlocksGT.Asphalt, 1, DYE_INDEX_Gray));
344 344
 		for (OreDictMaterial tRock : new OreDictMaterial[] {MT.Diorite, MT.Marble, MT.Chalk, MT.CaCO3, MT.Livingrock, MT.Holystone})
345 345
 		RM.Mixer            .addRecipe1(T, 16,   16, OM.dust(tRock), MT.Asphalt.liquid(U, T), NF, ST.make(BlocksGT.Asphalt, 1, DYE_INDEX_White));

+ 1
- 4
src/main/java/gregtech/old/Loader_MachineRecipes.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
  *
@@ -87,13 +87,10 @@ public class Loader_MachineRecipes implements Runnable {
87 87
 
88 88
 
89 89
 		RA.addBrewingRecipe(OM.get(OP.dust, MT.Talc, 1)     , FluidRegistry.getFluid("oil")     , FluidRegistry.getFluid("lubricant"), F);
90
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Soapstone, 1), FluidRegistry.getFluid("oil")     , FluidRegistry.getFluid("lubricant"), F);
91 90
 		RA.addBrewingRecipe(OM.get(OP.dust, MT.Redstone, 1) , FluidRegistry.getFluid("oil")     , FluidRegistry.getFluid("lubricant"), F);
92 91
 		RA.addBrewingRecipe(OM.get(OP.dust, MT.Talc, 1)     , FluidRegistry.getFluid("creosote"), FluidRegistry.getFluid("lubricant"), F);
93
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Soapstone, 1), FluidRegistry.getFluid("creosote"), FluidRegistry.getFluid("lubricant"), F);
94 92
 		RA.addBrewingRecipe(OM.get(OP.dust, MT.Redstone, 1) , FluidRegistry.getFluid("creosote"), FluidRegistry.getFluid("lubricant"), F);
95 93
 		RA.addBrewingRecipe(OM.get(OP.dust, MT.Talc, 1)     , FluidRegistry.getFluid("seedoil") , FluidRegistry.getFluid("lubricant"), F);
96
-		RA.addBrewingRecipe(OM.get(OP.dust, MT.Soapstone, 1), FluidRegistry.getFluid("seedoil") , FluidRegistry.getFluid("lubricant"), F);
97 94
 		RA.addBrewingRecipe(OM.get(OP.dust, MT.Redstone, 1) , FluidRegistry.getFluid("seedoil") , FluidRegistry.getFluid("lubricant"), F);
98 95
 
99 96
 

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

@@ -54,12 +54,14 @@ public class WorldgenBlackSand extends WorldgenObject {
54 54
 		
55 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
-			Block tBlock = NB, tLastBlock = aWorld.getBlock(tX+i, 64, tZ+j);
57
+			Block tBlock = NB, tLastBlock = WD.block(aWorld, tX+i, tUpperBound+1, tZ+j);
58 58
 			for (int tY = tUpperBound, tGenerated = 0; tY >= tLowerBound && tGenerated < 2; tY--, tLastBlock = tBlock) {
59
-				tBlock = aWorld.getBlock(tX+i, tY, tZ+j);
60
-				if (tBlock == BlocksGT.Sands && 0 == aWorld.getBlockMetadata(tX+i, tY, tZ+j)) {tGenerated++; continue;}
59
+				tBlock = WD.block(aWorld, tX+i, tY, tZ+j);
60
+				byte tMeta = WD.meta(aWorld, tX+i, tY, tZ+j);
61
+				if (tBlock == BlocksGT.Sands && tMeta == aMeta) {tGenerated++; continue;}
61 62
 				if (!tBlock.isOpaqueCube()) {if (tGenerated > 0) break; continue;}
62
-				if (tBlock == Blocks.dirt || tBlock == Blocks.gravel || tBlock == Blocks.sand || tBlock == Blocks.clay || tBlock == BlocksGT.oreSmallGravel || tBlock == BlocksGT.oreGravel || tBlock == BlocksGT.oreSmallSand || tBlock == BlocksGT.oreSand || tBlock == BlocksGT.oreSmallRedSand || tBlock == BlocksGT.oreRedSand) {
63
+				if ((tBlock == Blocks.dirt && tMeta < 2) || tBlock == Blocks.gravel || tBlock == Blocks.sand || tBlock == Blocks.clay || tBlock == BlocksGT.oreSmallGravel || tBlock == BlocksGT.oreGravel || tBlock == BlocksGT.oreSmallSand || tBlock == BlocksGT.oreSand || tBlock == BlocksGT.oreSmallRedSand || tBlock == BlocksGT.oreRedSand) {
64
+					// Don't take away the Dirt Block below Trees, Bushes and other Plants.
63 65
 					if (tGenerated <= 0 && (tLastBlock.getMaterial() == Material.wood || tLastBlock.getMaterial() == Material.gourd)) continue;
64 66
 				} else {
65 67
 					if (tGenerated > 0) {

Loading…
Cancel
Save