Commit Graph

604 Commits

Author SHA1 Message Date
kay27 f207832c5a Merge master into testing 2022-01-10 19:38:12 +04: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
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 05f1614893 #62 Spawn Ender Dragon 2022-01-04 04:13:28 +04:00
kay27 ea6d8f9e86 Merge remote-tracking branch 'mcl2/master' into testing 2021-12-09 03:07:00 +04:00
Lizzy Fleckenstein 0e9a56fa35
Add stacks to enchant_uniform_randomly 2021-12-07 18:19:41 +01:00
Lizzy Fleckenstein ec7e245b9d
Various fixes to the enchanting and loot system
- enchanted loot generated by mapgen now uses PseudoRandom for randomness
- prevent fishing loot from generating loot 32767 times (!!!) when only 1 is needed
- bows and fishing rods obtained from the treasure section of fishing loot are now enchanted
- there is now a function to uniform enchant items other than books
2021-12-07 17:57:18 +01:00
kay27 93da5d3f77 Merge MineClone2/master 2021-12-05 05:10:29 +04:00
Lizzy Fleckenstein 34f329a9d5
TextureConverter: Implement grass palette conversion
Source: https://minecraft.fandom.com/wiki/Tint
Since the MineClone2 biomes do not entirely match with the Minecraft ones I picked the Minecraft biomes that seem to match them best.
This also changes the palette index of the nether to match the desert instead of the mesa biome
and changes the color of grass blocks in item form to the default minecraft one.
2021-11-03 19:57:21 +01:00
kay27 79f9837880 [MineClone5] Merge feature branch mineclone5 into master 2021-07-12 05:32:01 +04:00
kay27 35f07a8b66 [mineclone5] Put mob flow code at its right place, fix unloaded player spawn rechech 2021-06-25 03:53:58 +04:00
kay27 7ff476b9b9 Fix igloo hidden trapdoor with minetest.after(), MineClone2/MineClone2#1797 2021-06-22 16:53:55 +04:00
kay27 b3e3b91b7c Merge master 2021-06-12 15:12:33 +04:00
marcin-serwin cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
AFCMS 00063cde73 speedup mcl_observer 2021-05-27 09:34:12 +02:00
Marcin Serwin 37b1191c0a Add polish translation of mcl_structures 2021-05-25 21:58:23 +02:00
AFCMS 9e074af07f unify code style [1] 2021-05-25 12:52:25 +02:00
AFCMS 388ab6d8df fix some codestyle issues 2021-05-25 10:56:06 +02:00
AFCMS 8592670f9b [tsm_railcorridors] fix warnings 2021-05-25 08:44:24 +02:00
AFCMS a71a0e9161 fix even more warnings (nether portals and potions) 2021-05-22 23:04:18 +02:00
AFCMS 1870a89af0 remove unused var 2021-05-22 20:01:59 +02:00
kay27 0b0be4cecf Merge branch 'master' into mineclone5 2021-05-15 02:24:26 +04:00
Code-Sploit bcea5a35ef Try to fix unknown variable in mcl_chorus_flower 2021-05-14 08:22:10 +00:00
Lizzy Fleckenstein f714d9399d Merge branch 'master' into mineclone5 2021-05-10 10:14:15 +02:00
AFCMS 45201481c1 Merge branch 'master' into luacheck-script 2021-05-10 09:38:40 +02:00
kay27 24dfda8d7e Merge branch 'master' into mineclone5 2021-05-10 06:19:56 +04:00
kay27 f054eb1ce6 [mcl_biomes] Fix chorus random function, prevent chorus growth at return portal position 2021-05-10 02:47:56 +04:00
kay27 f3c540af5d [mcl_mapgen_core, mcl_biomes] Make chorus growth deterministic 2021-05-10 02:24:52 +04:00
kay27 96be84161f [mcl_mapgen_core] Don't crash if Ender Dragon doesn't spawn for some reason 2021-05-10 01:57:34 +04:00
AFCMS cbb014ed38 basic working script 2021-05-03 22:11:49 +02:00
kay27 cb19340e0b [mineclone5] [mcl_mapgen_core] Fix empty caves which should be filled by lava 2021-04-25 19:45:59 +04:00
Lizzy Fleckenstein 58c20a7542 Merge branch 'mineclone5' into netherite 2021-04-19 11:13:01 +02:00
AFCMS 02f393998f fix many warnings (644 remaining) 2021-04-17 09:26:37 +02:00
AFCMS 22a2fdbf5f fix more codestyle 2021-04-17 07:46:24 +02:00
AFCMS 5f076d372a fix many codestyle errors 2021-04-17 07:42:49 +02:00
AFCMS 1a58b0c510 fix many codestyle issues 2021-04-16 13:35:03 +02:00
Lizzy Fleckenstein 30546a3902 Make sure ancient debris is not generated exposed to air 2021-04-16 12:17:07 +02:00
Code-Sploit 622c236b4b Add ancient debris generation in nether 2021-04-16 10:03:31 +00:00
jordan4ibanez 67c1bc973a Add lua locals into mcl_dungeons for performance 2021-04-14 01:19:01 +04:00