71455cca64
Update upstream (Luminol)
39 lines
2.2 KiB
Diff
39 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
|
Date: Wed, 18 Jun 2025 14:24:54 +0800
|
|
Subject: [PATCH] Old replaceable by mushrooms
|
|
|
|
|
|
diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
index 834e27ef2f7b342b074ff9e1e390e02f3ca1c399..f5765e3bbf9e735d6f959e1bf6ee1846ee11b4e9 100644
|
|
--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
+++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
@@ -770,6 +770,14 @@ public abstract class BlockBehaviour implements FeatureElement {
|
|
return this.solidRender;
|
|
}
|
|
|
|
+ public boolean mushroomCheck(BlockState state) {
|
|
+ BlockState blockState = state.asState();
|
|
+ if (blockState.canOcclude()) {
|
|
+ return !Block.isShapeFullBlock(blockState.getOcclusionShape());
|
|
+ }
|
|
+ return true;
|
|
+ }
|
|
+
|
|
public final boolean canOcclude() { // Paper - Perf: Final for inlining
|
|
return this.canOcclude;
|
|
}
|
|
diff --git a/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java b/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java
|
|
index 3a37d66ab3c27c9abd60f35ef3bf3a93f8d7c3cd..2aad65d76cdd0800ac593a5bb3ce84ad1925eab0 100644
|
|
--- a/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java
|
|
+++ b/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.java
|
|
@@ -26,7 +26,7 @@ public abstract class AbstractHugeMushroomFeature extends Feature<HugeMushroomFe
|
|
|
|
protected void placeMushroomBlock(LevelAccessor level, BlockPos.MutableBlockPos mutablePos, BlockState state) {
|
|
BlockState blockState = level.getBlockState(mutablePos);
|
|
- if (blockState.isAir() || blockState.is(BlockTags.REPLACEABLE_BY_MUSHROOMS)) {
|
|
+ if (blockState.isAir() || blockState.is(BlockTags.REPLACEABLE_BY_MUSHROOMS) || (fun.bm.lophine.config.modules.misc.OldFeatureConfig.oldReplaceableByMushrooms && state.mushroomCheck(blockState))) { // Lophine - old replaceable by mushrooms
|
|
this.setBlock(level, mutablePos, state);
|
|
}
|
|
}
|