adds stripped state pre processor #330
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Copyright 2026 Lambda | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.lambda.interaction.construction.simulation.processing.preprocessors.state | ||
|
|
||
| import com.lambda.context.AutomatedSafeContext | ||
| import com.lambda.context.SafeContext | ||
| import com.lambda.interaction.construction.simulation.processing.PreProcessingInfoAccumulator | ||
| import com.lambda.interaction.construction.simulation.processing.StateProcessor | ||
| import com.lambda.util.item.ItemUtils | ||
| import net.minecraft.block.Block | ||
| import net.minecraft.block.BlockState | ||
| import net.minecraft.entity.player.PlayerEntity | ||
| import net.minecraft.item.AxeItem | ||
| import net.minecraft.item.Item | ||
| import net.minecraft.state.property.Properties | ||
| import net.minecraft.util.math.BlockPos | ||
|
|
||
| @Suppress("unused") | ||
| object StrippedStateProcessor : StateProcessor { | ||
| // [AxeItem.STRIPPED_BLOCKS] maps unstripped to stripped, we need the other direction | ||
| private val unstrippedToStripped: Map<Block, Block> by lazy { | ||
| AxeItem.STRIPPED_BLOCKS.entries.associate { (from, to) -> to to from } | ||
| } | ||
|
|
||
| context(automatedSafeContext: AutomatedSafeContext) | ||
| override fun isEnabled() = automatedSafeContext.buildConfig.stripLogs | ||
|
|
||
| override fun acceptsState(state: BlockState, targetState: BlockState): Boolean { | ||
| val unstrippedVariant = unstrippedToStripped[targetState.block] ?: return false | ||
|
Member
There was a problem hiding this comment. this function as a whole can probably be simplified to an = function without a full block |
||
| return state.isReplaceable || state.block == unstrippedVariant | ||
|
beanbag44 marked this conversation as resolved.
|
||
| } | ||
|
|
||
| context(safeContext: SafeContext) | ||
| override fun PreProcessingInfoAccumulator.preProcess(state: BlockState, targetState: BlockState, pos: BlockPos) { | ||
| val unstrippedVariant = unstrippedToStripped[targetState.block] ?: return | ||
| val player = safeContext.player | ||
|
Member
There was a problem hiding this comment. for something like this, i try to avoid value sets and call with(safeContext) { }, wrapping the function in the safe context. If you change it to use that, i would change the function to = without the {} and then put the with on the next line |
||
|
|
||
| // Every branch below depends on the current inventory, so this must never be cached. | ||
| noCaching() | ||
|
|
||
| if (state.isReplaceable){ | ||
|
Member
There was a problem hiding this comment. missing space before the { Also, if you want the logic to mirror FlowerPotStateProcessor for parity, you could change this to state.block != unstrippedVariant and add a return in the block so you can handle the stripping logic after without indentation. The isReplaceable check is already handled in the acceptsState function |
||
| // Don't use unstripped logs if you already have stripped ones | ||
| if (player.carries(targetState.block.asItem())) return | ||
|
|
||
| val sourceItem = unstrippedVariant.asItem() | ||
| if (!player.carries(sourceItem)) return | ||
|
|
||
| setExpectedState(unstrippedVariant.withAxisOf(targetState)) | ||
| setItem(sourceItem) | ||
| } else if (state.block == unstrippedVariant) { | ||
| val axe = player.findAxe() ?: return | ||
| setItem(axe) | ||
| setPlacing(false) | ||
| // InteractSim refuses to interact while sneaking, so ask for it explicitly. | ||
| setSneak(false) | ||
| } | ||
| } | ||
|
|
||
| private fun Block.withAxisOf(targetState: BlockState) = defaultState.let { placed -> | ||
| if (Properties.AXIS in placed && Properties.AXIS in targetState) { | ||
| placed.with(Properties.AXIS, targetState.get(Properties.AXIS)) | ||
| } else placed | ||
| } | ||
|
|
||
| private fun PlayerEntity.findAxe(): Item? { | ||
| val held = mainHandStack.item | ||
| if (held in ItemUtils.axes) return held | ||
| return inventory.mainStacks.firstOrNull { it.item in ItemUtils.axes }?.item | ||
| } | ||
|
|
||
| private fun PlayerEntity.carries(item: Item) = | ||
| inventory.mainStacks.any { it.item == item } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the isEnabled check is only overridden by StrippedStateProcessor so the check should probably be moved into the acceptsState for StrippedStateProcessor and the function removed.