upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 00:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call getToolModifiedState for AXE_STRIP and AXE_WAX_OFF.

Browse Source
This commit is contained in:
LexManos committed 2025-05-21 23:41:54 -07:00
1 parent ce8838e721
commit 4ef7fe8bd8
1 file changed
+18 -3
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/world/item/AxeItem.java.patch
+18 -3
View File
@@ -9,7 +9,7 @@
if (optional.isEmpty()) {
return InteractionResult.PASS;
} else {
@@ -88,7 +_,12 @@
@@ -88,18 +_,25 @@
}
private Optional<BlockState> evaluateNewBlockState(Level p_312809_, BlockPos p_313114_, @Nullable Player p_312029_, BlockState p_311198_) {
@@ -18,11 +18,26 @@
+ }
+
+ private Optional<BlockState> evaluateNewBlockState(Level p_312809_, BlockPos p_313114_, @Nullable Player p_312029_, BlockState p_311198_, @Nullable UseOnContext ctx) {
+ var modded = ctx == null ? null : p_311198_.getToolModifiedState(ctx, net.minecraftforge.common.ToolActions.AXE_STRIP, false);
+ Optional<BlockState> optional = modded != null ? Optional.of(modded) : this.getStripped(p_311198_);
+ var strip = ctx == null ? null : p_311198_.getToolModifiedState(ctx, net.minecraftforge.common.ToolActions.AXE_STRIP, false);
+ Optional<BlockState> optional = strip != null ? Optional.of(strip) : this.getStripped(p_311198_);
if (optional.isPresent()) {
p_312809_.playSound(p_312029_, p_313114_, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F);
return optional;
} else {
- Optional<BlockState> optional1 = WeatheringCopper.getPrevious(p_311198_);
+ var scrape = ctx == null ? null : p_311198_.getToolModifiedState(ctx, net.minecraftforge.common.ToolActions.AXE_STRIP, false);
+ Optional<BlockState> optional1 = scrape != null ? Optional.of(scrape) : WeatheringCopper.getPrevious(p_311198_);
if (optional1.isPresent()) {
p_312809_.playSound(p_312029_, p_313114_, SoundEvents.AXE_SCRAPE, SoundSource.BLOCKS, 1.0F, 1.0F);
p_312809_.levelEvent(p_312029_, 3005, p_313114_, 0);
return optional1;
} else {
- Optional<BlockState> optional2 = Optional.ofNullable(HoneycombItem.WAX_OFF_BY_BLOCK.get().get(p_311198_.getBlock()))
+ var waxOff = ctx == null ? null : p_311198_.getToolModifiedState(ctx, net.minecraftforge.common.ToolActions.AXE_WAX_OFF, false);
+ Optional<BlockState> optional2 = waxOff != null ? Optional.of(waxOff) : Optional.ofNullable(HoneycombItem.WAX_OFF_BY_BLOCK.get().get(p_311198_.getBlock()))
.map(p_150694_ -> p_150694_.withPropertiesOf(p_311198_));
if (optional2.isPresent()) {
p_312809_.playSound(p_312029_, p_313114_, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F);
@@ -115,5 +_,21 @@
private Optional<BlockState> getStripped(BlockState p_150691_) {
return Optional.ofNullable(STRIPPABLES.get(p_150691_.getBlock()))