Some additional fixes from other branch.

This commit is contained in:
Sebastian Hartte
2020-05-30 22:18:26 +02:00
parent 16d6d55d7f
commit ec3b464655
139 changed files with 1489 additions and 1485 deletions
@@ -23,8 +23,8 @@ import java.util.Random;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.chunk.AbstractChunkProvider;
import net.minecraft.world.gen.ChunkGenerator;
import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraftforge.fml.common.IWorldGenerator;
@@ -56,7 +56,7 @@ public final class QuartzWorldGen implements IWorldGenerator
}
@Override
public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider )
public void generate(final Random r, final int chunkX, final int chunkZ, final World w, final ChunkGenerator chunkGenerator, final AbstractChunkProvider chunkProvider )
{
if( this.oreNormal == null && this.oreCharged == null )
{
@@ -39,7 +39,7 @@ public class ChunkOnly extends StandardWorld
public ChunkOnly( final World w, final int cx, final int cz )
{
super( w );
this.target = w.getChunkFromChunkCoords( cx, cz );
this.target = w.getChunk( cx, cz );
this.cx = cx;
this.cz = cz;
}
@@ -73,7 +73,7 @@ public class ChunkOnly extends StandardWorld
{
if( this.range( x, y, z ) )
{
return this.target.getBlockState( x, y, z ).getBlock();
return this.target.getBlockState( new BlockPos(x, y, z) ).getBlock();
}
return Platform.AIR_BLOCK;
}
@@ -75,7 +75,7 @@ public class Fallout
}
else if( a > 0.7 )
{
this.putter.put( w, x, y, z, Blocks.GRASS );
this.putter.put( w, x, y, z, Blocks.GRASS_BLOCK );
}
else if( a > 0.6 )
{