Skip to content

Cherrypick: Use a separate tree registry for tree placement #3501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SirYwell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Cherrypick: Use a separate tree registry for tree placement #3501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
import com.sk89q.worldedit.world.generation.StructureType;
import com.sk89q.worldedit.world.generation.TreeType;
import com.sk89q.worldedit.world.item.ItemType;
import net.minecraft.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.HolderSet;
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
Expand Down Expand Up @@ -113,6 +115,9 @@
import net.minecraft.world.level.dimension.LevelStem;
import net.minecraft.world.level.levelgen.WorldOptions;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.CoralTreeFeature;
import net.minecraft.world.level.levelgen.feature.TreeFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.Structure;
import net.minecraft.world.level.levelgen.structure.StructureStart;
Expand Down Expand Up @@ -918,6 +923,20 @@ public void initializeRegistries() {
}
}

// Trees
HolderLookup.RegistryLookup<PlacedFeature> placedFeatureRegistry = server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE);
placedFeatureRegistry.listElements()
.filter(feature -> {
var underlyingFeature = feature.value().feature().value().feature();
return underlyingFeature instanceof TreeFeature || underlyingFeature instanceof CoralTreeFeature;
})
.forEach(feature -> {
String key = feature.key().toString();
if (TreeType.REGISTRY.get(key) == null) {
TreeType.REGISTRY.register(key, new TreeType(key));
}
});

// BiomeCategories
Registry<Biome> biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME);
biomeRegistry.getTagNames().forEach(tagKey -> {
Expand Down
41 changes: 41 additions & 0 deletions ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
Expand Down Expand Up @@ -51,6 +52,7 @@
import com.sk89q.worldedit.world.entity.EntityType;
import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
import com.sk89q.worldedit.world.generation.StructureType;
import com.sk89q.worldedit.world.generation.TreeType;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import io.papermc.lib.PaperLib;
Expand Down Expand Up @@ -88,6 +90,7 @@
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.Structure;
import net.minecraft.world.level.levelgen.structure.StructureStart;
Expand Down Expand Up @@ -679,6 +682,44 @@ public boolean generateStructure(StructureType type, World world, EditSession ed
//FAWE end
}

@Override
public boolean generateTree(
final TreeType treeType,
final World world,
final EditSession session,
final BlockVector3 pt
) throws MaxChangedBlocksException {
ServerLevel serverLevel = getServerLevel(world);
ChunkGenerator generator = serverLevel.getMinecraftWorld().getChunkSource().getGenerator();

PlacedFeature placedFeature = serverLevel
.registryAccess()
.registryOrThrow(Registries.PLACED_FEATURE)
.get(ResourceLocation.tryParse(treeType.id()));

FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);
List<CraftBlockState> placed = TaskManager.taskManager().sync(() -> {
preCaptureStates(serverLevel);
try {
if (!placedFeature.place(
populator,
generator,
serverLevel.random,
new BlockPos(pt.x(), pt.y(), pt.z())
)) {
return null;
}
List<CraftBlockState> placedBlocks = new ArrayList<>(populator.getList());
placedBlocks.addAll(serverLevel.capturedBlockStates.values());
return placedBlocks;
} finally {
postCaptureBlockStates(serverLevel);
}
});

return placeFeatureIntoSession(session, populator, placed);
}

private boolean placeFeatureIntoSession(
final EditSession editSession,
final FaweBlockStateListPopulator populator,
Expand Down
19 changes: 19 additions & 0 deletions ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R3/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
import com.sk89q.worldedit.world.generation.StructureType;
import com.sk89q.worldedit.world.generation.TreeType;
import com.sk89q.worldedit.world.item.ItemType;
import net.minecraft.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.HolderSet;
import net.minecraft.core.Registry;
import net.minecraft.core.SectionPos;
Expand Down Expand Up @@ -113,6 +115,9 @@
import net.minecraft.world.level.dimension.LevelStem;
import net.minecraft.world.level.levelgen.WorldOptions;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.CoralTreeFeature;
import net.minecraft.world.level.levelgen.feature.TreeFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.Structure;
import net.minecraft.world.level.levelgen.structure.StructureStart;
Expand Down Expand Up @@ -917,6 +922,20 @@ public void initializeRegistries() {
}
}

// Trees
HolderLookup.RegistryLookup<PlacedFeature> placedFeatureRegistry = server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE);
placedFeatureRegistry.listElements()
.filter(feature -> {
var underlyingFeature = feature.value().feature().value().feature();
return underlyingFeature instanceof TreeFeature || underlyingFeature instanceof CoralTreeFeature;
})
.forEach(feature -> {
String key = feature.key().toString();
if (TreeType.REGISTRY.get(key) == null) {
TreeType.REGISTRY.register(key, new TreeType(key));
}
});

// BiomeCategories
Registry<Biome> biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME);
biomeRegistry.getTagNames().forEach(tagKey -> {
Expand Down
41 changes: 41 additions & 0 deletions ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
Expand Down Expand Up @@ -50,6 +51,7 @@
import com.sk89q.worldedit.world.entity.EntityType;
import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
import com.sk89q.worldedit.world.generation.StructureType;
import com.sk89q.worldedit.world.generation.TreeType;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import io.papermc.lib.PaperLib;
Expand Down Expand Up @@ -87,6 +89,7 @@
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.Structure;
import net.minecraft.world.level.levelgen.structure.StructureStart;
Expand Down Expand Up @@ -678,6 +681,44 @@ public boolean generateStructure(StructureType type, World world, EditSession ed
//FAWE end
}

@Override
public boolean generateTree(
final TreeType treeType,
final World world,
final EditSession session,
final BlockVector3 pt
) throws MaxChangedBlocksException {
ServerLevel serverLevel = getServerLevel(world);
ChunkGenerator generator = serverLevel.getMinecraftWorld().getChunkSource().getGenerator();

PlacedFeature placedFeature = serverLevel
.registryAccess()
.registryOrThrow(Registries.PLACED_FEATURE)
.get(ResourceLocation.tryParse(treeType.id()));

FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);
List<CraftBlockState> placed = TaskManager.taskManager().sync(() -> {
preCaptureStates(serverLevel);
try {
if (!placedFeature.place(
populator,
generator,
serverLevel.random,
new BlockPos(pt.x(), pt.y(), pt.z())
)) {
return null;
}
List<CraftBlockState> placedBlocks = new ArrayList<>(populator.getList());
placedBlocks.addAll(serverLevel.capturedBlockStates.values());
return placedBlocks;
} finally {
postCaptureBlockStates(serverLevel);
}
});

return placeFeatureIntoSession(session, populator, placed);
}

private boolean placeFeatureIntoSession(
final EditSession editSession,
final FaweBlockStateListPopulator populator,
Expand Down
19 changes: 19 additions & 0 deletions ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
import com.sk89q.worldedit.world.generation.StructureType;
import com.sk89q.worldedit.world.generation.TreeType;
import com.sk89q.worldedit.world.item.ItemType;
import net.minecraft.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.HolderSet;
import net.minecraft.core.Registry;
import net.minecraft.core.RegistryAccess;
Expand Down Expand Up @@ -117,6 +119,9 @@
import net.minecraft.world.level.dimension.LevelStem;
import net.minecraft.world.level.levelgen.WorldOptions;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.CoralTreeFeature;
import net.minecraft.world.level.levelgen.feature.TreeFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.Structure;
import net.minecraft.world.level.levelgen.structure.StructureStart;
Expand Down Expand Up @@ -941,6 +946,20 @@ public void initializeRegistries() {
}
}

// Trees
HolderLookup.RegistryLookup<PlacedFeature> placedFeatureRegistry = server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE);
placedFeatureRegistry.listElements()
.filter(feature -> {
var underlyingFeature = feature.value().feature().value().feature();
return underlyingFeature instanceof TreeFeature || underlyingFeature instanceof CoralTreeFeature;
})
.forEach(feature -> {
String key = feature.key().toString();
if (TreeType.REGISTRY.get(key) == null) {
TreeType.REGISTRY.register(key, new TreeType(key));
}
});

// BiomeCategories
Registry<Biome> biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME);
biomeRegistry.getTagNames().forEach(tagKey -> {
Expand Down
41 changes: 41 additions & 0 deletions ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
Expand Down Expand Up @@ -52,6 +53,7 @@
import com.sk89q.worldedit.world.entity.EntityType;
import com.sk89q.worldedit.world.generation.ConfiguredFeatureType;
import com.sk89q.worldedit.world.generation.StructureType;
import com.sk89q.worldedit.world.generation.TreeType;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import io.papermc.lib.PaperLib;
Expand Down Expand Up @@ -92,6 +94,7 @@
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.Structure;
import net.minecraft.world.level.levelgen.structure.StructureStart;
Expand Down Expand Up @@ -692,6 +695,44 @@ public boolean generateStructure(StructureType type, World world, EditSession ed
//FAWE end
}

@Override
public boolean generateTree(
final TreeType treeType,
final World world,
final EditSession session,
final BlockVector3 pt
) throws MaxChangedBlocksException {
ServerLevel serverLevel = getServerLevel(world);
ChunkGenerator generator = serverLevel.getMinecraftWorld().getChunkSource().getGenerator();

PlacedFeature placedFeature = serverLevel
.registryAccess()
.registryOrThrow(Registries.PLACED_FEATURE)
.get(ResourceLocation.tryParse(treeType.id()));

FaweBlockStateListPopulator populator = new FaweBlockStateListPopulator(serverLevel);
List<CraftBlockState> placed = TaskManager.taskManager().sync(() -> {
preCaptureStates(serverLevel);
try {
if (!placedFeature.place(
populator,
generator,
serverLevel.random,
new BlockPos(pt.x(), pt.y(), pt.z())
)) {
return null;
}
List<CraftBlockState> placedBlocks = new ArrayList<>(populator.getList());
placedBlocks.addAll(serverLevel.capturedBlockStates.values());
return placedBlocks;
} finally {
postCaptureBlockStates(serverLevel);
}
});

return placeFeatureIntoSession(session, populator, placed);
}

private boolean placeFeatureIntoSession(
final EditSession editSession,
final FaweBlockStateListPopulator populator,
Expand Down
Loading
Loading