projects/mmm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bauxite - Fixed gen (hopefully)

Browse source
This commit is contained in:
Emmanuel BENOîT 2016-07-07 16:17:23 +02:00
parent b79698d65e
commit d946f110d0
2 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/java/mmm/materials/ore/MOBauxite.java
View file

@ -1,21 +1,12 @@
package mmm.materials.ore; package mmm.materials.ore;
import java.util.List;
import mmm.materials.MOre; import mmm.materials.MOre;
import mmm.materials.Materials;
import mmm.utils.I_UOreGenerationRegistrar;
import mmm.world.WLocation;
import mmm.world.gen.WGOreCondition;
import mmm.world.gen.WGOreParameters;
import net.minecraft.block.state.pattern.BlockMatcher;
public class MOBauxite public class MOBauxite
extends MOre extends MOre
implements I_UOreGenerationRegistrar
{ {
public MOBauxite( ) public MOBauxite( )
@ -23,12 +14,4 @@ public class MOBauxite
super( "bauxite" , 1 ); super( "bauxite" , 1 );
} }
@Override
public void addConditions( final List< WGOreCondition > conditions )
{
conditions.add( new WGOreCondition( WLocation.inOverworld( ) , new WGOreParameters( this.getDefaultState( ) ,
10 , 9 , 45 , 80 , BlockMatcher.forBlock( Materials.ROCK_LIMESTONE ) ) ) );
}
} }

10
src/java/mmm/world/biome/A_WBLimestone.java
View file

@ -3,6 +3,7 @@ package mmm.world.biome;
import java.util.Random; import java.util.Random;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import mmm.materials.Materials; import mmm.materials.Materials;
@ -10,6 +11,7 @@ import mmm.world.I_WBiomeWithOres;
import mmm.world.I_WDefaultPopulateHandler; import mmm.world.I_WDefaultPopulateHandler;
import mmm.world.gen.WGLimestoneLayer; import mmm.world.gen.WGLimestoneLayer;
import mmm.world.gen.WGOreParameters; import mmm.world.gen.WGOreParameters;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.state.pattern.BlockMatcher; import net.minecraft.block.state.pattern.BlockMatcher;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -25,7 +27,7 @@ public abstract class A_WBLimestone
implements I_WDefaultPopulateHandler , I_WBiomeWithOres implements I_WDefaultPopulateHandler , I_WBiomeWithOres
{ {
public A_WBLimestone( BiomeProperties properties ) public A_WBLimestone( final BiomeProperties properties )
{ {
super( properties ); super( properties );
} }
@ -65,11 +67,13 @@ public abstract class A_WBLimestone
@Override @Override
public WGOreParameters[] getBiomeOres( final World worldIn ) public WGOreParameters[] getBiomeOres( final World worldIn )
{ {
final Predicate< IBlockState > stoneOrLimestone = Predicates.or( BlockMatcher.forBlock( Blocks.STONE ) ,
BlockMatcher.forBlock( Materials.ROCK_LIMESTONE ) );
return new WGOreParameters[] { return new WGOreParameters[] {
new WGOreParameters( Materials.ROCK_CHALK.getDefaultState( ) , 15 , 20 , // new WGOreParameters( Materials.ROCK_CHALK.getDefaultState( ) , 15 , 20 , //
worldIn.getSeaLevel( ) - 20 , 255 , // worldIn.getSeaLevel( ) - 20 , 255 , //
Predicates.or( BlockMatcher.forBlock( Blocks.STONE ) , stoneOrLimestone ) ,
BlockMatcher.forBlock( Materials.ROCK_LIMESTONE ) ) ) new WGOreParameters( Materials.ORE_BAUXITE.getDefaultState( ) , 10 , 9 , 45 , 255 , stoneOrLimestone )
}; };
} }