diff --git a/src/main/java/com/legacy/aether/world/dungeon/BronzeDungeon.java b/src/main/java/com/legacy/aether/world/dungeon/BronzeDungeon.java index 5897291..b45bd6b 100644 --- a/src/main/java/com/legacy/aether/world/dungeon/BronzeDungeon.java +++ b/src/main/java/com/legacy/aether/world/dungeon/BronzeDungeon.java @@ -45,9 +45,12 @@ public class BronzeDungeon extends AetherDungeon { return false; } - if (random.nextInt(25) != 0) + if (random.nextInt(40) != 0) { - return false; + if (random.nextInt(60) != 0) + { + return false; + } } setBlocks(this.lockedBlock(), this.lockedLightBlock(), 20); diff --git a/src/main/java/com/legacy/aether/world/gen/MapGenGoldenDungeon.java b/src/main/java/com/legacy/aether/world/gen/MapGenGoldenDungeon.java index 2d309c3..54128b3 100644 --- a/src/main/java/com/legacy/aether/world/gen/MapGenGoldenDungeon.java +++ b/src/main/java/com/legacy/aether/world/gen/MapGenGoldenDungeon.java @@ -2,12 +2,10 @@ package com.legacy.aether.world.gen; import java.util.Random; -import com.legacy.aether.world.util.AetherRandomTracker; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.structure.MapGenStructure; -import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureStart; import com.legacy.aether.world.gen.components.ComponentGoldenDungeon; @@ -26,17 +24,15 @@ public class MapGenGoldenDungeon extends MapGenStructure { @Override protected boolean canSpawnStructureAtCoords(int chunkX, int chunkZ) { - AetherRandomTracker tracker = AetherRandomTracker.INSTANCE; - int rand = tracker.testRandom(this.rand, 180); + if (this.rand.nextInt(120) != 0) + { + if (this.rand.nextInt(140) != 0) + { + return false; + } + } - if (rand != 0) - { - return false; - } - else - { - return chunkX % 10 == 0 && chunkZ % 10 == 0; - } + return chunkX % 10 == 0 && chunkZ % 10 == 0; } @Override diff --git a/src/main/java/com/legacy/aether/world/gen/MapGenSilverDungeon.java b/src/main/java/com/legacy/aether/world/gen/MapGenSilverDungeon.java index 792307a..7205acf 100644 --- a/src/main/java/com/legacy/aether/world/gen/MapGenSilverDungeon.java +++ b/src/main/java/com/legacy/aether/world/gen/MapGenSilverDungeon.java @@ -2,7 +2,6 @@ package com.legacy.aether.world.gen; import java.util.Random; -import com.legacy.aether.world.util.AetherRandomTracker; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.gen.structure.MapGenStructure; @@ -22,17 +21,15 @@ public class MapGenSilverDungeon extends MapGenStructure { @Override protected boolean canSpawnStructureAtCoords(int chunkX, int chunkZ) { - AetherRandomTracker tracker = AetherRandomTracker.INSTANCE; - int rand = tracker.testRandom(this.rand, 60); + if (this.rand.nextInt(60) != 0) + { + if (this.rand.nextInt(80) != 0) + { + return false; + } + } - if (rand != 0) - { - return false; - } - else - { - return chunkX % 6 == 0 && chunkZ % 6 == 0; - } + return chunkX % 6 == 0 && chunkZ % 6 == 0; } @Override diff --git a/src/main/java/com/legacy/aether/world/util/AetherRandomTracker.java b/src/main/java/com/legacy/aether/world/util/AetherRandomTracker.java deleted file mode 100644 index b1fec3f..0000000 --- a/src/main/java/com/legacy/aether/world/util/AetherRandomTracker.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.legacy.aether.world.util; - -import java.util.Random; - -public class AetherRandomTracker -{ - public static AetherRandomTracker INSTANCE = new AetherRandomTracker(); - public int lastRand = -1; - - public int testRandom(Random random, int bound) - { - int inputRandom = random.nextInt(bound); - - if (inputRandom != this.lastRand) - { - this.lastRand = inputRandom; - return inputRandom; - } - else - { - testRandom(random, bound); - } - - return -1; - } -}