Projects >> TerrainControl >>9ea36e1d2c4ccf555a2bfbd4a13a5d745b058cac

Chunk
Conflicting content 
public class ChunkProviderTC
{
<<<<<<< HEAD
=======
    private Random rnd;
    private NoiseGeneratorPerlinOctaves o;
    private NoiseGeneratorPerlinOctaves p;
    private NoiseGeneratorPerlinOctaves q;
    private NoiseGeneratorPerlinOctaves r;
    private NoiseGeneratorPerlinOctaves a;
    private NoiseGeneratorPerlinOctaves b;
    private double[] u;
    private double[] v = new double[256];

    double[] g;
    double[] h;
    double[] i;
    double[] j;
    double[] k;
    float[] NearBiomeWeight;

    private static int ChunkMaxX = 16;
    private static int ChunkMaxZ = 16;


    private LocalWorld localWorld;
    private double VolatilityFactor;
    private double HeightFactor;

    private WorldConfig worldSettings;
    private TerrainGenBase CaveGen;
>>>>>>> 59333121d149a4b682ade8ccc6d2744e89689a9d

    private final Random random;
    private final NoiseGeneratorOctaves noiseGen1;
Solution content 
public class ChunkProviderTC
{
    private final Random random;
File
ChunkProviderTC.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        this.noiseGen5 = new NoiseGeneratorOctaves(this.random, 10);
        this.noiseGen6 = new NoiseGeneratorOctaves(this.random, 16);

<<<<<<< HEAD
        this.caveGen = new CavesGen(this.worldSettings, this.localWorld);
        this.canyonGen = new CanyonsGen(this.worldSettings, this.localWorld);

        // Contains 2d array 5*5. Maximum weight is in array center.
        this.nearBiomeWeightArray = new float[25];
=======
        this.o = new NoiseGeneratorPerlinOctaves(this.rnd, 16);
        this.p = new NoiseGeneratorPerlinOctaves(this.rnd, 16);
        this.q = new NoiseGeneratorPerlinOctaves(this.rnd, 8);
        this.r = new NoiseGeneratorPerlinOctaves(this.rnd, 4);

        this.a = new NoiseGeneratorPerlinOctaves(this.rnd, 10);
        this.b = new NoiseGeneratorPerlinOctaves(this.rnd, 16);


        this.CaveGen = new CavesGen(this.worldSettings, this.localWorld);
        this.CanyonGen = new CanyonsGen(this.worldSettings, this.localWorld);

        this.NearBiomeWeight = new float[25];
>>>>>>> 59333121d149a4b682ade8ccc6d2744e89689a9d
        for (int x = -2; x <= 2; x++)
        {
            for (int z = -2; z <= 2; z++)
Solution content 
        this.caveGen = new CavesGen(this.worldSettings, this.localWorld);
        this.canyonGen = new CanyonsGen(this.worldSettings, this.localWorld);

        // Contains 2d array 5*5. Maximum weight is in array center.
        this.nearBiomeWeightArray = new float[25];
        
        for (int x = -2; x <= 2; x++)
        {
            for (int z = -2; z <= 2; z++)
File
ChunkProviderTC.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation