Commit Graph

10618 Commits

Author SHA1 Message Date
ancientmarinerdev ae92c51155 Adding error handling to the mob step function 2023-02-16 23:15:55 +00:00
ancientmarinerdev db7f4699eb Merge pull request 'Add Biome Coloured Foliage' (#3420) from biome_colored_foliage into master
Reviewed-on: MineClone2/MineClone2#3420
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-16 22:35:05 +00:00
ancientmarinerdev b23fc6d23d Merge branch 'master' into biome_colored_foliage 2023-02-16 22:14:40 +00:00
FossFanatic 68e6965dd0 Remove excessive functions and change the appropriate stuff 2023-02-16 18:09:39 +00:00
FossFanatic 7d642c9929 Remove the tab before the curly bracket 2023-02-16 17:25:21 +00:00
FossFanatic 406b27852b Improve the new function somewhat 2023-02-16 07:54:00 +00:00
ancientmarinerdev d00f183456 Merge pull request 'Prevent setting fire on top of water' (#3446) from emptyshore/MineClone2:3152-fire-water into master
Reviewed-on: MineClone2/MineClone2#3446
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-15 20:13:32 +00:00
emptyshore b121d0f804 Prevent placement of fire into nodes above water
This addresses the edge case where fire is set to the top of a non-water
block that represents water (such as kelp).

Note this is forbidding theoretically legitimate setups for fire over
water where fire is set to the side of a block diagonally from the
water.

Fire is still permitted next to water (so it can be set to the face of a
block diagonally from a water column).
2023-02-16 08:56:17 +13:00
FossFanatic 8f8385e4a1 Use metadata method to make player mangrove leaves 2023-02-15 18:29:56 +00:00
FossFanatic 17fc7a3256 Use metadata method to make player leaves 2023-02-15 18:29:18 +00:00
ancientmarinerdev c08153fa7f Merge pull request 'Texture-Rename-2' (#3456) from Texture-Rename-2 into master
Reviewed-on: MineClone2/MineClone2#3456
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-15 16:26:40 +00:00
ancientmarinerdev ba708010a2 Fix incorrect crimson texture issue 2023-02-15 16:23:08 +00:00
Michieal 6601ecf788 Basic signs texture replacement. 2023-02-15 14:52:00 +00:00
Michieal 660c85dddc Changed mcl_buckets' image use to be named properly. This fixes issue #3455 2023-02-15 14:52:00 +00:00
Michieal 2d0b4dd8f7 Finished mcl_crimson. 2023-02-15 14:52:00 +00:00
FossFanatic 10d9eb2980 Upload files to 'mods/MAPGEN/mcl_mapgen_core' 2023-02-15 12:23:58 +00:00
FossFanatic 3d9df5c797 Fix issue with vines in certain biomes
This commit removes some excessive checks which caused vines to not get a biome colour in certain biomes at certain rotations.
2023-02-15 12:20:15 +00:00
Michieal 8cc90b6714 Merge pull request 'Document hotfix release process' (#3453) from hotfix_process_document into master
Reviewed-on: MineClone2/MineClone2#3453
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
2023-02-15 08:02:37 +00:00
ancientmarinerdev db4ff13aeb Document hotfix release process 2023-02-15 00:30:01 +00:00
FossFanatic f919f73c24 Improve some code 2023-02-14 18:14:10 +00:00
FossFanatic 319beb91ce Improve vines code 2023-02-14 18:11:43 +00:00
FossFanatic bea9bbe212 Improve certain functions 2023-02-14 18:10:49 +00:00
FossFanatic 8fd40eaf46 Replace get_registered_biome_from_pos with get_palette_indexes_from_pos 2023-02-14 18:08:59 +00:00
FossFanatic fcaa2c4ce1 revert 55478f6953
revert Fix crash with mapgen v6
2023-02-14 14:22:03 +00:00
FossFanatic 55478f6953 Fix crash with mapgen v6 2023-02-14 14:01:14 +00:00
FossFanatic 57882ae56a Merge branch 'master' into biome_colored_foliage 2023-02-14 13:27:37 +00:00
FossFanatic fee4ccf096 Convert old player leaves into new system
This commit adds a couple of lines to the `mcl_mapgen_core:fix_foliage_palette_indexes"` LBM, which ensures that player leaves which were placed before this update get converted into the new player leaves.

I would have included mangrove leaves, but decided against it because of an issue where the `param2` of mangrove leaves was accidentally set to 1 (in the schematics?). This meant that if I included mangrove leaves, the LBM would have converted the natural leaves as well.

This would have made it very tedious to clean up the leaves after chopping down a mangrove tree, since these would not rot by themselves.
2023-02-14 11:20:00 +00:00
FossFanatic f653f47f26 Improve the new code somewhat 2023-02-14 08:36:49 +00:00
FossFanatic 7b7e213925 Fix mcl_util.get_registered_biome_from_pos(pos)
Adds something which was missing from the function.
2023-02-14 08:12:55 +00:00
ancientmarinerdev cf829b6481 Merge pull request 'Disable crafting white and blue dye from lily of the valley and cornflowers respectively' (#3449) from disable_lily_dye_craft into master
Reviewed-on: MineClone2/MineClone2#3449
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-14 02:46:10 +00:00
PrairieWind f62546a54f Comment out crafting white and blue dye from lily of the valley and cornflowers respectively 2023-02-13 19:37:04 -07:00
ancientmarinerdev 7b6d946d7b Merge pull request 'Campfire API' (#3437) from campfire_api into master
Reviewed-on: MineClone2/MineClone2#3437
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-14 02:35:34 +00:00
PrairieWind 1da272a941 Add campfires to the list of working item APIs 2023-02-14 02:25:50 +00:00
PrairieWind e3f14a3a99 Campfire API 2023-02-14 02:25:50 +00:00
ancientmarinerdev a9a61a034c Merge pull request 'Texture Conversion: Name Change Set 1 - Fixed Branch' (#3448) from fix_files_rename_branch into master
Reviewed-on: MineClone2/MineClone2#3448
2023-02-14 02:09:04 +00:00
ancientmarinerdev 6f98ba5118 Fix crimson mushroom naming issue 2023-02-14 02:00:19 +00:00
ancientmarinerdev f6f812257e Fix crimson name mismatch 2023-02-14 01:50:06 +00:00
Michieal f05e976d18 changed comment. 2023-02-14 01:50:05 +00:00
Michieal 5533ec7bac fix mobs losing their textures. 2023-02-14 01:50:05 +00:00
Michieal b66e2a117f fix json reading error. 2023-02-14 01:50:05 +00:00
Michieal 09ef5fd96b optipng the textures. 2023-02-14 01:50:05 +00:00
Michieal 1e61fc3069 Fixed "mcl_crimson_mcl_crimson" issue.
Fixed colors.json stupidity.
2023-02-14 01:50:05 +00:00
Michieal ef30646788 Changed mcl_crimson - finished. 2023-02-14 01:50:02 +00:00
Michieal 70e4aaa3a7 Changed mcl_crimson part 1. 2023-02-14 01:48:11 +00:00
Michieal 8bfa55fa7a Changed Salmon, Glow Squid, Cod, Cartography Table, Awards_Axolotl, Armor_Stand_Item. Glow-Ink_sac. 2023-02-14 01:43:16 +00:00
Michieal 2ba6a60e55 Deleted unused _alt textures from mcl_crimson. 2023-02-14 01:43:16 +00:00
FossFanatic aeddb7675f Don't run LBMs at every load
This commit makes it so the LBMs don't run at every load.

This commit also adds some new `minetest.register_on_generated()` code, which should ensure that any newly generated mapblocks have the correct foliage colours.
2023-02-13 18:50:26 +00:00
FossFanatic 2ccfd89379 Add nil checks 2023-02-13 15:49:19 +00:00
FossFanatic 3a24903a01 Add nil check 2023-02-13 15:46:45 +00:00
FossFanatic abdd5e11c0 Shorten code slightly 2023-02-13 15:46:08 +00:00