Skip to content

Allow constructing template chunk generators without a server instance #339

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

Draft
haykam821 wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Allow constructing template chunk generators without a server instance #339

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
8 changes: 6 additions & 2 deletions src/main/java/xyz/nucleoid/plasmid/api/game/world/generator/GameChunkGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkRegion;
Expand Down Expand Up @@ -32,9 +33,12 @@ public GameChunkGenerator(MinecraftServer server) {
this(createBiomeSource(server, BiomeKeys.THE_VOID));
}

protected static FixedBiomeSource createBiomeSource(RegistryWrapper.WrapperLookup registries, RegistryKey<Biome> biome) {
return new FixedBiomeSource(registries.getOrThrow(RegistryKeys.BIOME).getOrThrow(biome));
}

protected static FixedBiomeSource createBiomeSource(MinecraftServer server, RegistryKey<Biome> biome) {
var registryManager = server.getRegistryManager();
return new FixedBiomeSource(registryManager.getOrThrow(RegistryKeys.BIOME).getOrThrow(biome));
return createBiomeSource(server.getRegistryManager(), biome);
}

@Override
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/xyz/nucleoid/plasmid/api/game/world/generator/TemplateChunkGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.minecraft.block.BlockState;
import net.minecraft.registry.DynamicRegistryManager;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.server.MinecraftServer;
import net.minecraft.structure.StructureTemplateManager;
import net.minecraft.util.math.BlockPos;
Expand Down Expand Up @@ -30,13 +31,17 @@ public class TemplateChunkGenerator extends GameChunkGenerator {
private final MapTemplate template;
private final BlockBounds worldBounds;

public TemplateChunkGenerator(MinecraftServer server, MapTemplate template) {
super(createBiomeSource(server, template.getBiome()));
public TemplateChunkGenerator(RegistryWrapper.WrapperLookup registries, MapTemplate template) {
super(createBiomeSource(registries, template.getBiome()));

this.template = template;
this.worldBounds = template.getBounds();
}

public TemplateChunkGenerator(MinecraftServer server, MapTemplate template) {
this(server.getRegistryManager(), template);
}

@Override
public void setStructureStarts(DynamicRegistryManager registryManager, StructurePlacementCalculator placementCalculator, StructureAccessor structureAccessor, Chunk chunk, StructureTemplateManager structureTemplateManager, RegistryKey<World> dimension) {
}
Expand Down