[21.1+] Generalise lightable blocks #1186
There are no files selected for viewing
This file contains 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 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,11 @@ | ||
| --- a/net/minecraft/world/item/FireChargeItem.java | ||
| +++ b/net/minecraft/world/item/FireChargeItem.java | ||
| @@ -33,7 +_,7 @@ | ||
| BlockPos blockpos = p_41204_.getClickedPos(); | ||
| BlockState blockstate = level.getBlockState(blockpos); | ||
| boolean flag = false; | ||
| - if (!CampfireBlock.canLight(blockstate) && !CandleBlock.canLight(blockstate) && !CandleCakeBlock.canLight(blockstate)) { | ||
| + if (blockstate.getBlock() instanceof net.neoforged.neoforge.common.SpecialLightableBlock && !((net.neoforged.neoforge.common.SpecialLightableBlock) blockstate.getBlock()).canLight(blockstate)) { | ||
|
There was a problem hiding this comment. wrong logic, instead of catching unlightable blocks and lightable blocks that refuse, it only catches the latter. Should be I don't see the else, but I suspect it also sets LIT |
||
| blockpos = blockpos.relative(p_41204_.getClickedFace()); | ||
| if (BaseFireBlock.canBePlacedAt(level, blockpos, p_41204_.getHorizontalDirection())) { | ||
| this.playSound(level, blockpos); | ||
This file contains 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,30 @@ | ||
| --- a/net/minecraft/world/item/FlintAndSteelItem.java | ||
| +++ b/net/minecraft/world/item/FlintAndSteelItem.java | ||
| @@ -29,7 +_,7 @@ | ||
| Level level = p_41297_.getLevel(); | ||
| BlockPos blockpos = p_41297_.getClickedPos(); | ||
| BlockState blockstate = level.getBlockState(blockpos); | ||
| - if (!CampfireBlock.canLight(blockstate) && !CandleBlock.canLight(blockstate) && !CandleCakeBlock.canLight(blockstate)) { | ||
| + if (!(blockstate.getBlock() instanceof net.neoforged.neoforge.common.SpecialLightableBlock) || !((net.neoforged.neoforge.common.SpecialLightableBlock) blockstate.getBlock()).canLight(blockstate)) { | ||
| BlockPos blockpos1 = blockpos.relative(p_41297_.getClickedFace()); | ||
| if (BaseFireBlock.canBePlacedAt(level, blockpos1, p_41297_.getHorizontalDirection())) { | ||
| level.playSound(player, blockpos1, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0F, level.getRandom().nextFloat() * 0.4F + 0.8F); | ||
| @@ -46,9 +_,9 @@ | ||
| } else { | ||
| return InteractionResult.FAIL; | ||
| } | ||
| - } else { | ||
| + } else if (blockstate.getBlock() instanceof net.neoforged.neoforge.common.SpecialLightableBlock ilb) { | ||
| level.playSound(player, blockpos, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0F, level.getRandom().nextFloat() * 0.4F + 0.8F); | ||
| - level.setBlock(blockpos, blockstate.setValue(BlockStateProperties.LIT, Boolean.valueOf(true)), 11); | ||
| + ilb.setLit(level, blockstate, blockpos, true); | ||
| level.gameEvent(player, GameEvent.BLOCK_CHANGE, blockpos); | ||
| if (player != null) { | ||
| p_41297_.getItemInHand().hurtAndBreak(1, player, LivingEntity.getSlotForHand(p_41297_.getHand())); | ||
| @@ -56,5 +_,6 @@ | ||
|
|
||
| return InteractionResult.sidedSuccess(level.isClientSide()); | ||
| } | ||
| + return InteractionResult.PASS; | ||
| } | ||
| } |
This file contains 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,21 @@ | ||
| /* | ||
| * Copyright (c) NeoForged and contributors | ||
| * SPDX-License-Identifier: LGPL-2.1-only | ||
| */ | ||
|
|
||
| package net.neoforged.neoforge.common; | ||
|
|
||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.world.level.LevelAccessor; | ||
| import net.minecraft.world.level.block.CampfireBlock; | ||
| import net.minecraft.world.level.block.CandleBlock; | ||
| import net.minecraft.world.level.block.CandleCakeBlock; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
|
|
||
| public interface SpecialLightableBlock { | ||
| default boolean canLight(BlockState state) { | ||
| return CampfireBlock.canLight(state) || CandleBlock.canLight(state) || CandleCakeBlock.canLight(state); | ||
| } | ||
|
|
||
| void setLit(LevelAccessor level, BlockState state, BlockPos pos, boolean lit); | ||
| } |
Oops, something went wrong.
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.
Still sets the LIT property here