From ed89ccbc4f2cd1f6e2c13287f6c0b07ac7a246da Mon Sep 17 00:00:00 2001 From: Muramasa Date: Mon, 1 Aug 2016 15:08:11 +0100 Subject: Remove asteroids from isGenerationAllowed --- src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 2 +- src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java | 2 +- src/main/java/gregtech/common/GT_Worldgenerator.java | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java index d8a165a8af..cde5b2600b 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java +++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java @@ -66,7 +66,7 @@ public class GT_Worldgen_GT_Ore_Layer if (!this.mRestrictBiome.equals("None") && !(this.mRestrictBiome.equals(aBiome))) { return false; //Not the correct biome for ore mix } - if (!isGenerationAllowed(aWorld, aDimensionType, ((aDimensionType == -1) && (this.mNether)) || ((aDimensionType == 0) && (this.mOverworld)) || ((aDimensionType == 1) && (this.mEnd)) || ((aDimensionType == -28) && (this.mMoon)) || ((aDimensionType == -29) && (this.mMars)) || ((aDimensionType == -30) && (this.mAsteroid)) ? aDimensionType : aDimensionType ^ 0xFFFFFFFF)) { + if (!isGenerationAllowed(aWorld, aDimensionType, ((aDimensionType == -1) && (this.mNether)) || ((aDimensionType == 0) && (this.mOverworld)) || ((aDimensionType == 1) && (this.mEnd)) || ((aDimensionType == -28) && (this.mMoon)) || ((aDimensionType == -29) && (this.mMars)) ? aDimensionType : aDimensionType ^ 0xFFFFFFFF)) { return false; } int tMinY = this.mMinY + aRandom.nextInt(this.mMaxY - this.mMinY - 5); diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java index c5c6481344..305f03d52b 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java +++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java @@ -42,7 +42,7 @@ public class GT_Worldgen_GT_Ore_SmallPieces if (!this.mRestrictBiome.equals("None") && !(this.mRestrictBiome.equals(aBiome))) { return false; //Not the correct biome for small ore } - if (!isGenerationAllowed(aWorld, aDimensionType, ((aDimensionType == -1) && (this.mNether)) || ((aDimensionType == 0) && (this.mOverworld)) || ((aDimensionType == 1) && (this.mEnd)) || ((aDimensionType == -28) && (this.mMoon)) || ((aDimensionType == -29) && (this.mMars)) || ((aDimensionType == -30) && (this.mAsteroid)) ? aDimensionType : aDimensionType ^ 0xFFFFFFFF)) { + if (!isGenerationAllowed(aWorld, aDimensionType, ((aDimensionType == -1) && (this.mNether)) || ((aDimensionType == 0) && (this.mOverworld)) || ((aDimensionType == 1) && (this.mEnd)) || ((aDimensionType == -28) && (this.mMoon)) || ((aDimensionType == -29) && (this.mMars)) ? aDimensionType : aDimensionType ^ 0xFFFFFFFF)) { return false; } if (this.mMeta > 0) { diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java index 1dbd77a6da..2d421097fc 100644 --- a/src/main/java/gregtech/common/GT_Worldgenerator.java +++ b/src/main/java/gregtech/common/GT_Worldgenerator.java @@ -206,7 +206,12 @@ public class GT_Worldgenerator if (tDimensionType == -1) { mWorld.setBlock(eX, eY, eZ, Blocks.end_stone, 0, 0); } else if (tDimensionType == -30) { - mWorld.setBlock(eX, eY, eZ, GregTech_API.sBlockGranites, 8, 3); + //int asteroidType = aRandom.nextInt(20); + //if (asteroidType == 19) { //Rare Asteroid? + //mWorld.setBlock(eX, eY, eZ, GregTech_API.sBlockGranites, 8, 3); + //} else { + mWorld.setBlock(eX, eY, eZ, GregTech_API.sBlockGranites, 8, 3); + //} } } } -- cgit