From bb1c84fb40a828beba89799be2377c3f31f07fe4 Mon Sep 17 00:00:00 2001 From: ted80-PC Date: Sat, 1 Feb 2014 16:12:05 +0100 Subject: [PATCH 1/2] Nether biome gen Disabled biome deco: ChunkProviderBOPHell line 570 Add new hell biomes at: BiomeLayerHellBiomes line 23 --- .../java/biomesoplenty/BiomesOPlenty.java | 3 + .../common/helpers/BiomeCacheBlockHell.java | 48 ++ .../common/helpers/BiomeCacheHell.java | 105 +++ .../common/world/ChunkProviderBOPHell.java | 659 ++++++++++++++++++ .../world/WorldChunkManagerBOPHell.java | 281 ++++++++ .../common/world/WorldProviderBopHell.java | 38 + .../world/layer/hell/BiomeLayerHell.java | 43 ++ .../layer/hell/BiomeLayerHellBiomes.java | 49 ++ .../layer/hell/BiomeLayerHellCreate.java | 28 + .../layer/hell/BiomeLayerHellFuzzyZoom.java | 76 ++ .../layer/hell/BiomeLayerHellVoronoiZoom.java | 101 +++ .../world/layer/hell/BiomeLayerHellZoom.java | 119 ++++ 12 files changed, 1550 insertions(+) create mode 100644 src/main/java/biomesoplenty/common/helpers/BiomeCacheBlockHell.java create mode 100644 src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java create mode 100644 src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java create mode 100644 src/main/java/biomesoplenty/common/world/WorldChunkManagerBOPHell.java create mode 100644 src/main/java/biomesoplenty/common/world/WorldProviderBopHell.java create mode 100644 src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java create mode 100644 src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java create mode 100644 src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellCreate.java create mode 100644 src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellFuzzyZoom.java create mode 100644 src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellVoronoiZoom.java create mode 100644 src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java diff --git a/src/main/java/biomesoplenty/BiomesOPlenty.java b/src/main/java/biomesoplenty/BiomesOPlenty.java index d5932c1fe..d32f5c8da 100644 --- a/src/main/java/biomesoplenty/BiomesOPlenty.java +++ b/src/main/java/biomesoplenty/BiomesOPlenty.java @@ -23,6 +23,7 @@ import biomesoplenty.common.helpers.CreativeTabsBOP; import biomesoplenty.common.integration.TreecapitatorIntegration; import biomesoplenty.common.network.PacketPipeline; import biomesoplenty.common.utils.BOPModInfo; +import biomesoplenty.common.world.WorldProviderBopHell; import biomesoplenty.common.world.WorldProviderPromised; import biomesoplenty.common.world.WorldTypeBOP; import biomesoplenty.common.world.decoration.ForcedDecorators; @@ -89,6 +90,8 @@ public class BiomesOPlenty packetPipeline.initalize(); TreecapitatorIntegration.init(); + DimensionManager.unregisterProviderType(-1); + DimensionManager.registerProviderType(-1, WorldProviderBopHell.class, true); //DimensionManager.registerProviderType(BOPConfigurationIDs.promisedLandDimID, WorldProviderPromised.class, false); //DimensionManager.registerDimension(BOPConfigurationIDs.promisedLandDimID, BOPConfigurationIDs.promisedLandDimID); } diff --git a/src/main/java/biomesoplenty/common/helpers/BiomeCacheBlockHell.java b/src/main/java/biomesoplenty/common/helpers/BiomeCacheBlockHell.java new file mode 100644 index 000000000..7e2db17f4 --- /dev/null +++ b/src/main/java/biomesoplenty/common/helpers/BiomeCacheBlockHell.java @@ -0,0 +1,48 @@ +package biomesoplenty.common.helpers; + +import net.minecraft.world.biome.BiomeGenBase; + +public class BiomeCacheBlockHell +{ + /** An array of chunk temperatures saved by this cache. */ + public float[] temperatureValues; + + /** An array of chunk rainfall values saved by this cache. */ + public float[] rainfallValues; + + /** The array of biome types stored in this BiomeCacheBlock. */ + public BiomeGenBase[] biomes; + + /** The x coordinate of the BiomeCacheBlock. */ + public int xPosition; + + /** The z coordinate of the BiomeCacheBlock. */ + public int zPosition; + + /** The last time this BiomeCacheBlock was accessed, in milliseconds. */ + public long lastAccessTime; + + /** The BiomeCache object that contains this BiomeCacheBlock */ + final BiomeCacheHell theBiomeCache; + + public BiomeCacheBlockHell(BiomeCacheHell par1BiomeCache, int par2, int par3) + { + theBiomeCache = par1BiomeCache; + temperatureValues = new float[256]; + rainfallValues = new float[256]; + biomes = new BiomeGenBase[256]; + xPosition = par2; + zPosition = par3; + BiomeCacheHell.getChunkManager(par1BiomeCache).getTemperatures(temperatureValues, par2 << 4, par3 << 4, 16, 16); + BiomeCacheHell.getChunkManager(par1BiomeCache).getRainfall(rainfallValues, par2 << 4, par3 << 4, 16, 16); + BiomeCacheHell.getChunkManager(par1BiomeCache).getBiomeGenAt(biomes, par2 << 4, par3 << 4, 16, 16, false); + } + + /** + * Returns the BiomeGenBase related to the x, z position from the cache block. + */ + public BiomeGenBase getBiomeGenAt(int par1, int par2) + { + return biomes[par1 & 15 | (par2 & 15) << 4]; + } +} diff --git a/src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java b/src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java new file mode 100644 index 000000000..5fc47008a --- /dev/null +++ b/src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java @@ -0,0 +1,105 @@ +package biomesoplenty.common.helpers; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.LongHashMap; +import net.minecraft.world.biome.BiomeGenBase; +import biomesoplenty.common.world.WorldChunkManagerBOPHell; +import biomesoplenty.common.world.WorldChunkManagerPromised; + +public class BiomeCacheHell +{ + /** Reference to the WorldChunkManager */ + private final WorldChunkManagerBOPHell chunkManager; + + /** The last time this BiomeCache was cleaned, in milliseconds. */ + private long lastCleanupTime = 0L; + + /** + * The map of keys to BiomeCacheBlocks. Keys are based on the chunk x, z coordinates as (x | z << 32). + */ + private LongHashMap cacheMap = new LongHashMap(); + + /** The list of cached BiomeCacheBlocks */ + @SuppressWarnings("rawtypes") + private List cache = new ArrayList(); + + public BiomeCacheHell(WorldChunkManagerBOPHell par1WorldChunkManager) + { + chunkManager = par1WorldChunkManager; + } + + /** + * Returns a biome cache block at location specified. + */ + @SuppressWarnings("unchecked") + public BiomeCacheBlockHell getBiomeCacheBlock(int par1, int par2) + { + par1 >>= 4; + par2 >>= 4; + long var3 = par1 & 4294967295L | (par2 & 4294967295L) << 32; + BiomeCacheBlockHell var5 = (BiomeCacheBlockHell)cacheMap.getValueByKey(var3); + + if (var5 == null) + { + var5 = new BiomeCacheBlockHell(this, par1, par2); + cacheMap.add(var3, var5); + cache.add(var5); + } + + var5.lastAccessTime = System.currentTimeMillis(); + return var5; + } + + /** + * Returns the BiomeGenBase related to the x, z position from the cache. + */ + public BiomeGenBase getBiomeGenAt(int par1, int par2) + { + return this.getBiomeCacheBlock(par1, par2).getBiomeGenAt(par1, par2); + } + + /** + * Removes BiomeCacheBlocks from this cache that haven't been accessed in at least 30 seconds. + */ + public void cleanupCache() + { + long var1 = System.currentTimeMillis(); + long var3 = var1 - lastCleanupTime; + + if (var3 > 7500L || var3 < 0L) + { + lastCleanupTime = var1; + + for (int var5 = 0; var5 < cache.size(); ++var5) + { + BiomeCacheBlockPromised var6 = (BiomeCacheBlockPromised)cache.get(var5); + long var7 = var1 - var6.lastAccessTime; + + if (var7 > 30000L || var7 < 0L) + { + cache.remove(var5--); + long var9 = var6.xPosition & 4294967295L | (var6.zPosition & 4294967295L) << 32; + cacheMap.remove(var9); + } + } + } + } + + /** + * Returns the array of cached biome types in the BiomeCacheBlock at the given location. + */ + public BiomeGenBase[] getCachedBiomes(int par1, int par2) + { + return this.getBiomeCacheBlock(par1, par2).biomes; + } + + /** + * Get the world chunk manager object for a biome list. + */ + static WorldChunkManagerBOPHell getChunkManager(BiomeCacheHell par0BiomeCache) + { + return par0BiomeCache.chunkManager; + } +} diff --git a/src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java b/src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java new file mode 100644 index 000000000..ccaf6cddd --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/ChunkProviderBOPHell.java @@ -0,0 +1,659 @@ +package biomesoplenty.common.world; + +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SHROOM; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.NETHER_BRIDGE; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.NETHER_CAVE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.FIRE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.GLOWSTONE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.NETHER_LAVA; + +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockFalling; +import net.minecraft.block.BlockSand; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.init.Blocks; +import net.minecraft.util.IProgressUpdate; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.MapGenBase; +import net.minecraft.world.gen.MapGenCavesHell; +import net.minecraft.world.gen.NoiseGeneratorOctaves; +import net.minecraft.world.gen.feature.WorldGenFire; +import net.minecraft.world.gen.feature.WorldGenFlowers; +import net.minecraft.world.gen.feature.WorldGenGlowStone1; +import net.minecraft.world.gen.feature.WorldGenGlowStone2; +import net.minecraft.world.gen.feature.WorldGenHellLava; +import net.minecraft.world.gen.feature.WorldGenMinable; +import net.minecraft.world.gen.structure.MapGenNetherBridge; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.terraingen.ChunkProviderEvent; +import net.minecraftforge.event.terraingen.DecorateBiomeEvent; +import net.minecraftforge.event.terraingen.PopulateChunkEvent; +import net.minecraftforge.event.terraingen.TerrainGen; + +public class ChunkProviderBOPHell implements IChunkProvider +{ + private Random hellRNG; + private NoiseGeneratorOctaves netherNoiseGen1; + private NoiseGeneratorOctaves netherNoiseGen2; + private NoiseGeneratorOctaves netherNoiseGen3; + private NoiseGeneratorOctaves slowsandGravelNoiseGen; + private NoiseGeneratorOctaves netherrackExculsivityNoiseGen; + public NoiseGeneratorOctaves netherNoiseGen6; + public NoiseGeneratorOctaves netherNoiseGen7; + private World worldObj; + private double[] noiseField; + public MapGenNetherBridge genNetherBridge = new MapGenNetherBridge(); + private double[] slowsandNoise = new double[256]; + private double[] gravelNoise = new double[256]; + private BiomeGenBase[] biomesForGeneration; + private double[] netherrackExclusivityNoise = new double[256]; + private MapGenBase netherCaveGenerator = new MapGenCavesHell(); + double[] noiseData1; + double[] noiseData2; + double[] noiseData3; + double[] noiseData4; + double[] noiseData5; + + { + genNetherBridge = (MapGenNetherBridge) TerrainGen.getModdedMapGen(genNetherBridge, NETHER_BRIDGE); + netherCaveGenerator = TerrainGen.getModdedMapGen(netherCaveGenerator, NETHER_CAVE); + } + + public ChunkProviderBOPHell(World par1World, long par2) + { + worldObj = par1World; + hellRNG = new Random(par2); + netherNoiseGen1 = new NoiseGeneratorOctaves(hellRNG, 16); + netherNoiseGen2 = new NoiseGeneratorOctaves(hellRNG, 16); + netherNoiseGen3 = new NoiseGeneratorOctaves(hellRNG, 8); + slowsandGravelNoiseGen = new NoiseGeneratorOctaves(hellRNG, 4); + netherrackExculsivityNoiseGen = new NoiseGeneratorOctaves(hellRNG, 4); + netherNoiseGen6 = new NoiseGeneratorOctaves(hellRNG, 10); + netherNoiseGen7 = new NoiseGeneratorOctaves(hellRNG, 16); + + /*NoiseGeneratorOctaves[] noiseGens = {netherNoiseGen1, netherNoiseGen2, netherNoiseGen3, slowsandGravelNoiseGen, netherrackExculsivityNoiseGen, netherNoiseGen6, netherNoiseGen7}; + noiseGens = TerrainGen.getModdedNoiseGenerators(par1World, hellRNG, noiseGens); + netherNoiseGen1 = noiseGens[0]; + netherNoiseGen2 = noiseGens[1]; + netherNoiseGen3 = noiseGens[2]; + slowsandGravelNoiseGen = noiseGens[3]; + netherrackExculsivityNoiseGen = noiseGens[4]; + netherNoiseGen6 = noiseGens[5]; + netherNoiseGen7 = noiseGens[6];*/ + } + + /** + * Generates the shape of the terrain in the nether. + */ + public void generateNetherTerrain(int par1, int par2, Block[] blocks) + { + byte b0 = 4; + byte b1 = 32; + int k = b0 + 1; + byte b2 = 17; + int l = b0 + 1; + noiseField = this.initializeNoiseField(noiseField, par1 * b0, 0, par2 * b0, k, b2, l); + + for (int i1 = 0; i1 < b0; ++i1) + { + for (int j1 = 0; j1 < b0; ++j1) + { + for (int k1 = 0; k1 < 16; ++k1) + { + double d0 = 0.125D; + double d1 = noiseField[((i1 + 0) * l + j1 + 0) * b2 + k1 + 0]; + double d2 = noiseField[((i1 + 0) * l + j1 + 1) * b2 + k1 + 0]; + double d3 = noiseField[((i1 + 1) * l + j1 + 0) * b2 + k1 + 0]; + double d4 = noiseField[((i1 + 1) * l + j1 + 1) * b2 + k1 + 0]; + double d5 = (noiseField[((i1 + 0) * l + j1 + 0) * b2 + k1 + 1] - d1) * d0; + double d6 = (noiseField[((i1 + 0) * l + j1 + 1) * b2 + k1 + 1] - d2) * d0; + double d7 = (noiseField[((i1 + 1) * l + j1 + 0) * b2 + k1 + 1] - d3) * d0; + double d8 = (noiseField[((i1 + 1) * l + j1 + 1) * b2 + k1 + 1] - d4) * d0; + + for (int l1 = 0; l1 < 8; ++l1) + { + double d9 = 0.25D; + double d10 = d1; + double d11 = d2; + double d12 = (d3 - d1) * d9; + double d13 = (d4 - d2) * d9; + + for (int i2 = 0; i2 < 4; ++i2) + { + int j2 = i2 + i1 * 4 << 11 | 0 + j1 * 4 << 7 | k1 * 8 + l1; + short short1 = 128; + double d14 = 0.25D; + double d15 = d10; + double d16 = (d11 - d10) * d14; + + for (int k2 = 0; k2 < 4; ++k2) + { + Block l2 = Blocks.air; + + if (k1 * 8 + l1 < b1) + { + l2 = Blocks.lava; + } + + if (d15 > 0.0D) + { + l2 = Blocks.netherrack; + } + + blocks[j2] = l2; + j2 += short1; + d15 += d16; + } + + d10 += d12; + d11 += d13; + } + + d1 += d5; + d2 += d6; + d3 += d7; + d4 += d8; + } + } + } + } + } + + /** + * name based on ChunkProviderGenerate + */ + public void replaceBlocksForBiome(int par1, int par2, Block[] blocks, BiomeGenBase[] par4ArrayOfBiomeGenBase) + { + //ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, par1, par2, par3ArrayOfByte, par4ArrayOfBiomeGenBase); + //MinecraftForge.EVENT_BUS.post(event); + //if (event.getResult() == Result.DENY) return; + + byte b0 = 32; + double d0 = 0.03125D; + slowsandNoise = slowsandGravelNoiseGen.generateNoiseOctaves(slowsandNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, d0, d0, 1.0D); + gravelNoise = slowsandGravelNoiseGen.generateNoiseOctaves(gravelNoise, par1 * 16, 109, par2 * 16, 16, 1, 16, d0, 1.0D, d0); + netherrackExclusivityNoise = netherrackExculsivityNoiseGen.generateNoiseOctaves(netherrackExclusivityNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, d0 * 2.0D, d0 * 2.0D, d0 * 2.0D); + + for (int k = 0; k < 16; ++k) + { + for (int l = 0; l < 16; ++l) + { + BiomeGenBase biomegenbase = par4ArrayOfBiomeGenBase[l + k * 16]; + + boolean flag = slowsandNoise[k + l * 16] + hellRNG.nextDouble() * 0.2D > 0.0D; + boolean flag1 = gravelNoise[k + l * 16] + hellRNG.nextDouble() * 0.2D > 0.0D; + int i1 = (int)(netherrackExclusivityNoise[k + l * 16] / 3.0D + 3.0D + hellRNG.nextDouble() * 0.25D); + int j1 = -1; + Block b1 = biomegenbase.topBlock; + Block b2 = biomegenbase.fillerBlock; + + for (int k1 = 127; k1 >= 0; --k1) + { + int l1 = (l * 16 + k) * 128 + k1; + + if (k1 < 127 - hellRNG.nextInt(5) && k1 > 0 + hellRNG.nextInt(5)) + { + Block b3 = blocks[l1]; + + if (b3 == Blocks.air) + { + j1 = -1; + } + else if (b3 == Blocks.netherrack) + { + if (j1 == -1) + { + if (i1 <= 0) + { + b1 = Blocks.air; + b2 = Blocks.netherrack; + } + else if (k1 >= b0 - 4 && k1 <= b0 + 1) + { + b1 = Blocks.netherrack; + b2 = Blocks.netherrack; + + if (flag1) + { + b1 = Blocks.gravel; + } + + if (flag1) + { + b2 = Blocks.netherrack; + } + + if (flag) + { + b1 = Blocks.soul_sand; + } + + if (flag) + { + b2 = Blocks.soul_sand; + } + } + + if (k1 < b0 && b1 == Blocks.air) + { + b1 = Blocks.lava; + } + + j1 = i1; + + if (k1 >= b0 - 1) + { + blocks[l1] = b1; + } + else + { + blocks[l1] = b2; + } + } + else if (j1 > 0) + { + --j1; + blocks[l1] = b2; + } + } + } + else + { + blocks[l1] = Blocks.bedrock; + } + } + } + } + } + + /** + * loads or generates the chunk at the chunk location specified + */ + @Override + public Chunk loadChunk(int par1, int par2) + { + return this.provideChunk(par1, par2); + } + + /** + * Will return back a chunk, if it doesn't exist and its not a MP client it will generates all the blocks for the + * specified chunk from the map seed and chunk seed + */ + @Override + public Chunk provideChunk(int par1, int par2) + { + hellRNG.setSeed(par1 * 341873128712L + par2 * 132897987541L); + byte[] abyte = new byte[32768]; + Block[] blocks = new Block[32768]; + this.generateNetherTerrain(par1, par2, blocks); + biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, par1 * 16, par2 * 16, 16, 16); + this.replaceBlocksForBiome(par1, par2, blocks, biomesForGeneration); + netherCaveGenerator.func_151539_a(this, worldObj, par1, par2, blocks); + genNetherBridge.func_151539_a(this, worldObj, par1, par2, blocks); + Chunk chunk = new Chunk(worldObj, blocks, par1, par2); + BiomeGenBase[] abiomegenbase = worldObj.getWorldChunkManager().loadBlockGeneratorData((BiomeGenBase[])null, par1 * 16, par2 * 16, 16, 16); + byte[] abyte1 = chunk.getBiomeArray(); + + for (int k = 0; k < abyte1.length; ++k) + { + abyte1[k] = (byte)abiomegenbase[k].biomeID; + } + + chunk.resetRelightChecks(); + return chunk; + } + + /** + * generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the + * size. + */ + private double[] initializeNoiseField(double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, int par7) + { + //ChunkProviderEvent.InitNoiseField event = new ChunkProviderEvent.InitNoiseField(this, par1ArrayOfDouble, par2, par3, par4, par5, par6, par7); + //MinecraftForge.EVENT_BUS.post(event); + //if (event.getResult() == Result.DENY) return event.noisefield; + + if (par1ArrayOfDouble == null) + { + par1ArrayOfDouble = new double[par5 * par6 * par7]; + } + + double d0 = 684.412D; + double d1 = 2053.236D; + noiseData4 = netherNoiseGen6.generateNoiseOctaves(noiseData4, par2, par3, par4, par5, 1, par7, 1.0D, 0.0D, 1.0D); + noiseData5 = netherNoiseGen7.generateNoiseOctaves(noiseData5, par2, par3, par4, par5, 1, par7, 100.0D, 0.0D, 100.0D); + noiseData1 = netherNoiseGen3.generateNoiseOctaves(noiseData1, par2, par3, par4, par5, par6, par7, d0 / 80.0D, d1 / 60.0D, d0 / 80.0D); + noiseData2 = netherNoiseGen1.generateNoiseOctaves(noiseData2, par2, par3, par4, par5, par6, par7, d0, d1, d0); + noiseData3 = netherNoiseGen2.generateNoiseOctaves(noiseData3, par2, par3, par4, par5, par6, par7, d0, d1, d0); + int k1 = 0; + int l1 = 0; + double[] adouble1 = new double[par6]; + int i2; + + for (i2 = 0; i2 < par6; ++i2) + { + adouble1[i2] = Math.cos(i2 * Math.PI * 6.0D / par6) * 2.0D; + double d2 = i2; + + if (i2 > par6 / 2) + { + d2 = par6 - 1 - i2; + } + + if (d2 < 4.0D) + { + d2 = 4.0D - d2; + adouble1[i2] -= d2 * d2 * d2 * 10.0D; + } + } + + for (i2 = 0; i2 < par5; ++i2) + { + for (int j2 = 0; j2 < par7; ++j2) + { + double d3 = (noiseData4[l1] + 256.0D) / 512.0D; + + if (d3 > 1.0D) + { + d3 = 1.0D; + } + + double d4 = 0.0D; + double d5 = noiseData5[l1] / 8000.0D; + + if (d5 < 0.0D) + { + d5 = -d5; + } + + d5 = d5 * 3.0D - 3.0D; + + if (d5 < 0.0D) + { + d5 /= 2.0D; + + if (d5 < -1.0D) + { + d5 = -1.0D; + } + + d5 /= 1.4D; + d5 /= 2.0D; + d3 = 0.0D; + } + else + { + if (d5 > 1.0D) + { + d5 = 1.0D; + } + + d5 /= 6.0D; + } + + d3 += 0.5D; + d5 = d5 * par6 / 16.0D; + ++l1; + + for (int k2 = 0; k2 < par6; ++k2) + { + double d6 = 0.0D; + double d7 = adouble1[k2]; + double d8 = noiseData2[k1] / 512.0D; + double d9 = noiseData3[k1] / 512.0D; + double d10 = (noiseData1[k1] / 10.0D + 1.0D) / 2.0D; + + if (d10 < 0.0D) + { + d6 = d8; + } + else if (d10 > 1.0D) + { + d6 = d9; + } + else + { + d6 = d8 + (d9 - d8) * d10; + } + + d6 -= d7; + double d11; + + if (k2 > par6 - 4) + { + d11 = (k2 - (par6 - 4)) / 3.0F; + d6 = d6 * (1.0D - d11) + -10.0D * d11; + } + + if (k2 < d4) + { + d11 = (d4 - k2) / 4.0D; + + if (d11 < 0.0D) + { + d11 = 0.0D; + } + + if (d11 > 1.0D) + { + d11 = 1.0D; + } + + d6 = d6 * (1.0D - d11) + -10.0D * d11; + } + + par1ArrayOfDouble[k1] = d6; + ++k1; + } + } + } + + return par1ArrayOfDouble; + } + + /** + * Checks to see if a chunk exists at x, y + */ + @Override + public boolean chunkExists(int par1, int par2) + { + return true; + } + + /** + * Populates chunk with ores etc etc + */ + @Override + public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) + { + BlockFalling.field_149832_M = true; + + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, hellRNG, par2, par3, false)); + + int k = par2 * 16; + int l = par3 * 16; + BiomeGenBase var6 = worldObj.getBiomeGenForCoords(k + 16, l + 16); + + genNetherBridge.generateStructuresInChunk(worldObj, hellRNG, par2, par3); + int i1; + int j1; + int k1; + int l1; + + boolean doGen = TerrainGen.populate(par1IChunkProvider, worldObj, hellRNG, par2, par3, false, NETHER_LAVA); + for (i1 = 0; doGen && i1 < 8; ++i1) + { + j1 = k + hellRNG.nextInt(16) + 8; + k1 = hellRNG.nextInt(120) + 4; + l1 = l + hellRNG.nextInt(16) + 8; + (new WorldGenHellLava(Blocks.lava, false)).generate(worldObj, hellRNG, j1, k1, l1); + } + + i1 = hellRNG.nextInt(hellRNG.nextInt(10) + 1) + 1; + int i2; + + doGen = TerrainGen.populate(par1IChunkProvider, worldObj, hellRNG, par2, par3, false, FIRE); + for (j1 = 0; doGen && j1 < i1; ++j1) + { + k1 = k + hellRNG.nextInt(16) + 8; + l1 = hellRNG.nextInt(120) + 4; + i2 = l + hellRNG.nextInt(16) + 8; + (new WorldGenFire()).generate(worldObj, hellRNG, k1, l1, i2); + } + + i1 = hellRNG.nextInt(hellRNG.nextInt(10) + 1); + + doGen = TerrainGen.populate(par1IChunkProvider, worldObj, hellRNG, par2, par3, false, GLOWSTONE); + for (j1 = 0; doGen && j1 < i1; ++j1) + { + k1 = k + hellRNG.nextInt(16) + 8; + l1 = hellRNG.nextInt(120) + 4; + i2 = l + hellRNG.nextInt(16) + 8; + (new WorldGenGlowStone1()).generate(worldObj, hellRNG, k1, l1, i2); + } + + for (j1 = 0; doGen && j1 < 10; ++j1) + { + k1 = k + hellRNG.nextInt(16) + 8; + l1 = hellRNG.nextInt(128); + i2 = l + hellRNG.nextInt(16) + 8; + (new WorldGenGlowStone2()).generate(worldObj, hellRNG, k1, l1, i2); + } + + MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Pre(worldObj, hellRNG, k, l)); + + doGen = TerrainGen.decorate(worldObj, hellRNG, k, l, SHROOM); + if (doGen && hellRNG.nextInt(1) == 0) + { + j1 = k + hellRNG.nextInt(16) + 8; + k1 = hellRNG.nextInt(128); + l1 = l + hellRNG.nextInt(16) + 8; + (new WorldGenFlowers(Blocks.brown_mushroom)).generate(worldObj, hellRNG, j1, k1, l1); + } + + if (doGen && hellRNG.nextInt(1) == 0) + { + j1 = k + hellRNG.nextInt(16) + 8; + k1 = hellRNG.nextInt(128); + l1 = l + hellRNG.nextInt(16) + 8; + (new WorldGenFlowers(Blocks.red_mushroom)).generate(worldObj, hellRNG, j1, k1, l1); + } + + WorldGenMinable worldgenminable = new WorldGenMinable(Blocks.quartz_ore, 13, Blocks.netherrack); + int j2; + + for (k1 = 0; k1 < 16; ++k1) + { + l1 = k + hellRNG.nextInt(16); + i2 = hellRNG.nextInt(108) + 10; + j2 = l + hellRNG.nextInt(16); + worldgenminable.generate(worldObj, hellRNG, l1, i2, j2); + } + + for (k1 = 0; k1 < 16; ++k1) + { + l1 = k + hellRNG.nextInt(16); + i2 = hellRNG.nextInt(108) + 10; + j2 = l + hellRNG.nextInt(16); + (new WorldGenHellLava(Blocks.flowing_lava, true)).generate(worldObj, hellRNG, l1, i2, j2); + } + + MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(worldObj, hellRNG, k, l)); + + //var6.decorate(worldObj, hellRNG, k, l); + + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, hellRNG, par2, par3, false)); + + BlockFalling.field_149832_M = false; + } + + /** + * Two modes of operation: if passed true, save all Chunks in one go. If passed false, save up to two chunks. + * Return true if all chunks have been saved. + */ + @Override + public boolean saveChunks(boolean par1, IProgressUpdate par2IProgressUpdate) + { + return true; + } + + /** + * Unloads chunks that are marked to be unloaded. This is not guaranteed to unload every such chunk. + */ + @Override + public boolean unloadQueuedChunks() + { + return false; + } + + /** + * Returns if the IChunkProvider supports saving. + */ + @Override + public boolean canSave() + { + return true; + } + + /** + * Converts the instance data to a readable string. + */ + @Override + public String makeString() + { + return "HellRandomLevelSource"; + } + + /** + * Returns a list of creatures of the specified type that can spawn at the given location. + */ + @Override + public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4) + { + if (par1EnumCreatureType == EnumCreatureType.monster && genNetherBridge.hasStructureAt(par2, par3, par4)) + return genNetherBridge.getSpawnList(); + else + { + BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(par2, par4); + return biomegenbase == null ? null : biomegenbase.getSpawnableList(par1EnumCreatureType); + } + } + + /** + * Returns the location of the closest structure of the specified type. If not found returns null. + */ + //@Override + //public ChunkPosition findClosestStructure(World par1World, String par2Str, int par3, int par4, int par5) + //{ + // return null; + //} + + @Override + public int getLoadedChunkCount() + { + return 0; + } + + @Override + public void recreateStructures(int par1, int par2) + { + genNetherBridge.func_151539_a(this, worldObj, par1, par2, (Block[])null); + } + + @Override + public void saveExtraData() + { + } + + @Override + public ChunkPosition func_147416_a(World par1World, String par2Str, int par3, int par4, int par5) { + return null; + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOPHell.java b/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOPHell.java new file mode 100644 index 000000000..6aa985b69 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOPHell.java @@ -0,0 +1,281 @@ +package biomesoplenty.common.world; + +import java.util.List; +import java.util.Random; + +import biomesoplenty.common.helpers.BiomeCacheHell; +import biomesoplenty.common.world.layer.hell.BiomeLayerHell; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.WorldChunkManager; +import net.minecraft.world.gen.layer.GenLayer; +import net.minecraft.world.gen.layer.IntCache; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class WorldChunkManagerBOPHell extends WorldChunkManager +{ + private GenLayer genBiomes; + private GenLayer biomeIndexLayer; + private BiomeCacheHell biomeCache; + + @SuppressWarnings("rawtypes") + private List biomesToSpawnIn; + + @SuppressWarnings({ "unchecked", "rawtypes" }) + protected WorldChunkManagerBOPHell() + { + biomeCache = new BiomeCacheHell(this); + } + + public WorldChunkManagerBOPHell(long par1, WorldType par3WorldType) + { + this(); + GenLayer[] var4 = BiomeLayerHell.initializeAllBiomeGenerators(par1, par3WorldType, 1); + //var4 = getModdedBiomeGenerators(par3WorldType, par1, var4); + genBiomes = var4[0]; + biomeIndexLayer = var4[1]; + } + + public WorldChunkManagerBOPHell(World par1World) + { + this(par1World.getSeed(), par1World.getWorldInfo().getTerrainType()); + } + + /** + * Gets the list of valid biomes for the player to spawn in. + */ + @Override + @SuppressWarnings("rawtypes") + public List getBiomesToSpawnIn() + { + return biomesToSpawnIn; + } + + /** + * Returns the BiomeGenBase related to the x, z position on the world. + */ + @Override + public BiomeGenBase getBiomeGenAt(int par1, int par2) + { + return biomeCache.getBiomeGenAt(par1, par2); + } + + /** + * Returns a list of rainfall values for the specified blocks. Args: listToReuse, x, z, width, length. + */ + @Override + public float[] getRainfall(float[] par1ArrayOfFloat, int par2, int par3, int par4, int par5) + { + IntCache.resetIntCache(); + + if (par1ArrayOfFloat == null || par1ArrayOfFloat.length < par4 * par5) + { + par1ArrayOfFloat = new float[par4 * par5]; + } + + int[] var6 = biomeIndexLayer.getInts(par2, par3, par4, par5); + + for (int var7 = 0; var7 < par4 * par5; ++var7) + { + float var8 = BiomeGenBase.func_150565_n()[var6[var7]].getIntRainfall() / 65536.0F; + + if (var8 > 1.0F) + { + var8 = 1.0F; + } + + par1ArrayOfFloat[var7] = var8; + } + + return par1ArrayOfFloat; + } + + @Override + @SideOnly(Side.CLIENT) + + /** + * Return an adjusted version of a given temperature based on the y height + */ + public float getTemperatureAtHeight(float par1, int par2) + { + return par1; + } + + /** + * Returns a list of temperatures to use for the specified blocks. Args: listToReuse, x, y, width, length + */ + //@Override + public float[] getTemperatures(float[] par1ArrayOfFloat, int par2, int par3, int par4, int par5) + { + IntCache.resetIntCache(); + + if (par1ArrayOfFloat == null || par1ArrayOfFloat.length < par4 * par5) + { + par1ArrayOfFloat = new float[par4 * par5]; + } + + int[] var6 = biomeIndexLayer.getInts(par2, par3, par4, par5); + + for (int var7 = 0; var7 < par4 * par5; ++var7) + { + float var8 = BiomeGenBase.func_150565_n()[var6[var7]].temperature / 65536.0F; + + if (var8 > 1.0F) + { + var8 = 1.0F; + } + + par1ArrayOfFloat[var7] = var8; + } + + return par1ArrayOfFloat; + } + + /** + * Returns an array of biomes for the location input. + */ + @Override + public BiomeGenBase[] getBiomesForGeneration(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5) + { + IntCache.resetIntCache(); + + if (par1ArrayOfBiomeGenBase == null || par1ArrayOfBiomeGenBase.length < par4 * par5) + { + par1ArrayOfBiomeGenBase = new BiomeGenBase[par4 * par5]; + } + + int[] var6 = genBiomes.getInts(par2, par3, par4, par5); + + for (int var7 = 0; var7 < par4 * par5; ++var7) + { + par1ArrayOfBiomeGenBase[var7] = BiomeGenBase.func_150565_n()[var6[var7]]; + } + + return par1ArrayOfBiomeGenBase; + } + + /** + * Returns biomes to use for the blocks and loads the other data like temperature and humidity onto the + * WorldChunkManager Args: oldBiomeList, x, z, width, depth + */ + @Override + public BiomeGenBase[] loadBlockGeneratorData(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5) + { + return this.getBiomeGenAt(par1ArrayOfBiomeGenBase, par2, par3, par4, par5, true); + } + + /** + * Return a list of biomes for the specified blocks. Args: listToReuse, x, y, width, length, cacheFlag (if false, + * don't check biomeCache to avoid infinite loop in BiomeCacheBlock) + */ + @Override + public BiomeGenBase[] getBiomeGenAt(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5, boolean par6) + { + IntCache.resetIntCache(); + + if (par1ArrayOfBiomeGenBase == null || par1ArrayOfBiomeGenBase.length < par4 * par5) + { + par1ArrayOfBiomeGenBase = new BiomeGenBase[par4 * par5]; + } + + if (par6 && par4 == 16 && par5 == 16 && (par2 & 15) == 0 && (par3 & 15) == 0) + { + BiomeGenBase[] var9 = biomeCache.getCachedBiomes(par2, par3); + System.arraycopy(var9, 0, par1ArrayOfBiomeGenBase, 0, par4 * par5); + return par1ArrayOfBiomeGenBase; + } + else + { + int[] var7 = biomeIndexLayer.getInts(par2, par3, par4, par5); + + for (int var8 = 0; var8 < par4 * par5; ++var8) + { + par1ArrayOfBiomeGenBase[var8] = BiomeGenBase.func_150565_n()[var7[var8]]; + } + + return par1ArrayOfBiomeGenBase; + } + } + + /** + * checks given Chunk's Biomes against List of allowed ones + */ + @Override + @SuppressWarnings("rawtypes") + public boolean areBiomesViable(int par1, int par2, int par3, List par4List) + { + IntCache.resetIntCache(); + int var5 = par1 - par3 >> 2; + int var6 = par2 - par3 >> 2; + int var7 = par1 + par3 >> 2; + int var8 = par2 + par3 >> 2; + int var9 = var7 - var5 + 1; + int var10 = var8 - var6 + 1; + int[] var11 = genBiomes.getInts(var5, var6, var9, var10); + + for (int var12 = 0; var12 < var9 * var10; ++var12) + { + BiomeGenBase var13 = BiomeGenBase.func_150565_n()[var11[var12]]; + + if (!par4List.contains(var13)) + return false; + } + + return true; + } + + /** + * Finds a valid position within a range, that is in one of the listed biomes. Searches {par1,par2} +-par3 blocks. + * Strongly favors positive y positions. + */ + @Override + @SuppressWarnings("rawtypes") + //TODO: findBiomePosition + public ChunkPosition func_150795_a(int par1, int par2, int par3, List par4List, Random par5Random) + { + IntCache.resetIntCache(); + int var6 = par1 - par3 >> 2; + int var7 = par2 - par3 >> 2; + int var8 = par1 + par3 >> 2; + int var9 = par2 + par3 >> 2; + int var10 = var8 - var6 + 1; + int var11 = var9 - var7 + 1; + int[] var12 = genBiomes.getInts(var6, var7, var10, var11); + ChunkPosition var13 = null; + int var14 = 0; + + for (int var15 = 0; var15 < var10 * var11; ++var15) + { + int var16 = var6 + var15 % var10 << 2; + int var17 = var7 + var15 / var10 << 2; + BiomeGenBase var18 = BiomeGenBase.func_150565_n()[var12[var15]]; + + if (par4List.contains(var18) && (var13 == null || par5Random.nextInt(var14 + 1) == 0)) + { + var13 = new ChunkPosition(var16, 0, var17); + ++var14; + } + } + + return var13; + } + + /** + * Calls the WorldChunkManager's biomeCache.cleanupCache() + */ + @Override + public void cleanupCache() + { + biomeCache.cleanupCache(); + } + + //public GenLayer[] getModdedBiomeGenerators(WorldType worldType, long seed, GenLayer[] original) + //{ + // WorldTypeEvent.InitBiomeGens event = new WorldTypeEvent.InitBiomeGens(worldType, seed, original); + // MinecraftForge.TERRAIN_GEN_BUS.post(event); + // return event.newBiomeGens; + //} +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/WorldProviderBopHell.java b/src/main/java/biomesoplenty/common/world/WorldProviderBopHell.java new file mode 100644 index 000000000..1d2762a92 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/WorldProviderBopHell.java @@ -0,0 +1,38 @@ +package biomesoplenty.common.world; + +import net.minecraft.world.WorldProviderHell; +import net.minecraft.world.chunk.IChunkProvider; +import cpw.mods.fml.common.Loader; + +public class WorldProviderBopHell extends WorldProviderHell +{ + @Override + public void registerWorldChunkManager() + { + this.worldChunkMgr = new WorldChunkManagerBOPHell(worldObj); + this.isHellWorld = true; + this.hasNoSky = true; + this.dimensionId = -1; + } + + @Override + public IChunkProvider createChunkGenerator() + { + /* + if (Loader.isModLoaded("Natura")) + { + try + { + return new ChunkProviderBOPNaturaHell(this.worldObj, this.worldObj.getSeed()); + } + catch (Exception e) + { + System.out.println("[BiomesOPlenty] There was an error while integrating Natura with Biomes O' Plenty!"); + e.printStackTrace(System.err); + } + } + */ + + return new ChunkProviderBOPHell(this.worldObj, this.worldObj.getSeed()); + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java new file mode 100644 index 000000000..7b5c84781 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHell.java @@ -0,0 +1,43 @@ +package biomesoplenty.common.world.layer.hell; + +import net.minecraft.world.WorldType; +import net.minecraft.world.gen.layer.GenLayer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.terraingen.WorldTypeEvent; + +public abstract class BiomeLayerHell extends GenLayer +{ + public static GenLayer[] initializeAllBiomeGenerators(long seed, WorldType worldtype, int dim) + { + int biomesize = 3; + if(dim == 1) + { + biomesize = 2; + } + + //Hell and promised biome gen + BiomeLayerHell obj = new BiomeLayerHellCreate(1L, false); + obj = new BiomeLayerHellFuzzyZoom(2000L, (obj)); + for(int i = 1; i < 3; i++) { obj = new BiomeLayerHellZoom(2000L + i, (obj)); } + obj = BiomeLayerHellZoom.func_75915_a(1000L, ((obj)), 0); + obj = new BiomeLayerHellBiomes(200L, ((obj))); + obj = BiomeLayerHellZoom.func_75915_a(1000L, ((obj)), 2); + for(int j = 0; j < biomesize; j++) { obj = new BiomeLayerHellZoom(1000L + j, (obj)); } + BiomeLayerHellVoronoiZoom genlayervoronoizoom = new BiomeLayerHellVoronoiZoom(10L, ((obj))); + (obj).initWorldGenSeed(seed); + genlayervoronoizoom.initWorldGenSeed(seed); + return (new GenLayer[] { obj, genlayervoronoizoom }); + } + + public BiomeLayerHell(long seed) + { + super(seed); + } + + public static byte getModdedBiomeSize(WorldType worldType, byte original) + { + WorldTypeEvent.BiomeSize event = new WorldTypeEvent.BiomeSize(worldType, original); + MinecraftForge.TERRAIN_GEN_BUS.post(event); + return event.newSize; + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java new file mode 100644 index 000000000..fd75846f6 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java @@ -0,0 +1,49 @@ +package biomesoplenty.common.world.layer.hell; + +import java.util.ArrayList; + +import net.minecraft.world.WorldType; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.layer.IntCache; +import biomesoplenty.api.BOPBiomeHelper; + +public class BiomeLayerHellBiomes extends BiomeLayerHell +{ + private int dimension = 0; + + private static ArrayList netherBiomes = new ArrayList(); + + public BiomeLayerHellBiomes(long par1, BiomeLayerHell par3GenLayer) + { + super(par1); + parent = par3GenLayer; + + //NETHER BIOMES + + //add biomes to netherBiomes array here + + if (netherBiomes.size() == 0) + { + netherBiomes.add(BiomeGenBase.hell); + } + } + + @Override + public int[] getInts(int par1, int par2, int par3, int par4) + { + int[] var5 = this.parent.getInts(par1, par2, par3, par4); + int[] var6 = IntCache.getIntCache(par3 * par4); + + for (int var7 = 0; var7 < par4; ++var7) + { + for (int var8 = 0; var8 < par3; ++var8) + { + this.initChunkSeed((long)(var8 + par1), (long)(var7 + par2)); + int var9 = var5[var8 + var7 * par3]; + + var6[var8 + var7 * par3] = netherBiomes.get(this.nextInt(netherBiomes.size())).biomeID; + } + } + return var6; + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellCreate.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellCreate.java new file mode 100644 index 000000000..63a3d5412 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellCreate.java @@ -0,0 +1,28 @@ +package biomesoplenty.common.world.layer.hell; + +import net.minecraft.world.gen.layer.IntCache; + +public class BiomeLayerHellCreate extends BiomeLayerHell +{ + public BiomeLayerHellCreate(long par1, boolean o) + { + super(par1); + } + + @Override + public int[] getInts(int par1, int par2, int par3, int par4) + { + int[] var5 = IntCache.getIntCache(par3 * par4); + + for (int var6 = 0; var6 < par4; ++var6) + { + for (int var7 = 0; var7 < par3; ++var7) + { + this.initChunkSeed(par1 + var7, par2 + var6); + var5[var7 + var6 * par3] = 1; + } + } + + return var5; + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellFuzzyZoom.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellFuzzyZoom.java new file mode 100644 index 000000000..397b739c5 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellFuzzyZoom.java @@ -0,0 +1,76 @@ +package biomesoplenty.common.world.layer.hell; + +import net.minecraft.world.gen.layer.IntCache; + +public class BiomeLayerHellFuzzyZoom extends BiomeLayerHell +{ + public BiomeLayerHellFuzzyZoom(long par1, BiomeLayerHell par3GenLayer) + { + super(par1); + super.parent = par3GenLayer; + } + + /** + * Returns a list of integer values generated by this layer. These may be interpreted as temperatures, rainfall + * amounts, or biomeList[] indices based on the particular GenLayer subclass. + */ + @Override + public int[] getInts(int par1, int par2, int par3, int par4) + { + int i1 = par1 >> 1; + int j1 = par2 >> 1; + int k1 = (par3 >> 1) + 3; + int l1 = (par4 >> 1) + 3; + int[] aint = parent.getInts(i1, j1, k1, l1); + int[] aint1 = IntCache.getIntCache(k1 * 2 * l1 * 2); + int i2 = k1 << 1; + int j2; + + for (int k2 = 0; k2 < l1 - 1; ++k2) + { + j2 = k2 << 1; + int l2 = j2 * i2; + int i3 = aint[0 + (k2 + 0) * k1]; + int j3 = aint[0 + (k2 + 1) * k1]; + + for (int k3 = 0; k3 < k1 - 1; ++k3) + { + this.initChunkSeed(k3 + i1 << 1, k2 + j1 << 1); + int l3 = aint[k3 + 1 + (k2 + 0) * k1]; + int i4 = aint[k3 + 1 + (k2 + 1) * k1]; + aint1[l2] = i3; + aint1[l2++ + i2] = this.choose(i3, j3); + aint1[l2] = this.choose(i3, l3); + aint1[l2++ + i2] = this.choose(i3, l3, j3, i4); + i3 = l3; + j3 = i4; + } + } + + int[] aint2 = IntCache.getIntCache(par3 * par4); + + for (j2 = 0; j2 < par4; ++j2) + { + System.arraycopy(aint1, (j2 + (par2 & 1)) * (k1 << 1) + (par1 & 1), aint2, j2 * par3, par3); + } + + return aint2; + } + + /** + * randomly choose between the two args + */ + protected int choose(int par1, int par2) + { + return this.nextInt(2) == 0 ? par1 : par2; + } + + /** + * randomly choose between the four args + */ + protected int choose(int par1, int par2, int par3, int par4) + { + int i1 = this.nextInt(4); + return i1 == 0 ? par1 : (i1 == 1 ? par2 : (i1 == 2 ? par3 : par4)); + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellVoronoiZoom.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellVoronoiZoom.java new file mode 100644 index 000000000..0c50e0b21 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellVoronoiZoom.java @@ -0,0 +1,101 @@ +package biomesoplenty.common.world.layer.hell; + +import net.minecraft.world.gen.layer.IntCache; + +public class BiomeLayerHellVoronoiZoom extends BiomeLayerHell +{ + public BiomeLayerHellVoronoiZoom(long par1, BiomeLayerHell par3GenLayer) + { + super(par1); + super.parent = par3GenLayer; + } + + /** + * Returns a list of integer values generated by this layer. These may be interpreted as temperatures, rainfall + * amounts, or biomeList[] indices based on the particular GenLayer subclass. + */ + @Override + public int[] getInts(int par1, int par2, int par3, int par4) + { + par1 -= 2; + par2 -= 2; + byte b0 = 2; + int i1 = 1 << b0; + int j1 = par1 >> b0; + int k1 = par2 >> b0; + int l1 = (par3 >> b0) + 3; + int i2 = (par4 >> b0) + 3; + int[] aint = parent.getInts(j1, k1, l1, i2); + int j2 = l1 << b0; + int k2 = i2 << b0; + int[] aint1 = IntCache.getIntCache(j2 * k2); + int l2; + + for (int i3 = 0; i3 < i2 - 1; ++i3) + { + l2 = aint[0 + (i3 + 0) * l1]; + int j3 = aint[0 + (i3 + 1) * l1]; + + for (int k3 = 0; k3 < l1 - 1; ++k3) + { + double d0 = i1 * 0.9D; + this.initChunkSeed(k3 + j1 << b0, i3 + k1 << b0); + double d1 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0; + double d2 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0; + this.initChunkSeed(k3 + j1 + 1 << b0, i3 + k1 << b0); + double d3 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0 + i1; + double d4 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0; + this.initChunkSeed(k3 + j1 << b0, i3 + k1 + 1 << b0); + double d5 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0; + double d6 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0 + i1; + this.initChunkSeed(k3 + j1 + 1 << b0, i3 + k1 + 1 << b0); + double d7 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0 + i1; + double d8 = (this.nextInt(1024) / 1024.0D - 0.5D) * d0 + i1; + int l3 = aint[k3 + 1 + (i3 + 0) * l1]; + int i4 = aint[k3 + 1 + (i3 + 1) * l1]; + + for (int j4 = 0; j4 < i1; ++j4) + { + int k4 = ((i3 << b0) + j4) * j2 + (k3 << b0); + + for (int l4 = 0; l4 < i1; ++l4) + { + double d9 = (j4 - d2) * (j4 - d2) + (l4 - d1) * (l4 - d1); + double d10 = (j4 - d4) * (j4 - d4) + (l4 - d3) * (l4 - d3); + double d11 = (j4 - d6) * (j4 - d6) + (l4 - d5) * (l4 - d5); + double d12 = (j4 - d8) * (j4 - d8) + (l4 - d7) * (l4 - d7); + + if (d9 < d10 && d9 < d11 && d9 < d12) + { + aint1[k4++] = l2; + } + else if (d10 < d9 && d10 < d11 && d10 < d12) + { + aint1[k4++] = l3; + } + else if (d11 < d9 && d11 < d10 && d11 < d12) + { + aint1[k4++] = j3; + } + else + { + aint1[k4++] = i4; + } + } + } + + l2 = l3; + j3 = i4; + } + } + + int[] aint2 = IntCache.getIntCache(par3 * par4); + + for (l2 = 0; l2 < par4; ++l2) + { + System.arraycopy(aint1, (l2 + (par2 & i1 - 1)) * (l1 << b0) + (par1 & i1 - 1), aint2, l2 * par3, par3); + } + + return aint2; + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java new file mode 100644 index 000000000..92b989101 --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellZoom.java @@ -0,0 +1,119 @@ +package biomesoplenty.common.world.layer.hell; + +import net.minecraft.world.gen.layer.IntCache; + +public class BiomeLayerHellZoom extends BiomeLayerHell +{ + public BiomeLayerHellZoom(long par1, BiomeLayerHell par3GenLayer) + { + super(par1); + super.parent = par3GenLayer; + } + + @Override + public int[] getInts(int par1, int par2, int par3, int par4) + { + int i1 = par1 >> 1; + int j1 = par2 >> 1; + int k1 = (par3 >> 1) + 3; + int l1 = (par4 >> 1) + 3; + int[] aint = parent.getInts(i1, j1, k1, l1); + int[] aint1 = IntCache.getIntCache(k1 * 2 * l1 * 2); + int i2 = k1 << 1; + int j2; + + for (int k2 = 0; k2 < l1 - 1; ++k2) + { + j2 = k2 << 1; + int l2 = j2 * i2; + int i3 = aint[0 + (k2 + 0) * k1]; + int j3 = aint[0 + (k2 + 1) * k1]; + + for (int k3 = 0; k3 < k1 - 1; ++k3) + { + this.initChunkSeed(k3 + i1 << 1, k2 + j1 << 1); + int l3 = aint[k3 + 1 + (k2 + 0) * k1]; + int i4 = aint[k3 + 1 + (k2 + 1) * k1]; + aint1[l2] = i3; + aint1[l2++ + i2] = this.choose(i3, j3); + aint1[l2] = this.choose(i3, l3); + aint1[l2++ + i2] = this.modeOrRandom(i3, l3, j3, i4); + i3 = l3; + j3 = i4; + } + } + + int[] aint2 = IntCache.getIntCache(par3 * par4); + + for (j2 = 0; j2 < par4; ++j2) + { + System.arraycopy(aint1, (j2 + (par2 & 1)) * (k1 << 1) + (par1 & 1), aint2, j2 * par3, par3); + } + + return aint2; + } + + /** + * Chooses one of the two inputs randomly. + */ + protected int choose(int par1, int par2) + { + return this.nextInt(2) == 0 ? par1 : par2; + } + + /** + * returns the mode (most frequently occuring number) or a random number from the 4 integers provided + */ + protected int modeOrRandom(int par1, int par2, int par3, int par4) + { + if (par2 == par3 && par3 == par4) + return par2; + else if (par1 == par2 && par1 == par3) + return par1; + else if (par1 == par2 && par1 == par4) + return par1; + else if (par1 == par3 && par1 == par4) + return par1; + else if (par1 == par2 && par3 != par4) + return par1; + else if (par1 == par3 && par2 != par4) + return par1; + else if (par1 == par4 && par2 != par3) + return par1; + else if (par2 == par1 && par3 != par4) + return par2; + else if (par2 == par3 && par1 != par4) + return par2; + else if (par2 == par4 && par1 != par3) + return par2; + else if (par3 == par1 && par2 != par4) + return par3; + else if (par3 == par2 && par1 != par4) + return par3; + else if (par3 == par4 && par1 != par2) + return par3; + else if (par4 == par1 && par2 != par3) + return par3; + else if (par4 == par2 && par1 != par3) + return par3; + else if (par4 == par3 && par1 != par2) + return par3; + else + { + int i1 = this.nextInt(4); + return i1 == 0 ? par1 : (i1 == 1 ? par2 : (i1 == 2 ? par3 : par4)); + } + } + + public static BiomeLayerHell func_75915_a(long par0, BiomeLayerHell par2GenLayer, int par3) + { + Object object = par2GenLayer; + + for (int k = 0; k < par3; ++k) + { + object = new BiomeLayerHellZoom(par0 + k, (BiomeLayerHell)object); + } + + return (BiomeLayerHell)object; + } +} \ No newline at end of file From eb0381d3852317957cea80eee3797ef1b9c6fc59 Mon Sep 17 00:00:00 2001 From: ted Date: Sat, 1 Feb 2014 16:20:12 +0100 Subject: [PATCH 2/2] Fix --- src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java b/src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java index 5fc47008a..8660aa8a0 100644 --- a/src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java +++ b/src/main/java/biomesoplenty/common/helpers/BiomeCacheHell.java @@ -74,7 +74,7 @@ public class BiomeCacheHell for (int var5 = 0; var5 < cache.size(); ++var5) { - BiomeCacheBlockPromised var6 = (BiomeCacheBlockPromised)cache.get(var5); + BiomeCacheBlockHell var6 = (BiomeCacheBlockHell)cache.get(var5); long var7 = var1 - var6.lastAccessTime; if (var7 > 30000L || var7 < 0L)