Commit Graph

7966 Commits

Author SHA1 Message Date
kay27 5c27e1c186 Merge master into mapgen_issue 2022-01-18 19:18:04 +04:00
kay27 da606acfd1 Add old structures to new mod 2022-01-18 19:17:20 +04:00
kay27 ae6d9e44b0 Remove duplicated setting 2022-01-18 12:34:50 +04:00
kay27 a25770ecae Spawn Nice Jungle Temple by cora 2022-01-18 12:28:08 +04:00
kay27 4e832ba323 Use per-chunk probability and 1-octave Perlin noise to simplify spawning temples 2022-01-17 20:43:30 +04:00
kay27 30a0eb1d4a Restore nether_portal in spawnstruct list 2022-01-17 20:03:46 +04:00
kay27 6eb126da40 Disable debugging tools 2022-01-17 06:48:59 +04:00
kay27 0e70e386ea Add loot into jungle temple trapped chests 2022-01-17 06:37:15 +04:00
kay27 8caf8c91dd Add more complex temple spawn conditions 2022-01-17 06:17:52 +04:00
kay27 d3265a2f72 Find better place for jungle temples again, add cobbles to support some stair parts 2022-01-17 05:54:36 +04:00
kay27 93922a00d5 Find better places for Jungle Templates 2022-01-17 04:26:37 +04:00
kay27 66fded90d5 Fix vines 2022-01-17 03:25:47 +04:00
kay27 e528cc7d8b Place Jungle Temple by cora 2022-01-17 00:39:53 +04:00
kay27 12e85f9f12 Add Jungle Temple schematic by cora 2022-01-16 22:50:58 +04:00
kay27 2cfca05186 Move noise indicator into separate file 2022-01-16 19:20:42 +04:00
kay27 fefa9c8b4f Initialize temples 2022-01-16 06:42:18 +04:00
kay27 6d4f7d2e62 Fix strongholds 2022-01-16 05:20:34 +04:00
kay27 95fd9e9105 Flush current work on spawnstruct, refactor strongholds 2022-01-16 04:46:07 +04:00
kay27 37725cc1dc Refactor desert temples and structs in general (unfinished) 2022-01-15 20:32:48 +04:00
kay27 e2928c4afc Add red desert temples 2022-01-15 08:04:43 +04:00
kay27 096b384676 Spawn desert temples from seeds 2022-01-14 04:25:39 +04:00
kay27 9d171a6b7b Fix Nether roof light 2022-01-12 04:02:56 +04:00
kay27 c6754fd39e Start adding new structures API 2022-01-12 03:27:28 +04:00
kay27 16116df4c6 Generate only desert seeds for some structs and lots of debugging glass blocks in the sky 2022-01-10 19:35:04 +04:00
kay27 30ab997358 Merge pull request 'Really move mcl_stairs_stone_slab_top.png into mcl_core' (#112) from djc/MineClone5:polished-stone into master
Reviewed-on: MineClone5/MineClone5#112
2022-01-07 23:09:21 +00:00
Daniel Cassidy d0d7ebe53b Really move mcl_stairs_stone_slab_top.png into mcl_core
This is a fix for #105 where I accidentally moved it to the wrong place.
Sorry.

mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core had an undeclared dependency on mcl_stairs.

Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
2022-01-07 21:56:37 +00:00
kay27 667ebf1385 Fix several mapgen_issue warnings 2022-01-07 08:41:04 +04:00
kay27 da8e92e071 Fix layers 2022-01-07 07:16:31 +04:00
kay27 7868cf7dc5 Merge master into mapgen_issue 2022-01-07 06:47:11 +04:00
kay27 726159e796 Dedicate clay and structures from mapgen core 2022-01-07 06:24:11 +04:00
kay27 0693afe869 Merge pull request 'mcl_mapgen_core: Make most dependencies optional' (#109) from djc/MineClone5:optional-deps into master
Reviewed-on: MineClone5/MineClone5#109
2022-01-06 11:07:50 +00:00
Daniel Cassidy 978f23c70e mcl_mapgen_core: Rename cocoa to c_cocoas.
This is more consistent and should hopefully be clearer.
2022-01-06 02:56:51 +00:00
Daniel Cassidy 802d214d7b mcl_mapgen_core: Make mcl_nether an optional dependency.
mcl_nether was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:55:33 +00:00
Daniel Cassidy a0708abb9c mcl_mapgen_core: Make mcl_mushrooms an optional dependency.
mcl_mushrooms was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:46:02 +00:00
Daniel Cassidy 554f22b802 mcl_mapgen_core: Make mcl_farming an optional dependency.
mcl_farming was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:33:04 +00:00
Daniel Cassidy 1d03a3d150 mcl_mapgen_core: Make mcl_flowers an optional dependency.
mcl_flowers was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:30:24 +00:00
Daniel Cassidy 7c72ce1d0d mcl_mapgen_core: Fix check for wrong mod. 2022-01-06 02:11:06 +00:00
Daniel Cassidy 2bdaa77932 mcl_mapgen_core: Make mcl_structures an optional dependency. 2022-01-06 01:20:06 +00:00
Daniel Cassidy 5cad35dbfe mcl_mapgen_core: Make mcl_stairs an optional dependency.
The "mapgen_stair" aliases are only used by v6, and even then appear to
be optional in practice, so there's no reason for mcl_mapgen_core to
require mcl_stairs.
2022-01-06 01:20:06 +00:00
Daniel Cassidy 51cdc69b99 mcl_mapgen_core: Make mcl_monster_eggs an optional dependency.
The only purpose of this dependency appears to be to force
mcl_monster_eggs to load before mcl_mapgen_core. It is not actually
used in the code.

mcl_monster_eggs is an undeclared dependency of mobs_mc_gameconfig,
mcl_biomes, and mcl_structures, all of which are either transitive
or direct dependencies of mcl_mapgen_core.

It's not possible to add a dependency on mcl_monster_eggs directly
to mobs_mc_gameconfig, because that would lead to a circular
dependency. So it seems like a dependency on mcl_monster_eggs is
declared as a dependency of mcl_mapgen_core as a workaround to
ensure that mcl_monster_eggs at least gets loaded before
mcl_mapgen_core.

I've moved mcl_monster_eggs to the optional dependencies which
should achieve the same aim without complaining if mcl_monster_eggs
is missing, but this should probably be cleaned up in future to
remove the circular dependency.
2022-01-06 01:18:40 +00:00
kay27 54adfe9e30 Merge remote-tracking branch 'origin/testing' into mapgen_issue 2022-01-06 02:07:16 +04:00
Daniel Cassidy b73c0e8f2c mcl_mapgen_core: Make mcl_ocean an optional dependency. 2022-01-05 21:34:56 +00:00
Daniel Cassidy 012d0bd942 mcl_mapgen_core: Make mcl_sponges an optional dependency. 2022-01-05 20:52:53 +00:00
Daniel Cassidy c52f598e64 mcl_mapgen_core: Make mcl_cocoas an optional dependency. 2022-01-05 20:46:28 +00:00
kay27 fc3dc63f01 Merge pull request 'Move texture mcl_stairs_stone_slab_top to mcl_core.' (#105) from djc/MineClone5:polished-stone into master
Reviewed-on: MineClone5/MineClone5#105
2022-01-05 03:05:20 +00:00
kay27 806edcda19 Fix crash at startup 2022-01-05 06:47:06 +04:00
kay27 6c1d30a130 Polish new mapgen stuff 2022-01-05 06:43:16 +04:00
Daniel Cassidy af03b030a0 Move texture mcl_stairs_stone_slab_top to mcl_core.
mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core has an undeclared dependency on mcl_stairs.

Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
2022-01-05 02:33:31 +00:00
kay27 4ce3102ab4 Merge remote-tracking branch 'origin/testing' into mapgen_issue 2022-01-05 04:18:39 +04:00
kay27 b703dbc288 Merge remote-tracking branch 'origin/master' into testing 2022-01-05 04:18:07 +04:00