Skip to content

Add trial chambers support: fix trial spawner tile entity copying and advancement tracking #123

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

Merged
tastybento merged 2 commits into from
Mar 17, 2026
Merged

Add trial chambers support: fix trial spawner tile entity copying and advancement tracking #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
400ef77
Initial plan
Copilot Mar 14, 2026
ec58c08
Add trial chambers support: fix trial spawner copying and advancement…
Copilot Mar 14, 2026
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 src/main/java/world/bentobox/boxed/generators/chunks/BoxedBlockPopulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import org.bukkit.block.Banner;
import org.bukkit.block.BlockState;
import org.bukkit.block.CreatureSpawner;
import org.bukkit.block.TrialSpawner;
import org.bukkit.spawner.TrialSpawnerConfiguration;
import org.bukkit.entity.Entity;
import org.bukkit.generator.BlockPopulator;
import org.bukkit.generator.LimitedRegion;
Expand All @@ -20,6 +22,7 @@

import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock;
import world.bentobox.bentobox.blueprints.dataobjects.BlueprintCreatureSpawner;
import world.bentobox.bentobox.blueprints.dataobjects.BlueprintTrialSpawner;
import world.bentobox.bentobox.util.Pair;
import world.bentobox.boxed.Boxed;
import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator.ChestData;
Expand Down Expand Up @@ -98,6 +101,10 @@ public void setBlockState(BlockState bs, BlueprintBlock bpBlock) {
else if (bs instanceof CreatureSpawner spawner) {
setSpawner(spawner, bpBlock.getCreatureSpawner());
}
// Trial spawners
else if (bs instanceof TrialSpawner trialSpawner && bpBlock.getTrialSpawner() != null) {
setTrialSpawner(trialSpawner, bpBlock.getTrialSpawner());
}
// Banners
else if (bs instanceof Banner banner && bpBlock.getBannerPatterns() != null) {
bpBlock.getBannerPatterns().removeIf(Objects::isNull);
Expand Down Expand Up @@ -129,4 +136,16 @@ public void setSpawner(CreatureSpawner spawner, BlueprintCreatureSpawner s) {
spawner.update(true, false);
}

/**
* Set the trial spawner configuration from the blueprint
*
* @param trialSpawner - trial spawner
* @param bts - blueprint trial spawner
*/
public void setTrialSpawner(TrialSpawner trialSpawner, BlueprintTrialSpawner bts) {
TrialSpawnerConfiguration config = trialSpawner.getNormalConfiguration();
trialSpawner.setOminous(bts.configTrialSpawner(config));
trialSpawner.update(true, false);
}

}
8 changes: 8 additions & 0 deletions src/main/java/world/bentobox/boxed/generators/chunks/BoxedChunkGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.bukkit.block.BlockState;
import org.bukkit.block.CreatureSpawner;
import org.bukkit.block.Sign;
import org.bukkit.block.TrialSpawner;
import org.bukkit.entity.AbstractHorse;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.ChestedHorse;
Expand All @@ -36,6 +37,7 @@
import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock;
import world.bentobox.bentobox.blueprints.dataobjects.BlueprintCreatureSpawner;
import world.bentobox.bentobox.blueprints.dataobjects.BlueprintEntity;
import world.bentobox.bentobox.blueprints.dataobjects.BlueprintTrialSpawner;
import world.bentobox.boxed.Boxed;

/**
Expand Down Expand Up @@ -175,6 +177,12 @@ private BlueprintBlock getBluePrintBlock(Block block) {
b.setCreatureSpawner(getSpawner(spawner));
}

// Trial spawner
if (blockState instanceof TrialSpawner trialSpawner) {
b.setTrialSpawner(new BlueprintTrialSpawner(trialSpawner.isOminous(),
trialSpawner.isOminous() ? trialSpawner.getOminousConfiguration() : trialSpawner.getNormalConfiguration()));
}

// Banners
if (blockState instanceof Banner banner) {
b.setBannerPatterns(banner.getPatterns());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class NewAreaListener implements Listener {
"mineshaft", "mineshaft_mesa", "monument", "nether_fossil", "ocean_ruin_cold", "ocean_ruin_warm",
"pillager_outpost", "ruined_portal_desert", "ruined_portal_jungle", "ruined_portal_mountain",
"ruined_portal_nether", "ruined_portal_ocean", "ruined_portal_swamp", "ruined_portal", "shipwreck_beached",
"shipwreck", "stronghold", "swamp_hut", "village_desert", "village_plains", "village_savanna",
"shipwreck", "stronghold", "swamp_hut", "trial_chambers", "village_desert", "village_plains", "village_savanna",
"village_snowy", "village_taiga");
private final Boxed addon;
private final File structureFile;
Expand Down
Loading