mirror of
https://github.com/Sollace/Unicopia.git
synced 2024-12-21 01:08:00 +01:00
Merge branch '1.20.4' into 1.21
# Conflicts: # src/main/java/com/minelittlepony/unicopia/block/cloud/PoreousCloudStairsBlock.java # src/main/java/com/minelittlepony/unicopia/mixin/MixinEnchantmentHelper.java # src/main/java/com/minelittlepony/unicopia/server/world/Tree.java
This commit is contained in:
commit
d4581f0cdb
1 changed files with 1 additions and 1 deletions
|
@ -131,7 +131,7 @@ public record Tree (
|
||||||
|
|
||||||
public Tree build() {
|
public Tree build() {
|
||||||
RegistryKey<ConfiguredFeature<?, ?>> configuredFeatureId = RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, id);
|
RegistryKey<ConfiguredFeature<?, ?>> configuredFeatureId = RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, id);
|
||||||
Optional<Block> sapling = saplingId.map(id -> UBlocks.register(id, saplingConstructor.apply(new SaplingGenerator(id.toString(), Optional.of(configuredFeatureId), Optional.empty(), Optional.empty()), Block.Settings.copy(Blocks.OAK_SAPLING)), ItemGroups.NATURAL));
|
Optional<Block> sapling = saplingId.map(id -> UBlocks.register(id, saplingConstructor.apply(new SaplingGenerator(id.toString(), Optional.empty(), Optional.of(configuredFeatureId), Optional.empty()), Block.Settings.copy(Blocks.OAK_SAPLING)), ItemGroups.NATURAL));
|
||||||
Tree tree = new Tree(id, configParameters.apply(new TreeFeatureConfig.Builder(
|
Tree tree = new Tree(id, configParameters.apply(new TreeFeatureConfig.Builder(
|
||||||
BlockStateProvider.of(logType),
|
BlockStateProvider.of(logType),
|
||||||
trunkPlacer,
|
trunkPlacer,
|
||||||
|
|
Loading…
Reference in a new issue