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
Really move mcl_stairs_stone_slab_top.png into mcl_core
2022-01-07 23:09:21 +00:00 · 2022-01-07 21:56:37 +00:00 · 2022-01-06 11:07:50 +00:00 · 2022-01-06 02:56:51 +00:00 · 2022-01-06 02:55:33 +00:00 · 2022-01-06 02:46:02 +00:00
3 changed files with 464 additions and 410 deletions
--- a/mods/ITEMS/mcl_stairs/textures/mcl_stairs_stone_slab_top.png
+++ b/mods/ITEMS/mcl_stairs/textures/mcl_stairs_stone_slab_top.png
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
--- a/mods/MAPGEN/mcl_mapgen_core/mod.conf
+++ b/mods/MAPGEN/mcl_mapgen_core/mod.conf
@ -1,5 +1,5 @@
 name = mcl_mapgen_core
 author = Wuzzy
 description = The core of the MCL2 mapgen
-depends = mcl_init, mcl_core, biomeinfo, mcl_worlds, mcl_cocoas, mcl_sponges, mcl_ocean, mcl_stairs, mcl_monster_eggs, mcl_structures
-optional_depends = mclx_core
+depends = mcl_init, mcl_core, biomeinfo, mcl_worlds
+optional_depends = mclx_core, mcl_cocoas, mcl_sponges, mcl_ocean, mcl_stairs, mcl_monster_eggs, mcl_structures, mcl_flowers, mcl_farming, mcl_mushrooms, mcl_nether
Author	SHA1	Message	Date
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	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
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
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