Browse Source

More PFAA Compat for when CustomOreGen is not installed

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

+ 4
- 1
CHANGELOG.md View File

@@ -11,7 +11,10 @@ Nothing (I tend to only add finished Stuff to the Changelog).
11 11
 
12 12
 6.14.07: (Not released yet, happens whenever a Bugfix needs to be released, Bear is still testing GT6 even though he cant Stream at the moment, while I'm working on my Life and things)
13 13
 [NOTE] I've been indirectly asked through bear, to make GT6 Tools compatible with "Progressive Automation", but it only accepts Vanilla alike Tools, meaning that will never really work. But my Wrench can harvest all of its Machines now at the very least.
14
-[COMPAT] The PFAA Sands now have more appropriate Processing, and the PFAA Clay Balls now have fitting Material Data.
14
+[COMPAT] Per Fabrica Ad Astra (PFAA)
15
+If CustomOreGen is not installed, PFAA still works, this means PFAA Blocks exist but they wont generate. Because of this likely intended thing, I will now generate the 25 PFAA Rock Types with my own Stone Layer System alongside the other Stuff, if PFAA is installed without CustomOreGen.
16
+The PFAA Sands now have more appropriate Processing, and the PFAA Clay Balls now have fitting Material Data.
17
+I made sure all Ores actually work. Realgar (Red Gem Ore made of Arsenic + Sulfur) did not have any Material Data.
15 18
 [IMPROVED] Advanced Crafting Table now consumes Items in a better order. Also fixed a brand new Bug I caused earlier.
16 19
 [FIXED] Magnesite and Magnesium Carbonate are now the same Material, like they should have been.
17 20
 [FIXED] The Collect Sound for autocollecting Tools is now matching the vanilla Sound in Pitch and Volume.

+ 1
- 1
src/main/java/gregapi/GT_API.java View File

@@ -629,7 +629,7 @@ public class GT_API extends Abstract_Mod {
629 629
 		ITexture.Util.GT_ALPHA_BLENDING     = ConfigsGT.CLIENT.get(ConfigCategories.general, "useGTAlphaBlending"      , ITexture.Util.GT_ALPHA_BLENDING);
630 630
 		ITexture.Util.MC_ALPHA_BLENDING     = ConfigsGT.CLIENT.get(ConfigCategories.general, "useMCAlphaBlending"      , ITexture.Util.MC_ALPHA_BLENDING);
631 631
 		
632
-		GT6WorldGenerator.PFAA = (ConfigsGT.WORLDGEN.get(ConfigCategories.general, "AutoDetectPFAA", T) && MD.PFAA.mLoaded);
632
+		GT6WorldGenerator.PFAA = (ConfigsGT.WORLDGEN.get(ConfigCategories.general, "AutoDetectPFAA", T) && MD.PFAA.mLoaded && MD.COG.mLoaded);
633 633
 		GT6WorldGenerator.TFC  = (ConfigsGT.WORLDGEN.get(ConfigCategories.general, "AutoDetectTFC" , T) && (MD.TFC.mLoaded || MD.TFCP.mLoaded));
634 634
 		
635 635
 		// Register Crafting Recipe Classes.

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

@@ -189,7 +189,7 @@ public class Loader_Ores implements Runnable {
189 189
 		for (int i = 0; i < 5; i++) rockset(MD.PFAA, "weakStone", i, i, "weakRubble", i, "pfaa.weak."+i, tPrefix[i], tDrops[i], 0.5F, 0.5F, 0, F, F, T);
190 190
 		
191 191
 		tPrefix = new OreDictPrefix[] {OP.oreLimestone, OP.oreVanillastone, OP.oreVanillastone, OP.oreVanillastone, OP.oreVanillastone};
192
-		tDrops  = new OreDictMaterial[] {MT.Limestone, MT.Stone, MT.Stone, MT.Stone, MT.Stone};
192
+		tDrops  = new OreDictMaterial[] {MT.Limestone, MT.Stone, MT.Stone, MT.Slate, MT.Stone};
193 193
 		for (int i = 0; i < 5; i++) rockset(MD.PFAA, "mediumStone", i, i, "mediumCobble", i, "pfaa.medium."+i, tPrefix[i], tDrops[i], 1.0F, 1.0F, 0, F, F, T);
194 194
 		
195 195
 		tPrefix = new OreDictPrefix[] {OP.oreAndesite, OP.oreBasalt, OP.oreVanillastone, OP.oreBlackgranite, OP.oreVanillastone, OP.oreMarble, OP.oreVanillastone, OP.oreVanillastone, OP.oreSandstone, OP.oreSandstone};

+ 33
- 0
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -388,6 +388,39 @@ public class Loader_Worldgen implements Runnable {
388 388
 		}
389 389
 		
390 390
 		
391
+		if (MD.PFAA.mLoaded) {
392
+		Block tStone = ST.block(MD.PFAA, "weakStone"), tCobble = ST.block(MD.PFAA, "weakRubble");
393
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  0, tCobble,  0, MT.Stone       ));
394
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  1, tCobble,  1, MT.Stone       ));
395
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  2, tCobble,  2, MT.Stone       ));
396
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  3, tCobble,  3, MT.Stone       ));
397
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  4, tCobble,  4, MT.Shale       ));
398
+		tStone = ST.block(MD.PFAA, "mediumStone"); tCobble = ST.block(MD.PFAA, "mediumCobble");
399
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  0, tCobble,  0, MT.Limestone   ));
400
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  1, tCobble,  1, MT.Stone       ));
401
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  2, tCobble,  2, MT.Stone       ));
402
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  3, tCobble,  3, MT.Slate       ));
403
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  4, tCobble,  4, MT.Stone       ));
404
+		tStone = ST.block(MD.PFAA, "strongStone"); tCobble = ST.block(MD.PFAA, "strongCobble");
405
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  0, tCobble,  0, MT.Andesite    ));
406
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  1, tCobble,  1, MT.Basalt      ));
407
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  2, tCobble,  2, MT.Gneiss      ));
408
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  3, tCobble,  3, MT.GraniteBlack));
409
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  4, tCobble,  4, MT.Greenschist ));
410
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  5, tCobble,  5, MT.Marble      ));
411
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  6, tCobble,  6, MT.Stone       ));
412
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  7, tCobble,  7, MT.Rhyolite    ));
413
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  8, tCobble,  8, MT.Sand        ));
414
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  9, tCobble,  9, MT.Sand        ));
415
+		tStone = ST.block(MD.PFAA, "veryStrongStone"); tCobble = ST.block(MD.PFAA, "veryStrongCobble");
416
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  0, tCobble,  0, MT.Diorite     ));
417
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  1, tCobble,  1, MT.Gabbro      ));
418
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  2, tCobble,  2, MT.Stone       ));
419
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  3, tCobble,  3, MT.Stone       ));
420
+		StoneLayer.LAYERS.add(new StoneLayer(tStone,  4, tCobble,  4, MT.Quartzite   ));
421
+		}
422
+		
423
+		
391 424
 		if (MD.UB.mLoaded) {
392 425
 		Block tStone = ST.block(MD.UB, "igneousStone"), tCobble = ST.block(MD.UB, "igneousCobblestone");
393 426
 		StoneLayer.LAYERS.add(new StoneLayer(tStone, 0+8, tCobble, 0, MT.Granite     ));

Loading…
Cancel
Save