This commit is contained in:
gigabit101 2016-02-20 01:08:22 +00:00
commit 4521008c73
2 changed files with 7 additions and 8 deletions

View file

@ -32,7 +32,7 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
}
private static List<ItemStack> expandOreDict(ItemStack itemStack) {
if(itemStack == null){
if(itemStack == null || itemStack.getItem() == null){
return new ArrayList<ItemStack>();
}
int[] oreIds = OreDictionary.getOreIDs(itemStack);

View file

@ -23,13 +23,12 @@ public class TreeGenerator implements IWorldGenerator {
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
int chance = 0;
BiomeGenBase biomeGenBase = world.getBiomeGenForCoords( new BlockPos(chunkX * 16 + 16, 72, chunkZ * 16 + 16));
// if(BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.SWAMP)){
// chance += random.nextInt(10) + 5;
// }
// if(BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.FOREST) || BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.JUNGLE)){
// chance += random.nextInt(5) + 1;
// }
chance = 10;
if(BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.SWAMP)){
chance += random.nextInt(10) + 5;
}
if(BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.FOREST) || BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.JUNGLE)){
chance += random.nextInt(5) + 1;
}
if(world.provider.isSurfaceWorld()){
if(random.nextInt(100) + 1 <= chance * 2){
treeGenerator.generate(world, random, new BlockPos(chunkX * 16 + random.nextInt(16), 72, chunkZ * 16 + random.nextInt(16)));