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,557 Commits 108 Branches 83 Tags 166 MiB
b121d0f804
Commit Graph

9287 Commits

Author SHA1 Message Date
ancientmarinerdev
30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-16 20:22:09 +00:00
Michieal
55bb9800f4 removed errant logging line. 2023-01-16 15:07:57 -05:00
Michieal
b805ae9926 Adjust bamboo growth rates to be close to the MC wiki. 2023-01-16 15:01:38 -05:00
Johannes Fritz
6e6c11cde2 Fix undeclared global variable in mcl_buckets 2023-01-16 12:56:59 -06:00
Michieal
d48b3dcaee Starting Inventory fix #4 Optimized and remove chatcommand. 2023-01-16 02:12:39 -05:00
Michieal
88493091b6 Starting Inventory fix #3. turn off debugging in code. 
Ready for testing.
 2023-01-16 01:58:27 -05:00
Michieal
d68667beb9 Starting Inventory fix #2. add in chat command, /give_starting_inventory. add in debug code. 2023-01-16 01:53:35 -05:00
Michieal
181628e539 Starting Inventory fix #2 2023-01-16 00:51:23 -05:00
Michieal
c57a757510 Starting Inventory fix #1/ 2023-01-16 00:21:15 -05:00
Michieal
26f3275b7c renamed to mcl_starting_inventory... continued. Fixed the setting in settingtypes.txt 2023-01-15 21:23:49 -05:00
Michieal
45b4b4a458 renamed to mcl_starting_inventory as that is what it is. 2023-01-15 21:21:26 -05:00
Michieal
5424ca8c2b Created Starting Chest that is given to players. 
Based on the "give_initial_stuff" mod.
 2023-01-15 20:39:51 -05:00
ancientmarinerdev
9b28baaad6 Give longer to breed mobs. 1.5s is not enough 2023-01-16 00:00:28 +00:00
b3nderman
f9b021e4c6 Fix animals jumping way too high upon growing up 2023-01-15 22:47:05 +00:00
ancientmarinerdev
38732e801d Fix geode crash 2023-01-15 22:27:02 +00:00
ancientmarinerdev
8f6c932e88 Allow blaze spawners to be deactivated 2023-01-15 22:22:14 +00:00
Michieal
e9c202ae45 Added Bamboo Biomes to spawning.lua. 2023-01-15 15:30:34 -05:00
Michieal
d6ee21d192 Merge branch 'master' into mcl_bamboo_too 2023-01-15 15:27:30 -05:00
Michieal
0c61035df0 Missing files from the optipng commit. (not exactly sure what happened.) 2023-01-15 14:30:12 -05:00
b3nderman
a7fac7c550 Fix tamed ocelot textures not being set correctly 2023-01-15 16:57:47 +00:00
AFCMS
3027965314 Add comment 2023-01-15 15:32:42 +00:00
AFCMS
e9c9f151de Let user dig light blocks when wielding a light block 2023-01-15 15:32:42 +00:00
AFCMS
fb8262bf57 Make light blocks buildable_to 2023-01-15 15:32:42 +00:00
AFCMS
726358da4b Rename callbacks parameters to match Minetest documentation 2023-01-15 15:32:42 +00:00
AFCMS
515204d296 Update translation template and add french translation 2023-01-15 15:32:42 +00:00
AFCMS
eb5f5678d6 Fix typo in barrier help text 2023-01-15 15:32:42 +00:00
AFCMS
33e2b79b2b Make nearby light blocks spawn particles when player wield one 2023-01-15 15:32:42 +00:00
AFCMS
7c20896d5e Make light blocks not walkable 2023-01-15 15:32:42 +00:00
AFCMS
cd70dd5b88 Spawn particle then placing light blocks 2023-01-15 15:32:42 +00:00
AFCMS
302970d220 Basic light blocks 2023-01-15 15:32:42 +00:00
AFCMS
79876635af Use mcl_util.call_on_rightclick in on_place callback for barrier block 2023-01-15 15:32:42 +00:00
AFCMS
b9238b4069 Use new vectors 2023-01-15 15:32:42 +00:00
AFCMS
bf25fca47d Remove support for use_texture_alpha bool values (mt 5.3) 2023-01-15 15:32:42 +00:00
AFCMS
92261e5fb5 Remove stack_max fields duplicated with default value 2023-01-15 15:32:42 +00:00
AFCMS
1e31e383d4 Fix invalid function signature for on_place callbacks + handling of possible nil value 2023-01-15 15:32:42 +00:00
AFCMS
4457432d32 Format file 2023-01-15 15:32:42 +00:00
FossFanatic
fbb4cf084f Revert grass footstep sound 
This reverts the grass footstep sounds back to the one before the recent sound update by grorp.
 2023-01-14 15:22:19 +00:00
FossFanatic
60b19b31ab Add hyphenation 
This also adds hyphenation to `In-game`.
 2023-01-14 10:21:35 +00:00
FossFanatic
18c0e1f050 Change the indexes back to the older ones 2023-01-14 10:05:00 +00:00
FossFanatic
fb8e41047d Use older palette PNG file 2023-01-14 10:00:42 +00:00
FossFanatic
2bd5e6a84f Delete text file 2023-01-14 10:00:19 +00:00
FossFanatic
23a13f14e0 Merge branch 'master' into simplified_palette_index 2023-01-14 09:51:47 +00:00
gldrk
5412206743 Make iron golem protect villagers 2023-01-14 01:37:32 +03:00
gldrk
30521a8b2f Make iron golem defend itself from players 2023-01-14 01:34:28 +03:00
gldrk
1536338199 Allow passive mobs to have protectors 2023-01-14 01:32:42 +03:00
gldrk
3697ef8069 Fix summoning friends for mobs 2023-01-14 01:28:35 +03:00
ancientmarinerdev
ce485e89cd In game music review feedback fix 2023-01-13 15:04:40 -06:00
ancientmarinerdev
09a7348256 Give an option for players to disable the in game music 2023-01-13 15:04:40 -06:00
FossFanatic
a500528613 Make the LBM run only once 
Since some people complained about the LBM running at every load, I changed it so it only runs once instead. It shouldn't even need to run more than once anyways, unless somebody could prove the contrary.
 2023-01-13 17:58:51 +00:00
FossFanatic
292e7129f2 Merge branch 'master' into simplified_palette_index 2023-01-13 17:50:39 +00:00
Michieal
3091e85b1c Optipng textures. 2023-01-12 22:17:26 -05:00
Michieal
da277f9dc7 fixed missed line. 2023-01-12 22:16:02 -05:00
Michieal
27a487195a Merge branch 'master' into mcl_bamboo_too 2023-01-12 22:14:58 -05:00
Michieal
2fdc8cbdd4 Changed Bamboo Sign's inventory & wield image to match the placed sign. 
Reduced the number of images that trapdoors need to work.
 2023-01-12 22:12:05 -05:00
Michieal
0079cf807e Changed Bamboo Signs to use custom image. 2023-01-12 21:06:25 -05:00
CyberMango
64a7f76d5b Replaced positions check with an area check. 
This one is using the minetest.is_area_protected so it should work
faster. It also doesnt require the user to manually add all the points
that should be checked so its nicer to use.
 2023-01-12 21:22:36 +02:00
CyberMango
b0d9eed3e1 Removed specific functions and added usage examples. 
The specific functions didnt end up adding much simplicity, but did add
some degree of confusion.
 2023-01-12 20:04:44 +02:00
CyberMango
685a7ff256 Added a function for a single position and better naming. 
Now the functions are named with "position" instead of "node" to better
reflect what they do and what args they expect.

Also added a function for cehcking just a single position since thats
the most common use case, so it saves a small performance overhead.
 2023-01-12 20:04:44 +02:00
CyberMango
949a2b787e Added protection violation checker functions. 
1 completley generic and 3 more that use it for more specific cases -
  placing a node, modifying a node and planting over a node.
 2023-01-12 20:04:44 +02:00
FossFanatic
8849b2e98f Merge branch 'master' into simplified_palette_index 2023-01-12 15:32:46 +00:00
Michieal
9e76cd963d Adjust bamboo sign color 2023-01-12 03:51:42 -05:00
Michieal
522a7577de Fix Bamboo nodes showing up in creative inventory. 
Fix lava bamboo node placement.
 2023-01-12 03:47:13 -05:00
Michieal
396fedd8e7 temp commit - brownish, rather than yellow, colored palette for bamboo things. 2023-01-12 03:29:49 -05:00
Michieal
d2625d3ace Fix water node placement, and lava node placement. (Yes, nether lava too!) 2023-01-12 03:27:17 -05:00
Michieal
a04d946879 Updated Licensing for additional images. 2023-01-11 21:50:34 -05:00
Michieal
6993559330 Updated relevant Credits for Bamboo and recent work. 2023-01-11 07:26:01 -05:00
Michieal
b572363b8e temp commit. recolor scaffolds. 2023-01-11 07:16:41 -05:00
Michieal
00408b998c Fix -- Bamboo grow, bamboo place to be correct. 2023-01-11 07:16:12 -05:00
Michieal
1de806f6f8 Put height into placed, base, bamboo stalk nodes so that height checks work properly. 
Fix placing bamboo on top of other bamboo nodes, when it would go above the decided height. It now stops just before the endcap node placement.

Fixed Errant log message.
Fixed itemstack removal while in creative mode.
 2023-01-11 02:31:36 -05:00
Michieal
04efa74115 Prevent growing "around" things in the way. 2023-01-11 02:19:19 -05:00
Michieal
2e8f56d098 Merge branch 'master' into mcl_bamboo_too 2023-01-10 22:29:28 -05:00
Michieal
ff7299a444 Fix beetroot seeds not dropping. 
Changed drop rate to 1-4.

Added in Fortune drops too. (Per the minecraft wiki.)
 2023-01-10 21:38:42 -05:00
Michieal
aad2d114f9 temp commit. recolor of the planks and scaffolds. 2023-01-10 20:49:38 -05:00
ancientmarinerdev
111c885417 Added burger alias 2023-01-11 01:07:18 +00:00
ancientmarinerdev
8e1f00d428 Villager breeding is now unburgered. Burger now needs right click to initiate follow. 2023-01-11 01:07:18 +00:00
ancientmarinerdev
4fd4425aae Improved mob debug 2023-01-11 01:07:18 +00:00
ancientmarinerdev
ac4cd2c325 Improve performance for head swivel check 2023-01-11 01:07:18 +00:00
ancientmarinerdev
01c8009c6a Tidy on_step function 2023-01-11 01:07:18 +00:00
ancientmarinerdev
ef90820f67 Fix farm animals so they don't get into combat state 2023-01-11 01:07:18 +00:00
ancientmarinerdev
d6d11b9526 Zombie villagers cannot despawn during curing process 2023-01-11 01:07:17 +00:00
ancientmarinerdev
b0264b2736 Endermen now despawn when not holding a block. 2023-01-11 01:07:17 +00:00
Michieal
c12f2cc565 Fix placement of bamboo endcap 2023-01-10 19:23:40 -05:00
Michieal
9f94f12127 Fix placement of bamboo onto bamboo nodes going higher than max height. 2023-01-10 18:48:50 -05:00
Michieal
784f3ec226 Made plank textures more dried bamboo looking. 2023-01-10 16:40:18 -05:00
Michieal
44a769397d Fix bamboo mosaic using wrong texture. 
Fix error.
 2023-01-10 15:36:17 -05:00
ancientmarinerdev
3ed32abc4e Add credit for nether music 2023-01-10 19:05:56 +00:00
kay27
9db6050638 Fix music interruption 2023-01-10 19:05:56 +00:00
kay27
7ceb953a56 Add different music for different dimensions 2023-01-10 19:05:56 +00:00
kay27
1894d8c5f0 Fix mcl_music: play to all players, play every day, overworld only 2023-01-10 19:05:56 +00:00
kay27
419d61edde Add trivial mcl_music mod and a piano track by diminixed 2023-01-10 19:05:55 +00:00
Michieal
726eba7ed8 Make bamboo fence/gate less yellow. It's bamboo, not corn XD 2023-01-10 04:42:31 -05:00
Michieal
f46581905a Added veins to the Hyphae log sides. 2023-01-10 04:30:29 -05:00
Michieal
4f6de581dd fixed the warped fungus mushroom texture. 
fixed the warped fungus selection box.
 2023-01-10 04:29:47 -05:00
Michieal
eb8f7360a2 Merge branch 'master' into mcl_bamboo_too 2023-01-09 18:56:05 -05:00
ancientmarinerdev
fb30564827 Ooooooh, lecterns. My favourite. 2023-01-09 22:32:14 +00:00
Michieal
8c355db3ce Made Lecterns solid. 2023-01-09 22:32:14 +00:00
Michieal
eae08f3010 Finished Lecterns. 
Added in License.txt.
 2023-01-09 22:32:14 +00:00
Michieal
4701c4d6e7 Built basic lectern model, texture, and node definition. 
Created crafting recipe.

Marked Lecterns as WIP.

Started defining placement.

Added in README.txt.
 2023-01-09 22:32:14 +00:00
Michieal
8df0b2a48e Made changes to the MapGen definitions because with the new grow code, bamboo creates its own height, and therefore places its own top. And, having multiple tops looks funny. 2023-01-09 16:31:02 -05:00
PrairieWind
7cb5c55d68 Update Translation Files 
Fixes the translation error for other languages
 2023-01-09 13:36:36 -07:00
Michieal
34faca3f2c Added in License.txt 
Made the end cap node wave in the wind.
 2023-01-08 23:08:12 -05:00
Michieal
d5dda679eb fix vestigial variable names to not be so obtuse. 2023-01-07 16:45:36 -05:00
Michieal
c65bbcd5a5 fixed missed spot for licensing. 2023-01-07 16:14:33 -05:00
Michieal
533f59bf27 Merge branch 'master' into mcl_bamboo_too 2023-01-06 18:08:33 -05:00
Michieal
3074c15d14 clear up comment confusion. 
Factored out hard coded names for variable names.

removed "minecraft" from README.md.
 2023-01-06 18:07:30 -05:00
Michieal
132178b8c7 clear up comment confusion. 2023-01-06 17:46:54 -05:00
Michieal
ede21a8627 revert f92ea77849d07db5ff7bbfe596cb5d6c605a733e 
revert accidental second commit.

Mega commit. lol.

Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
 2023-01-06 22:43:41 +00:00
Michieal
82fae13b47 Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too 2023-01-06 17:41:57 -05:00
Michieal
f92ea77849 Mega commit. lol. 
Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
 2023-01-06 17:41:01 -05:00
Michieal
7ebf9b7ab8 Mega commit. lol. 
Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
 2023-01-06 17:40:35 -05:00
Michieal
07a56165ed update optional depends. 2023-01-06 20:23:59 +00:00
Michieal
ee0b355f51 Fix licensing. 2023-01-06 20:21:08 +00:00
PrairieWind
6fd799ac42 Fix Country Lode HUD Issue 
Fixed the error that was thrown when the advancement is unlocked and also fixed the popup HUD so the advancement title fits correctly
 2023-01-06 16:35:59 +00:00
ancientmarinerdev
59694ebc7c Fix merge conflict 2023-01-06 13:52:03 +00:00
Michieal
cc24144bc6 Fixed collision and selection box for endcap nodes. 
fixed typo in debug message.
 2023-01-06 01:22:18 -05:00
Michieal
e1cd16c971 Adjusted growth interval. 
tested and fixed bamboo growth function.

Add debug code across growth function and scaffold place.

disabled debug for commit. removed finished todos.
 2023-01-06 00:41:26 -05:00
ancientmarinerdev
e4db91d35c Fix crash bug 2023-01-06 02:59:02 +00:00
ancientmarinerdev
2527479401 Clean up on isle 5, please 2023-01-06 02:59:02 +00:00
ancientmarinerdev
85f7bbdb80 Optimisation. Don't even prepare to path if not ready to path 2023-01-06 02:59:02 +00:00
ancientmarinerdev
465a919f6b Villager will now reclaim job during the day even when it isn't work time 2023-01-06 02:59:02 +00:00
ancientmarinerdev
325a666c62 Added pathfinder constants to make it easier to tweak 2023-01-06 02:59:02 +00:00
ancientmarinerdev
e9b54e85c2 Pathfinding clean up 2023-01-06 02:59:02 +00:00
ancientmarinerdev
4324fe2489 Villager will now path from one house to another in search of available job or bed 2023-01-06 02:59:02 +00:00
ancientmarinerdev
d6804bf4b7 Fix distance to target issue, and refactor pathing actions 2023-01-06 02:59:02 +00:00
ancientmarinerdev
87f04bdd9f Prevent attempting to path through 2 doors until code supports it. Clean up also. 2023-01-06 02:59:02 +00:00
ancientmarinerdev
e3307d647b Fix pathing to bell that is sat on the ground 2023-01-06 02:59:02 +00:00
ancientmarinerdev
29cd73cb84 Pathfinding through door should also check door closest to position so villager can leave current house 2023-01-06 02:59:02 +00:00
ancientmarinerdev
5c0a763b83 Optimisation - Only check for town bell if ready to path 2023-01-06 02:59:02 +00:00
ancientmarinerdev
9b1ceebf0d Villagers will now pathfind to town bell that isn't on the ground 2023-01-06 02:59:02 +00:00
Michieal
ed64e7f733 Reverted scaffolding (WIP) for final push. Making an issue for it's continued work. Left wip in, but commented and future featured out. Will test changes forthwith. 
Adjusted bamboo base code (randomize which one to use.) to do less math and accomplish the same thing.
 2023-01-05 20:27:52 -05:00
ancientmarinerdev
856a60bcc2 Merge pull request 'Fix a few issues with sweet berries.' (#3187) from CyberMango/MineClone2:bug/mango/sweet_berry_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3187
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-06 00:09:41 +00:00
Michieal
08f9c0074a REVERT: Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions. 2023-01-05 18:31:21 -05:00
FossFanatic
09db6017c3 Merge branch 'master' into simplified_palette_index 2023-01-05 10:06:11 +00:00
Michieal
c4969c13cd trying to fix redundancy error... 2023-01-05 00:30:18 -05:00
Michieal
f70176da34 Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions. 2023-01-04 23:56:51 -05:00
Michieal
e314addeb3 Merge branch 'master' into mcl_bamboo_too 
# Conflicts:
#	mods/ITEMS/mcl_dye/init.lua
 2023-01-04 23:10:54 -05:00
Michieal
df8fc65e1e temp commit. 2023-01-04 23:03:08 -05:00
Michieal
687887fe27 Incorporate applying bonemeal to Bamboo stalks. 2023-01-04 22:49:17 -05:00
Michieal
65aa956d9c Add alias for scaffolding. 
Rework grow_bamboo to handle random heights, and to handle bonemeal.

 Remove "bamboo_node" in favor of is_bamboo()
 2023-01-04 22:43:05 -05:00
ancientmarinerdev
609ef220ad Village building and paths should not spawn on top of snowy trees 2023-01-04 15:14:40 -06:00
ancientmarinerdev
32a7eb4087 Fix incorrect foundation size for belltower 2023-01-04 15:14:37 -06:00
CyberMango
5e969ba928 Added sweet berries death messages. 2023-01-04 23:04:19 +02:00
CyberMango
17e02aec3c Applying bone meal on a stage 3 sweet berry no longer grows it. 
It now ignores the bone meal and harvests the sweet berry as normal.
 2023-01-04 23:04:19 +02:00
CyberMango
fb28e192e6 Bone meal applied on sweet berries only grows them by 1 stage now. 
The interface of the grow plant is a bit confusing since even with
stages set to 0 the plant grows by 1 stage (if other conditions such as
light are met). Therefore changing it to 0 makes the plant grow by 1.
 2023-01-04 23:04:19 +02:00
CyberMango
0f569fdbaa Bone meal on sweet berries in creative mode is no longer wasted and 
minor fixes.

removed an unnecessary -- in a comment.
Removed a redundant concatination.
 2023-01-04 23:04:19 +02:00
CyberMango
8a7fcfde82 Fixed sweet berries bugs. 
Now they can only be placed a tile's upper part.
Also when destroyed bushes at stage 2 drop 1 or 2 berries, while bushes
at stage 3 drop 2 or 3 (instead of fixed numbers of 1 and 3
respectively).
Also harvesting sweet berries at stage 3 (final) brings them to stage 1
instead of just to stage 2. Number of dropped berries was adjusted.
 2023-01-04 23:04:19 +02:00
CyberMango
fb51067c78 Created a shared function for planting a seed that can also be consumed. 2023-01-04 23:04:19 +02:00
Michieal
8dd4a2611e Added alias for scaffolding. 2023-01-04 14:25:31 -05:00
Michieal
f86ee99abf Further cleaned up bamboo base code. 
Fixed some errors in Scaffolding, Commented out the in progress section.
 2023-01-04 11:28:09 -05:00
FossFanatic
6cf1fa7b81 Merge branch 'master' into simplified_palette_index 2023-01-04 15:02:56 +00:00
FossFanatic
39bcf2f961 Merge branch 'master' into simplified_palette_index 2023-01-04 14:01:58 +00:00
Johannes Fritz
0b1916b807 Fix baby zombies going through 1 node high space 2023-01-04 07:52:48 -06:00
Michieal
d1a017f6b2 optimized out some for loops, cleaned up code for bamboo placement. 
tested the changes.
 2023-01-03 18:40:40 -05:00
Michieal
50e50e2904 Continued some optimizations of code in bamboo.on_place. 
Begun work on scaffolding.
 2023-01-03 15:57:58 -05:00
Michieal
9351f72c15 Updated Bamboo translations template.txt 2023-01-03 15:38:34 -05:00
Michieal
ef7fb0d2e3 Cleaned up the code. Fixed side placement of bamboo against bamboo. 
Dinked with the random number generator some more.

Condensed some more of the code duplication (WIP).

Added in MCL_Log function.

Finally settled on a decent looking Bamboo top.
 2023-01-03 01:38:12 -05:00
Michieal
5ef7d9f7a0 Added in Bamboo_Plank variable. 
Dinked with the random number generator some.

Moved Bamboo Mosaic from base to items.

condensed some of the code duplication (WIP).

started to add in checks to prevent bamboo from being placed against itself horizontally.

Fixed a couple of naming issues.
 2023-01-02 22:36:09 -05:00
Michieal
388632cd46 Fixed BROKEN skycolor 2023-01-02 19:36:01 -05:00
Michieal
dd4a0a4172 Fixed mcl_fishing depending on mcl_bamboo. 2023-01-02 19:24:56 -05:00
ancientmarinerdev
df6d1c026a Fix crash for sky colour if cannot find biome 2023-01-02 21:48:58 +00:00
Michieal
d586b3fecc Tracked down missing node type placement issues, and fixed them. 
Now with Chicken Cherry Cola!
 2023-01-02 03:54:26 -05:00
Michieal
a7a0c4791a Many bug fixes, Adjusted randomizing code. 
And, Now with Lime-Cherry Kool-aid!! Yum!
 2023-01-02 02:19:33 -05:00
Michieal
23b62c296a Fix code caching errors, and remove unused variables from init. 2023-01-01 23:07:20 -05:00
ancientmarinerdev
f8ae702ce4 Function name consistency 2023-01-02 00:58:23 +00:00
ancientmarinerdev
5faf060122 Fix crash and remove unused duplicate variables 2023-01-02 00:54:08 +00:00
ancientmarinerdev
8c648d1fc3 Refactor mob_step and do_states 2023-01-02 00:00:40 +00:00
kabou
2a37d38f6c Reformat cocoa pod node definition groups. 2022-12-31 11:18:04 +01:00
kabou
89821a8329 Rename cocoa pod placement function. 
* Rename cocoa pod placement function to match the `on_place` call in
  the cocoa pods item definition.
* Make the function local, there are no callers outside of mcl_cocoas.
 2022-12-31 10:41:39 +01:00
iliekprogrammar
2ea72ccda8 Merge branch 'master' into mcl-meshhand-fixes 2022-12-30 18:47:55 +00:00
iliekprogrammar
c2ba70a601 Merge branch 'master' into mcl-item-entity-fixes 2022-12-30 18:34:41 +00:00
iliekprogrammar
661afed46c Merge branch 'master' into mcl-init-fixes 2022-12-30 18:11:08 +00:00
FossFanatic
3d2955c394 Merge branch 'master' into simplified_palette_index 2022-12-30 10:36:35 +00:00
FossFanatic
aacbaddfe0 Add warped hyphae texture to the right folder 2022-12-30 01:27:02 +00:00
ancientmarinerdev
e6e898671a Merge pull request 'add japanese translation' (#3149) from SakuraRiu/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3149
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2022-12-29 22:14:48 +00:00
Michieal
87327abfb9 Restructure Commit. 
Recipes are in recipes.lua
Bamboo Basic nodes are in bamboo_base.lua
Bamboo items are in bamboo_items.lua
Bamboo api / globals are in globals.lua.
 2022-12-29 13:16:48 -05:00
Michieal
34263c2ef3 Change bamboo back to Axey, instead of swordy. 2022-12-29 12:28:42 -05:00
Michieal
38c6969292 Fix mod.conf in mcl_fishing 
Fix bamboo nodes on_destruct to handle the alt nodes too.
clean up ToDos
 2022-12-29 11:31:13 -05:00
FossFanatic
54548ecfdf Merge branch 'master' into simplified_palette_index 2022-12-29 14:51:17 +00:00
FossFanatic
5ec7b8ed89 Add LBM to fix grass palette indexes 
Adds a LBM which basically fixes the grass palette indexes of the nodes from older worlds. I have also added some more nodes to `block_fixes`.
 2022-12-29 14:18:37 +00:00
FossFanatic
137179ac8e revert 3afb42b2f771e9bd33f5e15cd7bd7fb9117b9480 
revert Add a LBM to fix grass palette indexes on older worlds
 2022-12-29 14:13:50 +00:00
FossFanatic
3afb42b2f7 Add a LBM to fix grass palette indexes on older worlds 2022-12-29 14:12:00 +00:00
FossFanatic
d5f8129ea7 Merge branch 'master' into fix_v6_sky_color 2022-12-29 07:55:49 +00:00
Michieal
1d0968f4f5 Fix bamboo nodes on_destruct to handle the alt nodes too. 
clean up ToDos
 2022-12-29 01:38:10 -05:00
Michieal
0f9d263e02 Add Bamboo to the Fishing Junk table. 
Update the mod.conf to be aware of mcl_bamboo.
 2022-12-29 01:29:25 -05:00
Michieal
26c1be3722 Fix bamboo node to be Swordy. 
Added in secondary bamboo node types.
Changed the grow_bamboo function to make use of new alt nodes, and removed unneccessary "force" parameter.
 2022-12-29 01:03:25 -05:00
kabou
44f724f677 Minor refactoring of mcl_dye, fix dye texture names. 
* Reorganize dyes table.
* Rename dye item textures to conform to mcl naming standard.
* Refactor dye item registration.
* Shuffle recipes around in a more logical order.
* Remove unused dye names from lists that are probably equally unused.
 2022-12-29 03:08:50 +00:00
kabou
92ee402971 Separate white dye from bone meal. 
* Add craftitem for ":mcl_bone_meal:bone_meal" to mcl_dye (temporarily.)
* Add crafting recipe for bone meal.
* Add texture for white dye item.
* Merge craftitem registration for "mcl_dye:white" with generic dyes.
* Add crafting recipe for white dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update mcl_crimson and sweet berry on_rightclick handlers.
* Update composter output, both as freestanding and to hoppers.
* Update bone block crafting recipes.
* Update tropical fish, cod and salmon mob drops.
 2022-12-29 03:08:50 +00:00
kabou
7d8fdc6ec3 Separate brown dye from cocoa beans. 
* Add craftitem "mcl_cocoas:cocoa_beans".
* Add texture for brown dye item.
* Merge craftitem registration for "mcl_dye:brown" with generic dyes.
* Add crafting recipe for brown dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update cookie recipe.
 2022-12-29 03:08:49 +00:00
kabou
d2edc75407 Separate blue dye from lapis lazuli. 
* Add craftitem "mcl_core:lapis".
* Add texture for blue dye item.
* Add crafting recipe for blue dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update lapis block crafting recipes.
* Update lapis ore drops.
* Update dungeon and shipwreck loot.
* Update enchanting table input.
* Update villager trade.
 2022-12-29 03:08:49 +00:00
kabou
7311071303 Separate black dye from squid ink sac. 
* Add craftitem "mcl_mobitems:ink_sac".
* Add texture for black dye item.
* Add crafting recipe for black dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update fishing loot.
 2022-12-29 03:08:49 +00:00
kabou
60b0cfe89a Remove FIXME about slimes spawning in swamps. 
* This has been fixed.
 2022-12-29 02:13:57 +00:00
kabou
d8a883e81f Limit size of cow herds spawning. 
* Cows should spawn in herds of max 4, not 8.
 2022-12-29 02:13:57 +00:00
kabou
15f5c3c30a Make slimes spawn at night in swamps. 
* Adds spawn definitions for large, small and tiny slimes to spawn in
  Swampland and MangroveSwamp biomes when light levels are less than 7.
 2022-12-29 02:13:57 +00:00
kabou
4af8148850 Refactor spawn registrations. 
* Unduplicate spawnable biome lists for slimes and magma cubes.
* Rename min and max spawndepth identifiers.
 2022-12-29 02:13:57 +00:00
kabou
ea6201d32f Add missing biome to slime spawn list. 
* Add "MangroveSwamp_underground" to the lists of spawnable biomes for
  big, small and tiny slimes.
 2022-12-29 02:13:57 +00:00
kabou
da17ff8ea0 Remove stray dependency. 
While mobs_mc_gameconfig was deleted at some point during the mob
refactoring, it was still listed in mobs_mc's mod.conf.
 2022-12-29 02:13:57 +00:00
kabou
6756ee340c Mob spawning chatcommand refactoring. 
* Put calculations that are only used conditionally inside the
  related `if` block.
* Make code logic more explicit.
* Take logging statement out of return value assignment.
* Remove duplicate assignment.
* Fix a typo in the function's description.
 2022-12-29 02:13:57 +00:00
kabou
0c454a34c9 Use vectors in get_next_mob_spawn_pos() 2022-12-29 02:13:57 +00:00
kabou
8279dcb3dd Add FIXME notes to slime mob code. 
Missing features:
* Slimes should not only spawn in caves, but also at night in swamps.
* Slimes should only spawn on 10% of the map ("slime chunks").
* There are no spawn eggs registered for small and tiny slimes and magma
  cubes.
 2022-12-29 02:13:57 +00:00
kabou
ea19f02e14 Assorted spawn_children_on_die fixes. 
* Use proper vector semantics.
* Optimize away superfluous temp variables and repetitive local variable
  declarations.
 2022-12-29 02:13:57 +00:00
kabou
95cbac78a8 Change number of children spawned on die. 
When a slime or magma cube dies, it should spawn between 2 to 4 smaller
children.  The code was always spawning 4 children (3 for big magma
cubes).  This commit makes the following changes to the function
`spawn_children_on_die`:
* Make the number of children spawned a random number between 2 and 4.
* No longer accept the `children_count` as an argument, because this
  number should always be a random number between 2 and 4 anyway.
* Update all callers accordingly.
 2022-12-29 02:13:57 +00:00
Michieal
28cb06421d Merge branch 'master' into mcl_bamboo_too 2022-12-28 18:13:51 -05:00
Michieal
731468cf5a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 18:10:12 -05:00
Michieal
ff7693937a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 15:29:06 -05:00
FossFanatic
c1cde073c8 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:34:24 +00:00
Michieal
76669e1f3c Moved bamboo grow code to its own function, and made that function global so that it can be called outside of mcl_bamboo. 2022-12-28 14:34:14 -05:00
FossFanatic
ef15477e37 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:33:26 +00:00
FossFanatic
a0c5a04d26 Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:32:42 +00:00
FossFanatic
18e932997d Rename _mcl_palette_index to _mcl_grass_palette_index 2022-12-28 19:31:11 +00:00
FossFanatic
1f601c68c5 Make snowy grass blocks have a palette index 
This fixes the issue where snowy grass blocks always have the same coloured grass underneath them.
 2022-12-28 17:02:58 +00:00
FossFanatic
9cf6c9ed5e Change swamp and mangrove grass palette index 
Changes the grass palette index of the swamp and mangrove to use the swampier variant of the swamp colours.
 2022-12-28 16:10:02 +00:00
ancientmarinerdev
81daec14a2 Merge pull request 'Update sounds from MTG' (#3157) from grorp/MineClone2:patch-1 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3157
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-27 21:36:33 +00:00
FossFanatic
9f9cc3a629 Change grass block inventory colour 
According to the wiki, the hex code of the grass block when held or in the inventory is #7CBD6B.
 2022-12-27 21:19:33 +00:00
FossFanatic
ac90350257 Change palette indexes to fit the new palette 2022-12-27 20:57:58 +00:00
FossFanatic
a6841fe38b Simplify palette and add helpful text file 2022-12-27 20:55:24 +00:00
kabou
5e129985f2 Put back default sky and fog color. 
Recent changes set the default colors to some pretty psychedelic ones.
The stated purpose was debugging, but in absense of any actual debugging
code other than v6 mapgen inadvertently assuming that role, more sensible
colors were reinstated.

If debugging code is desired, it should probably be added to the main
parts of mcl_weather.
 2022-12-27 15:10:24 +01:00
Michieal
6f05992c8b Fix Licensing. 
Removed Make_Stairs check.
Made unified protection check.
Began work on the second half of scaffolding.
Removed comments that was no longer needed.
 2022-12-25 07:30:31 -05:00
PrairieWind
0dc31611ac Merge pull request 'Adjusts mcl_crimson Doors to have a specified side texture' (#3140) from Wbjitscool/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3140
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-12-25 02:09:14 +00:00
3raven
5964f25fa7 Merge branch 'master' into master 2022-12-24 17:01:13 +00:00
FossFanatic
e0a9aca469 Merge branch 'master' into useless_textures_cleanup 2022-12-24 15:05:14 +00:00
FossFanatic
9eb86f011b Make the code clearer to read 2022-12-24 14:54:48 +00:00
3raven
d3e8e24f42 Fix the disapearance of christmas texture of the ender chest once it is placed 
Fix the disapearance of christmas texture of the ender chest once it is placed
 2022-12-24 14:44:06 +00:00
FossFanatic
770dd0ec47 Merge branch 'master' into useless_textures_cleanup 2022-12-24 12:31:56 +00:00
FossFanatic
00b2afecad Merge branch 'master' into biome_skycolor_overworld 2022-12-24 12:31:10 +00:00
Michieal
c55332bf42 Change mod.conf and readme's depends. 
Optipng images, after adding in bamboo top image.
Try out a plantlike style top node for bamboo stalks.
Make Bamboo drop 1-2 bamboo.
Fix Bamboo top drops.
 2022-12-24 00:57:44 -05:00
Michieal
42f8fbf9b8 Added in Fuel Recipes for bamboo slabs / stairs; including mosaics. 
Finished Bamboo Mosaic nodes.
 2022-12-23 17:27:01 -05:00
CyberMango
bd38827f60 Fixes #2976 
Now the inventory view on creative is no longer set to the survival
inventory upon taking damage.
Also the initial inventory view when openning a world in creative is at
the search page, not the survival inventory page.

mcl_inventory/init.lua no longer wraps mcl_armor.update_player to also
update the inventory view. This visual update happens anyways since it
is registered to happen on a visual change with
mcl_player.register_on_visual_change .

This also fixes a small visual bug that, on creative mode, if you would
equip/unequip an armor piece, the image of the player would be updated
twice.
 2022-12-23 13:54:41 +02:00
Michieal
b0978d275d Abstracted variables in bamboo abm. 
Fix Base scaffolding in Creative mode.
Fixed Lua Warnings.
 2022-12-22 16:08:05 -05:00
FossFanatic
522bbbbe26 Delete 'mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_block.png' 2022-12-22 12:47:44 +00:00
FossFanatic
e1f26ea70d Remove dry grass side texture 
The same reason as why the dry grass top texture got removed.
 2022-12-22 12:40:36 +00:00
FossFanatic
9ef4a850b1 Remove dry grass top texture 
This is a remnant of Minetest Game and used to be for dry biomes before colour palettes were a thing in MineClone 2.
 2022-12-22 12:40:10 +00:00
FossFanatic
4c23601d03 Remove useless amethyst texture 
This texture is a remnant of the PixelPerfection resource pack and nowhere in the code does this texture get used.
 2022-12-22 12:38:05 +00:00
FossFanatic
8d51e16b8e Remove obsolete texture 2022-12-22 12:34:14 +00:00
Michieal
2b11b5c17a Added full node names for bamboo on_place. 
Added in bamboo top destruct.
Removed mapgen.lua.
 2022-12-21 22:23:46 -05:00
Michieal
9445b02dcc MapGen update. Adjusted decorations. 2022-12-21 20:57:34 -05:00
SakuraRiu
1b980849db Merge branch 'master' into master 2022-12-22 00:55:48 +00:00
Gregor Parzefall
14adcbbecb Make snow sound like snow while digging it 2022-12-21 22:39:26 +01:00
Michieal
e0d48400a7 Fix the removal of bamboo extras. 2022-12-21 16:16:53 -05:00
Gregor Parzefall
7312c30f8e Update attribution of sounds 
Also: Add myself to CREDITS.md
 2022-12-21 22:13:08 +01:00
Michieal
742a625c42 Added in aliasing for scaffolding, to prevent breakage for players using the "mcl_scaffolding" mod. 2022-12-21 15:55:50 -05:00
Michieal
95d3f9be07 Make Lantern API callable from outside of mcl_lanterns 2022-12-21 12:34:47 -05:00
Michieal
16d94a88db moved extras to the proper location 2022-12-21 12:32:09 -05:00
FossFanatic
a50908e1eb Fix the flat biome having a beach sky colour 2022-12-21 16:00:04 +00:00
FossFanatic
afbb8e2288 Add locals for certain hex codes that occur too many times 2022-12-21 15:57:33 +00:00
FossFanatic
79b1db4b1a Fix underwater fog colour regression 2022-12-21 14:04:47 +00:00
FossFanatic
1c752019f0 Make the explanation shorter 2022-12-21 13:08:23 +00:00
FossFanatic
1977dbf9a1 Remove excessive whitespace 2022-12-21 13:05:52 +00:00
FossFanatic
91836f3a1d Add sky and fog colour for each overworld biome 2022-12-21 13:04:46 +00:00
FossFanatic
35b2f3b638 Make overworld biome specific (daytime) sky and fog colours possible 2022-12-21 13:01:54 +00:00
Gregor Parzefall
4fcbe05be5 Remove a sound I forgot 2022-12-21 13:53:09 +01:00