remo/RegionIO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match very biased height sampling

Browse source
This commit is contained in:
Daniar Mannanov 2026-08-17 10:56:05 +03:00
parent 8e73993adf
commit 4fa0a5e554
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/world/store.go
View file

@ -33,7 +33,7 @@ const dataVersion26 = 4790
// first time it ran: chunkAt prefers the store over the generator, so the // first time it ran: chunkAt prefers the store over the generator, so the
// already-explored area around spawn keeps its old terrain and every later fix // already-explored area around spawn keeps its old terrain and every later fix
// looks like it did nothing in exactly the place you are standing. // looks like it did nothing in exactly the place you are standing.
const generatorVersion = 19 const generatorVersion = 20
// generatorVersionTag is the NBT key holding generatorVersion. It is namespaced // generatorVersionTag is the NBT key holding generatorVersion. It is namespaced
// because it is ours, not part of the vanilla chunk format. // because it is ours, not part of the vanilla chunk format.

5
internal/worldgen/features.go
View file

@ -210,9 +210,8 @@ func (p PlacementPlan) SampleY(r RandomSource, minY, height int) int {
if span-inner <= 0 { if span-inner <= 0 {
return lo return lo
} }
first := lo + inner + int(r.NextIntN(int32(span-inner))) first := int(r.NextIntN(int32(span - inner)))
second := lo + int(r.NextIntN(int32(first-lo))) return lo + int(r.NextIntN(int32(first+inner)))
return lo + int(r.NextIntN(int32(second-lo+inner)))
} }
return lo + int(r.NextIntN(int32(span))) return lo + int(r.NextIntN(int32(span)))
} }

20
internal/worldgen/features_test.go
View file

@ -137,6 +137,26 @@ func TestPlacementHeightDistributionsStayWithinInclusiveBounds(t *testing.T) {
} }
} }
func TestVeryBiasedToBottomConsumesVanillaDraws(t *testing.T) {
plan := PlacementPlan{
HeightDistribution: "minecraft:very_biased_to_bottom",
MinY: HeightProvider{Absolute: intPtr(-64)},
MaxY: HeightProvider{Absolute: intPtr(320)},
}
gotRandom := NewLegacy(12345)
wantRandom := NewLegacy(12345)
for sample := 0; sample < 16; sample++ {
first := int(wantRandom.NextIntN(377))
want := -64 + int(wantRandom.NextIntN(int32(first+8)))
if got := plan.SampleY(gotRandom, -64, 384); got != want {
t.Fatalf("sample %d = %d, want %d", sample, got, want)
}
}
if got, want := gotRandom.NextLong(), wantRandom.NextLong(); got != want {
t.Fatalf("random state after samples = %d, want %d", got, want)
}
}
func TestPlacementPositionsPreservesModifierOrder(t *testing.T) { func TestPlacementPositionsPreservesModifierOrder(t *testing.T) {
modifier := func(raw string) PlacementModifier { modifier := func(raw string) PlacementModifier {
var value PlacementModifier var value PlacementModifier