Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nether tree support #453

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Nether tree support #453

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67d03d7
Nether tree support
aria1th May 18, 2022
127bc59
Merge branch 'GabrielOlvH:master' into patch-4
aria1th Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/main/kotlin/me/steven/indrev/blockentities/farms/ChopperBlockEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ChopperBlockEntity(tier: Tier, pos: BlockPos, state: BlockState) : AOEMach
2 filter { stack -> stack.item is AxeItem || stack.item is SwordItem }
3 filter { (_, item) -> item is BoneMealItem }
4..5 filter { (stack, item), _ -> stack.isIn(ItemTags.SAPLINGS)
|| (item is BlockItem && (item.block is MushroomPlantBlock || item.block is BambooBlock)) }
|| (item is BlockItem && (item.block is MushroomPlantBlock || item.block is BambooBlock || item.block is FungusBlock)) }
}
output { slots = intArrayOf(6, 7, 8, 9, 10, 11, 12, 13, 14) }
coolerSlot = 1
Expand Down Expand Up @@ -131,8 +131,11 @@ class ChopperBlockEntity(tier: Tier, pos: BlockPos, state: BlockState) : AOEMach
}
val block = blockState.block
when {
toolStack.item is AxeItem
&& (blockState.isIn(BlockTags.LOGS) || block is MushroomBlock || block == Blocks.MUSHROOM_STEM) -> {
toolStack.item is AxeItem && block !is FungusBlock
&& (blockState.isIn(BlockTags.LOGS) || block is MushroomBlock || block == Blocks.MUSHROOM_STEM ||
block == Blocks.SHROOMLIGHT || block is NetherWartBlock || block == Blocks.WARPED_WART_BLOCK || block is RootsBlock || block is WeepingVinesBlock || block is WeepingVinesPlantBlock ||
block is TwistingVinesPlantBlock || block is TwistingVinesBlock ||
block.defaultState?.material == Material.NETHER_SHOOTS || block.defaultState?.material == Material.NETHER_WOOD) -> {
if (!damageTool(1)) return false
world?.setBlockState(blockPos, Blocks.AIR.defaultState, 3)
}
Expand Down Expand Up @@ -168,7 +171,7 @@ class ChopperBlockEntity(tier: Tier, pos: BlockPos, state: BlockState) : AOEMach
}
block is AirBlock
&& item is BlockItem
&& (itemStack.isIn(ItemTags.SAPLINGS) || item.block is MushroomPlantBlock || item.block is BambooBlock)
&& (itemStack.isIn(ItemTags.SAPLINGS) || item.block is MushroomPlantBlock || item.block is BambooBlock || item.block is FungusBlock)
&& item.block.defaultState.canPlaceAt(world, pos)
&& itemStack.count > 1 -> {
if (item.block is BambooBlock)
Expand Down Expand Up @@ -199,4 +202,4 @@ class ChopperBlockEntity(tier: Tier, pos: BlockPos, state: BlockState) : AOEMach
else -> 1
}
}
}
}