Code

NukkitX standard generator#1303

Code

Merged

SupremeMortal merged 147 commits into2.0CloudburstMC/Nukkit:2.0from dev/nukkitx-standard-generatorCloudburstMC/Nukkit:dev/nukkitx-standard-generatorCopy head branch name to clipboardApr 19, 2020

+13,011-9,970

Commits

Commits on Jan 23, 2020

• delete packages cn.nukkit.level.generator and cn.nukkit.level.biome

  DaMatrix

  committed
  d8ba11f

• add some base generator interfaces

  Show description for 8085328
  DaMatrix

  committed
  8085328

• allow generators to define a custom selection of chunks for population

  DaMatrix

  committed
  f700fa4

Commits on Jan 25, 2020

• add a basic superflat generator

  Show description for 2a7501c
  DaMatrix

  committed
  2a7501c

• make the server be able to build and start again

  Show description for 5b91d04
  DaMatrix

  committed
  5b91d04

• add tasks for generation and population, theoretically population should partially work now

  DaMatrix

  committed
  20493ad

• redo NukkitRandom to make it be not bad, and eliminate dozens of unneeded NukkitRandom allocations by using ThreadLocalRandom

  DaMatrix

  committed
  d644006

• begin to implement a ChunkManager for population

  DaMatrix

  committed
  5d7a050

• Merge remote-tracking branch 'upstream/2.0' into dev/generator-api-rewrite

  Show description for aa36895
  DaMatrix

  committed
  aa36895

• attempt to use population chunk manager, it's broken though...

  Show description for e91ebc1
  DaMatrix

  committed
  e91ebc1

Commits on Jan 26, 2020

• debug temp commit

  DaMatrix

  committed
  0eca8ff

Commits on Feb 15, 2020

• Merge remote-tracking branch 'upstream/2.0' into dev/generator-api-rewrite

  Show description for e8ffc2b
  DaMatrix

  committed
  e8ffc2b

Commits on Feb 20, 2020

• Merge remote-tracking branch 'upstream/2.0' into dev/generator-api-rewrite

  Show description for fdd49f4
  DaMatrix

  committed
  fdd49f4

Commits on Feb 22, 2020

• Merge remote-tracking branch 'upstream/2.0' into dev/generator-api-rewrite

  Show description for 97427fd
  DaMatrix

  committed
  97427fd

• totally remove NukkitRandom and remove all usages of BedrockRandom

  Show description for f088b32
  DaMatrix

  committed
  f088b32

• since we now can save all chunks, we can make this a lot cleaner

  DaMatrix

  committed
  4c502de

• crash when an invalid generator is configured

  DaMatrix

  committed
  52dfe71

• make chunks completely unobtainable unless they and all of their neighbors have been populated

  DaMatrix

  committed
  8fdae79

• avoid useless array allocation

  DaMatrix

  committed
  3b91718

Commits on Feb 23, 2020

• implement superflat presets

  DaMatrix

  committed
  dd660a9

Commits on Feb 24, 2020

• initial commit for standard generator

  DaMatrix

  committed
  e39bc77

• population chunks are always 3x3

  DaMatrix

  committed
  cf4f5e8

• Merge branch 'dev/generator-api-rewrite' into dev/nukkitx-standard-generator

  Show description for cab9e40
  DaMatrix

  committed
  cab9e40

• Merge remote-tracking branch 'upstream/2.0' into dev/generator-api-rewrite

  Show description for de5ab70
  DaMatrix

  committed
  de5ab70

• Merge branch 'dev/generator-api-rewrite' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  326b259

Commits on Feb 25, 2020

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  Show description for 4641aaf
  DaMatrix

  committed
  4641aaf

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  35ccf5b

• initial block replacer interface

  DaMatrix

  committed
  0e57147

• load block replacers from registry

  DaMatrix

  committed
  77e60ea

• begin working on a noise generator registry as well

  DaMatrix

  committed
  443fb3f

• add a biome implementation

  DaMatrix

  committed
  700ddc3

• we can now generate a world with surfaces

  DaMatrix

  committed
  21746a5

• interpolate density values

  DaMatrix

  committed
  f274bc8

• be able to use BiomeMap to actually select biomes

  DaMatrix

  committed
  f97a0a3

• add populator registry as well

  Show description for 2ab5ad1
  DaMatrix

  committed
  2ab5ad1

Commits on Feb 26, 2020

• add "decorators" (basically populators, except at generation time)

  DaMatrix

  committed
  177a287

Commits on Feb 27, 2020

• add simple tree populator

  DaMatrix

  committed
  12d3d0c

• make a system for matching an arbitrary number of block types with one option

  DaMatrix

  committed
  213a82e

• make biome dictionary only contain IDs, everything else should be separate

  DaMatrix

  committed
  f5384fe

• add simple surface decorator

  DaMatrix

  committed
  37e11d8

• minor refactor (BlockMatcher to BlockFilter, add separate BlockMatcher interface)

  DaMatrix

  committed
  39d3a0c

Commits on Feb 28, 2020

• add block layers (i'll probably have to remove this again shortly)

  DaMatrix

  committed
  f7e4ed8

Commits on Feb 29, 2020

• begin migrating to jackson for loading generator config

  Show description for d04a2be
  DaMatrix

  committed
  d04a2be

• okay this is a hell of a lot cleaner! begin porting everything to jackson

  DaMatrix

  committed
  27d15e4

• everything except noise generation has now been ported to jackson

  DaMatrix

  committed
  5a40454

• noise generation loads with jackson now as well

  DaMatrix

  committed
  04c1f3a

• allow overriding the local seed generation to ensure consistency

  DaMatrix

  committed
  608440b

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  5bdce13

Commits on Mar 1, 2020

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  604a497

• theoretically be able to define biome-specific generation passes

  Show description for bc40d8e
  DaMatrix

  committed
  bc40d8e

Commits on Mar 2, 2020

• actually implement biome-specific generation passes

  DaMatrix

  committed
  fee16fb

Commits on Mar 3, 2020

• prepare to implement vanilla noise

  DaMatrix

  committed
  4dc5950

• actually implement vanilla noise

  DaMatrix

  committed
  35f30cd

• fix up biome generation heights

  DaMatrix

  committed
  6b0ec26

Commits on Mar 4, 2020

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  e0e1f4c

Commits on Mar 5, 2020

• break some stuff

  DaMatrix

  committed
  731d438

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  Show description for 26a996c
  DaMatrix

  committed
  26a996c

• theoretically make biome surface now be done using a block replacer instead of a decorator

  Show description for d701883
  DaMatrix

  committed
  d701883

• remove block replacers, because they add a lot of extra load for very little benefit (can be implemented better as decorator)

  DaMatrix

  committed
  a4566d3

Commits on Mar 6, 2020

• make surfaces be generated using a decorator again, but this time do it correctly

  DaMatrix

  committed
  64cdbda

• implement basic tall grass populator and a block selection mechanism

  DaMatrix

  committed
  2066da9

• fix build

  DaMatrix

  committed
  74595ca

• set name in LevelConverter

  DaMatrix

  committed
  0a8abe3

• implement vanilla-style flower generation

  DaMatrix

  committed
  bad5c77

Commits on Mar 7, 2020

• make trees look nicer and add double plants

  DaMatrix

  committed
  f22114d

• begin working on implementing a decent biome selector

  DaMatrix

  committed
  a05c6a3

Commits on Mar 8, 2020

• temp commit

  DaMatrix

  committed
  b59e94b

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  b876373

• implement biome selection zoom filter

  DaMatrix

  committed
  dd3f95a

Commits on Mar 9, 2020

• work on implementing more biome selection filters

  DaMatrix

  committed
  c32ec2a

Commits on Mar 10, 2020

• stop trying to skid from vanilla and actually implement this myself, and it looks way better

  DaMatrix

  committed
  dab54e8

• try and fail to make rivers

  DaMatrix

  committed
  7a7a9e6

• something is very broken...

  Show description for 1b34764
  DaMatrix

  committed
  1b34764

Commits on Mar 14, 2020

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  be99cb1

• fix biome selection artifacts when sampling at low resolutions

  DaMatrix

  committed
  f4bb0c2

• try to fix biome generation heights part 1

  DaMatrix

  committed
  25ebc4a

• try to fix biome generation heights part 2

  DaMatrix

  committed
  7c67d93

• revert previous changes

  DaMatrix

  committed
  f2e5010

Commits on Mar 15, 2020

• okay now i think i'm on the right track to fixing biome elevations

  DaMatrix

  committed
  2c3e673

• ores

  DaMatrix

  committed
  4553919

Commits on Mar 17, 2020

• allow biomes to inherit from each other

  DaMatrix

  committed
  27f0910

• partially clean up trees

  DaMatrix

  committed
  4300a86

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  Show description for 97ade38
  DaMatrix

  committed
  97ade38

Commits on Mar 18, 2020

• re-implement population around

  Show description for d932c2b
  DaMatrix

  committed
  d932c2b

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  7ee644d

• fix build

  DaMatrix

  committed
  8ac5fcd

• spruce trees

  DaMatrix

  committed
  5df8345

Commits on Mar 25, 2020

• partially make extreme hills ground cover correct

  DaMatrix

  committed
  d006744

Commits on Mar 26, 2020

• rename filtered to complex

  DaMatrix

  committed
  e0df32f

• make biome selection a lot like vanilla (part 1)

  DaMatrix

  committed
  d8cd9c6

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  424aecf

• make biome selection a lot like vanilla (part 2)

  DaMatrix

  committed
  5bebfe0

Commits on Mar 27, 2020

• make biome selection a lot like vanilla (part 3)

  Show description for cdb5b41
  DaMatrix

  committed
  cdb5b41

Commits on Mar 28, 2020

• make biome selection a lot like vanilla (part 4)

  Show description for 229a09b
  DaMatrix

  committed
  229a09b

• make biome selection a lot like vanilla (part 5)

  DaMatrix

  committed
  7687bf0

• make biome selection a lot like vanilla (part 6)

  Show description for fb9ccf4
  DaMatrix

  committed
  fb9ccf4

• fully implement mushroom island and mushroom island shore

  DaMatrix

  committed
  5023744

Commits on Mar 29, 2020

• fully implement (frozen) river, (frozen) ocean, deep ocean

  Show description for b21df7e
  DaMatrix

  committed
  b21df7e

• fully implement beach, stone beach, cold beach, fix generation of extreme hills and variants

  DaMatrix

  committed
  89d66d3

• fully implement ice plains, ice plains spikes, ice mountains, fix generation of plains and sunflower plains

  Show description for 6d58c24
  DaMatrix

  committed
  6d58c24

• fully implement (cold) taiga, (cold) taiga hills, (cold) taiga m

  DaMatrix

  committed
  78e4f51

Commits on Mar 30, 2020

• fully implement mega taiga (hills), redwood taiga (hills)

  Show description for 2ef99ba
  DaMatrix

  committed
  2ef99ba

Commits on Mar 31, 2020

• convert biome height variation from vanilla correctly

  DaMatrix

  committed
  aabd1f3

• fully implement swampland (hills)

  DaMatrix

  committed
  d9042f9

• fully implement (flower) forest (hills), (tall) birch forest (hills)

  DaMatrix

  committed
  c943839

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  a4b1b6c

• fully implement roofed forest (hills)

  DaMatrix

  committed
  9bcaece

Commits on Apr 3, 2020

• fully implement (mutated) jungle (hills)

  DaMatrix

  committed
  68e257a

• fully implement (mutated) desert (hills)

  DaMatrix

  committed
  c542d30

• fully implement (mutated) savanna (plateau)

  Show description for 2275e1c
  DaMatrix

  committed
  2275e1c

Commits on Apr 4, 2020

• fully implement (mutated) mesa (plateau)

  Show description for f184656
  DaMatrix

  committed
  f184656

• add all biomes to overworld biome selector and finalize overworld preset

  DaMatrix

  committed
  97688bf

• add fallen trees

  DaMatrix

  committed
  24c34b8

• make populators be per-block rather than per-chunk (part 1)

  DaMatrix

  committed
  ffb7d35

• make populators be per-block rather than per-chunk (part 2)

  DaMatrix

  committed
  d9806c6

Commits on Apr 5, 2020

• some minor things

  Show description for b16b4ff
  DaMatrix

  committed
  b16b4ff

• try to implement end noise generation

  DaMatrix

  committed
  e9447a1

Commits on Apr 11, 2020

• something something end terrain doesn't like me

  DaMatrix

  committed
  d764d28

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  a922d7d

• this kind of almost works...

  DaMatrix

  committed
  ce0e91e

• finalize end density generation

  DaMatrix

  committed
  1aed528

Commits on Apr 13, 2020

• add basic nether density source

  DaMatrix

  committed
  c1ba6f9

Commits on Apr 14, 2020

• finalize nether terrain

  DaMatrix

  committed
  729ce08

Commits on Apr 15, 2020

• mostly finalize end terrain

  DaMatrix

  committed
  a215fd4

• add water/lava lakes

  DaMatrix

  committed
  2a535b3

• fix generation frequency of shrubs

  DaMatrix

  committed
  ca4ce80

Commits on Apr 16, 2020

• partially fix empty chunks

  DaMatrix

  committed
  655b4b2

• fix empty chunks for good

  DaMatrix

  committed
  59ad700

• clean up+optimize chunk heightmap stuff somewhat and optimize chunk locking

  Show description for ad179fb
  DaMatrix

  committed
  ad179fb

• make the default preset be correct

  DaMatrix

  committed
  17d1836

• make generation+population a lot faster by caching biomes one chunk at a time rather than each block

  DaMatrix

  committed
  1c37555

Commits on Apr 17, 2020

• make density sources generate entire swaths at a time

  Show description for 2f67568
  DaMatrix

  committed
  2f67568

• make biomes actually have their own registry and eliminate "biome dictionaries"

  DaMatrix

  committed
  f695a7a

• implement "finish" pass for standard generator

  DaMatrix

  committed
  9d82740

• fix ice/snow generation by actually using finishers correctly

  DaMatrix

  committed
  2b8b491

• stop randomly switching between the seed in config and the seed in level.dat

  Show description for 8a63cff
  DaMatrix

  committed
  8a63cff

• add an amplified preset

  DaMatrix

  committed
  2ebbbeb

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  DaMatrix

  committed
  6ef998e

Commits on Apr 18, 2020

• add optimized swath implementations for overworld and end density sources

  DaMatrix

  committed
  9dd656f

• make ice/snow generation altitude-based

  DaMatrix

  committed
  cc82d75

• fix up most of the TODOs

  DaMatrix

  committed
  e6c1687

• bake generation pass arrays once at the beginning, and use int keys in the map

  Show description for 8705753
  DaMatrix

  committed
  8705753

• fix worlds config in default nukkit.yml

  DaMatrix

  committed
  bcf120f

• make property naming more consistent

  DaMatrix

  committed
  07380a2

• reformat

  DaMatrix

  committed
  e45f86e

Commits on Apr 19, 2020

• don't generate surface blocks one block below sea level

  DaMatrix

  committed
  dc8209c

• Merge remote-tracking branch 'upstream/2.0' into dev/nukkitx-standard-generator

  Show description for 14f30d8
  DaMatrix

  committed
  14f30d8