Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-24 20:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,763 Commits 108 Branches 83 Tags 166 MiB
a766a6ac85
Commit Graph

9440 Commits

Author SHA1 Message Date
ancientmarinerdev
ae92c51155 Adding error handling to the mob step function 2023-02-16 23:15:55 +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
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
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
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 55478f6953e4a05ba83c0cfc2c61bb76e5cd701a 
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
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
PrairieWind
e3f14a3a99 Campfire API 2023-02-14 02:25:50 +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
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
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
FossFanatic
e17fab385b Add nil checks 2023-02-13 15:44:23 +00:00
FossFanatic
17cae6896e Add back the logical code? 
My gut feeling tells me that it is somehow a bad idea to have removed this.
 2023-02-13 11:17:51 +00:00
FossFanatic
1c84bc6572 Put all affected grass blocks in a local 
This commit puts all nodes which make use of the grass palette in a local, to make for less messy code.
 2023-02-13 10:33:47 +00:00
FossFanatic
4d29fab932 Improve some trees code 2023-02-13 10:22:28 +00:00
FossFanatic
a2087b19a5 Delete rogue file 2023-02-13 10:20:48 +00:00
PrairieWind
5da6c25ccf Fix cornflower biomes and change seed values for cornflowers and lilies of the valley 2023-02-12 23:29:02 +00:00
PrairieWind
b79f74c390 Update Translation Template for flowers 2023-02-12 23:29:02 +00:00
PrairieWind
06f47a0756 Add Cornflowers 
Evidently I didn't include the lily texture in the lily of the valley commit, so it is in this one. Again, lily of the valley texture by Nicu
 2023-02-12 23:29:02 +00:00
PrairieWind
ff79af26e4 Add Lily of the Valley Flower 
Awesome Lily Texture by Nicu
 2023-02-12 23:29:02 +00:00
ancientmarinerdev
e3c8d995b5 Finish clean up# 2023-02-12 22:48:20 +00:00
ancientmarinerdev
b8b45210e9 Clean up and remove old code 2023-02-12 22:48:20 +00:00
ancientmarinerdev
a1f10205f6 Init age on plant so not all kelp grow to top of ocean 2023-02-12 22:48:20 +00:00
ancientmarinerdev
6f7505b6c6 Change kelp to use ABMs to solve performance issues 2023-02-12 22:48:20 +00:00
FossFanatic
c88f0047c1 Merge branch 'master' into biome_colored_foliage 2023-02-12 08:44:29 +00:00
FossFanatic
0400d9a2a5 Even further improvements to some foliage code 2023-02-12 08:28:21 +00:00
FossFanatic
3590ff6dfb Improve some LBM code 2023-02-12 08:23:19 +00:00
FossFanatic
d1ceacf7ba Improve some vines code 2023-02-12 08:22:07 +00:00
FossFanatic
a70a6ef13d Improve some foliage code 2023-02-12 08:21:14 +00:00
FossFanatic
b4e84dadb0 Add new function 
Adds the `get_registered_biome_from_pos` function, which does what the name says.
 2023-02-12 07:57:04 +00:00
PrairieWind
194ff53400 Make sea pickles smelt into lime dye 2023-02-12 01:09:25 +00:00
ancientmarinerdev
9445e10834 Pathfinding optimisations and villager has earlier bed time 2023-02-11 10:36:56 +00:00
FossFanatic
81dbdaab94 Adjust palette foliage check 
The excessive 128 blocks high check has been changed to now check only up to 30 blocks, since the tallest 2x2 jungle tree I seemed to get was only 29 blocks tall.

I also discovered that the search area wasn't wide enough, so sometimes the most outer leaves avoided the check. I also adjusted that.
 2023-02-11 07:53:12 +00:00
ancientmarinerdev
2fd7f8c69f Fix hungry sheep and hyrdophobic passive mobs 2023-02-11 00:37:16 +00:00
ancientmarinerdev
d4c2802afb Implement review/testing feedback 2023-02-10 19:01:29 +00:00
ancientmarinerdev
bf50a17f2e Limit spawning of mobs outside y axis as well 2023-02-10 19:01:29 +00:00
ancientmarinerdev
b817c079ba Improve balancing for early game 2023-02-10 19:01:29 +00:00
ancientmarinerdev
cfa276f722 Add settings for percentage of hostile and peaceful groups spawned 2023-02-10 19:01:29 +00:00
ancientmarinerdev
86b1d8bc3e Add world gen limits to spawning to avoid things spawning past the world gen limits 2023-02-10 19:01:29 +00:00
ancientmarinerdev
9c2f43a242 Limit peaceful spawning and add configurable option 2023-02-10 19:01:29 +00:00
ancientmarinerdev
044a91e831 Change spawn cap groups to spawn_type to give water it's own spawn cap. 2023-02-10 19:01:29 +00:00
ancientmarinerdev
106979e64a Clean up 2023-02-10 19:01:29 +00:00
ancientmarinerdev
4482068211 Nerf group spawning until group spawn is based on pack size, not per spawn attempt 2023-02-10 19:01:29 +00:00
ancientmarinerdev
1dc7cab6be Add logging 2023-02-10 19:01:29 +00:00
ancientmarinerdev
634379dfe9 Retry if failing to find spawn position 2023-02-10 19:01:29 +00:00
ancientmarinerdev
c2ac33ac61 Mobs now can spawn in multiple positions around you per spawning cycle 2023-02-10 19:01:29 +00:00
ancientmarinerdev
b5c0830060 Restructure code and tidy 2023-02-10 19:01:29 +00:00
ancientmarinerdev
c43c723e08 Clean logging etc. 2023-02-10 19:01:29 +00:00
ancientmarinerdev
bd3a4ff0df Clean up 2023-02-10 19:01:28 +00:00
ancientmarinerdev
0267ad2f31 Decrease change of groups spawning for peacefuls. Refresh total mobs check on spawn. 2023-02-10 19:01:28 +00:00
ancientmarinerdev
a2f9ea81cc Fix mobs debug crash 2023-02-10 19:01:28 +00:00
ancientmarinerdev
7c7f4b930c Move cap check out of spawn checks and reimplement close cap check 2023-02-10 19:01:28 +00:00
ancientmarinerdev
60529d3d5d Add in constants for spawn zones 2023-02-10 19:01:28 +00:00
ancientmarinerdev
6ea4b43249 Limit group spawn to available cap space. Total mobs check once per spawn cycle. 2023-02-10 19:01:28 +00:00
FossFanatic
1fb300ef18 Fix leaves not dropping 
Due to some renaming, leaves no longer dropped from any of the `mcl_core` trees.

This has now been fixed.
 2023-02-10 18:40:35 +00:00
FossFanatic
b789845f62 Indentation improvements 2023-02-10 15:19:02 +00:00
FossFanatic
f368fb3e43 Indentation improvements 2023-02-10 15:17:46 +00:00
FossFanatic
d63ecac7cb Indentation improvements 2023-02-10 15:14:53 +00:00
FossFanatic
7fbc84971e Remove useless function 
This commit removes an useless function which wasn't really needed.
 2023-02-10 15:12:37 +00:00
FossFanatic
953044cc4b Mangrove propagules also grab biome colour on growth 2023-02-10 11:33:58 +00:00
FossFanatic
6744967d02 Make placed mangrove leaves always become player leaves 
The same thing as with the `mcl_core` leaves.
 2023-02-10 10:41:43 +00:00
FossFanatic
fdb2333493 Make placed leaves always become player leaves 
Any players which still have leaves in their inventory from before this update would have had those leaves rot if someone were to break any log withing 6 nodes of the leaves if they were placed. This commit adds an `after_place_node` callback which makes sure that any leaves placed by the player, become non-rotting player leaves.
 2023-02-10 10:39:43 +00:00
FossFanatic
1defd03408 Make the function work self grown saplings 
Saplings now also get the biome's foliage colour when grown by themselves.
 2023-02-10 10:06:55 +00:00
FossFanatic
d163faeb42 Use more fitting names for the newly added function 
Basically renaming anything related to leaves in the new function to something more broad such as foliage, so vines aren't indirectly considered leaves. An aesthetic change, basically.
 2023-02-10 08:08:28 +00:00
FossFanatic
197d3ae00b Make sapling foliage grab biome colour 2023-02-10 08:04:13 +00:00
Michieal
f6b77aa458 reformated code. 2023-02-10 03:42:34 +00:00
Michieal
1558c852d8 Undo mesecon.register_mvps_dropper() and use abms until more research can be done. 2023-02-10 03:42:34 +00:00
Michieal
6c0525f00e Fix merge / rebase crossing massacre. 
[Michieal] 83bc60722d Begin: make bamboo dig-able by Pistons for Farm Creation.

[Michieal] 449cbdb330 Make Bamboo & Bamboo items not sticky for pistons.

[Michieal] a44566f863 hijack the ABM to check for orphaned bamboo nodes.

[Michieal] 5dff9e1994 Fixed the ABM situation so that now bamboo "breaks" when pushed by pistons.
Probably not the most elegant, but hey. It works.

[Michieal] 76507025d9 Cleaned up the global function to match the current ABM.

[Michieal] dfa849e19a Merge branch 'master' into Bamboo-Piston-Dig

[Michieal] a5bdc8a166 fix bamboo mosaic recipe.

[Michieal] 14383d6c6f update mod.conf to use optional depends mesecons_mvps

[Michieal] f81d530912 Update init.lua to register dropper callback.
 2023-02-10 03:42:34 +00:00
ancientmarinerdev
3c13ce1d6b Merge pull request 'Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index.' (#3408) from fix_dirt_dry_grass into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3408
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-10 02:50:27 +00:00
PrairieWind
70fb4f8a0d Fixed weather not clearing after sleep 
Isnt as clean as it should be because making it clean made some very funky results
 2023-02-10 01:51:28 +00:00
ancientmarinerdev
620a0af483 Merge pull request 'Fix damage desyncing entity from chest node, making it invisible' (#3385) from emptyshore/MineClone2:fix-lightning-chests into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3385
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-10 00:38:55 +00:00
FossFanatic
4ddab8bdf1 Remove the ABMs 
There are likely better ways to fix any palettes that the LBMs missed.
 2023-02-09 16:16:13 +00:00
FossFanatic
bfe4b2fd31 Merge branch 'master' into biome_colored_foliage 2023-02-09 15:24:20 +00:00
FossFanatic
169019096e Change the waterlily code 
Waterlilies now use a brownish grey texture with a coded hex colour.
 2023-02-09 09:46:18 +00:00
SmokeyDope
dfbee5cb93 Add "mushroom" to the warped fungus and crimson fungus item descriptions for creative search 2023-02-09 03:22:17 +00:00
SmokeyDope
378af531a9 remove "mushroom" from the names of crimson fungus and warped fungus 2023-02-09 03:22:17 +00:00
SmokeyDope
71671f8b5f Make minecart rails unable to be broken with lava 2023-02-09 01:53:52 +00:00
SmokeyDope
c4d60e50cc Make minecart rails unable to be broken with water 2023-02-09 01:53:52 +00:00
ancientmarinerdev
b834e790a7 Fix game crashes 2023-02-08 19:34:04 +00:00
ancientmarinerdev
39d4434df1 Reorder on_step calls 2023-02-08 19:34:04 +00:00
ancientmarinerdev
4b9482cb09 Mobs should not drop XP when dying by fire from sunlight 2023-02-08 19:34:04 +00:00
FossFanatic
b95ebb3fca Add LBMs, ABMs, and more 
This commit adds 1 new LBM (for foliage) and 2 new ABMs (one for foliage, and one for grass).

This also adds a new generator so any new maps created will have biome coloured leaves with a faster method. (Vines are excluded from this generator since I don't know yet how to get those to work with this.)
 2023-02-08 16:17:33 +00:00
FossFanatic
07f332f0cd Add foliage palette indexes 
This commit adds foliage palette indexes to every biome, this makes it possible for foliage to use biome colouring.
 2023-02-08 16:15:04 +00:00
FossFanatic
f4e8088e60 Improve mangrove leaves 
This commit makes it so mangrove leaves also no longer use `param2` to see if they rot or not. The leaves also use the biome colours now.
 2023-02-08 16:13:13 +00:00
FossFanatic
198375a18e Change stuff in mcl_core 
Simply put, this commit changes some code so that leaves don't use `param2` to see if they rot or not, and will now use the biome colours.

This commit also makes it so vines do the same (use biome colours).
 2023-02-08 16:11:38 +00:00
emptyshore
bdc82b76b5 Respect immortal armor group, ensuring objects are not dealt damage 
Context: some objects such as chest, frame or sign entities are set to
be immortal, because they are tied to a node and should not be removed
on their own.

However since immortality wasn't respected, it would lead to odd desync
issues between nodes and accompanying entities. An example is a chest
that becomes invisible when struck by lightning or anvil.
 2023-02-08 15:59:36 +13:00
anarquimico
e2de5908c7 5th ITEMS batch 2023-02-07 16:39:24 +00:00
anarquimico
439c879508 4th batch of ITEMs translation 2023-02-07 16:39:23 +00:00
anarquimico
67977b0d26 Third batch of ITEMS translation 2023-02-07 16:39:23 +00:00
anarquimico
ed8c3e7d26 Second batch of ITEMS translated 2023-02-07 16:39:22 +00:00
anarquimico
7add59992f First batch of ITEMS translation 2023-02-07 16:39:22 +00:00
Michieal
ef4e4b1b7b Merge branch 'master' into fix_copper_blocks 2023-02-06 16:58:38 -05:00
Michieal
0e000e6491 Merge branch 'master' into fix_dirt_dry_grass 2023-02-06 16:55:14 -05:00
Michieal
ec7a97ba3e Made LBM run at every load, so that it catches anything missed from previous passes. 2023-02-06 16:54:23 -05:00
SmokeyDope
48eb934d64 Add compostability to warped wart blocks and shroomlight 2023-02-06 13:08:28 -07:00
SmokeyDope
88cf3a5900 Add compostability to nether sprouts 2023-02-06 13:08:27 -07:00
SmokeyDope
1401652015 Add compostability to warped roots and crimson roots 2023-02-06 13:08:26 -07:00
SmokeyDope
cac6e15736 Add compostability to twisting vines and weeping vines 2023-02-06 13:08:24 -07:00
SmokeyDope
156d096a78 Add compostability to warped fungus and crimson fungus 2023-02-06 13:08:23 -07:00
ancientmarinerdev
ace6f8db43 Ensure index for heightmap entry is within bounds 2023-02-06 13:16:15 -06:00
ancientmarinerdev
9aeafe6053 Fix mapgen issue for mcl5 to mcl2 conversion 2023-02-06 13:16:15 -06:00
Michieal
de00b7228e Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index. 2023-02-05 21:17:53 -05:00
FossFanatic
ccef2d1147 More sky improvements 2023-02-06 01:40:25 +00:00
GuyLiner
4d922d9edf Added conditional based on existing fire damage conditional that will apply fire damage to a 
mob standing on top of a magma node that belongs to the "fire" group. The magma node
has also been added to the fire group, making it so that standing on the node will
do damage to the mob.

In official Minecraft, magma blocks just do fire damage without the fire animation.
Source: https://minecraft.fandom.com/wiki/Magma_Block
 2023-02-06 00:10:52 +00:00
Michieal
46ca650ea4 further optimize and reformat mcl_honey's init.lua 2023-02-04 16:31:18 -05:00
Michieal
c4e4a8e4d2 Move Waxing function to MCL_Honey. Remove commented code. 2023-02-04 03:31:11 -05:00
Michieal
08610296fc Merge branch 'master' into fix_copper_blocks 2023-02-04 03:30:20 -05:00
ancientmarinerdev
7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-04 03:23:13 +00:00
ancientmarinerdev
58a08ea697 Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-04 00:27:48 +00:00
Michieal
50effaa807 Made Requested changes from Pull Request. 2023-02-03 14:09:16 -05:00
SmokeyDope
08df1fe02f Update overworld vine breaking logic with vector.offset 2023-02-03 00:50:25 +00:00
SmokeyDope
bc4d9211cb Update nether vine breaking logic with vector.offset 2023-02-03 00:43:17 +00:00
SmokeyDope
cf05771e30 remove unnecessary blank line 2023-02-02 23:12:09 +00:00
SmokeyDope
16a6dcb66c Completely remove selection box for warped fungus 
Recommended by Michael
 2023-02-02 22:45:06 +00:00
SmokeyDope
89eb458df7 Fix up indentation for warped and crimson wart block sounds part 2 2023-02-02 22:42:44 +00:00
SmokeyDope
eae1ee7cee Fix indentation for shapeless type @ netherite ingot 2023-02-02 22:39:37 +00:00
SmokeyDope
27f5a94c6a Fix up indentation for warped and crimson wart block sounds 2023-02-02 22:36:33 +00:00
SmokeyDope
b4719599b5 Fix up indentation 2023-02-02 22:30:15 +00:00
SmokeyDope
659f11bf6f Fixed up indentation and removed excess blank lines 2023-02-02 22:08:37 +00:00
SmokeyDope
88a7a8afab Removed handy, axey, swordy, from nether vines & removed useless comments 2023-02-02 21:37:23 +00:00
ancientmarinerdev
cdc922d4ac Merge pull request 'Make fletcher buy sticks' (#3383) from mrminer/MineClone2-Fletcher-Fix:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3383
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-02-02 15:37:35 +00:00
Michieal
ad43fbd237 Adjust amethyst bud growth speed. 2023-02-02 15:25:33 +00:00