etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed the Random Filter

This commit is contained in:
Adubbz 2014-03-15 19:52:55 +11:00
parent b42946c89b
commit 0a46079293
4 changed files with 276 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/biomesoplenty/common/biomes/promisedland/BiomeGenPromisedLandForest.java
View File

@ -1,28 +1,20 @@
package biomesoplenty.common.biomes.promisedland;
import java.awt.Color;
import java.util.Random;
//import worldcore.interfaces.IWCFog;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraft.world.gen.feature.WorldGenTrees;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.biomes.BOPBiome;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import biomesoplenty.common.world.decoration.BOPBiomeDecorator;
import biomesoplenty.common.world.features.WorldGenWaterSpring;
import biomesoplenty.common.world.features.trees.WorldGenPromisedTree;
import biomesoplenty.common.world.features.trees.WorldGenPromisedTree2;
import biomesoplenty.common.world.features.trees.WorldGenRainforestTree1;
import biomesoplenty.common.configuration.BOPConfigurationMisc;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraft.world.gen.feature.WorldGenerator;
import java.util.Random;
//import worldcore.interfaces.IWCFog;
public class BiomeGenPromisedLandForest extends BOPBiome //implements IWCFog
{
@ -58,19 +50,7 @@ public class BiomeGenPromisedLandForest extends BOPBiome //implements IWCFog
//this.bopWorldFeatures.generateMossySkystone = true;
//this.bopWorldFeatures.generateUndergroundLakes = false;
theWorldGenerator = new WorldGenWaterSpring(Blocks.water, 8);
/*this.spawnableMonsterList.add(new SpawnListEntry(EntityCow.class, 6, 1, 4));
if (Loader.isModLoaded("TwilightForest"))
{
try {
this.spawnableMonsterList.add(new SpawnListEntry(Class.forName("twilightforest.entity.passive.EntityTFBighorn"), 2, 1, 3));
this.spawnableMonsterList.add(new SpawnListEntry(Class.forName("twilightforest.entity.passive.EntityTFDeer"), 4, 1, 3));
this.spawnableMonsterList.add(new SpawnListEntry(Class.forName("twilightforest.entity.passive.EntityTFBird"), 2, 1, 3));
} catch (ClassNotFoundException e) {
System.out.println("[BiomesOPlenty] There was an error while integrating Twilight Forest with Biomes O' Plenty!");
e.printStackTrace();
}
}*/
/*this.spawnableMonsterList.add(new SpawnListEntry(EntityCow.class, 6, 1, 4));*/
}
/**
@ -84,7 +64,6 @@ public class BiomeGenPromisedLandForest extends BOPBiome //implements IWCFog
}
@Override
//TODO: getBiomeGrassColor()
public int getBiomeGrassColor(int x, int y, int z)
{
return 7925125;
@ -108,7 +87,6 @@ public class BiomeGenPromisedLandForest extends BOPBiome //implements IWCFog
//@Override
public float getFogCloseness()
{
// TODO Auto-generated method stub
return 1.0F;
}
@ -130,29 +108,10 @@ public class BiomeGenPromisedLandForest extends BOPBiome //implements IWCFog
}
}
/**
* takes temperature, returns color
*/
@Override
public int getSkyColorByTemp(float par1)
public int getSkyColorByTemp(float temperature)
{
if (BOPConfigurationMisc.skyColors)
return BOPConfigurationMisc.promisedLandSkyColor;
else
{
par1 /= 3.0F;
if (par1 < -1.0F)
{
par1 = -1.0F;
}
if (par1 > 1.0F)
{
par1 = 1.0F;
}
return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB();
}
if (BOPConfigurationMisc.skyColors) return BOPConfigurationMisc.promisedLandSkyColor;
else return super.getSkyColorByTemp(temperature);
}
}

32
src/main/java/biomesoplenty/common/utils/RandomForcedPositive.java Normal file
View File

@ -0,0 +1,32 @@
package biomesoplenty.common.utils;
import java.util.Random;
/**
* @prevent crashes in non overworld biome generation
* due to calls to decorator getting -1 height values
* Random.nextInt(-1) = crash
*/
public class RandomForcedPositive extends Random
{
public RandomForcedPositive(long par2)
{
super(par2);
}
@Override
public int nextInt()
{
return this.nextInt(1);
}
@Override
public int nextInt(int n)
{
if (n > 0)
{
return super.nextInt(n);
}
return 0;
}
}

452
src/main/java/biomesoplenty/common/world/ChunkProviderPromised.java
View File

@ -1,8 +1,8 @@
package biomesoplenty.common.world;
import java.util.List;
import java.util.Random;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.utils.RandomForcedPositive;
import biomesoplenty.common.world.noise.NoiseOctaves;
import cpw.mods.fml.common.eventhandler.Event.Result;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSand;
@ -17,14 +17,14 @@ import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.terraingen.ChunkProviderEvent;
import net.minecraftforge.event.terraingen.PopulateChunkEvent;
import biomesoplenty.api.BOPBlockHelper;
import biomesoplenty.common.utils.RandomFiltered;
import biomesoplenty.common.world.noise.NoiseOctaves;
import java.util.List;
import java.util.Random;
public class ChunkProviderPromised implements IChunkProvider
{
private Random endRNG;
private RandomFiltered endRNG2;
private RandomForcedPositive endRNG2;
private NoiseOctaves field_912_k;
private NoiseOctaves field_911_l;
private NoiseOctaves field_910_m;
@ -49,7 +49,7 @@ public class ChunkProviderPromised implements IChunkProvider
endWorld = par1World;
endRNG = new Random(par2);
// prevent Random.nextInt(-1) crashes
this.endRNG2 = new RandomFiltered(par2);
this.endRNG2 = new RandomForcedPositive(par2);
field_912_k = new NoiseOctaves(endRNG, 16);
field_911_l = new NoiseOctaves(endRNG, 16);
field_910_m = new NoiseOctaves(endRNG, 8);
@ -207,8 +207,8 @@ public class ChunkProviderPromised implements IChunkProvider
/**
* loads or generates the chunk at the chunk location specified
*/
@Override
public Chunk loadChunk(int par1, int par2)
@Override
public Chunk loadChunk(int par1, int par2)
{
return this.provideChunk(par1, par2);
}
@ -217,133 +217,133 @@ public class ChunkProviderPromised implements IChunkProvider
* 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)
@Override
public Chunk provideChunk(int par1, int par2)
{
endRNG.setSeed(par1 * 341873128712L + par2 * 132897987541L);
Block[] var3 = new Block[32768];
biomesForGeneration = endWorld.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, par1 * 16, par2 * 16, 16, 16);
this.generateTerrain(par1, par2, var3, biomesForGeneration);
this.replaceBlocksForBiome(par1, par2, var3, biomesForGeneration);
Chunk var4 = new Chunk(endWorld, var3, par1, par2);
byte[] var5 = var4.getBiomeArray();
endRNG.setSeed(par1 * 341873128712L + par2 * 132897987541L);
Block[] var3 = new Block[32768];
biomesForGeneration = endWorld.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, par1 * 16, par2 * 16, 16, 16);
this.generateTerrain(par1, par2, var3, biomesForGeneration);
this.replaceBlocksForBiome(par1, par2, var3, biomesForGeneration);
Chunk var4 = new Chunk(endWorld, var3, par1, par2);
byte[] var5 = var4.getBiomeArray();
for (int var6 = 0; var6 < var5.length; ++var6)
{
var5[var6] = (byte)biomesForGeneration[var6].biomeID;
}
for (int var6 = 0; var6 < var5.length; ++var6)
{
var5[var6] = (byte)biomesForGeneration[var6].biomeID;
}
var4.generateSkylightMap();
return var4;
var4.generateSkylightMap();
return var4;
}
/**
* generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the
* size.
*/
/**
* 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 ad[], int i, int j, int k, int l, int i1, int j1)
{
if(ad == null)
{
ad = new double[l * i1 * j1];
}
double d = 684.41200000000003D;
double d1 = 684.41200000000003D;
field_4182_g = field_922_a.generateNoiseOctaves(field_4182_g, i, k, l, j1, 1.121D, 1.121D, 0.5D);
field_4181_h = field_921_b.generateNoiseOctaves(field_4181_h, i, k, l, j1, 200D, 200D, 0.5D);
d *= 2D;
field_4185_d = field_910_m.generateNoiseOctaves(field_4185_d, i, j, k, l, i1, j1, d / 80D, d1 / 160D, d / 80D);
field_4184_e = field_912_k.generateNoiseOctaves(field_4184_e, i, j, k, l, i1, j1, d, d1, d);
field_4183_f = field_911_l.generateNoiseOctaves(field_4183_f, i, j, k, l, i1, j1, d, d1, d);
int k1 = 0;
int l1 = 0;
int i2 = 16 / l;
for(int j2 = 0; j2 < l; j2++)
{
int k2 = j2 * i2 + i2 / 2;
for(int l2 = 0; l2 < j1; l2++)
{
int i3 = l2 * i2 + i2 / 2;
double d3;
d3 = 0.5D;
double d4 = 1.0D - d3;
d4 *= d4;
d4 *= d4;
d4 = 1.0D - d4;
double d5 = (field_4182_g[l1] + 256D) / 512D;
d5 *= d4;
if(d5 > 1.0D)
{
d5 = 1.0D;
}
double d6 = field_4181_h[l1] / 8000D;
if(d6 < 0.0D)
{
d6 = -d6 * 0.29999999999999999D;
}
d6 = d6 * 3D - 2D;
if(d6 > 1.0D)
{
d6 = 1.0D;
}
d6 /= 8D;
d6 = 0.0D;
if(d5 < 0.0D)
{
d5 = 0.0D;
}
d5 += 0.5D;
d6 = (d6 * i1) / 16D;
l1++;
double d7 = i1 / 2D;
for(int j3 = 0; j3 < i1; j3++)
{
double d8 = 0.0D;
double d9 = ((j3 - d7) * 8D) / d5;
if(d9 < 0.0D)
{
d9 *= -1D;
}
double d10 = field_4184_e[k1] / 512D;
double d11 = field_4183_f[k1] / 512D;
double d12 = (field_4185_d[k1] / 10D + 1.0D) / 2D;
if(d12 < 0.0D)
{
d8 = d10;
} else
if(d12 > 1.0D)
{
d8 = d11;
} else
{
d8 = d10 + (d11 - d10) * d12;
}
d8 -= 8D;
int k3 = 32;
if(j3 > i1 - k3)
{
double d13 = (j3 - (i1 - k3)) / (k3 - 1.0F);
d8 = d8 * (1.0D - d13) + -30D * d13;
}
k3 = 8;
if(j3 < k3)
{
double d14 = (k3 - j3) / (k3 - 1.0F);
d8 = d8 * (1.0D - d14) + -30D * d14;
}
ad[k1] = d8;
k1++;
}
private double[] initializeNoiseField(double ad[], int i, int j, int k, int l, int i1, int j1)
{
if(ad == null)
{
ad = new double[l * i1 * j1];
}
double d = 684.41200000000003D;
double d1 = 684.41200000000003D;
field_4182_g = field_922_a.generateNoiseOctaves(field_4182_g, i, k, l, j1, 1.121D, 1.121D, 0.5D);
field_4181_h = field_921_b.generateNoiseOctaves(field_4181_h, i, k, l, j1, 200D, 200D, 0.5D);
d *= 2D;
field_4185_d = field_910_m.generateNoiseOctaves(field_4185_d, i, j, k, l, i1, j1, d / 80D, d1 / 160D, d / 80D);
field_4184_e = field_912_k.generateNoiseOctaves(field_4184_e, i, j, k, l, i1, j1, d, d1, d);
field_4183_f = field_911_l.generateNoiseOctaves(field_4183_f, i, j, k, l, i1, j1, d, d1, d);
int k1 = 0;
int l1 = 0;
int i2 = 16 / l;
for(int j2 = 0; j2 < l; j2++)
{
int k2 = j2 * i2 + i2 / 2;
for(int l2 = 0; l2 < j1; l2++)
{
int i3 = l2 * i2 + i2 / 2;
double d3;
d3 = 0.5D;
double d4 = 1.0D - d3;
d4 *= d4;
d4 *= d4;
d4 = 1.0D - d4;
double d5 = (field_4182_g[l1] + 256D) / 512D;
d5 *= d4;
if(d5 > 1.0D)
{
d5 = 1.0D;
}
double d6 = field_4181_h[l1] / 8000D;
if(d6 < 0.0D)
{
d6 = -d6 * 0.29999999999999999D;
}
d6 = d6 * 3D - 2D;
if(d6 > 1.0D)
{
d6 = 1.0D;
}
d6 /= 8D;
d6 = 0.0D;
if(d5 < 0.0D)
{
d5 = 0.0D;
}
d5 += 0.5D;
d6 = (d6 * i1) / 16D;
l1++;
double d7 = i1 / 2D;
for(int j3 = 0; j3 < i1; j3++)
{
double d8 = 0.0D;
double d9 = ((j3 - d7) * 8D) / d5;
if(d9 < 0.0D)
{
d9 *= -1D;
}
double d10 = field_4184_e[k1] / 512D;
double d11 = field_4183_f[k1] / 512D;
double d12 = (field_4185_d[k1] / 10D + 1.0D) / 2D;
if(d12 < 0.0D)
{
d8 = d10;
} else
if(d12 > 1.0D)
{
d8 = d11;
} else
{
d8 = d10 + (d11 - d10) * d12;
}
d8 -= 8D;
int k3 = 32;
if(j3 > i1 - k3)
{
double d13 = (j3 - (i1 - k3)) / (k3 - 1.0F);
d8 = d8 * (1.0D - d13) + -30D * d13;
}
k3 = 8;
if(j3 < k3)
{
double d14 = (k3 - j3) / (k3 - 1.0F);
d8 = d8 * (1.0D - d14) + -30D * d14;
}
ad[k1] = d8;
k1++;
}
}
}
}
}
return ad;
}
return ad;
}
/*
/*
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);
@ -482,124 +482,124 @@ public class ChunkProviderPromised implements IChunkProvider
return par1ArrayOfDouble;
}
*/
*/
/**
* Checks to see if a chunk exists at x, y
*/
@Override
public boolean chunkExists(int par1, int par2)
{
return true;
}
/**
* 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)
{
BlockSand.fallInstantly = true;
/**
* Populates chunk with ores etc etc
*/
@Override
public void populate(IChunkProvider par1IChunkProvider, int par2, int par3)
{
BlockSand.fallInstantly = true;
MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, endWorld, endRNG2, par2, par3, false));
MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, endWorld, endRNG2, par2, par3, false));
int var4 = par2 * 16;
int var5 = par3 * 16;
BiomeGenBase var6 = endWorld.getBiomeGenForCoords(var4 + 16, var5 + 16);
int var4 = par2 * 16;
int var5 = par3 * 16;
BiomeGenBase var6 = endWorld.getBiomeGenForCoords(var4 + 16, var5 + 16);
for (int a = 0; a < 25; ++a)
{
int x = var4 + endWorld.rand.nextInt(16);
int y = endWorld.rand.nextInt(30) + 30;
int z = var5 + endWorld.rand.nextInt(16);
Block b = endWorld.getBlock(x, y, z);
for (int a = 0; a < 25; ++a)
{
int x = var4 + endWorld.rand.nextInt(16);
int y = endWorld.rand.nextInt(30) + 30;
int z = var5 + endWorld.rand.nextInt(16);
Block b = endWorld.getBlock(x, y, z);
if (b == BOPBlockHelper.get("holyStone"))
{
endWorld.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
}
}
if (b == BOPBlockHelper.get("holyStone"))
{
endWorld.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 0, 2);
}
}
var6.decorate(endWorld, endRNG2, var4, var5);
var6.decorate(endWorld, endRNG2, var4, var5);
MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, endWorld, endRNG2, par2, par3, false));
MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, endWorld, endRNG2, par2, par3, false));
BlockSand.fallInstantly = false;
}
BlockSand.fallInstantly = 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;
}
/**
* 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 the 100 oldest chunks from memory, due to a bug with chunkSet.add() never being called it thinks the list
* is always empty and will not remove any chunks.
*/
/**
* Unloads the 100 oldest chunks from memory, due to a bug with chunkSet.add() never being called it thinks the list
* is always empty and will not remove any chunks.
*/
@Override
public boolean unloadQueuedChunks()
{
return false;
}
@Override
public boolean unloadQueuedChunks()
{
return false;
}
public boolean unload100OldestChunks()
{
return false;
}
public boolean unload100OldestChunks()
{
return false;
}
/**
* Returns if the IChunkProvider supports saving.
*/
@Override
public boolean canSave()
{
return true;
}
/**
* 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 "RandomLevelSource";
}
/**
* Converts the instance data to a readable string.
*/
@Override
public String makeString()
{
return "RandomLevelSource";
}
/**
* Returns a list of creatures of the specified type that can spawn at the given location.
*/
@Override
@SuppressWarnings("rawtypes")
public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4)
{
BiomeGenBase var5 = endWorld.getBiomeGenForCoords(par2, par4);
return var5 == null ? null : var5.getSpawnableList(par1EnumCreatureType);
}
/**
* Returns a list of creatures of the specified type that can spawn at the given location.
*/
@Override
@SuppressWarnings("rawtypes")
public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4)
{
BiomeGenBase var5 = endWorld.getBiomeGenForCoords(par2, par4);
return var5 == null ? null : var5.getSpawnableList(par1EnumCreatureType);
}
/**
* Returns the location of the closest structure of the specified type. If not found returns null.
*/
@Override
//TODO: findClosestStructure
public ChunkPosition func_147416_a(World par1World, String par2Str, int par3, int par4, int par5)
{
return null;
}
/**
* Returns the location of the closest structure of the specified type. If not found returns null.
*/
@Override
//TODO: findClosestStructure
public ChunkPosition func_147416_a(World par1World, String par2Str, int par3, int par4, int par5)
{
return null;
}
@Override
public int getLoadedChunkCount()
{
return 0;
}
@Override
public int getLoadedChunkCount()
{
return 0;
}
@Override
public void recreateStructures(int par1, int par2) {}
@Override
public void recreateStructures(int par1, int par2) {}
@Override
public void saveExtraData()

13
src/main/java/biomesoplenty/common/world/WorldChunkManagerBOPHell.java
View File

@ -1,10 +1,9 @@
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 cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.world.ChunkPosition;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
@ -12,8 +11,9 @@ 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;
import java.util.List;
import java.util.Random;
public class WorldChunkManagerBOPHell extends WorldChunkManager
{
@ -21,10 +21,8 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager
private GenLayer biomeIndexLayer;
private BiomeCacheHell biomeCache;
@SuppressWarnings("rawtypes")
private List biomesToSpawnIn;
@SuppressWarnings({ "unchecked", "rawtypes" })
protected WorldChunkManagerBOPHell()
{
biomeCache = new BiomeCacheHell(this);
@ -34,7 +32,6 @@ public class WorldChunkManagerBOPHell extends WorldChunkManager
{
this();
GenLayer[] var4 = BiomeLayerHell.initializeAllBiomeGenerators(par1, par3WorldType, 1);
//var4 = getModdedBiomeGenerators(par3WorldType, par1, var4);
genBiomes = var4[0];
biomeIndexLayer = var4[1];
}