fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tree blocks config option, fixes #165

Browse Source
This commit is contained in:
Electroblob77
2019-08-18 22:44:09 +01:00
parent 413d21d1d8
commit 93bc9b1b89
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/util/WizardryUtilities.java
+17 -4
View File
@@ -7,6 +7,7 @@ import electroblob.wizardry.entity.living.ISpellCaster;
import electroblob.wizardry.item.ISpellCastingItem;
import electroblob.wizardry.spell.Spell;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCactus;
import net.minecraft.block.BlockLog;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
@@ -285,13 +286,25 @@ public final class WizardryUtilities {
/** Surface criterion which defines a surface as the boundary between a block that cannot be moved through, and
* a block that can be moved through or a tree block (log or leaves). Used for structure generation. */
SurfaceCriteria COLLIDABLE_IGNORING_TREES = basedOn((world, pos) ->
world.getBlockState(pos).getMaterial().blocksMovement()
&& !(world.getBlockState(pos).getBlock() instanceof BlockLog)
&& !(world.getBlockState(pos).getBlock().isLeaves(world.getBlockState(pos), world, pos)
&& !(world.getBlockState(pos).getBlock().isFoliage(world, pos))));
world.getBlockState(pos).getMaterial().blocksMovement() && !isTreeBlock(world, pos));
}
/**
* Returns true if the block at the given position is a tree block (or other 'solid' vegetation, such as cacti).
* Used for structure generation.
* @param world The world the block is in
* @param pos The position of the block to be tested
* @return True if the given block is a tree block, false if not.
*/
public static boolean isTreeBlock(World world, BlockPos pos){
return world.getBlockState(pos).getBlock() instanceof BlockLog
|| world.getBlockState(pos).getBlock() instanceof BlockCactus
|| world.getBlockState(pos).getBlock().isLeaves(world.getBlockState(pos), world, pos)
|| world.getBlockState(pos).getBlock().isFoliage(world, pos)
|| Arrays.asList(Wizardry.settings.treeBlocks).contains(world.getBlockState(pos).getBlock().getRegistryName());
}
/**
* Finds the nearest floor level in the given direction from the given position,
* within the range specified. This is a shorthand for