PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-12-18 16:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.20.4' into 1.21

Browse source 
# 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:
Sollace 2024-12-10 23:47:43 +01:00
commit d4581f0cdb
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/unicopia/server/world/Tree.java
View file

@ -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,