Merge branch 'master' into dyable-leather-armor

.gitignore

@@ -0,0 +1,5 @@
+# Text Editor TMP Files
+*.swp
+*.blend1
+*.blend2
+*.blend3

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+eliasfleckenstein@web.de.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -1,105 +1,410 @@
-# Contributing to MineClone 2
-So you want to contribute to MineClone 2?
+# Contributing to MineClone2
+So you want to contribute to MineClone2?
 Wow, thank you! :-)
 
-But first, some things to note:
+MineClone2 is maintained by Nicu and Fleckenstein. If you have any
+problems or questions, contact us (See Links section below).
 
-MineClone 2's development target is to make a free software clone of Minecraft,
-***version 1.12***, ***PC edition***, *** + Optifine features supported by the Minetest Engine ***.
+You can help with MineClone2's development in many different ways,
+whether you're a programmer or not.
 
-MineClone 2 is maintained by three persons. Namely, kay27, EliasFleckenstein and jordan4ibanez. You can find us
-in the Minetest forums (forums.minetest.net), in IRC in the #mineclone2
-channel on irc.freenode.net. And finally, you can send e-mails to
-<eliasfleckenstein@web.de> or <kay27@bk.ru>.
+## MineClone2's development target is to...
+- Crucially, create a stable, moddable, free/libre clone of Minecraft
+based on the Minetest engine with polished features, usable in both
+singleplayer and multiplayer. Currently, most of **Minecraft Java
+Edition 1.12.2** features are already implemented and polishing existing
+features are prioritized over new feature requests.
+- With lessened priority yet strictly, implement features targetting
+**Minecraft version 1.17 + OptiFine** (OptiFine only as far as supported
+by the Minetest Engine). This means features in parity with the listed
+Minecraft experiences are prioritized over those that don't fulfill this
+scope.
+- Optionally, create a performant experience that will run relatively
+well on really low spec computers. Unfortunately, due to Minecraft's
+mechanisms and Minetest engine's limitations along with a very small
+playerbase on low spec computers, optimizations are hard to investigate.
 
-By sending us patches or asking us to include your changes in this game,
-you agree that they fall under the terms of the LGPLv2.1, which basically
-means they will become part of a free software.
+## Links
+* [Mesehub](https://git.minetest.land/MineClone2/MineClone2)
+* [Discord](https://discord.gg/xE4z8EEpDC)
+* [YouTube](https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A)
+* [IRC](https://web.libera.chat/#mineclone2)
+* [Matrix](https://app.element.io/#/room/#mc2:matrix.org)
+* [Reddit](https://www.reddit.com/r/MineClone2/)
+* [Minetest forums](https://forum.minetest.net/viewtopic.php?f=50&t=16407)
+* [ContentDB](https://content.minetest.net/packages/wuzzy/mineclone2/)
+* [OpenCollective](https://opencollective.com/mineclone2)
 
-## The suggested workflow
-We don't **dictate** your workflow, but in order to work with us in an efficient
-way, you can follow these suggestions:
+## Using git
+MineClone2 is developed using the version control system
+[git](https://git-scm.com/). If you want to contribute code to the
+project, it is **highly recommended** that you learn the git basics.
+For non-programmers and people who do not plan to contribute code to
+MineClone2, git is not required. However, git is a tool that will be
+referenced frequently because of its usefulness. As such, it is valuable
+in learning how git works and its terminology. It can also help you
+keeping your game updated, and easily test pull requests.
 
-For small and medium changes:
+## How you can help as a non-programmer
 
-* Fork the repository
+As someone who does not know how to write programs in Lua or does not
+know how to use the Minetest API, you can still help us out a lot. For
+example, by opening an issue in the
+[Issue tracker](https://git.minetest.land/MineClone2/MineClone2/issues),
+you can report a bug or request a feature.
+
+### Rules about both bugs and feature requests
+* Stay polite towards the developers and anyone else involved in the
+discussion.
+* Choose a descriptive title (e.g. not just "crash", "bug" or "question"
+).
+* Please write in plain, understandable English. It will be easier to
+communicate.
+* Please start the issue title with a capital letter.
+* Always check the currently opened issues before creating a new one.
+Don't report bugs that have already been reported or request features
+that already have been requested.
+* If you know about Minetest's inner workings, please think about
+whether the bug / the feature that you are reporting / requesting is
+actually an issue with Minetest itself, and if it is, head to the
+[Minetest issue tracker](https://github.com/minetest/minetest/issues)
+instead.
+* If you need any help regarding creating a Mesehub account or opening
+an issue, feel free to ask on the Discord / Matrix server or the IRC
+channel.
+
+### Reporting bugs
+* A bug is an unintended behavior or, in the worst case, a crash.
+However, it is not a bug if you believe something is missing in the
+game. In this case, please read "Requesting features"
+* If you report a crash, always include the error message. If you play
+in singleplayer, post a screenshot of the message that Minetest showed
+when the crash happened (or copy the message into your issue). If you
+are a server admin, you can find error messages in the log file of the
+server.
+* Tell us which MineClone2 and Minetest versions you are using.
+* Tell us how to reproduce the problem: What you were doing to trigger
+the bug, e.g. before the crash happened or what causes the faulty
+behavior.
+
+### Requesting features
+* Ensure the requested feature fulfills our development targets and
+goals.
+* Begging or excessive attention seeking does not help us in the
+slightest, and may very well disrupt MineClone2 development. It's better
+to put that energy into helping or researching the feature in question.
+After all, we're just volunteers working on our spare time.
+* Ensure the requested feature has not been implemented in MineClone2
+latest or development versions.
+
+### Testing code
+If you want to help us with speeding up MineClone2 development and
+making the game more stable, a great way to do that is by testing out
+new features from contributors. For most new things that get into the
+game, a pull request is created. A pull request is essentially a
+programmer saying "Look, I modified the game, please apply my changes
+to the upstream version of the game". However, every programmer makes
+mistakes sometimes, some of which are hard to spot. You can help by
+downloading this modified version of the game and trying it out - then
+tell us if the code works as expected without any issues. Ideally, you
+would report issues will pull requests similar to when you were
+reporting bugs that are the mainline (See Reporting bugs section). You
+can find currently open pull requests here:
+<https://git.minetest.land/MineClone2/MineClone2/pulls>. Note that pull
+requests that start with a `WIP:` are not done yet, and therefore might
+not work, so it's not very useful to try them out yet.
+
+### Contributing assets
+Due to license problems, MineClone2 unfortunately cannot use
+Minecraft's assets, therefore we are always looking for asset
+contributions. To contribute assets, it can be useful to learn git
+basics and read the section for Programmers of this document, however
+this is not required. It's also a good idea to join the Discord server
+(or alternatively IRC or Matrix).
+
+#### Textures
+For textures we use the Pixel Perfection texture pack. This is mostly
+enough; however in some cases - e.g. for newer Minecraft features, it's
+useful to have texture artists around. If you want to make such
+contributions, join our Discord server. Demands for textures will be
+communicated there.
+
+#### Sounds
+MineClone2 currently does not have a consistent way to handle sounds.
+The sounds in the game come from different sources, like the SnowZone
+resource pack or minetest_game. Unfortunately, MineClone2 does not play
+a sound in every situation you would get one in Minecraft. Any help with
+sounds is greatly appreciated, however if you add new sounds you should
+probably work together with a programmer, to write the code to actually
+play these sounds in game.
+
+#### 3D Models
+Most of the 3D Models in MineClone2 come from
+[22i's repository](https://github.com/22i/minecraft-voxel-blender-models).
+Similar to the textures, we need people that can make 3D Models with
+Blender on demand. Many of the models have to be patched, some new
+animations have to be added etc.
+
+#### Crediting
+Asset contributions will be credited in their own respective sections in
+CREDITS.md. If you have commited the results yourself, you will also be
+credited in the Contributors section.
+
+### Contributing Translations
+
+#### Workflow
+To add/update support for your language to MineClone2, you should take
+the steps documented in the section for Programmers, add/update the
+translation files of the mods that you want to update. You can add
+support for all mods, just some of them or only one mod; you can update
+the translation file entirely or only partly; basically any effort is
+valued. If your changes are small, you can also send them to developers
+via E-Mail, Discord, IRC or Matrix - they will credit you appropriately.
+
+#### Things to note
+You can use the script at `tools/check_translate_files.py` to compare
+the translation files for the language you are working on with the
+template files, to see what is missing and what is out of date with
+the template file. However, template files are often incomplete and/or
+out of date, sometimes they don't match the code. You can update the
+translation files if that is required, you can also modify the code in
+your translation PR if it's related to translation. You can also work on
+multiple languages at the same time in one PR.
+
+#### Crediting
+Translation contributions will be credited in their own in CREDITS.md.
+If you have commited the results yourself, you will also be credited in
+the Contributors section.
+
+### Profiling
+If you own a server, a great way to help us improve MineClone2's code
+is by giving us profiler results. Profiler results give us detailed
+information about the game's performance and let us know places to
+investigate optimization issues. This way we can make the game faster.
+
+#### Using Minetest's profiler
+Minetest has a built in profiler. Simply set `profiler.load = true` in
+your configuration file and restart the server. After running the server
+for some time, just run `/profiler save` in chat - then you will find a
+file in the world directory containing the results. Open a new issue and
+upload the file. You can name the issue "<Server name> profiler
+results".
+
+### Let us know your opinion
+It is always encouraged to actively contribute to issue discussions on
+MeseHub, let us know what you think about a topic and help us make
+decisions. Also, note that a lot of discussion takes place on the
+Discord server, so it's definitely worth checking it out.
+
+### Funding
+You can help pay for our infrastructure (Mesehub) by donating to our
+OpenCollective link (See Links section).
+
+### Crediting
+If you opened or have contributed to an issue, you receive the
+`Community` role on our Discord (after asking for it).
+OpenCollective Funders are credited in their own section in
+`CREDITS.md` and receive a special role "Funder" on our discord (unless
+they have made their donation Incognito).
+
+## How you can help as a programmer
+(Almost) all the MineClone2 development is done using pull requests.
+
+### Recommended workflow
+* Fork the repository (in case you have not already)
 * Do your change in a new branch
 * Create a pull request to get your changes merged into master
+* Keep your pull request up to date by regularly merging upstream. It is
+imperative that conflicts are resolved prior to merging the pull
+request.
+* After the pull request got merged, you can delete the branch
 
-For small changes, sending us a patch is also good.
+### Discuss first
+If you feel like a problem needs to fixed or you want to make a new
+feature, you could start writing the code right away and notifying us
+when you're done, but it never hurts to discuss things first. If there
+is no issue on the topic, open one. If there is an issue, tell us that
+you'd like to take care of it, to avoid duplicate work.
 
-For big changes: Same as above, but consider notifying us first to avoid
-duplicate work and possible tears of rejection. ;-)
+### Don't hesitate to ask for help
+We appreciate any contributing effort to MineClone2. If you are a
+relatively new programmer, you can reach us on Discord, Matrix or IRC
+for questions about git, Lua, Minetest API, MineClone2 codebase or
+anything related to MineClone2. We can help you avoid writing code that
+would be deemed inadequate, or help you become familiar with MineClone2
+better, or assist you use development tools.
 
-For trusted people, we might give them direct commit access to this
-repository. In this case, you obviously don't need to fork, but you still
-need to show your contributions align with the project goals. We still
-reserve the right to revert everything that we don't like.
-For bigger changes, we strongly recommend to use feature branches and
-discuss with me first.
+### Maintain your own code, even if already got merged
+Sometimes, your code may cause crashes or bugs - we try to avoid such
+scenarios by testing every time before merging it, but if your merged
+work causes problems, we ask you fix the issues as soon as possible.
 
-If your code causes bugs and crashes, it is your responsibility to fix them as soon as possible.
+### Changing Gameplay
+Pull Requests that change gameplay have to be properly researched and
+need to state their sources. These PRs also need Fleckenstein's approval
+before they are merged.
+You can use these sources:
 
-We mostly use plain merging rather than rebasing or squash merging.
+* Testing things inside of Minecraft (Attach screenshots / video footage
+of the results)
+* Looking at [Minestom](https://github.com/Minestom/Minestom) code. An open source Minecraft Server implementation
+* [Official Minecraft Wiki](https://minecraft.fandom.com/wiki/Minecraft_Wiki)
+(Include a link to the specific page you used)
 
-Your commit names should be relatively descriptive, e.g. when saying "Fix #issueid", the commit message should also contain the title of the issue.
+### Stick to our guidelines
 
-Contributors will be credited in `CREDITS.md`.
+#### Git Guidelines
+* We use merge rather than rebase or squash merge
+* We don't use git submodules.
+* Your commit names should be relatively descriptive, e.g. when saying
+"Fix #issueid", the commit message should also contain the title of the
+issue.
+* Try to keep your commits as atomic as possible (advise, but completely
+optional)
 
-## Code Style
+#### Code Guidelines
+* Each mod must provide `mod.conf`.
+* Mod names are snake case, and newly added mods start with `mcl_`, e.g.
+`mcl_core`, `mcl_farming`, `mcl_monster_eggs`. Keep in mind Minetest
+does not support capital letters in mod names.
+* To export functions, store them inside a global table named like the
+mod, e.g.
 
-Each mod must provide `mod.conf`.
-Each mod which add API functions should store functions inside a global table named like the mod.
-Public functions should not use self references but rather just access the table directly.
-Functions should be defined in this way:
-```
-function mcl_xyz.stuff(param) end
-```
-Insteed of this way:
-```
-mcl_xyz.stuff = function(param) end
-```
-Indentation must be unified, more likely with tabs.
+```lua
+mcl_example = {}
+
+function mcl_example.do_something()
+	-- ...
+end
 
-Time sensitive mods should make a local copy of most used API functions to improve performances.
-```
-local vector = vector
-local get_node = minetest.get_node
 ```
 
+* Public functions should not use self references but rather just access
+the table directly, e.g.
 
-## Features > 1.12
+```lua
+-- bad
+function mcl_example:do_something()
+end
 
-If you want to make a feature that was added in a Minecraft version later than 1.12, you should fork MineClone5 (mineclone5 branch in the repository) and add your changes to this.
+-- good
+function mcl_example.do_something()
+end
+```
 
-## What we accept
+* Use modern Minetest API, e.g. no usage of `minetest.env`
+* Tabs should be used for indent, spaces for alignment, e.g.
 
-* Every MC features up to version 1.12 JE.
-* Every already finished and working good features from versions above (only when making a MineClone5 PR / Contribution).
-* Except features which couldn't be done easily and bugfree because of Minetest engine limitations. Eg. we CAN extend world boundaries by playing with map chunks, just teleporting player onto next layer after 31000 , but it would cost too much (time, code, bugs, performance, stability, etc).
-* Some features, approved by the rest of the community, I mean maybe some voting and really missing any negative feedback.
+```lua
 
-## What we reject
+-- use tabs for indent
 
-* Any features which cause critical bugs, sending them to rework/fix or trying to fix immediately.
-* Some small portions of big entirely missing features which just definitely break gamplay balance give nothing useful
-* Controversial features, which some people support while others do not should be discussed well, with publishing forum announcements, at least during the week. In case if there are still doubts - send them into the mod.
+for i = 1, 10 do
+	if i % 3 == 0 then
+		print(i)
+	end
+end
 
-## Reporting bugs
-Report all bugs and missing Minecraft features here:
+-- use tabs for indent and spaces to align things
 
-<https://git.minetest.land/MineClone2/MineClone2/issues>
+some_table = {
+	{"a string",                   5},
+	{"a very much longer string", 10},
+}
+```
 
-## Direct discussion
-We have an IRC channel! Join us on #mineclone2 in freenode.net.
+* Use double quotes for strings, e.g. `"asdf"` rather than `'asdf'`
+* Use snake_case rather than CamelCase, e.g. `my_function` rather than
+`MyFunction`
+* Don't declare functions as an assignment, e.g.
 
-<ircs://irc.freenode.net:6697/#mineclone2>
+```lua
+-- bad
+local some_local_func = function()
+	-- ...
+end
 
-## Creating releases
+my_mod.some_func = function()
+	-- ...
+end
+
+-- good
+local function some_local_func()
+	-- ...
+end
+
+function my_mod.some_func()
+	-- ...
+end
+```
+
+### Developer status
+Active and trusted contributors are often granted write access to the
+MineClone2 repository.
+
+#### Developer responsibilities
+- You should not push things directly to
+MineClone2 master - rather, do your work on a branch on your private
+repository, then create a pull request. This way other people can review
+your changes and make sure they work before they get merged.
+- Merge PRs only when they have recieved the necessary feedback and have
+been tested by at least two different people (including the author of
+the pull request), to avoid crashes or the introduction of new bugs.
+- You may also be assigned to issues or pull
+requests as a developer. In this case it is your responsibility to fix
+the issue / review and merge the pull request when it is ready. You can
+also unassign yourself from the issue / PR if you have no time or don't
+want to take care of it for some other reason. After all, everyone is a
+volunteer and we can't expect you to do work that you are not interested
+in. **The important thing is that you make sure to inform us if you
+won't take care of something that has been assigned to you.**
+- Please assign yourself to something that you want to work on to avoid
+duplicate work.
+- As a developer, it should be easy to reach you about your work. You
+should be in at least one of the public MineClone2 discussion rooms -
+preferrably Discord, but if you really don't like Discord, Matrix
+or IRC are fine too.
+
+### Maintainer status
+Maintainers carry the main responsibility for the project.
+
+#### Maintainer responsibilities
+- Making sure issues are addressed and pull requests are reviewed and
+merged, by assigning either themselves or Developers to issues / PRs
+- Making releases
+- Making sure guidelines are kept
+- Making project decisions based on community feedback
+- Granting/revoking developer access
+- Enforcing the code of conduct (See CODE_OF_CONDUCT.md)
+- Moderating official community spaces (See Links section)
+- Resolving conflicts and problems within the community
+
+#### Current maintainers
+* Fleckenstein - responsible for gameplay review, publishing releases,
+technical guidelines and issue/PR delegation
+* Nicu - responsible for community related issues
+
+#### Release process
+* Run `tools/generate_ingame_credits.lua` to update the ingame credits
+from `CREDITS.md` and commit the result (if anything changed)
 * Launch MineClone2 to make sure it still runs
 * Update the version number in README.md
-* Use `git tag <version number>` to tag the latest commit with the version number
-* Push to repo (don't forget `--tags`!)
-* Update ContentDB (https://content.minetest.net/packages/Wuzzy/mineclone2/)
-* Update first post in forum thread (https://forum.minetest.net/viewtopic.php?f=50&t=16407)
+* Use `git tag <version number>` to tag the latest commit with the
+version number
+* Push to repository (don't forget `--tags`!)
+* Update ContentDB
+(https://content.minetest.net/packages/Wuzzy/mineclone2/)
+* Update first post in forum thread
+(https://forum.minetest.net/viewtopic.php?f=50&t=16407)
 * Post release announcement and changelog in forums
+
+### Licensing
+By asking us to include your changes in this game, you agree that they
+fall under the terms of the GPLv3, which basically means they will
+become part of a free/libre software.
+
+### Crediting
+Contributors, Developers and Maintainers will be credited in
+`CREDITS.md`. If you make your first time contribution, please add
+yourself to this file. There are also Discord roles for Contributors,
+Developers and Maintainers.

CREDITS.md

@@ -6,9 +6,13 @@
 ## Creator of MineClone2
 * Wuzzy
 
+
 ## Maintainers
+* Nicu
+* cora
+
+## Previous Maintainers
 * Fleckenstein
-* kay27
 * jordan4ibanez
 
 ## Developers
@@ -19,10 +23,10 @@
 * iliekprogrammar
 * MysticTempest
 * Rootyjr
-* Nicu
 * aligator
 * Code-Sploit
 * NO11
+* kabou
 
 ## Contributors
 * Laurent Rocher
@@ -48,8 +52,25 @@
 * dBeans
 * nickolas360
 * yutyo
-* ztianyang
+* Tianyang Zhang
 * j45
+* Marcin Serwin
+* erlehmann
+* E
+* Benjamin Schötz
+* Doloment
+* Sydney Gems
+* talamh
+* Emily2255
+* Emojigit
+* FinishedFragment
+* sfan5
+* Blue Blancmange
+* Jared Moody
+* SmallJoker
+* Sven792
+* aldum
+* Dieter44
 
 ## MineClone5
 * kay27
@@ -57,6 +78,16 @@
 * epCode
 * NO11
 * j45
+* 3raven
+* PrarieWind
+* Gustavo1
+* CableGuy67
+
+## Mineclonia
+* erlehmann
+* Li0n
+* E
+* n_to
 
 ## Original Mod Authors
 * Wuzzy
@@ -74,7 +105,6 @@
 * Rochambeau
 * rubenwardy
 * stu
-* jordan4ibanez
 * 4aiman
 * Kahrl
 * Krock
@@ -103,6 +133,7 @@
 * xMrVizzy
 * yutyo
 * NO11
+* kay27
 
 ## Translations
 * Wuzzy
@@ -110,6 +141,11 @@
 * wuniversales
 * kay27
 * pitchum
+* todoporlalibertad
+* Marcin Serwin
+
+## Funders
+* 40W
 
 ## Special thanks
 * celeron55 for creating Minetest

GROUPS.md

@@ -56,6 +56,7 @@ Please read <http://minecraft.gamepedia.com/Breaking> to learn how digging times
 * `no_eat_delay=1`: Only for foodstuffs. When eating this, all eating delays are ignored.
 * `can_eat_when_full=1`: Only for foodstuffs. This item can be eaten when the user has a full hunger bar
 * `attached_node_facedir=1`: Like `attached_node`, but for facedir nodes
+* `supported_node=1`: Like `attached_node`, but can be placed on any nodes that do not have the `drawtype="airlike"` attribute.
 * `cauldron`: Cauldron. 1: Empty. 2-4: Water height
 * `anvil`: Anvil. 1: No damage. 2-3: Higher damage levels
 * `no_rename=1`: Item cannot be renamed by anvil
@@ -71,6 +72,7 @@ Please read <http://minecraft.gamepedia.com/Breaking> to learn how digging times
 * `coral_block=X`: Coral block (1 = alive, 2 = dead)
 * `coral_species=X`: Specifies the species of a coral; equal X means equal species
 * `set_on_fire=X`: Sets any (not fire-resistant) mob or player on fire for X seconds when touching
+* `compostability=X`: Item can be used on a composter block; X (1-100) is the % chance of adding a level of compost
 
 #### Footnotes
 
@@ -149,7 +151,7 @@ These groups are used mostly for informational purposes
 * `trapdoor=2`: Open trapdoor
 * `glass=1`: Glass (full cubes only)
 * `rail=1`: Rail
-* `music_record`: Music Disc (rating is track ID)
+* `music_record`: Item is Music Disc
 * `tnt=1`: Block is TNT
 * `boat=1`: Boat
 * `minecart=1`: Minecart

README.md

@@ -1,10 +1,8 @@
-# (Currently in feature freeze)
-
-# MineClone 2
+# MineClone2
 An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
 Developed by many people. Not developed or endorsed by Mojang AB.
 
-Version: 0.72.0 (in development)
+Version: 0.74 (in development)
 
 ### Gameplay
 You start in a randomly-generated world made entirely of cubes. You can explore
@@ -68,39 +66,43 @@ Use the `/giveme` chat command to obtain them. See the in-game help for
 an explanation.
 
 ## Installation
-This game requires [Minetest](http://minetest.net) to run (version 5.3.0 or
+This game requires [Minetest](http://minetest.net) to run (version 5.4.1 or
 later). So you need to install Minetest first. Only stable versions of Minetest
 are officially supported.
-There is no support for running MineClone 2 in development versions of Minetest.
+There is no support for running MineClone2 in development versions of Minetest.
 
-To install MineClone 2 (if you haven't already), move this directory into the
+To install MineClone2 (if you haven't already), move this directory into the
 “games” directory of your Minetest data directory. Consult the help of
 Minetest to learn more.
 
-## Reporting bugs
-Please report all bugs and missing Minecraft features here:
+## Useful links
+The MineClone2 repository is hosted at Mesehub. To contribute or report issues, head there.
 
-<https://git.minetest.land/MineClone2/MineClone2/issues>
+* Mesehub: <https://git.minetest.land/MineClone2/MineClone2>
+* Discord: <https://discord.gg/xE4z8EEpDC>
+* YouTube <https://www.youtube.com/channel/UClI_YcsXMF3KNeJtoBfnk9A>
+* IRC: <https://web.libera.chat/#mineclone2>
+* Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
+* Reddit: <https://www.reddit.com/r/MineClone2/>
+* Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
+* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
+* OpenCollective: <https://opencollective.com/mineclone2>
 
-## Chating with the community
-Join our discord server at:
-
-<https://discord.gg/84GKcxczG3>
-
-## Project description
-The main goal of **MineClone 2** is to be a clone of Minecraft and to be released as free software.
-
-* **Target of development: Minecraft, PC Edition, version 1.12** (later known as “Java Edition”)
-* MineClone2 also includes Optifine features supported by the Minetest
-* In general, Minecraft is aimed to be cloned as good as possible
-* Cloning the gameplay has highest priority
-* MineClone 2 will use different assets, but with a similar style
-* Limitations found in Minetest will be documented in the course of development
-* Features of later Minecraft versions are collected in the mineclone5 branch
-
-## Using features from newer versions of Minecraft
-For > 1.12 features, checkout MineClone5. It includes features from newer Minecraft versions.
-Download it here: https://git.minetest.land/MineClone2/MineClone2/src/branch/mineclone5
+## Target
+- Crucially, create a stable, moddable, free/libre clone of Minecraft
+based on the Minetest engine with polished features, usable in both
+singleplayer and multiplayer. Currently, most of **Minecraft Java
+Edition 1.12.2** features are already implemented and polishing existing
+features are prioritized over new feature requests.
+- With lessened priority yet strictly, implement features targetting
+**Minecraft version 1.17 + OptiFine** (OptiFine only as far as supported
+by the Minetest Engine). This means features in parity with the listed
+Minecraft experiences are prioritized over those that don't fulfill this
+scope.
+- Optionally, create a performant experience that will run relatively
+well on really low spec computers. Unfortunately, due to Minecraft's
+mechanisms and Minetest engine's limitations along with a very small
+playerbase on low spec computers, optimizations are hard to investigate.
 
 ## Completion status
 This game is currently in **beta** stage.
@@ -187,7 +189,7 @@ Technical differences from Minecraft:
 * Different engine (Minetest)
 * Different easter eggs
 
-… and finally, MineClone 2 is free software (“free” as in “freedom”)!
+… and finally, MineClone2 is free software (“free” as in “freedom”)!
 
 ## Other readme files
 

README_locale/README.zh_TW.md

@@ -0,0 +1,324 @@
+# MineClone 2
+一個非官方的Minetest遊戲，遊玩方式和Minecraft類似。由davedevils從MineClone分拆。
+由許多人開發。並非由Mojang Studios開發。<!-- "Mojang AB"'s Name changed at 2020/05, main README should change too -->
+
+版本：0.71.0
+
+### 遊玩
+你開始在一個完全由方塊隨機生成的世界裡。你可以探索這個世界，挖掘和建造世界上幾乎所有的方塊，以創造新的結構。你可以選擇在「生存模式」中進行遊戲，在這個模式中，你必須與怪物戰鬥，飢餓求生，並在遊戲的其他各個環節中慢慢進步，如採礦、養殖、建造機器等等。
+
+或者你也可以在「創造模式」中玩，在這個模式中，你可以瞬間建造大部分東西。
+#### Gameplay summary
+
+* 沙盒式遊戲，沒有明確目標
+* 生存：與怪物和飢餓搏鬥
+* 挖礦來獲得礦物和寶物
+* 附魔：獲得經驗值並以附魔強化你的工具
+* 使用收集的方塊來創造偉大的建築
+* 收集鮮花（和其他染料來源），令世界多姿多彩
+* 找些種子並開始耕種
+* 尋找或合成數百個物品之一
+* 建立一個鐵路系統，並從礦車中得到樂趣
+* 用紅石電路建造複雜的機器
+* 在創造模式下，你幾乎可以免費建造任何東西，而且沒有限制。
+
+## 如何開始
+### 開始生存
+* **挖樹幹**直到其破裂並收集木材
+* 將木頭**放入2×2的格子中**（你的物品欄中的「合成格子」），然後製作4塊木材。
+* 將4塊木材按2×2的形狀擺放在合成格子裡，製作成合成臺。
+* **右鍵單擊製作臺**以獲得3×3製作網格，製作更複雜的東西
+* 使用**合成指南**（書形圖標）了解所有可能的合成方式
+* **製作一個木鎬**，這樣你就可以挖石頭了。
+* 不同的工具可以打破不同種類的方塊。試試吧！
+* 繼續玩你想玩的。盡情享受吧！
+
+### 耕種
+* 找到種子
+* 合成鋤頭
+* 用鋤頭右鍵點擊泥土或類似的方塊，創建農田
+* 將種子放在農田上，看著它們長出來
+* Collect plant when fully grown
+* If near water, farmland becomes wet and speeds up growth
+
+### Furnace
+* Craft furnace
+* Furnace allows you to obtain more items
+* Upper slot must contain a smeltable item (example: iron ore)
+* Lower slot must contain a fuel item (example: coal)
+* See tooltips in crafting guide to learn about fuels and smeltable items
+
+### Additional help
+More help about the gameplay, blocks items and much more can be found from inside
+the game. You can access the help from your inventory menu.
+
+### Special items
+The following items are interesting for Creative Mode and for adventure
+map builders. They can not be obtained in-game or in the creative inventory.
+
+* Barrier: `mcl_core:barrier`
+
+Use the `/giveme` chat command to obtain them. See the in-game help for
+an explanation.
+
+#### Incomplete items
+These items do not work yet, but you can get them with `/giveme` for testing:
+
+* Minecart with Chest: `mcl_minecarts:chest_minecart`
+* Minecart with Furnace: `mcl_minecarts:furnace_minecart`
+* Minecart with Hopper: `mcl_minecarts:hopper_minecart`
+* Minecart with Command Block: `mcl_minecarts:command_block_minecart`
+
+## Installation
+This game requires [Minetest](http://minetest.net) to run (version 5.0.0 or
+later). So you need to install Minetest first. Only stable versions of Minetest
+are officially supported.
+There is no support for running MineClone 2 in development versions of Minetest.
+
+To install MineClone 2 (if you haven't already), move this directory into the
+“games” directory of your Minetest data directory. Consult the help of
+Minetest to learn more.
+
+## Project description
+The main goal of **MineClone 2** is to be a clone of Minecraft and to be released as free software.
+
+* **開發目標：我的世界, Java版, 版本 1.12**
+* MineClone2還包括Minetest支持的Optifine功能。
+* 後期Minecraft版本的功能可能會偷偷加入，但它們的優先級較低。
+* 總的來說，Minecraft的目標是在Minetest目前允許的情況下進行克隆。
+* 克隆Minecraft是最優先的。
+* MineClone2將使用不同的圖形和聲音，但風格相似。
+* 克隆界面沒有優先權。只會被粗略地模仿。
+* 在Minetest中發現的局限性將在開發過程中被記錄和報告。
+
+## 完成程度
+該遊戲目前處於**alpha**階段。
+它是可玩的，但尚未完成，預計會出現許多錯誤。
+向後兼容性是**不能保證的**，更新你的世界可能會造成大大小小的bug（比如「缺少節點」的錯誤甚至崩潰）。
+
+已經實現以下功能：
+
+* 工具，武器
+* 盔甲
+* 合成和熔煉系統：2×2 合成格, 合成臺 (3×3 合成格), 熔爐, 合成教學
+* 儲物箱，大型儲物箱，終界箱和界伏盒
+* 熔爐, 漏斗
+* 飢餓和飽食
+* 大多數怪物和動物
+* Minecraft 1.12中的所有礦物<!-- Minecraft 1.17 added copper, so here must mark the version is 1.12, then main README should also add this -->
+* 主世界的大部分方塊
+* 水和岩漿
+* 天氣
+* 28個生態域
+* 地獄，熾熱的維度
+* 紅石電路（部分）
+* 礦車（部分）
+* 狀態效果（部分）
+* 經驗系統
+* 附魔
+* 釀造，藥水，藥水箭（部分）
+* 船
+* 火
+* 建築方塊：樓梯、半磚、門、地板門、柵欄、柵欄門、牆。
+* 時鐘
+* 指南針
+* 海綿
+* 史萊姆方塊（不與紅石互動）
+* 小植物和樹苗
+* 染料
+* 旗幟
+* 裝飾方塊：玻璃、染色玻璃、玻璃片、鐵柵欄、陶土（和染色版本）、頭顱等
+* 物品展示框
+* 唱片機
+* 床
+* 物品欄
+* 創造模式物品欄
+* 生產
+* 書和羽毛筆
+* 一些服務器命令
+* 還有更多！
+
+以下是不完整的特性：
+
+* 生成結構（特別是村莊）
+* 一些怪物和動物
+* 紅石系統
+* 終界
+* 特殊的礦車
+* 一些不簡單的方塊和物品。
+
+額外功能（在Minecraft 1.11中沒有）。
+
+* 內置合成指南，向你展示製作和熔煉的配方
+* 遊戲中的幫助系統包含了大量關於遊戲基礎知識、方塊、物品等方面的幫助。
+* 臨時製作配方。它們的存在只是為了在你不在創造模式下時，提供一些其他無法獲得的物品。這些配方將隨著開發的進行和更多功能的出現而被移除。
+* v6地圖生成器中箱子裡的樹苗。
+* 完全可修改（得益於Minetest強大的Lua API）。
+* 新的方塊和物品：
+    * 查找工具，顯示觸及事物的幫助
+    * 更多的半磚和樓梯
+    * 地獄磚柵欄門
+    * 紅地獄磚柵欄
+    * 紅地獄磚柵欄門
+
+與Minecraft的技性術差異：
+
+* 高度限制為31000格(遠高於Minecraft)
+* 水平世界大小約為62000×62000格（比Minecraft中的小得多，但仍然非常大）。
+* 仍然非常不完整和有問題
+* 塊、物品、敵人和其他功能缺失。
+* 一些項目的名稱略有不同，以便於區分。
+* 唱片機的音樂不同
+* 不同的材質（像素完美）
+* 不同的聲音（各種來源）
+* 不同的引擎（Minetest）
+
+...最後，MineClone2是自由軟件！
+
+## 錯誤報告
+請在此處報告所有錯誤和缺少的功能：
+
+<https://git.minetest.land/MineClone2/MineClone2/issues>
+
+## Chating with the community
+我們有Discord交流羣：
+
+<https://discord.gg/84GKcxczG3>
+
+
+## Other readme files
+
+* `LICENSE.txt`：GPLv3許可文本
+* `CONTRIBUTING.md`: 為那些想參與貢獻的人提供資訊
+* `MISSING_ENGINE_FEATURES.md`: MineClone2需要改进，Minetest中缺失的功能列表。
+* `API.md`: 關於MineClone2的API
+
+## 參與者
+有這麼多人要列出（抱歉）。詳情請查看各mod目錄。本節只是粗略地介紹了本遊戲的核心作者。
+
+### 程式碼
+* [Wuzzy](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=3082)：大多數mod的主要程序員（已退休）
+* davedevils：MineClone 2的原型——「MineClone」的創造者
+* [ex-bart](https://github.com/ex-bart)：紅石比較器
+* [Rootyjr](https://github.com/Rootyjr)：釣竿和錯誤修復
+* [aligator](https://github.com/aligator)：改進門
+* [ryvnf](https://github.com/ryvnf)：爆炸物理
+* MysticTempest：錯誤修復
+* [bzoss](https://github.com/bzoss)：狀態效果，釀造，藥水
+* kay27 <kay27@bk.ru>：經驗系統，錯誤修復和優化（當前維護者）
+* [EliasFleckenstein03](https://github.com/EliasFleckenstein03)：終界水晶，附魔，燃燒的怪物/玩家，箱子的動畫和錯誤修復（當前維護者）
+* epCode：更好的玩家動畫，新徽標
+* 2mac：修復動力鐵軌的錯誤
+* 更多：待篇寫 (請查看各mod目錄)
+
+#### Mod（概括）
+
+* `controls`: Arcelmi
+* `flowlib`: Qwertymine13
+* `walkover`: lordfingle
+* `drippingwater`: kddekadenz
+* `mobs_mc`: maikerumine, 22i and others
+* `awards`: rubenwardy
+* `screwdriver`: RealBadAngel, Maciej Kastakin, Minetest contributors
+* `xpanes`: Minetest contributors
+* `mesecons` mods: Jeija and contributors
+* `wieldview`: Stuart Jones
+* `mcl_meshhand`: Based on `newhand` by jordan4ibanez
+* `mcl_mobs`: Based on Mobs Redo [`mobs`] by TenPlus1 and contributors
+* 大多其他的Mod: Wuzzy
+
+每个mod的详细參與者可以在各个mod目录中找到。
+
+### 圖形
+* [XSSheep](http://www.minecraftforum.net/members/XSSheep)：主要作者；Minecraft 1.11的Pixel Perfection资源包的制作者
+* [Wuzzy](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=3082)：主菜單圖像和各種編輯和添加的材質包
+* [kingoscargames](https://github.com/kingoscargames)：現有材質的各種編輯和添加
+* [leorockway](https://github.com/leorockway)：怪物紋理的一些編輯
+* [xMrVizzy](https://minecraft.curseforge.com/members/xMrVizzy)：釉陶（材質以後會被替換）
+* yutyo <tanakinci2002@gmail.com>：MineClone2標志
+* 其他：GUI圖片
+
+### 翻譯
+* Wuzzy：德語
+* Rocher Laurent <rocherl@club-internet.fr>：法語
+* wuniversales：西班牙語
+* kay27 <kay27@bk.ru>：俄語
+* [Emoji](https://toyshost2.ddns.net)：繁體中文<!-- Hi, after the translate finish, this name should add to the main README too! -->
+
+### 模型
+* [22i](https://github.com/22i)：所有模型的作者
+* [tobyplowy](https://github.com/tobyplowy)：對上述模型進行UV映射修復
+
+### 聲音和音樂
+多種來源。 有關詳細信息，請參見相應的mod目錄。
+
+### 特殊感謝
+
+* Wuzzy，感謝他啟動和維護MineClone2多年。
+* celeron55，創建Minetest。
+* Minetest的社區提供了大量的mods選擇，其中一些最終被納入MineClone 2。
+* Jordach，為《Big Freaking Dig》的唱片機音樂合輯而來
+* 花了太多時間為Minecraft Wiki寫作的工作狂。它是創建這個遊戲的寶貴資源。
+* Notch和Jeb是Minecraft背后的主要力量
+* XSSheep用於創建Pixel Perfection資源包。
+* [22i](https://github.com/22i) 提供出色的模型和支持
+* [maikerumine](http://github.com/maikerumine) 揭開生物和生物群落的序幕
+
+## 給程序員的信息
+你可以在「API.md」中找到有趣和有用的信息。
+
+## 法律信息
+這是一款粉絲開發的遊戲，並非由Mojang AB開發或認可。
+
+複製是一種愛的行為。請複制和分享! <3
+下面是詳細的法律條文，有需要的朋友可以參考。
+
+### License of source code
+```
+MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others)
+is an imitation of Minecraft.
+
+MineClone 2 is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License (in the LICENSE.txt file) for more
+details.
+
+In the mods you might find in the read-me or license
+text files a different license. This counts as dual-licensing.
+You can choose which license applies to you: Either the
+license of MineClone 2 (GNU GPLv3) or the mod's license.
+
+MineClone 2 is a direct continuation of the discontinued MineClone
+project by davedevils.
+
+Mod credits:
+See `README.txt` or `README.md` in each mod directory for information about other authors.
+For mods that do not have such a file, the license is the source code license
+of MineClone 2 and the author is Wuzzy.
+```
+
+### License of media (textures and sounds)
+```
+No non-free licenses are used anywhere.
+
+The textures, unless otherwise noted, are based on the Pixel Perfection resource pack for Minecraft 1.11,
+authored by XSSheep. Most textures are verbatim copies, while some textures have been changed or redone
+from scratch.
+The glazed terracotta textures have been created by (MysticTempest)[https://github.com/MysticTempest].
+Source: <https://www.planetminecraft.com/texture_pack/131pixel-perfection/>
+License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
+
+The main menu images are release under: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)
+
+All other files, unless mentioned otherwise, fall under:
+Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+http://creativecommons.org/licenses/by-sa/3.0/
+
+See README.txt in each mod directory for detailed information about other authors.
+```

mods/CORE/_mcl_autogroup/init.lua

@@ -83,7 +83,7 @@ local function get_hardness_values_for_groups()
 
 	for _, ndef in pairs(minetest.registered_nodes) do
 		for g, _ in pairs(mcl_autogroup.registered_diggroups) do
-			if ndef.groups[g] ~= nil then
+			if ndef.groups[g] then
 				maps[g][ndef._mcl_hardness or 0] = true
 			end
 		end
@@ -207,6 +207,10 @@ end
 function mcl_autogroup.can_harvest(nodename, toolname)
 	local ndef = minetest.registered_nodes[nodename]
 
+	if not ndef then
+		return false
+	end
+
 	if minetest.get_item_group(nodename, "dig_immediate") >= 2 then
 		return true
 	end

mods/CORE/controls/init.lua

@@ -1,6 +1,8 @@
 local get_connected_players = minetest.get_connected_players
 local clock = os.clock
 
+local pairs = pairs
+
 controls = {}
 controls.players = {}
 
@@ -20,15 +22,15 @@ function controls.register_on_hold(func)
 end
 
 local known_controls = {
-	jump=true,
-	right=true,
-	left=true,
-	LMB=true,
-	RMB=true,
-	sneak=true,
-	aux1=true,
-	down=true,
-	up=true,
+	jump = true,
+	right = true,
+	left = true,
+	LMB = true,
+	RMB = true,
+	sneak = true,
+	aux1 = true,
+	down = true,
+	up = true,
 }
 
 minetest.register_on_joinplayer(function(player)
@@ -52,17 +54,17 @@ minetest.register_globalstep(function(dtime)
 			for cname, cbool in pairs(player_controls) do
 				if known_controls[cname] == true then
 					--Press a key
-			if cbool==true and controls.players[player_name][cname][1]==false then
+					if cbool == true and controls.players[player_name][cname][1] == false then
 						for _, func in pairs(controls.registered_on_press) do
 							func(player, cname)
 						end
 						controls.players[player_name][cname] = {true, clock()}
-			elseif cbool==true and controls.players[player_name][cname][1]==true then
+					elseif cbool == true and controls.players[player_name][cname][1] == true then
 						for _, func in pairs(controls.registered_on_hold) do
 							func(player, cname, clock()-controls.players[player_name][cname][2])
 						end
 					--Release a key
-			elseif cbool==false and controls.players[player_name][cname][1]==true then
+					elseif cbool == false and controls.players[player_name][cname][1] == true then
 						for _, func in pairs(controls.registered_on_release) do
 							func(player, cname, clock()-controls.players[player_name][cname][2])
 						end

mods/CORE/mcl_attached/init.lua

@@ -1,29 +1,93 @@
+-- Overrides the builtin minetest.check_single_for_falling.
+-- We need to do this in order to handle nodes in mineclone specific groups
+-- "supported_node" and "attached_node_facedir".
+--
+-- Nodes in group "supported_node" can be placed on any node that does not
+-- have the "airlike" drawtype.  Carpets are an example of this type.
+
 local vector = vector
 
 local facedir_to_dir = minetest.facedir_to_dir
 local get_item_group = minetest.get_item_group
 local remove_node = minetest.remove_node
 local get_node = minetest.get_node
+local get_meta = minetest.get_meta
+local registered_nodes = minetest.registered_nodes
+local get_node_drops = minetest.get_node_drops
+local add_item = minetest.add_item
 
+-- drop_attached_node(p)
+--
+-- This function is copied verbatim from minetest/builtin/game/falling.lua
+-- We need this to do the exact same dropping node handling in our override
+-- minetest.check_single_for_falling() function as in the builtin function.
+--
+local function drop_attached_node(p)
+	local n = get_node(p)
+	local drops = get_node_drops(n, "")
+	local def = registered_nodes[n.name]
+	if def and def.preserve_metadata then
+		local oldmeta = get_meta(p):to_table().fields
+		-- Copy pos and node because the callback can modify them.
+		local pos_copy = vector.new(p)
+		local node_copy = {name=n.name, param1=n.param1, param2=n.param2}
+		local drop_stacks = {}
+		for k, v in pairs(drops) do
+			drop_stacks[k] = ItemStack(v)
+		end
+		drops = drop_stacks
+		def.preserve_metadata(pos_copy, node_copy, oldmeta, drops)
+	end
+	if def and def.sounds and def.sounds.fall then
+		core.sound_play(def.sounds.fall, {pos = p}, true)
+	end
+	remove_node(p)
+	for _, item in pairs(drops) do
+		local pos = {
+			x = p.x + math.random()/2 - 0.25,
+			y = p.y + math.random()/2 - 0.25,
+			z = p.z + math.random()/2 - 0.25,
+		}
+		add_item(pos, item)
+	end
+end
+
+-- minetest.check_single_for_falling(pos)
+--
+-- * causes an unsupported `group:falling_node` node to fall and causes an
+--   unattached `group:attached_node` or `group:attached_node_facedir` node
+--   or unsupported `group:supported_node` node to drop.
+-- * does not spread these updates to neighbours.
+--
+-- Returns true if the node at <pos> has spawned a falling node or has been
+-- dropped as item(s).
+--
 local original_function = minetest.check_single_for_falling
 
 function minetest.check_single_for_falling(pos)
-	local ret_o = original_function(pos)
-	local ret = false
-	local node = minetest.get_node(pos)
+	if original_function(pos) then
+		return true
+	end
+
+	local node = get_node(pos)
 	if get_item_group(node.name, "attached_node_facedir") ~= 0 then
 		local dir = facedir_to_dir(node.param2)
 		if dir then
 			if get_item_group(get_node(vector.add(pos, dir)).name, "solid") == 0 then
-				remove_node(pos)
-				local drops = minetest.get_node_drops(node.name, "")
-				for dr=1, #drops do
-					minetest.add_item(pos, drops[dr])
-				end
-				ret = true
+				drop_attached_node(pos)
+				return true
 			end
 		end
 	end
-	return ret_o or ret
+
+	if get_item_group(node.name, "supported_node") ~= 0 then
+		local def = registered_nodes[get_node(vector.offset(pos, 0, -1, 0)).name]
+		if def and def.drawtype == "airlike" then
+			drop_attached_node(pos)
+			return true
+		end
+	end
+
+	return false
 end
 

mods/CORE/mcl_damage/API.md

@@ -0,0 +1,15 @@
+# mcl_damage
+
+This mod is intended to overall minetest's native damage system, to provide a better integration between features that deals with entities' health.
+
+WARNING: Not using it inside your mods may cause strange bugs (using the native damage system may cause conflicts with this system).
+
+## Callbacks
+
+To modify the amount of damage made by something:
+
+```lua
+--obj: an ObjectRef
+mcl_damage.register_modifier(function(obj, damage, reason)
+end, 0)
+```

mods/CORE/mcl_explosions/init.lua

@@ -12,9 +12,13 @@ under the LGPLv2.1 license.
 
 mcl_explosions = {}
 
-local mod_fire = minetest.get_modpath("mcl_fire") ~= nil
+local mod_fire = minetest.get_modpath("mcl_fire")
 --local CONTENT_FIRE = minetest.get_content_id("mcl_fire:fire")
 
+local math = math
+local vector = vector
+local table = table
+
 local hash_node_position = minetest.hash_node_position
 local get_objects_inside_radius = minetest.get_objects_inside_radius
 local get_position_from_hash = minetest.get_position_from_hash
@@ -24,6 +28,7 @@ local get_voxel_manip = minetest.get_voxel_manip
 local bulk_set_node = minetest.bulk_set_node
 local check_for_falling = minetest.check_for_falling
 local add_item = minetest.add_item
+local pos_to_string = minetest.pos_to_string
 
 -- Saved sphere explosion shapes for various radiuses
 local sphere_shapes = {}
@@ -240,7 +245,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
 		local ent = obj:get_luaentity()
 
 		-- Ignore items to lower lag
-		if (obj:is_player() or (ent and ent.name ~= '__builtin.item')) and obj:get_hp() > 0 then
+		if (obj:is_player() or (ent and ent.name ~= "__builtin.item")) and obj:get_hp() > 0 then
 			local opos = obj:get_pos()
 			local collisionbox = nil
 
@@ -356,9 +361,9 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
 		local on_blast = node_on_blast[data[idx]]
 		local remove = true
 
-		if do_drop or on_blast ~= nil then
+		if do_drop or on_blast then
 			local npos = get_position_from_hash(hash)
-			if on_blast ~= nil then
+			if on_blast then
 				on_blast(npos, 1.0, do_drop)
 				remove = false
 			else
@@ -400,8 +405,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
 	end
 
 	-- Log explosion
-	minetest.log('action', 'Explosion at ' .. minetest.pos_to_string(pos) ..
-		' with strength ' .. strength .. ' and radius ' .. radius)
+	minetest.log("action", "Explosion at "..pos_to_string(pos).." with strength "..strength.." and radius "..radius)
 end
 
 -- Create an explosion with strength at pos.

mods/CORE/mcl_explosions/locale/mcl_explosions.pl.tr

@@ -0,0 +1,2 @@
+# textdomain:mcl_explosions
+@1 was caught in an explosion.=@1 została wysadzona.

mods/CORE/mcl_explosions/locale/mcl_explosions.zh_TW.tr

@@ -0,0 +1,2 @@
+# textdomain:mcl_explosions
+@1 was caught in an explosion.=@1 被炸飛了

mods/CORE/mcl_init/init.lua

@@ -32,9 +32,9 @@ local singlenode = mg_name == "singlenode"
 
 -- Calculate mapgen_edge_min/mapgen_edge_max
 mcl_vars.chunksize = math.max(1, tonumber(minetest.get_mapgen_setting("chunksize")) or 5)
-mcl_vars.MAP_BLOCKSIZE = math.max(1, core.MAP_BLOCKSIZE or 16)
+mcl_vars.MAP_BLOCKSIZE = math.max(1, minetest.MAP_BLOCKSIZE or 16)
 mcl_vars.mapgen_limit = math.max(1, tonumber(minetest.get_mapgen_setting("mapgen_limit")) or 31000)
-mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, core.MAX_MAP_GENERATION_LIMIT or 31000)
+mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, minetest.MAX_MAP_GENERATION_LIMIT or 31000)
 local central_chunk_offset = -math.floor(mcl_vars.chunksize / 2)
 mcl_vars.central_chunk_offset_in_nodes = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
 mcl_vars.chunk_size_in_nodes = mcl_vars.chunksize * mcl_vars.MAP_BLOCKSIZE

mods/CORE/mcl_loot/init.lua

@@ -58,26 +58,27 @@ function mcl_loot.get_loot(loot_definitions, pr)
 		end
 		if item then
 			local itemstring = item.itemstring
-			local itemstack = item.itemstack
+
 			if itemstring then
+				local stack = ItemStack(itemstring)
+
 				if item.amount_min and item.amount_max then
-					itemstring = itemstring .. " " .. pr:next(item.amount_min, item.amount_max)
+					stack:set_count(pr:next(item.amount_min, item.amount_max))
 				end
+
 				if item.wear_min and item.wear_max then
 					-- Sadly, PseudoRandom only allows very narrow ranges, so we set wear in steps of 10
 					local wear_min = math.floor(item.wear_min / 10)
 					local wear_max = math.floor(item.wear_max / 10)
-					local wear = pr:next(wear_min, wear_max) * 10
 
-					if not item.amount_min and not item.amount_max then
-						itemstring = itemstring .. " 1"
+					stack:set_wear(pr:next(wear_min, wear_max) * 10)
 				end
 
-					itemstring = itemstring .. " " .. tostring(wear)
+				if item.func then
+					item.func(stack, pr)
 				end
-				table.insert(items, itemstring)
-			elseif itemstack then
-				table.insert(items, itemstack)
+
+				table.insert(items, stack)
 			else
 				minetest.log("error", "[mcl_loot] INTERNAL ERROR! Failed to select random loot item!")
 			end

mods/CORE/mcl_util/init.lua

@@ -1,5 +1,27 @@
 mcl_util = {}
 
+-- Updates all values in t using values from to*.
+function table.update(t, ...)
+	for _, to in ipairs{...} do
+		for k,v in pairs(to) do
+			t[k] = v
+		end
+	end
+	return t
+end
+
+-- Updates nil values in t using values from to*.
+function table.update_nil(t, ...)
+	for _, to in ipairs{...} do
+		for k,v in pairs(to) do
+			if t[k] == nil then
+				t[k] = v
+			end
+		end
+	end
+	return t
+end
+
 -- Based on minetest.rotate_and_place
 
 --[[
@@ -335,6 +357,32 @@ function mcl_util.get_first_occupied_inventory_slot(inventory, listname)
 	return mcl_util.get_eligible_transfer_item_slot(inventory, listname)
 end
 
+local function drop_item_stack(pos, stack)
+	if not stack or stack:is_empty() then return end
+	local drop_offset = vector.new(math.random() - 0.5, 0, math.random() - 0.5)
+	minetest.add_item(vector.add(pos, drop_offset), stack)
+end
+
+function mcl_util.drop_items_from_meta_container(listname)
+	return function(pos, oldnode, oldmetadata)
+		if oldmetadata and oldmetadata.inventory then
+			-- process in after_dig_node callback
+			local main = oldmetadata.inventory.main
+			if not main then return end
+			for _, stack in pairs(main) do
+				drop_item_stack(pos, stack)
+			end
+		else
+			local meta = minetest.get_meta(pos)
+			local inv = meta:get_inventory()
+			for i = 1, inv:get_size("main") do
+				drop_item_stack(pos, inv:get_stack("main", i))
+			end
+			meta:from_table()
+		end
+	end
+end
+
 -- Returns true if item (itemstring or ItemStack) can be used as a furnace fuel.
 -- Returns false otherwise
 function mcl_util.is_fuel(item)
@@ -456,7 +504,9 @@ function mcl_util.calculate_durability(itemstack)
 				end
 			end
 		end
-		uses = uses or (next(itemstack:get_tool_capabilities().groupcaps) or {}).uses
+
+		local _, groupcap = next(itemstack:get_tool_capabilities().groupcaps)
+		uses = uses or (groupcap or {}).uses
 	end
 
 	return uses or 0
@@ -538,3 +588,25 @@ function mcl_util.get_object_name(object)
 		return luaentity.nametag and luaentity.nametag ~= "" and luaentity.nametag or luaentity.description or luaentity.name
 	end
 end
+
+function mcl_util.replace_mob(obj, mob)
+	local rot = obj:get_yaw()
+	local pos = obj:get_pos()
+	obj:remove()
+	obj = minetest.add_entity(pos, mob)
+	obj:set_yaw(rot)
+	return obj
+end
+
+function mcl_util.get_pointed_thing(player, liquid)
+	local pos = vector.offset(player:get_pos(), 0, player:get_properties().eye_height, 0)
+	local look_dir = vector.multiply(player:get_look_dir(), 5)
+	local pos2 = vector.add(pos, look_dir)
+	local ray = minetest.raycast(pos, pos2, false, liquid)
+	
+	if ray then
+		for pointed_thing in ray do
+			return pointed_thing
+		end
+	end
+end

mods/CORE/mcl_worlds/API.md

@@ -12,7 +12,7 @@ Params:
 
 * pos: position
 
-## mcl_worlds.y_to_layer(y)
+## mcl_worlds.y_to_layer(y)
 This function is used to calculate the minetest y layer and dimension of the given <y> minecraft layer.
 Mainly used for ore generation.
 Takes an Y coordinate as input and returns:

mods/CORE/mcl_worlds/init.lua

@@ -1,5 +1,7 @@
 mcl_worlds = {}
 
+local get_connected_players = minetest.get_connected_players
+
 -- For a given position, returns a 2-tuple:
 -- 1st return value: true if pos is in void
 -- 2nd return value: true if it is in the deadly part of the void
@@ -44,12 +46,16 @@ function mcl_worlds.y_to_layer(y)
 	end
 end
 
+local y_to_layer = mcl_worlds.y_to_layer
+
 -- Takes a pos and returns the dimension it belongs to (same as above)
 function mcl_worlds.pos_to_dimension(pos)
-	local _, dim = mcl_worlds.y_to_layer(pos.y)
+	local _, dim = y_to_layer(pos.y)
 	return dim
 end
 
+local pos_to_dimension = mcl_worlds.pos_to_dimension
+
 -- Takes a Minecraft layer and a “dimension” name
 -- and returns the corresponding Y coordinate for
 -- MineClone 2.
@@ -119,6 +125,8 @@ function mcl_worlds.dimension_change(player, dimension)
 	last_dimension[playername] = dimension
 end
 
+local dimension_change = mcl_worlds.dimension_change
+
 ----------------------- INTERNAL STUFF ----------------------
 
 -- Update the dimension callbacks every DIM_UPDATE seconds
@@ -126,22 +134,41 @@ local DIM_UPDATE = 1
 local dimtimer = 0
 
 minetest.register_on_joinplayer(function(player)
-	last_dimension[player:get_player_name()] = mcl_worlds.pos_to_dimension(player:get_pos())
+	last_dimension[player:get_player_name()] = pos_to_dimension(player:get_pos())
 end)
 
 minetest.register_globalstep(function(dtime)
 	-- regular updates based on iterval
 	dimtimer = dimtimer + dtime;
 	if dimtimer >= DIM_UPDATE then
-		local players = minetest.get_connected_players()
-		for p=1, #players do
-			local dim = mcl_worlds.pos_to_dimension(players[p]:get_pos())
+		local players = get_connected_players()
+		for p = 1, #players do
+			local dim = pos_to_dimension(players[p]:get_pos())
 			local name = players[p]:get_player_name()
 			if dim ~= last_dimension[name] then
-				mcl_worlds.dimension_change(players[p], dim)
+				dimension_change(players[p], dim)
 			end
 		end
 		dimtimer = 0
 	end
 end)
 
+function mcl_worlds.get_cloud_parameters()
+	if minetest.get_mapgen_setting("mg_name") == "valleys" then
+		return {
+			height = 384, --valleys has a much higher average elevation thus often "normal" landscape ends up in the clouds
+			speed = {x=-2, z=0},
+			thickness=5,
+			color="#FFF0FEF",
+			ambient = "#201060",
+		}
+	else
+		-- MC-style clouds: Layer 127, thickness 4, fly to the “West”
+		return {
+			height = mcl_worlds.layer_to_y(127),
+			speed = {x=-2, z=0},
+			thickness = 4,
+			color = "#FFF0FEF",
+		}
+	end
+end

mods/CORE/tga_encoder/init.lua

@@ -38,18 +38,32 @@ function image:encode_header()
 	self.data = self.data
 		.. string.char(0) -- image id
 		.. string.char(0) -- color map type
-		.. string.char(2) -- image type (uncompressed true-color image = 2)
+		.. string.char(10) -- image type (RLE RGB = 10)
 	self:encode_colormap_spec() -- color map specification
 	self:encode_image_spec() -- image specification
 end
 
 function image:encode_data()
+	local current_pixel = ''
+	local previous_pixel = ''
+	local count = 1
+	local packets = {}
+	local rle_packet = ''
 	for _, row in ipairs(self.pixels) do
 		for _, pixel in ipairs(row) do
-			self.data = self.data
-				.. string.char(pixel[3], pixel[2], pixel[1])
+			current_pixel = string.char(pixel[3], pixel[2], pixel[1])
+			if current_pixel ~= previous_pixel or count == 128 then
+				packets[#packets +1] = rle_packet
+				count = 1
+				previous_pixel = current_pixel
+			else
+				count = count + 1
+			end
+			rle_packet = string.char(128 + count - 1) .. current_pixel
 		end
 	end
+	packets[#packets +1] = rle_packet
+	self.data = self.data .. table.concat(packets)
 end
 
 function image:encode_footer()
@@ -70,7 +84,7 @@ function image:encode()
 end
 
 function image:save(filename)
-	local f = assert(io.open(filename, "w"))
+	local f = assert(io.open(filename, "wb"))
 	f:write(self.data)
 	f:close()
 end

mods/CORE/walkover/init.lua

@@ -2,46 +2,45 @@
 
 local get_connected_players = minetest.get_connected_players
 local get_node = minetest.get_node
-local vector_add = vector.add
+local vector = vector
 local ceil = math.ceil
+local pairs = pairs
 
 walkover = {}
-walkover.registered_globals = {}
-
-function walkover.register_global(func)
-	table.insert(walkover.registered_globals, func)
-end
 
 local on_walk = {}
 local registered_globals = {}
 
+walkover.registered_globals = registered_globals
+
+function walkover.register_global(func)
+	table.insert(registered_globals, func)
+end
+
 minetest.register_on_mods_loaded(function()
 	for name,def in pairs(minetest.registered_nodes) do
 		if def.on_walk_over then
 			on_walk[name] = def.on_walk_over
 		end
 	end
-	for _,func in ipairs(walkover.registered_globals) do --cache registered globals
-		table.insert(registered_globals, func)
-	end
 end)
 
 local timer = 0
 minetest.register_globalstep(function(dtime)
-	timer = timer + dtime;
+	timer = timer + dtime
 	if timer >= 0.3 then
-		for _,player in pairs(get_connected_players()) do
-		local pp = player:get_pos()
-		pp.y = ceil(pp.y)
-			local loc = vector_add(pp, {x=0,y=-1,z=0})
-			if loc ~= nil then
-				local nodeiamon = get_node(loc)
-				if nodeiamon ~= nil then
-					if on_walk[nodeiamon.name] then
-						on_walk[nodeiamon.name](loc, nodeiamon, player)
+		for _, player in pairs(get_connected_players()) do
+			local ppos = player:get_pos()
+			ppos.y = ceil(ppos.y)
+			local npos = vector.add(ppos, vector.new(0, -1, 0))
+			if npos then
+				local node = get_node(npos)
+				if node then
+					if on_walk[node.name] then
+						on_walk[node.name](npos, node, player)
 					end
 					for i = 1, #registered_globals do
-						registered_globals[i](loc, nodeiamon, player)
+						registered_globals[i](npos, node, player)
 					end
 				end
 			end

mods/ENTITIES/drippingwater/init.lua

@@ -1,114 +0,0 @@
---Dripping Water Mod
---by kddekadenz
-
-local math = math
-
--- License of code, textures & sounds: CC0
-
---Drop entities
-
---water
-
-local water_tex = "default_water_source_animated.png^[verticalframe:16:0"
-minetest.register_entity("drippingwater:drop_water", {
-	hp_max = 1,
-	physical = true,
-	collide_with_objects = false,
-	collisionbox = {-0.025,-0.05,-0.025,0.025,-0.01,0.025},
-	pointable = false,
-	visual = "cube",
-	visual_size = {x=0.05, y=0.1},
-	textures = {water_tex, water_tex, water_tex, water_tex, water_tex, water_tex},
-	spritediv = {x=1, y=1},
-	initial_sprite_basepos = {x=0, y=0},
-	static_save = false,
-	on_activate = function(self, staticdata)
-		self.object:set_sprite({x=0,y=0}, 1, 1, true)
-	end,
-	on_step = function(self, dtime)
-		local k = math.random(1,222)
-		local ownpos = self.object:get_pos()
-		if k==1 then
-			self.object:set_acceleration({x=0, y=-5, z=0})
-		end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y +0.5, z=ownpos.z}).name == "air" then
-			self.object:set_acceleration({x=0, y=-5, z=0})
-		end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y -0.5, z=ownpos.z}).name ~= "air" then
-			self.object:remove()
-			minetest.sound_play({name="drippingwater_drip"}, {pos = ownpos, gain = 0.5, max_hear_distance = 8}, true)
-		end
-	end,
-})
-
-
---lava
-
-local lava_tex = "default_lava_source_animated.png^[verticalframe:16:0"
-minetest.register_entity("drippingwater:drop_lava", {
-	hp_max = 1,
-	physical = true,
-	collide_with_objects = false,
-	collisionbox = {-0.025,-0.05,-0.025,0.025,-0.01,0.025},
-	glow = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
-	pointable = false,
-	visual = "cube",
-	visual_size = {x=0.05, y=0.1},
-	textures = {lava_tex, lava_tex, lava_tex, lava_tex, lava_tex, lava_tex},
-	spritediv = {x=1, y=1},
-	initial_sprite_basepos = {x=0, y=0},
-	static_save = false,
-	on_activate = function(self, staticdata)
-		self.object:set_sprite({x=0,y=0}, 1, 0, true)
-	end,
-	on_step = function(self, dtime)
-		local k = math.random(1,222)
-		local ownpos = self.object:get_pos()
-		if k == 1 then
-			self.object:set_acceleration({x=0, y=-5, z=0})
-		end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y +0.5, z=ownpos.z}).name == "air" then
-			self.object:set_acceleration({x=0, y=-5, z=0})
-		end
-		if minetest.get_node({x=ownpos.x, y=ownpos.y -0.5, z=ownpos.z}).name ~= "air" then
-			self.object:remove()
-			minetest.sound_play({name="drippingwater_lavadrip"}, {pos = ownpos, gain = 0.5, max_hear_distance = 8}, true)
-		end
-	end,
-})
-
-
-
---Create drop
-
-minetest.register_abm({
-	label = "Create water drops",
-	nodenames = {"group:opaque", "group:leaves"},
-	neighbors = {"group:water"},
-	interval = 2,
-	chance = 22,
-	action = function(pos)
-		if minetest.get_item_group(minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name, "water") ~= 0
-			and minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name == "air" then
-			local i = math.random(-45,45) / 100
-			minetest.add_entity({x=pos.x + i, y=pos.y - 0.501, z=pos.z + i}, "drippingwater:drop_water")
-		end
-	end,
-})
-
---Create lava drop
-
-minetest.register_abm({
-	label = "Create lava drops",
-	nodenames = {"group:opaque"},
-	neighbors = {"group:lava"},
-	interval = 2,
-	chance = 22,
-	action = function(pos)
-		if minetest.get_item_group(minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name, "lava") ~= 0
-			and	minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name == "air" then
-			local i = math.random(-45,45) / 100
-			minetest.add_entity({x=pos.x + i, y=pos.y - 0.501, z=pos.z + i}, "drippingwater:drop_lava")
-		end
-	end,
-})

mods/ENTITIES/mcl_boats/init.lua

@@ -1,4 +1,4 @@
-local S = minetest.get_translator("mcl_boats")
+local S = minetest.get_translator(minetest.get_current_modname())
 
 local boat_visual_size = {x = 1, y = 1, z = 1}
 local paddling_speed = 22
@@ -84,7 +84,7 @@ local function attach_object(self, obj)
 			end
 		end, name)
 		obj:set_look_horizontal(yaw)
-		mcl_tmp_message.message(obj, S("Sneak to dismount"))
+		mcl_title.set(obj, "actionbar", {text=S("Sneak to dismount"), color="white", stay=60})
 	else
 		obj:get_luaentity()._old_visual_size = visual_size
 	end
@@ -115,7 +115,7 @@ local boat = {
 	collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
 	visual = "mesh",
 	mesh = "mcl_boats_boat.b3d",
-	textures = {"mcl_boats_texture_oak_boat.png"},
+	textures = {"mcl_boats_texture_oak_boat.png", "mcl_boats_texture_oak_boat.png", "mcl_boats_texture_oak_boat.png", "mcl_boats_texture_oak_boat.png", "mcl_boats_texture_oak_boat.png"},
 	visual_size = boat_visual_size,
 	hp_max = boat_max_hp,
 	damage_texture_modifier = "^[colorize:white:0",
@@ -148,6 +148,11 @@ function boat.on_activate(self, staticdata, dtime_s)
 		self._v = data.v
 		self._last_v = self._v
 		self._itemstring = data.itemstring
+
+		while #data.textures < 5 do
+			table.insert(data.textures, data.textures[1])
+		end
+
 		self.object:set_properties({textures = data.textures})
 	end
 end
@@ -262,7 +267,7 @@ function boat.on_step(self, dtime, moveresult)
 			return
 		end
 		local yaw = self.object:get_yaw()
-		if ctrl.up then
+		if ctrl and ctrl.up then
 			-- Forwards
 			self._v = self._v + 0.1 * v_factor
 
@@ -271,7 +276,7 @@ function boat.on_step(self, dtime, moveresult)
 				self.object:set_animation({x=0, y=40}, paddling_speed, 0, true)
 				self._animation = 1
 			end
-		elseif ctrl.down then
+		elseif ctrl and ctrl.down then
 			-- Backwards
 			self._v = self._v - 0.1 * v_factor
 
@@ -337,7 +342,8 @@ function boat.on_step(self, dtime, moveresult)
 			self.object:get_velocity().y)
 	else
 		p.y = p.y + 1
-		if is_water(p) then
+		local is_obsidian_boat = self.object:get_luaentity()._itemstring == "mcl_boats:boat_obsidian"
+		if is_water(p) or is_obsidian_boat then
 			-- Inside water: Slowly sink
 			local y = self.object:get_velocity().y
 			y = y - 0.01
@@ -377,13 +383,13 @@ end
 -- Register one entity for all boat types
 minetest.register_entity("mcl_boats:boat", boat)
 
-local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak" }
-local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat") }
+local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian" }
+local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat") }
 local craftstuffs = {}
 if minetest.get_modpath("mcl_core") then
-	craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood" }
+	craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian" }
 end
-local images = { "oak", "spruce", "birch", "jungle", "acacia", "dark_oak" }
+local images = { "oak", "spruce", "birch", "jungle", "acacia", "dark_oak", "obsidian" }
 
 for b=1, #boat_ids do
 	local itemstring = "mcl_boats:"..boat_ids[b]
@@ -434,8 +440,9 @@ for b=1, #boat_ids do
 				pos = vector.add(pos, vector.multiply(dir, boat_y_offset_ground))
 			end
 			local boat = minetest.add_entity(pos, "mcl_boats:boat")
+			local texture = "mcl_boats_texture_"..images[b].."_boat.png"
 			boat:get_luaentity()._itemstring = itemstring
-			boat:set_properties({textures = { "mcl_boats_texture_"..images[b].."_boat.png" }})
+			boat:set_properties({textures = { texture, texture, texture, texture, texture }})
 			boat:set_yaw(placer:get_look_horizontal())
 			if not minetest.is_creative_enabled(placer:get_player_name()) then
 				itemstack:take_item()
@@ -470,6 +477,6 @@ minetest.register_craft({
 	burntime = 20,
 })
 
-if minetest.get_modpath("doc_identifier") ~= nil then
+if minetest.get_modpath("doc_identifier") then
 	doc.sub.identifier.register_object("mcl_boats:boat", "craftitems", "mcl_boats:boat")
 end

mods/ENTITIES/mcl_boats/locale/mcl_boats.fr.tr

@@ -6,6 +6,7 @@ Boats are used to travel on the surface of water.=Les bateaux sont utilisés pou
 Dark Oak Boat=Bateau en Chêne Noir
 Jungle Boat=Bateau en Acajou
 Oak Boat=Bateau en Chêne
-Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Cliquez de nouveau avec le bouton droit sur le bateau pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
+Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Faites un clic droit sur une source d'eau pour placer le bateau. Faites un clic droit sur le bateau pour y entrer. Utilisez [Gauche] et [Droite] pour diriger, [Avant] pour accélérer et [Arrière] pour ralentir ou reculer. Utilisez [Sneak] pour le quitter, frappez le bateau pour le faire tomber en tant qu'objet.
 Spruce Boat=Bateau en Sapin
 Water vehicle=Véhicule aquatique
+Sneak to dismount=

mods/ENTITIES/mcl_boats/locale/mcl_boats.pl.tr

@@ -0,0 +1,12 @@
+# textdomain: mcl_boats
+Acacia Boat=Akacjowa łódź
+Birch Boat=Brzozowa łódź
+Boat=Łódź
+Boats are used to travel on the surface of water.=Łodzie są wykorzystywane do podróżowania po powierzchni wody.
+Dark Oak Boat=Ciemno-dębowa łódź
+Jungle Boat=Tropikalna łódź
+Oak Boat=Dębowa łódź
+Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=Kliknij prawym przyciskiem myszy na źródło wody by postawić łódź. Kliknij prawym przyciskiem myszy by w nią wsiąść. Użyj przycisków [Lewy] oraz [Prawy] by sterować, [Naprzód] by przyspieszyć i [W tył] by zwolnić lub się cofać. Kliknij [Skradanie] by z niej wyjść, uderz ją by wziąć ją jako przedmiot.
+Spruce Boat=Świerkowa łódź
+Water vehicle=Pojazd wodny
+Sneak to dismount=Skradaj się by opuścić łódź

mods/ENTITIES/mcl_boats/locale/mcl_boats.zh_TW.tr

@@ -0,0 +1,11 @@
+# textdomain: mcl_boats
+Acacia Boat=相思木船
+Birch Boat=白樺木船
+Boat=船
+Boats are used to travel on the surface of water.=船是用來在水上行走的交通工具。
+Dark Oak Boat=黑橡木船
+Jungle Boat=叢林木船
+Oak Boat=橡木船
+Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Rightclick the boat again to leave it, punch the boat to make it drop as an item.=右鍵單擊水源以放置船。右鍵單擊船以搭乘它。使用[左]和[右]進行轉向，[向前]加快速度，[向後]減速或向後移動。再次右鍵單擊船以離開它，打擊船以使其掉落為物品。
+Spruce Boat=杉木船
+Water vehicle=水上交通工具

mods/ENTITIES/mcl_boats/mod.conf

@@ -1,7 +1,7 @@
 name = mcl_boats
 author = PilzAdam
 description = Adds drivable boats.
-depends = mcl_player, flowlib
+depends = mcl_player, flowlib, mcl_title
 optional_depends = mcl_core, doc_identifier
 
 

mods/ENTITIES/mcl_burning/api.lua

@@ -26,20 +26,64 @@ function mcl_burning.get_collisionbox(obj, smaller, storage)
 	end
 end
 
+local find_nodes_in_area = minetest.find_nodes_in_area
+
 function mcl_burning.get_touching_nodes(obj, nodenames, storage)
 	local pos = obj:get_pos()
 	local minp, maxp = mcl_burning.get_collisionbox(obj, true, storage)
-	local nodes = minetest.find_nodes_in_area(vector.add(pos, minp), vector.add(pos, maxp), nodenames)
+	local nodes = find_nodes_in_area(vector.add(pos, minp), vector.add(pos, maxp), nodenames)
 	return nodes
 end
 
+-- Manages the fire animation on a burning player's HUD
+--
+-- Parameters:
+--   player - a valid player object;
+--
+-- If the player already has a fire HUD, updates the burning animation.
+-- If the fire does not have a fire HUD, initializes the HUD.
+--
+function mcl_burning.update_hud(player)
+	local animation_frames = tonumber(minetest.settings:get("fire_animation_frames")) or 8
+	local hud_flame_animated = "mcl_burning_hud_flame_animated.png^[opacity:180^[verticalframe:" .. animation_frames .. ":"
+
+	local storage = mcl_burning.get_storage(player)
+	if not storage.fire_hud_id then
+		storage.animation_frame = 1
+		storage.fire_hud_id = player:hud_add({
+			hud_elem_type = "image",
+			position = {x = 0.5, y = 0.5},
+			scale = {x = -100, y = -100},
+			text = hud_flame_animated .. storage.animation_frame,
+			z_index = 1000,
+		})
+	else
+		storage.animation_frame = storage.animation_frame + 1
+		if storage.animation_frame > animation_frames - 1 then
+			storage.animation_frame = 0
+		end
+		player:hud_change(storage.fire_hud_id, "text", hud_flame_animated .. storage.animation_frame)
+	end
+end
+
+-- Sets and object state as burning and adds a fire animation to the object.
+--
+-- Parameters:
+--   obj - may be a player or a lua_entity;
+--   burn_time - sets the object's burn duration;
+--
+-- If obj is a player, adds a fire animation to the HUD, if obj is a
+-- lua_entity, adds an animated fire entity to obj.
+-- The effective burn duration is modified by obj's armor protection.
+-- If obj was already burning, its burn duration is updated if the current
+-- duration is less than burn_time.
+-- If obj is dead, fireproof or a creative player, this function does nothing.
+--
 function mcl_burning.set_on_fire(obj, burn_time)
 	if obj:get_hp() < 0 then
 		return
 	end
 
-	local storage = mcl_burning.get_storage(obj)
-
 	local luaentity = obj:get_luaentity()
 	if luaentity and luaentity.fire_resistant then
 		return
@@ -60,50 +104,32 @@ function mcl_burning.set_on_fire(obj, burn_time)
 				end
 			end
 		end
-
 		if max_fire_prot_lvl > 0 then
 			burn_time = burn_time - math.floor(burn_time * max_fire_prot_lvl * 0.15)
 		end
 	end
 
-	if not storage.burn_time or burn_time >= storage.burn_time then
-		if obj:is_player() and not storage.fire_hud_id then
-			storage.fire_hud_id = obj:hud_add({
-				hud_elem_type = "image",
-				position = {x = 0.5, y = 0.5},
-				scale = {x = -100, y = -100},
-				text = "mcl_burning_entity_flame_animated.png^[opacity:180^[verticalframe:" .. mcl_burning.animation_frames .. ":" .. 1,
-				z_index = 1000,
-			})
+	local storage = mcl_burning.get_storage(obj)
+	if storage.burn_time then
+		if burn_time > storage.burn_time then
+			storage.burn_time = burn_time
+		end
+		return
 	end
 	storage.burn_time = burn_time
 	storage.fire_damage_timer = 0
 
-		local fire_entity = minetest.add_entity(obj:get_pos(), "mcl_burning:fire")
 	local minp, maxp = mcl_burning.get_collisionbox(obj, false, storage)
-		local obj_size = obj:get_properties().visual_size
-
-		local vertical_grow_factor = 1.2
-		local horizontal_grow_factor = 1.1
-		local grow_vector = vector.new(horizontal_grow_factor, vertical_grow_factor, horizontal_grow_factor)
-
 	local size = vector.subtract(maxp, minp)
-		size = vector.multiply(size, grow_vector)
-		size = vector.divide(size, obj_size)
-		local offset = vector.new(0, size.y * 10 / 2, 0)
+	size = vector.multiply(size, vector.new(1.1, 1.2, 1.1))
+	size = vector.divide(size, obj:get_properties().visual_size)
 
+	local fire_entity = minetest.add_entity(obj:get_pos(), "mcl_burning:fire")
 	fire_entity:set_properties({visual_size = size})
-		fire_entity:set_attach(obj, "", offset, {x = 0, y = 0, z = 0})
-		local fire_luaentity = fire_entity:get_luaentity()
-		fire_luaentity:update_frame(obj, storage)
+	fire_entity:set_attach(obj, "", vector.new(0, size.y * 5, 0), vector.new(0, 0, 0))
 
-		for _, other in pairs(minetest.get_objects_inside_radius(fire_entity:get_pos(), 0)) do
-			local other_luaentity = other:get_luaentity()
-			if other_luaentity and other_luaentity.name == "mcl_burning:fire" and other_luaentity ~= fire_luaentity then
-				other:remove()
-				break
-			end
-		end
+	if obj:is_player() then
+		mcl_burning.update_hud(obj)
 	end
 end
 

mods/ENTITIES/mcl_burning/init.lua

@@ -1,14 +1,29 @@
 local modpath = minetest.get_modpath(minetest.get_current_modname())
 
 mcl_burning = {
-	storage = {},
-	animation_frames = tonumber(minetest.settings:get("fire_animation_frames")) or 8
+	-- the storage table holds a list of objects (players,luaentities) and tables
+	-- associated with these objects.  These tables have the following attributes:
+	--      burn_time:
+	--              Remaining time that object will burn.
+	--      fire_damage_timer:
+	--              Timer for dealing damage every second while burning.
+	--      fire_hud_id:
+	--              HUD id of the flames animation on a burning player's HUD.
+	--	animation_frame:
+	--		The HUD's current animation frame, used by update_hud().
+	--      collisionbox_cache:
+	--              Used by mcl_burning.get_collisionbox() to avoid recalculations.
+	storage = {}
 }
 
 dofile(modpath .. "/api.lua")
 
+local pairs = pairs
+local get_connected_players = minetest.get_connected_players
+local get_item_group = minetest.get_item_group
+
 minetest.register_globalstep(function(dtime)
-	for _, player in pairs(minetest.get_connected_players()) do
+	for _, player in pairs(get_connected_players()) do
 		local storage = mcl_burning.storage[player]
 		if not mcl_burning.tick(player, dtime, storage) and not mcl_burning.is_affected_by_rain(player) then
 			local nodes = mcl_burning.get_touching_nodes(player, {"group:puts_out_fire", "group:set_on_fire"}, storage)
@@ -16,12 +31,12 @@ minetest.register_globalstep(function(dtime)
 
 			for _, pos in pairs(nodes) do
 				local node = minetest.get_node(pos)
-				if minetest.get_item_group(node.name, "puts_out_fire") > 0 then
+				if get_item_group(node.name, "puts_out_fire") > 0 then
 					burn_time = 0
 					break
 				end
 
-				local value = minetest.get_item_group(node.name, "set_on_fire")
+				local value = get_item_group(node.name, "set_on_fire")
 				if value > burn_time then
 					burn_time = value
 				end
@@ -39,75 +54,78 @@ minetest.register_on_respawnplayer(function(player)
 end)
 
 minetest.register_on_joinplayer(function(player)
-	local storage
-
+	local storage = {}
 	local burn_data = player:get_meta():get_string("mcl_burning:data")
-	if burn_data == "" then
-		storage = {}
-	else
-		storage = minetest.deserialize(burn_data)
+	if burn_data ~= "" then
+		storage = minetest.deserialize(burn_data) or storage
 	end
-
 	mcl_burning.storage[player] = storage
+	if storage.burn_time and storage.burn_time > 0 then
+		mcl_burning.update_hud(player)
+	end
 end)
 
-minetest.register_on_leaveplayer(function(player)
+local function on_leaveplayer(player)
 	local storage = mcl_burning.storage[player]
+	if not storage then
+		-- For some unexplained reasons, mcl_burning.storage can be `nil` here.
+		-- Logging this exception to assist in finding the cause of this.
+		minetest.log("warning", "on_leaveplayer: missing mcl_burning.storage "
+				.. "for player " .. player:get_player_name())
+		storage = {}
+	end
 	storage.fire_hud_id = nil
 	player:get_meta():set_string("mcl_burning:data", minetest.serialize(storage))
 	mcl_burning.storage[player] = nil
+end
+
+minetest.register_on_leaveplayer(function(player)
+	on_leaveplayer(player)
 end)
 
+minetest.register_on_shutdown(function()
+	for _,player in ipairs(minetest.get_connected_players()) do
+		on_leaveplayer(player)
+	end
+end)
+
+local animation_frames = tonumber(minetest.settings:get("fire_animation_frames")) or 8
 
 minetest.register_entity("mcl_burning:fire", {
 	initial_properties = {
 		physical = false,
 		collisionbox = {0, 0, 0, 0, 0, 0},
-		visual = "cube",
+		visual = "upright_sprite",
+		textures = {
+			"mcl_burning_entity_flame_animated.png",
+			"mcl_burning_entity_flame_animated.png"
+		},
+		spritediv = {x = 1, y = animation_frames},
 		pointable = false,
 		glow = -1,
 		backface_culling = false,
 	},
-	animation_frame = 0,
-	animation_timer = 0,
+	_mcl_animation_timer = 0,
+	on_activate = function(self)
+		self.object:set_sprite({x = 0, y = 0}, animation_frames, 1.0 / animation_frames)
+	end,
 	on_step = function(self, dtime)
-		local parent, storage = self:sanity_check()
-
-		if parent then
-			self.animation_timer = self.animation_timer + dtime
-			if self.animation_timer >= 0.1 then
-				self.animation_timer = 0
-				self.animation_frame = self.animation_frame + 1
-				if self.animation_frame > mcl_burning.animation_frames - 1 then
-					self.animation_frame = 0
-				end
-				self:update_frame(parent, storage)
-			end
-		else
-			self.object:remove()
-		end
-	end,
-	sanity_check = function(self)
 		local parent = self.object:get_attach()
-
 		if not parent then
+			self.object:remove()
 			return
 		end
-
 		local storage = mcl_burning.get_storage(parent)
-
 		if not storage or not storage.burn_time then
+			self.object:remove()
 			return
 		end
-
-		return parent, storage
-	end,
-	update_frame = function(self, parent, storage)
-		local frame_overlay = "^[opacity:180^[verticalframe:" .. mcl_burning.animation_frames .. ":" .. self.animation_frame
-		local fire_texture = "mcl_burning_entity_flame_animated.png" .. frame_overlay
-		self.object:set_properties({textures = {"blank.png", "blank.png", fire_texture, fire_texture, fire_texture, fire_texture}})
 		if parent:is_player() then
-			parent:hud_change(storage.fire_hud_id, "text", "mcl_burning_hud_flame_animated.png" .. frame_overlay)
+			self._mcl_animation_timer = self._mcl_animation_timer + dtime
+			if self._mcl_animation_timer >= 0.1 then
+				self._mcl_animation_timer = 0
+				mcl_burning.update_hud(parent)
+			end
 		end
 	end,
 })

mods/ENTITIES/mcl_dripping/init.lua

@@ -0,0 +1,66 @@
+-- Dripping Water Mod
+-- by kddekadenz
+
+local math = math
+
+-- License of code, textures & sounds: CC0
+
+local function register_drop(liquid, glow, sound, nodes)
+	minetest.register_entity("mcl_dripping:drop_" .. liquid, {
+		hp_max = 1,
+		physical = true,
+		collide_with_objects = false,
+		collisionbox = {-0.01, 0.01, -0.01, 0.01, 0.01, 0.01},
+		glow = glow,
+		pointable = false,
+		visual = "sprite",
+		visual_size = {x = 0.1, y = 0.1},
+		textures = {""},
+		spritediv = {x = 1, y = 1},
+		initial_sprite_basepos = {x = 0, y = 0},
+		static_save = false,
+		_dropped = false,
+		on_activate = function(self)
+			self.object:set_properties({
+				textures = {"[combine:2x2:" .. -math.random(1, 16) .. "," .. -math.random(1, 16) .. "=default_" .. liquid .. "_source_animated.png"}
+			})
+		end,
+		on_step = function(self, dtime)
+			local k = math.random(1, 222)
+			local ownpos = self.object:get_pos()
+			if k == 1 then
+				self.object:set_acceleration(vector.new(0, -5, 0))
+			end
+			if minetest.get_node(vector.offset(ownpos, 0, 0.5, 0)).name == "air" then
+				self.object:set_acceleration(vector.new(0, -5, 0))
+			end
+			if minetest.get_node(vector.offset(ownpos, 0, -0.1, 0)).name ~= "air" then
+				local ent = self.object:get_luaentity()
+				if not ent._dropped then
+					ent._dropped = true
+					minetest.sound_play({name = "drippingwater_" .. sound .. "drip"}, {pos = ownpos, gain = 0.5, max_hear_distance = 8}, true)
+				end
+				if k < 3 then
+					self.object:remove()
+				end
+			end
+		end,
+	})
+	minetest.register_abm({
+		label = "Create drops",
+		nodenames = nodes,
+		neighbors = {"group:" .. liquid},
+		interval = 2,
+		chance = 22,
+		action = function(pos)
+			if minetest.get_item_group(minetest.get_node(vector.offset(pos, 0, 1, 0)).name, liquid) ~= 0
+			and minetest.get_node(vector.offset(pos, 0, -1, 0)).name == "air" then
+				local x, z = math.random(-45, 45) / 100, math.random(-45, 45) / 100
+				minetest.add_entity(vector.offset(pos, x, -0.520, z), "mcl_dripping:drop_" .. liquid)
+			end
+		end,
+	})
+end
+
+register_drop("water", 1, "", {"group:opaque", "group:leaves"})
+register_drop("lava", math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3), "lava", {"group:opaque"})

mods/ENTITIES/mcl_dripping/mod.conf

@@ -1,4 +1,4 @@
-name = drippingwater
+name = mcl_dripping
 author = kddekadenz 
 description = Drops are generated rarely under solid nodes
 depends = mcl_core

mods/ENTITIES/mcl_dripping/readme.txt

@@ -1,12 +1,12 @@
-Dripping Water Mod
+Dripping Mod
 by kddekadenz
 
-modified for MineClone 2 by Wuzzy
+modified for MineClone 2 by Wuzzy and NO11
 
 
 Installing instructions:
 
-	1. Copy the drippingwater mod folder into games/gamemode/mods
+	1. Copy the mcl_dripping mod folder into games/gamemode/mods
 
 	2. Start game and enjoy :)
 

mods/ENTITIES/mcl_falling_nodes/init.lua

@@ -19,7 +19,10 @@ local function deal_falling_damage(self, dtime)
 	end
 	self._hit = self._hit or {}
 	for _, obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do
-		if mcl_util.get_hp(obj) > 0 and not self._hit[obj] then
+		local entity = obj:get_luaentity()
+		if entity and entity.name == "__builtin:item" then
+			obj:remove()
+		elseif mcl_util.get_hp(obj) > 0 and not self._hit[obj] then
 			self._hit[obj] = true
 			local way = self._startpos.y - pos.y
 			local damage = (way - 1) * 2

mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.pl.tr

@@ -0,0 +1,3 @@
+# textdomain: mcl_falling_nodes
+@1 was smashed by a falling anvil.=@1 została zmiażdżona przez spadające kowadło.
+@1 was smashed by a falling block.=@1 została zmiażdżona przez spadający blok.

mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.zh_TW.tr

@@ -0,0 +1,3 @@
+# textdomain: mcl_falling_nodes
+@1 was smashed by a falling anvil.=@1 被鐵砧壓扁了。
+@1 was smashed by a falling block.=@1 被掉下來的方塊壓扁了。

mods/ENTITIES/mcl_item_entity/init.lua

@@ -1,5 +1,5 @@
 --these are lua locals, used for higher performance
-local minetest, math, vector, ipairs = minetest, math, vector, ipairs
+local minetest, math, vector, ipairs, pairs = minetest, math, vector, ipairs, pairs
 
 --this is used for the player pool in the sound buffer
 local pool = {}
@@ -110,7 +110,7 @@ minetest.register_globalstep(function(dtime)
 			if tick == true and pool[name] > 0 then
 				minetest.sound_play("item_drop_pickup", {
 					pos = pos,
-					gain = 0.7,
+					gain = 0.3,
 					max_hear_distance = 16,
 					pitch = math.random(70,110)/100
 				})
@@ -233,7 +233,7 @@ function minetest.handle_node_drops(pos, drops, digger)
 	local dug_node = minetest.get_node(pos)
 	local tooldef
 	local tool
-	if digger ~= nil then
+	if digger then
 		tool = digger:get_wielded_item()
 		tooldef = minetest.registered_tools[tool:get_name()]
 
@@ -256,6 +256,8 @@ function minetest.handle_node_drops(pos, drops, digger)
 
 	local silk_touch_drop = false
 	local nodedef = minetest.registered_nodes[dug_node.name]
+	if not nodedef then return end
+
 	if shearsy_level and shearsy_level > 0 and nodedef._mcl_shears_drop then
 		if nodedef._mcl_shears_drop == true then
 			drops = { dug_node.name }
@@ -290,10 +292,10 @@ function minetest.handle_node_drops(pos, drops, digger)
 		end
 	end
 
-	if digger and mcl_experience.throw_experience and not silk_touch_drop then
+	if digger and mcl_experience.throw_xp and not silk_touch_drop then
 		local experience_amount = minetest.get_item_group(dug_node.name,"xp")
 		if experience_amount > 0 then
-			mcl_experience.throw_experience(pos, experience_amount)
+			mcl_experience.throw_xp(pos, experience_amount)
 		end
 	end
 
@@ -314,7 +316,7 @@ function minetest.handle_node_drops(pos, drops, digger)
 			end
 			-- Spawn item and apply random speed
 			local obj = minetest.add_item(dpos, drop_item)
-			if obj ~= nil then
+			if obj then
 				local x = math.random(1, 5)
 				if math.random(1,2) == 1 then
 					x = -x
@@ -363,6 +365,17 @@ if not time_to_live then
 	time_to_live = 300
 end
 
+local function cxcz(o, cw, one, zero)
+	if cw < 0 then
+		table.insert(o, { [one]=1, y=0, [zero]=0 })
+		table.insert(o, { [one]=-1, y=0, [zero]=0 })
+	else
+		table.insert(o, { [one]=-1, y=0, [zero]=0 })
+		table.insert(o, { [one]=1, y=0, [zero]=0 })
+	end
+	return o
+end
+
 minetest.register_entity(":__builtin:item", {
 	initial_properties = {
 		hp_max = 1,
@@ -383,7 +396,7 @@ minetest.register_entity(":__builtin:item", {
 	-- The itemstring MUST be set immediately to a non-empty string after creating the entity.
 	-- The hand is NOT permitted as dropped item. ;-)
 	-- Item entities will be deleted if they still have an empty itemstring on their first on_step tick.
-	itemstring = '',
+	itemstring = "",
 
 	-- If true, item will fall
 	physical_state = true,
@@ -469,7 +482,7 @@ minetest.register_entity(":__builtin:item", {
 	end,
 
 	get_staticdata = function(self)
-		return minetest.serialize({
+		local data = minetest.serialize({
 			itemstring = self.itemstring,
 			always_collect = self.always_collect,
 			age = self.age,
@@ -477,6 +490,39 @@ minetest.register_entity(":__builtin:item", {
 			_flowing = self._flowing,
 			_removed = self._removed,
 		})
+		-- sfan5 guessed that the biggest serializable item
+		-- entity would have a size of 65530 bytes. This has
+		-- been experimentally verified to be still too large.
+		--
+		-- anon5 has calculated that the biggest serializable
+		-- item entity has a size of exactly 65487 bytes:
+		--
+		-- 1. serializeString16 can handle max. 65535 bytes.
+		-- 2. The following engine metadata is always saved:
+		--    • 1 byte (version)
+		--    • 2 byte (length prefix)
+		--    • 14 byte “__builtin:item”
+		--    • 4 byte (length prefix)
+		--    • 2 byte (health)
+		--    • 3 × 4 byte = 12 byte (position)
+		--    • 4 byte (yaw)
+		--    • 1 byte (version 2)
+		--    • 2 × 4 byte = 8 byte (pitch and roll)
+		-- 3. This leaves 65487 bytes for the serialization.
+		if #data > 65487 then -- would crash the engine
+			local stack = ItemStack(self.itemstring)
+			stack:get_meta():from_table(nil)
+			self.itemstring = stack:to_string()
+			minetest.log(
+				"warning",
+				"Overlong item entity metadata removed: “" ..
+				self.itemstring ..
+				"” had serialized length of " ..
+				#data
+			)
+			return self:get_staticdata()
+		end
+		return data
 	end,
 
 	on_activate = function(self, staticdata, dtime_s)
@@ -564,7 +610,7 @@ minetest.register_entity(":__builtin:item", {
 		return true
 	end,
 
-	on_step = function(self, dtime)
+	on_step = function(self, dtime, moveresult)
 		if self._removed then
 			self.object:set_properties({
 				physical = false
@@ -574,7 +620,7 @@ minetest.register_entity(":__builtin:item", {
 			return
 		end
 		self.age = self.age + dtime
-		if self._collector_timer ~= nil then
+		if self._collector_timer then
 			self._collector_timer = self._collector_timer + dtime
 		end
 		if time_to_live > 0 and self.age > time_to_live then
@@ -631,6 +677,18 @@ minetest.register_entity(":__builtin:item", {
 			end
 		end
 
+		-- Destroy item when it collides with a cactus
+		if moveresult and moveresult.collides then
+			for _, collision in pairs(moveresult.collisions) do
+				local pos = collision.node_pos
+				if collision.type == "node" and minetest.get_node(pos).name == "mcl_core:cactus" then
+					self._removed = true
+					self.object:remove()
+					return
+				end
+			end
+		end
+
 		-- Push item out when stuck inside solid opaque node
 		if def and def.walkable and def.groups and def.groups.opaque == 1 then
 			local shootdir
@@ -642,16 +700,6 @@ minetest.register_entity(":__builtin:item", {
 			-- 1st: closest
 			-- 2nd: other direction
 			-- 3rd and 4th: other axis
-			local cxcz = function(o, cw, one, zero)
-				if cw < 0 then
-					table.insert(o, { [one]=1, y=0, [zero]=0 })
-					table.insert(o, { [one]=-1, y=0, [zero]=0 })
-				else
-					table.insert(o, { [one]=-1, y=0, [zero]=0 })
-					table.insert(o, { [one]=1, y=0, [zero]=0 })
-				end
-				return o
-			end
 			if math.abs(cx) < math.abs(cz) then
 				order = cxcz(order, cx, "x", "z")
 				order = cxcz(order, cz, "z", "x")

mods/ENTITIES/mcl_minecarts/init.lua

@@ -1,9 +1,10 @@
-local S = minetest.get_translator("mcl_minecarts")
+local modname = minetest.get_current_modname()
+local S = minetest.get_translator(modname)
 
 local has_mcl_wip = minetest.get_modpath("mcl_wip")
 
 mcl_minecarts = {}
-mcl_minecarts.modpath = minetest.get_modpath("mcl_minecarts")
+mcl_minecarts.modpath = minetest.get_modpath(modname)
 mcl_minecarts.speed_max = 10
 mcl_minecarts.check_float_time = 15
 
@@ -197,14 +198,27 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 		else
 			self._last_float_check = self._last_float_check + dtime
 		end
-		local pos, rou_pos, node
+
+		local pos, rou_pos, node = self.object:get_pos()
+		local r = 0.6
+		for _, node_pos in pairs({{r, 0}, {0, r}, {-r, 0}, {0, -r}}) do
+			if minetest.get_node(vector.offset(pos, node_pos[1], 0, node_pos[2])).name == "mcl_core:cactus" then
+				detach_driver(self)
+				for d = 1, #drop do
+					minetest.add_item(pos, drop[d])
+				end
+				self.object:remove()
+				return
+			end
+		end
+
 		-- Drop minecart if it isn't on a rail anymore
 		if self._last_float_check >= mcl_minecarts.check_float_time then
 			pos = self.object:get_pos()
 			rou_pos = vector.round(pos)
 			node = minetest.get_node(rou_pos)
 			local g = minetest.get_item_group(node.name, "connect_to_raillike")
-			if g ~= self._railtype and self._railtype ~= nil then
+			if g ~= self._railtype and self._railtype then
 				-- Detach driver
 				if player then
 					if self._old_pos then
@@ -418,7 +432,8 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
 			-- Slow down or speed up
 			local acc = dir.y * -1.8
 			local friction = 0.4
-			local speed_mod = minetest.registered_nodes[minetest.get_node(pos).name]._rail_acceleration
+			local ndef = minetest.registered_nodes[minetest.get_node(pos).name]
+			local speed_mod = ndef and ndef._rail_acceleration
 
 			acc = acc - friction
 
@@ -523,7 +538,7 @@ function mcl_minecarts.place_minecart(itemstack, pointed_thing, placer)
 	local cart = minetest.add_entity(railpos, entity_id)
 	local railtype = minetest.get_item_group(node.name, "connect_to_raillike")
 	local le = cart:get_luaentity()
-	if le ~= nil then
+	if le then
 		le._railtype = railtype
 	end
 	local cart_dir = mcl_minecarts:get_rail_direction(railpos, {x=1, y=0, z=0}, nil, nil, railtype)
@@ -606,7 +621,7 @@ Register a minecart
 local function register_minecart(itemstring, entity_id, description, tt_help, longdesc, usagehelp, mesh, textures, icon, drop, on_rightclick, on_activate_by_rail, creative)
 	register_entity(entity_id, mesh, textures, drop, on_rightclick, on_activate_by_rail)
 	register_craftitem(itemstring, entity_id, description, tt_help, longdesc, usagehelp, icon, creative)
-	if minetest.get_modpath("doc_identifier") ~= nil then
+	if minetest.get_modpath("doc_identifier") then
 		doc.sub.identifier.register_object(entity_id, "craftitems", itemstring)
 	end
 end
@@ -645,7 +660,7 @@ register_minecart(
 				if player then
 					mcl_player.player_set_animation(player, "sit" , 30)
 					player:set_eye_offset({x=0, y=-5.5, z=0},{x=0, y=-4, z=0})
-					mcl_tmp_message.message(clicker, S("Sneak to dismount"))
+					mcl_title.set(clicker, "actionbar", {text=S("Sneak to dismount"), color="white", stay=60})
 				end
 			end, name)
 		end

mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.fr.tr

@@ -33,3 +33,4 @@ Activates minecarts when powered=Active les wagonnets lorsqu'il est alimenté
 Emits redstone power when a minecart is detected=Émet de l'énergie redstone lorsqu'un wagonnet est détecté
 Vehicle for fast travel on rails=Véhicule pour voyager rapidement sur rails
 Can be ignited by tools or powered activator rail=Peut être allumé par des outils ou un rail d'activation motorisé
+Sneak to dismount=

mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.pl.tr

@@ -0,0 +1,36 @@
+# textdomain: mcl_minecarts
+Minecart=Wagonik
+Minecarts can be used for a quick transportion on rails.=Wagoniki mogą być użyte do szybkiego transportu po torach.
+Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=Wagoniki mogą jeździć tylko po torach i zawsze podążają za wytyczoną ścieżką. W przypadku skrzyżowań typu T, gdzie nie ma prostej ścieżki, skręcają w lew. Ich szybkość zależy od typu torów.
+You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Możesz postawić wagonik na torach. Kliknij prawym przyciskiem myszy aby do niego wejść. Uderz go by zaczął się poruszać.
+To obtain the minecart, punch it while holding down the sneak key.=Aby odzyskać wagonik uderz go podczas skradania.
+A minecart with TNT is an explosive vehicle that travels on rail.=Wagonik z TNT jest wybuchowym pojazdem podróżującym po torach.
+Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=Postaw go na torach. Uderz by zaczął się poruszać. TNT zapala się krzesiwem lub gdy wagonik jest na zasilonych torach aktywacyjnych.
+To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=Aby odzyskać wagonik z TNT uderz go podczas skradania. Nie możesz tego zrobić gdy TNT jest zapalone.
+A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=Wagonik z piecem jest pojazdem podróżującym na torach. Napędza on samego siebie za pomocą paliwa.
+Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=Postaw go na torach. Jeśli dasz mu nieco węgla piec zacznie palić przez długi czas, a wagonik będzie się sam poruszał. Uderz go by zaczął się poruszać.
+To obtain the minecart and furnace, punch them while holding down the sneak key.=Aby odzyskać wagonik z piecem uderz go podczas skradania.
+Minecart with Chest=Wagonik ze skrzynią
+Minecart with Furnace=Wagonik z piecem
+Minecart with Command Block=Wagonik z blokiem poleceń
+Minecart with Hopper=Wagonik z lejem
+Minecart with TNT=Wagonik z TNT
+Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=Postaw je na ziemi by zbudować ścieżkę z torów. Tory automatycznie połączą się ze sobą i zamienią się w zakręty, skrzyżowania typu T, skrzyżowania i równie w zależności od potrzeb.
+Rail=Tor
+Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Tory mogą być wykorzystane do zbudowania torów dla wagoników. Zwyczajne tory nieco spowalniają wagoniki ze względu na tarcie.
+Powered Rail=Zasilane tory
+Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Tory mogą być wykorzystane do zbudowania torów dla wagoników. Zasilane tory mogą przyspieszać lub spowalniać wagoniki.
+Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Bez zasilania czerwienitem tory będą spowalniać wagoniki. Aby sprawić by je przyspieszały zasil je czerwienitem.
+Activator Rail=Tory aktywacyjne
+Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Tory mogą być wykorzystane do zbudowania torów dla wagoników. Tory aktywacyjne są wykorzystywane do aktywacji specjalnych wagoników.
+To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=Aby ten tor aktywował wagonik, zasil go czerwienitem i spraw by wagonik po nim przejechał.
+Detector Rail=Tory z czujnikiem
+Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=Tory mogą być wykorzystane do zbudowania torów dla wagoników. Tory z czujnikiem są w stanie wykryć kiedy wagonik po nich przejeżdża i wysłać sygnał do czerwienitowych mechanizmów.
+To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=Aby wykryć wagonik i dostarczyć zasilanie czerwienitem podłącz go czerwienitem to mechanizmu i spraw by wagonik po nim przejechał.
+Track for minecarts=Tor dla wagoników
+Speed up when powered, slow down when not powered=Przyspiesza gdy zasilane, spowalnia gdy nie
+Activates minecarts when powered=Aktywuje wagoniki gdy zasilane
+Emits redstone power when a minecart is detected=Emituje zasilanie czerwienitem gdy wagonik jest wykryty
+Vehicle for fast travel on rails=Pojazd do szybkiej podróży na torach
+Can be ignited by tools or powered activator rail=Może być zapalony przez narzędzia, lub zasilane tor aktywacyjne
+Sneak to dismount=Zacznij się skradać by zejść

mods/ENTITIES/mcl_minecarts/mod.conf

@@ -1,6 +1,6 @@
 name = mcl_minecarts
 author = Krock
 description = Minecarts are vehicles to move players quickly on rails.
-depends = mcl_explosions, mcl_core, mcl_sounds, mcl_player, mcl_achievements, mcl_chests, mcl_furnaces, mesecons_commandblock, mcl_hoppers, mcl_tnt, mesecons
+depends = mcl_title, mcl_explosions, mcl_core, mcl_sounds, mcl_player, mcl_achievements, mcl_chests, mcl_furnaces, mesecons_commandblock, mcl_hoppers, mcl_tnt, mesecons
 optional_depends = doc_identifier, mcl_wip
 

mods/ENTITIES/mcl_minecarts/rails.lua

@@ -1,4 +1,4 @@
-local S = minetest.get_translator("mcl_minecarts")
+local S = minetest.get_translator(minetest.get_current_modname())
 
 -- Template rail function
 local function register_rail(itemstring, tiles, def_extras, creative)
@@ -206,11 +206,11 @@ register_rail("mcl_minecarts:detector_rail_on",
 
 -- Crafting
 minetest.register_craft({
-	output = 'mcl_minecarts:rail 16',
+	output = "mcl_minecarts:rail 16",
 	recipe = {
-		{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
-		{'mcl_core:iron_ingot', 'mcl_core:stick', 'mcl_core:iron_ingot'},
-		{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
+		{"mcl_core:iron_ingot", "", "mcl_core:iron_ingot"},
+		{"mcl_core:iron_ingot", "mcl_core:stick", "mcl_core:iron_ingot"},
+		{"mcl_core:iron_ingot", "", "mcl_core:iron_ingot"},
 	}
 })
 

mods/ENTITIES/mcl_mobs/api.txt

@@ -502,6 +502,20 @@ and damages any entity caught inside the blast radius.  Protection will limit
 node destruction but not entity damage.
 
 
+mobs:capture_mob
+----------------
+
+mobs:capture_mob(...)
+
+Does nothing and returns false.
+
+This function is provided for compability with Mobs Redo for an attempt to
+capture a mob.
+Mobs cannot be captured in MineClone 2.
+
+In Mobs Redo, this is generally called inside the on_rightclick section of the mob
+api code, it provides a chance of capturing the mob. See Mobs Redo documentation
+of parameters.
 
 Feeding and Taming/Breeding
 ---------------------------
@@ -521,6 +535,19 @@ Will return true when mob is fed with item it likes.
                 them up
 
 
+Protecting Mobs
+---------------
+
+mobs:protect(self, clicker)
+
+This function can be used to right-click any tamed mob with mobs:protector item,
+this will protect the mob from harm inside of a protected area from other
+players.  Will return true when mob right-clicked with mobs:protector item.
+
+   'self'    mob information
+   'clicker' player information
+
+
 Riding Mobs
 -----------
 
@@ -578,7 +605,7 @@ Note: animation names above are from the pre-defined animation lists inside mob
 registry without extensions.
 
 
-mobs.set_mob_animation(self, name)
+mobs:set_animation(self, name)
 
 This function sets the current animation for mob, defaulting to "stand" if not
 found.
@@ -754,5 +781,8 @@ mobs:register_mob("mob_horse:horse", {
 				inv:remove_item("main", "mobs:saddle")
 			end
 		end
+
+		-- used to capture horse with magic lasso
+		mobs:capture_mob(self, clicker, 0, 0, 80, false, nil)
 	end
 })

mods/ENTITIES/mcl_mobs/api/api.lua

@@ -1,735 +0,0 @@
--- API for Mobs Redo: MineClone 2 Delux 2.0 DRM Free Early Access Super Extreme Edition
-
--- mobs library
-mobs = {}
-
--- lua locals - can grab from this to easily plop them into the api lua files
-
---localize minetest functions
-local minetest_settings                     = minetest.settings
-local minetest_get_objects_inside_radius    = minetest.get_objects_inside_radius
-local minetest_get_modpath                  = minetest.get_modpath
-local minetest_registered_nodes             = minetest.registered_nodes
-local minetest_get_node                     = minetest.get_node
---local minetest_get_item_group               = minetest.get_item_group
-local minetest_registered_entities          = minetest.registered_entities
---local minetest_line_of_sight                = minetest.line_of_sight
---local minetest_after                        = minetest.after
---local minetest_sound_play                   = minetest.sound_play
---local minetest_add_particlespawner          = minetest.add_particlespawner
---local minetest_registered_items             = minetest.registered_items
---local minetest_set_node                     = minetest.set_node
-local minetest_add_item                     = minetest.add_item
---local minetest_get_craft_result             = minetest.get_craft_result
---local minetest_find_path                    = minetest.find_path
-local minetest_is_creative_enabled          = minetest.is_creative_enabled
---local minetest_find_node_near               = minetest.find_node_near
---local minetest_find_nodes_in_area_under_air = minetest.find_nodes_in_area_under_air
---local minetest_raycast                      = minetest.raycast
---local minetest_get_us_time                  = minetest.get_us_time
-local minetest_add_entity                   = minetest.add_entity
---local minetest_get_natural_light            = minetest.get_natural_light
---local minetest_get_node_or_nil              = minetest.get_node_or_nil
-
--- localize math functions
-local math = math
-
--- localize vector functions
-local vector = vector
-
-local string = string
-
--- mob constants
---local BREED_TIME          = 30
---local BREED_TIME_AGAIN    = 300
---local CHILD_GROW_TIME     = 60*20
---local DEATH_DELAY         = 0.5
-local DEFAULT_FALL_SPEED  = -10
---local FLOP_HEIGHT         = 5.0
---local FLOP_HOR_SPEED      = 1.5
-local GRAVITY             = minetest_settings:get("movement_gravity")-- + 9.81
-
-local MAX_MOB_NAME_LENGTH = 30
-
-
---[[local MOB_CAP   = {}
-MOB_CAP.hostile = 70
-MOB_CAP.passive = 10
-MOB_CAP.ambient = 15
-MOB_CAP.water   = 15
-]]
-
--- Load main settings
---local damage_enabled    = minetest_settings:get_bool("enable_damage")
---local disable_blood     = minetest_settings:get_bool("mobs_disable_blood")
---local mobs_drop_items   = minetest_settings:get_bool("mobs_drop_items") ~= false
---local mobs_griefing     = minetest_settings:get_bool("mobs_griefing") ~= false
---local spawn_protected   = minetest_settings:get_bool("mobs_spawn_protected") ~= false
---local remove_far        = true
-local difficulty        = tonumber(minetest_settings:get("mob_difficulty")) or 1.0
---local show_health       = false
---local max_per_block     = tonumber(minetest_settings:get("max_objects_per_block") or 64)
----local mobs_spawn_chance = tonumber(minetest_settings:get("mobs_spawn_chance") or 2.5)
-
--- pathfinding settings
---local enable_pathfinding = true
---local stuck_timeout      = 3 -- how long before mob gets stuck in place and starts searching
---local stuck_path_timeout = 10 -- how long will mob follow path before giving up
-
--- default nodes
---local node_ice       = "mcl_core:ice"
---local node_snowblock = "mcl_core:snowblock"
---local node_snow      = "mcl_core:snow"
-mobs.fallback_node   = minetest.registered_aliases["mapgen_dirt"] or "mcl_core:dirt"
-
---local mod_weather     = minetest_get_modpath("mcl_weather")
---local mod_explosions  = minetest_get_modpath("mcl_explosions")
-local mod_mobspawners = minetest_get_modpath("mcl_mobspawners")
---local mod_hunger      = minetest_get_modpath("mcl_hunger")
---local mod_worlds      = minetest_get_modpath("mcl_worlds")
---local mod_armor       = minetest_get_modpath("mcl_armor")
---local mod_experience  = minetest_get_modpath("mcl_experience")
-
-
--- random locals I found
---local los_switcher    = false
---local height_switcher = false
-
--- Get translator
-local S = minetest.get_translator("mcl_mobs")
-
--- CMI support check
---local use_cmi = minetest.global_exists("cmi")
-
--- creative check
-function mobs.is_creative(name)
-	return minetest_is_creative_enabled(name)
-end
-
---[[local function atan(x)
-	if not x or x ~= x then
-		return 0
-	else
-		return math.atan(x)
-	end
-end]]
-
--- Shows helpful debug info above each mob
---local mobs_debug = minetest_settings:get_bool("mobs_debug", false)
-
--- Peaceful mode message so players will know there are no monsters
-if minetest_settings:get_bool("only_peaceful_mobs", false) then
-	minetest.register_on_joinplayer(function(player)
-		minetest.chat_send_player(player:get_player_name(),
-			S("Peaceful mode active! No monsters will spawn."))
-	end)
-end
-
-
-local api_path = minetest.get_modpath(minetest.get_current_modname()).."/api/mob_functions/"
-
---ignite all parts of the api
-dofile(api_path .. "ai.lua")
-dofile(api_path .. "animation.lua")
-dofile(api_path .. "collision.lua")
-dofile(api_path .. "environment.lua")
-dofile(api_path .. "interaction.lua")
-dofile(api_path .. "movement.lua")
-dofile(api_path .. "set_up.lua")
-dofile(api_path .. "attack_type_instructions.lua")
-dofile(api_path .. "sound_handling.lua")
-dofile(api_path .. "death_logic.lua")
-dofile(api_path .. "mob_effects.lua")
-dofile(api_path .. "projectile_handling.lua")
-dofile(api_path .. "breeding.lua")
-dofile(api_path .. "head_logic.lua")
-
-
-mobs.spawning_mobs = {}
-
-
-
-
--- register mob entity
-function mobs:register_mob(name, def)
-
-	local collisionbox = def.collisionbox or {-0.25, -0.25, -0.25, 0.25, 0.25, 0.25}
-
-	-- Workaround for <https://github.com/minetest/minetest/issues/5966>:
-	-- Increase upper Y limit to avoid mobs glitching through solid nodes.
-	-- FIXME: Remove workaround if it's no longer needed.
-
-	if collisionbox[5] < 0.79 then
-		collisionbox[5] = 0.79
-	end
-
-	mobs.spawning_mobs[name] = true
-
-	local function scale_difficulty(value, default, min, special)
-		if (not value) or (value == default) or (value == special) then
-			return default
-		else
-			return math.max(min, value * difficulty)
-		end
-	end
-
-	minetest.register_entity(name, {
-		description = def.description,
-		use_texture_alpha = def.use_texture_alpha,
-		stepheight = def.stepheight or 0.6,
-		stepheight_backup = def.stepheight or 0.6,
-		name = name,
-		type = def.type,
-		attack_type = def.attack_type,
-		fly = def.fly,
-		fly_in = def.fly_in or {"air", "__airlike"},
-		owner = def.owner or "",
-		order = def.order or "",
-		on_die = def.on_die,
-		spawn_small_alternative = def.spawn_small_alternative,
-		do_custom = def.do_custom,
-		jump_height = def.jump_height or 4, -- was 6
-		rotate = def.rotate or 0, --  0=front, 90=side, 180=back, 270=side2
-		hp_min = scale_difficulty(def.hp_min, 5, 1),
-		hp_max = scale_difficulty(def.hp_max, 10, 1),
-		xp_min = def.xp_min or 1,
-		xp_max = def.xp_max or 5,
-		breath_max = def.breath_max or 6,
-		breathes_in_water = def.breathes_in_water or false,
-		physical = true,
-		collisionbox = collisionbox,
-		collide_with_objects = def.collide_with_objects or false,
-		selectionbox = def.selectionbox or def.collisionbox,
-		visual = def.visual,
-		visual_size = def.visual_size or {x = 1, y = 1},
-		mesh = def.mesh,
-		makes_footstep_sound = def.makes_footstep_sound or false,
-		view_range = def.view_range or 16,
-		walk_velocity = def.walk_velocity or 1,
-		run_velocity = def.run_velocity or 2,
-		damage = scale_difficulty(def.damage, 0, 0),
-		light_damage = def.light_damage or 0,
-		sunlight_damage = def.sunlight_damage or 0,
-		water_damage = def.water_damage or 0,
-		lava_damage = def.lava_damage or 8,
-		fire_damage = def.fire_damage or 1,
-		suffocation = def.suffocation or true,
-		fall_damage = def.fall_damage or 1,
-		fall_speed = def.fall_speed or DEFAULT_FALL_SPEED, -- must be lower than -2
-		drops = def.drops or {},
-		armor = def.armor or 100,
-		on_rightclick = mobs.create_mob_on_rightclick(def.on_rightclick),
-		arrow = def.arrow,
-		shoot_interval = def.shoot_interval,
-		sounds = def.sounds or {},
-		animation = def.animation,
-		jump = def.jump ~= false,
-		walk_chance = def.walk_chance or 50,
-		attacks_monsters = def.attacks_monsters or false,
-		group_attack = def.group_attack or false,
-		passive = def.passive or false,
-		knock_back = def.knock_back ~= false,
-		shoot_offset = def.shoot_offset or 0,
-		floats = def.floats or 1, -- floats in water by default
-		floats_on_lava = def.floats_on_lava or 0,
-		replace_rate = def.replace_rate,
-		replace_what = def.replace_what,
-		replace_with = def.replace_with,
-		replace_offset = def.replace_offset or 0,
-		on_replace = def.on_replace,
-		timer = 0,
-		state_timer = 0,
-		env_damage_timer = 0,
-		tamed = false,
-		pause_timer = 0,
-		gotten = false,
-		reach = def.reach or 3,
-		htimer = 0,
-		texture_list = def.textures,
-		child_texture = def.child_texture,
-		docile_by_day = def.docile_by_day or false,
-		time_of_day = 0.5,
-		fear_height = def.fear_height or 0,
-		runaway = def.runaway,
-		runaway_timer = 0,
-		pathfinding = def.pathfinding,
-		immune_to = def.immune_to or {},
-		explosion_radius = def.explosion_radius, -- LEGACY
-		explosion_damage_radius = def.explosion_damage_radius, -- LEGACY
-		explosiontimer_reset_radius = def.explosiontimer_reset_radius,
-		explosion_timer = def.explosion_timer or 3,
-		allow_fuse_reset = def.allow_fuse_reset ~= false,
-		stop_to_explode = def.stop_to_explode ~= false,
-		custom_attack = def.custom_attack,
-		double_melee_attack = def.double_melee_attack,
-		dogshoot_switch = def.dogshoot_switch,
-		dogshoot_count = 0,
-		dogshoot_count_max = def.dogshoot_count_max or 5,
-		dogshoot_count2_max = def.dogshoot_count2_max or (def.dogshoot_count_max or 5),
-		attack_animals = def.attack_animals or false,
-		specific_attack = def.specific_attack,
-		runaway_from = def.runaway_from,
-		owner_loyal = def.owner_loyal,
-		facing_fence = false,
-
-		_cmi_is_mob = true,
-
-		pushable = def.pushable or true,
-
-		--j4i stuff
-		yaw = 0,
-		automatic_face_movement_dir = def.rotate or 0,  --  0=front, 90=side, 180=back, 270=side2
-		automatic_face_movement_max_rotation_per_sec = 360, --degrees
-		backface_culling = true,
-		walk_timer = 0,
-		stand_timer = 0,
-		current_animation = "",
-		gravity = GRAVITY,
-		swim = def.swim,
-		swim_in = def.swim_in or {mobs_mc.items.water_source, "mcl_core:water_flowing", mobs_mc.items.river_water_source},
-		pitch_switch = "static",
-		jump_only = def.jump_only,
-		hostile = def.hostile,
-		neutral = def.neutral,
-		attacking = nil,
-		visual_size_origin = def.visual_size or {x = 1, y = 1, z = 1},
-		punch_timer_cooloff = def.punch_timer_cooloff or 0.5,
-		death_animation_timer = 0,
-		hostile_cooldown = def.hostile_cooldown or 15,
-		tilt_fly = def.tilt_fly,
-		tilt_swim = def.tilt_swim,
-		fall_slow = def.fall_slow,
-		projectile_cooldown_min = def.projectile_cooldown_min or 2,
-		projectile_cooldown_max = def.projectile_cooldown_max or 6,
-		skittish = def.skittish,
-
-		minimum_follow_distance = def.minimum_follow_distance or 0.5, --make mobs not freak out when underneath
-
-		memory = 0, -- memory timer if chasing/following
-		fly_random_while_attack = def.fly_random_while_attack,
-
-		--for spiders
-		always_climb = def.always_climb,
-
-		--despawn mechanic variables
-		lifetimer_reset = 30, --30 seconds
-		lifetimer = 30, --30 seconds
-
-		--breeding stuff
-		breed_timer = 0,
-		breed_lookout_timer = 0,
-		breed_distance = def.breed_distance or 1.5, --how far away mobs have to be to begin actual breeding
-		breed_lookout_timer_goal = 30, --30 seconds (this timer is for how long the mob looks for a mate)
-		breed_timer_cooloff = 5*60, -- 5 minutes (this timer is for how long the mob has to wait before being bred again)
-		bred = false,
-		follow = def.follow, --this item is also used for the breeding mechanism
-		follow_distance = def.follow_distance or 2,
-		baby_size = def.baby_size or 0.5,
-		baby = false,
-		grow_up_timer = 0,
-		grow_up_goal  = 20*60, --in 20 minutes the mob grows up
-		special_breed_timer = 0, --this is used for the AHEM AHEM part of breeding
-
-		backup_visual_size = def.visual_size,
-		backup_collisionbox = collisionbox,
-		backup_selectionbox = def.selectionbox or def.collisionbox,
-
-
-		--fire timer
-		burn_timer = 0,
-
-		ignores_cobwebs = def.ignores_cobwebs,
-		breath = def.breath_max or 6,
-
-		random_sound_timer_min = 3,
-		random_sound_timer_max = 10,
-
-		--head code variables
-		--defaults are for the cow's default
-		--because I don't know what else to set them
-		--to :P
-
-		--you must use these to adjust the mob's head positions
-
-		--has_head is used as a logic gate (quick easy check)
-		has_head = def.has_head or false,
-		--head_bone is the actual bone in the model which the head
-		--is attached to for animation
-		head_bone = def.head_bone or "head",
-
-		--this part controls the base position of the head calculations
-		--localized to the mob's visual yaw when gotten (self.object:get_yaw())
-		--you can enable the debug in /mob_functions/head_logic.lua by uncommenting the
-		--particle spawner code
-		head_height_offset =  def.head_height_offset or 1.0525,
-		head_direction_offset = def.head_direction_offset or 0.5,
-
-		--this part controls the visual of the head
-		head_bone_pos_y = def.head_bone_pos_y or 3.6,
-		head_bone_pos_z = def.head_bone_pos_z or -0.6,
-		head_pitch_modifier = def.head_pitch_modifier or 0,
-
-		--these variables are switches in case the model
-		--moves the wrong way
-		swap_y_with_x = def.swap_y_with_x or false,
-		reverse_head_yaw = def.reverse_head_yaw or false,
-
-		--END HEAD CODE VARIABLES
-
-		--end j4i stuff
-
-		-- MCL2 extensions
-		teleport = mobs.teleport,
-		do_teleport = def.do_teleport,
-		spawn_class = def.spawn_class,
-		ignores_nametag = def.ignores_nametag or false,
-		rain_damage = def.rain_damage or 0,
-		glow = def.glow,
-		--can_despawn = can_despawn,
-		child = def.child or false,
-		texture_mods = {},
-		shoot_arrow = def.shoot_arrow,
-		sounds_child = def.sounds_child,
-		explosion_strength = def.explosion_strength,
-		suffocation_timer = 0,
-		follow_velocity = def.follow_velocity or 2.4,
-		instant_death = def.instant_death or false,
-		fire_resistant = def.fire_resistant or false,
-		fire_damage_resistant = def.fire_damage_resistant or false,
-		ignited_by_sunlight = def.ignited_by_sunlight or false,
-		eye_height = def.eye_height or 1.5,
-		defuse_reach = def.defuse_reach or 4,
-		-- End of MCL2 extensions
-
-		on_spawn = def.on_spawn,
-
-		--on_blast = def.on_blast or do_tnt,
-
-		on_step  = mobs.mob_step,
-
-		--do_punch = def.do_punch,
-
-		on_punch = mobs.mob_punch,
-
-		--on_breed = def.on_breed,
-
-		--on_grown = def.on_grown,
-
-		--on_detach_child = mob_detach_child,
-
-		on_activate = function(self, staticdata, dtime)
-			self.object:set_acceleration(vector.new(0,-GRAVITY, 0))
-			return mobs.mob_activate(self, staticdata, def, dtime)
-		end,
-
-		get_staticdata = function(self)
-			return mobs.mob_staticdata(self)
-		end,
-
-		--harmed_by_heal = def.harmed_by_heal,
-	})
-
-	if minetest_get_modpath("doc_identifier") ~= nil then
-		doc.sub.identifier.register_object(name, "basics", "mobs")
-	end
-
-end -- END mobs:register_mob function
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- register arrow for shoot attack
-function mobs:register_arrow(name, def)
-
-	-- errorcheck
-	if not name or not def then
-		print("failed to register arrow entity")
-		return
-	end
-
-	minetest.register_entity(name.."_entity", {
-
-		physical = false,
-		visual = def.visual,
-		visual_size = def.visual_size,
-		textures = def.textures,
-		velocity = def.velocity,
-		hit_player = def.hit_player,
-		hit_node = def.hit_node,
-		hit_mob = def.hit_mob,
-		hit_object = def.hit_object,
-		drop = def.drop or false, -- drops arrow as registered item when true
-		collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows
-		timer = 0,
-		switch = 0,
-		owner_id = def.owner_id,
-		rotate = def.rotate,
-		speed = def.speed or nil,
-		on_step = function(self)
-
-			local vel = self.object:get_velocity()
-
-			local pos = self.object:get_pos()
-
-			if self.timer > 150
-			or not mobs.within_limits(pos, 0) then
-				mcl_burning.extinguish(self.object)
-				self.object:remove();
-				return
-			end
-
-			-- does arrow have a tail (fireball)
-			if def.tail
-			and def.tail == 1
-			and def.tail_texture then
-
-				--do this to prevent clipping through main entity sprite
-				local pos_adjustment = vector.multiply(vector.normalize(vel), -1)
-				local divider = def.tail_distance_divider or 1
-				pos_adjustment = vector.divide(pos_adjustment, divider)
-				local new_pos = vector.add(pos, pos_adjustment)
-				minetest.add_particle({
-					pos = new_pos,
-					velocity = {x = 0, y = 0, z = 0},
-					acceleration = {x = 0, y = 0, z = 0},
-					expirationtime = def.expire or 0.25,
-					collisiondetection = false,
-					texture = def.tail_texture,
-					size = def.tail_size or 5,
-					glow = def.glow or 0,
-				})
-			end
-
-			if self.hit_node then
-
-				local node = minetest_get_node(pos).name
-
-				if minetest_registered_nodes[node].walkable then
-
-					self.hit_node(self, pos, node)
-
-					if self.drop == true then
-
-						pos.y = pos.y + 1
-
-						self.lastpos = (self.lastpos or pos)
-
-						minetest_add_item(self.lastpos, self.object:get_luaentity().name)
-					end
-
-					self.object:remove();
-
-					return
-				end
-			end
-
-			if self.hit_player or self.hit_mob or self.hit_object then
-
-				for _,player in pairs(minetest_get_objects_inside_radius(pos, 1.5)) do
-
-					if self.hit_player
-					and player:is_player() then
-
-						if self.hit_player then
-							self.hit_player(self, player)
-						else
-							mobs.arrow_hit(self, player)
-						end
-
-						self.object:remove();
-						return
-					end
-
-					--[[
-					local entity = player:get_luaentity()
-
-					if entity
-					and self.hit_mob
-					and entity._cmi_is_mob == true
-					and tostring(player) ~= self.owner_id
-					and entity.name ~= self.object:get_luaentity().name
-					and (self._shooter and entity.name ~= self._shooter:get_luaentity().name) then
-
-						--self.hit_mob(self, player)
-						self.object:remove();
-						return
-					end
-					]]--
-
-					--[[
-					if entity
-					and self.hit_object
-					and (not entity._cmi_is_mob)
-					and tostring(player) ~= self.owner_id
-					and entity.name ~= self.object:get_luaentity().name
-					and (self._shooter and entity.name ~= self._shooter:get_luaentity().name) then
-
-						--self.hit_object(self, player)
-						self.object:remove();
-						return
-					end
-					]]--
-				end
-			end
-
-			self.lastpos = pos
-		end
-	})
-end
-
--- Register spawn eggs
-
--- Note: This also introduces the “spawn_egg” group:
--- * spawn_egg=1: Spawn egg (generic mob, no metadata)
--- * spawn_egg=2: Spawn egg (captured/tamed mob, metadata)
-function mobs:register_egg(mob, desc, background, addegg, no_creative)
-
-	local grp = {spawn_egg = 1}
-
-	-- do NOT add this egg to creative inventory (e.g. dungeon master)
-	if no_creative == true then
-		grp.not_in_creative_inventory = 1
-	end
-
-	local invimg = background
-
-	if addegg == 1 then
-		invimg = "mobs_chicken_egg.png^(" .. invimg ..
-			"^[mask:mobs_chicken_egg_overlay.png)"
-	end
-
-	-- register old stackable mob egg
-	minetest.register_craftitem(mob, {
-
-		description = desc,
-		inventory_image = invimg,
-		groups = grp,
-
-		_doc_items_longdesc = S("This allows you to place a single mob."),
-		_doc_items_usagehelp = S("Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns."),
-
-		on_place = function(itemstack, placer, pointed_thing)
-
-			local pos = pointed_thing.above
-
-			-- am I clicking on something with existing on_rightclick function?
-			local under = minetest_get_node(pointed_thing.under)
-			local def = minetest_registered_nodes[under.name]
-			if def and def.on_rightclick then
-				return def.on_rightclick(pointed_thing.under, under, placer, itemstack)
-			end
-
-			if pos
-			--and within_limits(pos, 0)
-			and not minetest.is_protected(pos, placer:get_player_name()) then
-
-				local name = placer:get_player_name()
-				local privs = minetest.get_player_privs(name)
-				if mod_mobspawners and under.name == "mcl_mobspawners:spawner" then
-					if minetest.is_protected(pointed_thing.under, name) then
-						minetest.record_protection_violation(pointed_thing.under, name)
-						return itemstack
-					end
-					if not privs.maphack then
-						minetest.chat_send_player(name, S("You need the “maphack” privilege to change the mob spawner."))
-						return itemstack
-					end
-					mcl_mobspawners.setup_spawner(pointed_thing.under, itemstack:get_name())
-					if not mobs.is_creative(name) then
-						itemstack:take_item()
-					end
-					return itemstack
-				end
-
-				if not minetest_registered_entities[mob] then
-					return itemstack
-				end
-
-				if minetest_settings:get_bool("only_peaceful_mobs", false)
-						and minetest_registered_entities[mob].type == "monster" then
-					minetest.chat_send_player(name, S("Only peaceful mobs allowed!"))
-					return itemstack
-				end
-
-				local mob = minetest_add_entity(pos, mob)
-				minetest.log("action", "Mob spawned: "..name.." at "..minetest.pos_to_string(pos))
-				local ent = mob:get_luaentity()
-
-				-- don't set owner if monster or sneak pressed
-				--[[
-				if ent.type ~= "monster"
-				and not placer:get_player_control().sneak then
-					ent.owner = placer:get_player_name()
-					ent.tamed = true
-				end
-				]]--
-
-				-- set nametag
-				local nametag = itemstack:get_meta():get_string("name")
-				if nametag ~= "" then
-					if string.len(nametag) > MAX_MOB_NAME_LENGTH then
-						nametag = string.sub(nametag, 1, MAX_MOB_NAME_LENGTH)
-					end
-					ent.nametag = nametag
-					--update_tag(ent)
-				end
-
-				-- if not in creative then take item
-				if not mobs.is_creative(placer:get_player_name()) then
-					itemstack:take_item()
-				end
-			end
-
-			return itemstack
-		end,
-	})
-
-end
-
-

mods/ENTITIES/mcl_mobs/api/mob_functions/animation.lua

@@ -1,257 +0,0 @@
-local math = math
-local vector = vector
-
-local HALF_PI     = math.pi/2
-
-
-local vector_direction = vector.direction
-local vector_distance  = vector.distance
-local vector_new       = vector.new
-
-local minetest_dir_to_yaw = minetest.dir_to_yaw
-
--- set defined animation
-mobs.set_mob_animation = function(self, anim, fixed_frame)
-
-	if not self.animation or not anim then
-		return
-	end
-
-	if self.state == "die" and anim ~= "die" and anim ~= "stand" then
-		return
-	end
-
-
-	if (not self.animation[anim .. "_start"] or not self.animation[anim .. "_end"]) then
-		return
-	end
-
-	--animations break if they are constantly set
-	--so we put this return gate to check if it is
-	--already at the animation we are trying to implement
-	if self.current_animation == anim then
-		return
-	end
-
-	local a_start = self.animation[anim .. "_start"]
-	local a_end
-
-	if fixed_frame then
-		a_end = a_start
-	else
-		a_end = self.animation[anim .. "_end"]
-	end
-
-	self.object:set_animation({
-		x = a_start,
-		y = a_end},
-		self.animation[anim .. "_speed"] or self.animation.speed_normal or 15,
-		0, self.animation[anim .. "_loop"] ~= false)
-
-	self.current_animation = anim
-end
-
-
-
-
-mobs.death_effect = function(pos, yaw, collisionbox, rotate)
-	local min, max
-	if collisionbox then
-		min = {x=collisionbox[1], y=collisionbox[2], z=collisionbox[3]}
-		max = {x=collisionbox[4], y=collisionbox[5], z=collisionbox[6]}
-	else
-		min = { x = -0.5, y = 0, z = -0.5 }
-		max = { x = 0.5, y = 0.5, z = 0.5 }
-	end
-	if rotate then
-		min = vector.rotate(min, {x=0, y=yaw, z=math.pi/2})
-		max = vector.rotate(max, {x=0, y=yaw, z=math.pi/2})
-		min, max = vector.sort(min, max)
-		min = vector.multiply(min, 0.5)
-		max = vector.multiply(max, 0.5)
-	end
-
-	minetest.add_particlespawner({
-		amount = 50,
-		time = 0.001,
-		minpos = vector.add(pos, min),
-		maxpos = vector.add(pos, max),
-		minvel = vector_new(-5,-5,-5),
-		maxvel = vector_new(5,5,5),
-		minexptime = 1.1,
-		maxexptime = 1.5,
-		minsize = 1,
-		maxsize = 2,
-		collisiondetection = false,
-		vertical = false,
-		texture = "mcl_particles_mob_death.png^[colorize:#000000:255",
-	})
-
-	minetest.sound_play("mcl_mobs_mob_poof", {
-		pos = pos,
-		gain = 1.0,
-		max_hear_distance = 8,
-	}, true)
-end
-
-
---this allows auto facedir rotation while making it so mobs
---don't look like wet noodles flopping around
-mobs.movement_rotation_lock = function(self)
-	local current_engine_yaw = self.object:get_yaw()
-	local current_lua_yaw = self.yaw
-
-	if current_engine_yaw > math.pi * 2 then
-		current_engine_yaw = current_engine_yaw - (math.pi * 2)
-	end
-
-	if math.abs(current_engine_yaw - current_lua_yaw) <= 0.05 and self.object:get_properties().automatic_face_movement_dir then
-		self.object:set_properties{automatic_face_movement_dir = false}
-	elseif math.abs(current_engine_yaw - current_lua_yaw) > 0.05 and self.object:get_properties().automatic_face_movement_dir == false then
-		self.object:set_properties{automatic_face_movement_dir = self.rotate}
-	end
-end
-
-
---this is used when a mob is chasing a player
-mobs.set_yaw_while_attacking = function(self)
-
-	if self.object:get_properties().automatic_face_movement_dir then
-		self.object:set_properties{automatic_face_movement_dir = false}
-	end
-
-	--turn positions into pseudo 2d vectors
-	local pos1 = self.object:get_pos()
-	pos1.y = 0
-
-	local pos2 = self.attacking:get_pos()
-	pos2.y = 0
-
-	local new_direction = vector_direction(pos1,pos2)
-	local new_yaw = minetest_dir_to_yaw(new_direction)
-
-	self.object:set_yaw(new_yaw)
-	self.yaw = new_yaw
-end
-
---this is used to unlock a mob's yaw after attacking
-mobs.unlock_yaw = function(self)
-	if self.object:get_properties().automatic_face_movement_dir == false then
-		self.object:set_properties{automatic_face_movement_dir = self.rotate}
-	end
-end
-
---this is used to lock a mob's yaw when they're standing
-mobs.lock_yaw = function(self)
-	if self.object:get_properties().automatic_face_movement_dir then
-		self.object:set_properties{automatic_face_movement_dir = false}
-	end
-end
-
-
-local calculate_pitch = function(self)
-	local pos  = self.object:get_pos()
-	local pos2 = self.old_pos
-
-	if pos == nil or pos2 == nil then
-		return false
-	end
-
-    return minetest_dir_to_yaw(vector_new(vector_distance(vector_new(pos.x,0,pos.z),vector_new(pos2.x,0,pos2.z)),0,pos.y - pos2.y)) + HALF_PI
-end
-
---this is a helper function used to make mobs pitch rotation dynamically flow when flying/swimming
-mobs.set_dynamic_pitch = function(self)
-	local pitch = calculate_pitch(self)
-
-	if not pitch then
-		return
-	end
-
-	local current_rotation = self.object:get_rotation()
-
-	current_rotation.x = pitch
-
-	self.object:set_rotation(current_rotation)
-
-	self.pitch_switch = "dynamic"
-end
-
---this is a helper function used to make mobs pitch rotation reset when flying/swimming
-mobs.set_static_pitch = function(self)
-
-	if self.pitch_switch == "static" then
-		return
-	end
-
-	local current_rotation = self.object:get_rotation()
-
-	current_rotation.x = 0
-
-	self.object:set_rotation(current_rotation)
-	self.pitch_switch = "static"
-end
-
---this is a helper function for mobs explosion animation
-mobs.handle_explosion_animation = function(self)
-
-	--secondary catch-all
-	if not self.explosion_animation then
-		self.explosion_animation = 0
-	end
-
-	--the timer works from 0 for sense of a 0 based counting
-	--but this just bumps it up so it's usable in here
-	local explosion_timer_adjust = self.explosion_animation + 1
-
-
-	local visual_size_modified = table.copy(self.visual_size_origin)
-
-	visual_size_modified.x = visual_size_modified.x * (explosion_timer_adjust ^ 3)
-	visual_size_modified.y = visual_size_modified.y * explosion_timer_adjust
-
-	self.object:set_properties({visual_size = visual_size_modified})
-end
-
-
---this is used when a mob is following player
-mobs.set_yaw_while_following = function(self)
-
-	if self.object:get_properties().automatic_face_movement_dir then
-		self.object:set_properties{automatic_face_movement_dir = false}
-	end
-
-	--turn positions into pseudo 2d vectors
-	local pos1 = self.object:get_pos()
-	pos1.y = 0
-
-	local pos2 = self.following_person:get_pos()
-	pos2.y = 0
-
-	local new_direction = vector_direction(pos1,pos2)
-	local new_yaw = minetest_dir_to_yaw(new_direction)
-
-	self.object:set_yaw(new_yaw)
-	self.yaw = new_yaw
-end
-
---this is used for when mobs breed
-mobs.set_yaw_while_breeding = function(self, mate)
-
-	if self.object:get_properties().automatic_face_movement_dir then
-		self.object:set_properties{automatic_face_movement_dir = false}
-	end
-
-	--turn positions into pseudo 2d vectors
-	local pos1 = self.object:get_pos()
-	pos1.y = 0
-
-	local pos2 = mate:get_pos()
-	pos2.y = 0
-
-	local new_direction = vector_direction(pos1,pos2)
-	local new_yaw = minetest_dir_to_yaw(new_direction)
-
-	self.object:set_yaw(new_yaw)
-	self.yaw = new_yaw
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/attack_type_instructions.lua

@@ -1,348 +0,0 @@
-local vector_direction = vector.direction
---local minetest_dir_to_yaw = minetest.dir_to_yaw
-local vector_distance = vector.distance
-local vector_multiply = vector.multiply
-local math_random  = math.random
-
---[[
- _   _                     _   _
-| | | |                   | | | |
-| | | |     __ _ _ __   __| | | |
-| | | |    / _` | '_ \ / _` | | |
-|_| | |___| (_| | | | | (_| | |_|
-(_) \_____/\__,_|_| |_|\__,_| (_)
-]]--
-
-
-
---[[
- _____           _           _
-|  ___|         | |         | |
-| |____  ___ __ | | ___   __| | ___
-|  __\ \/ / '_ \| |/ _ \ / _` |/ _ \
-| |___>  <| |_) | | (_) | (_| |  __/
-\____/_/\_\ .__/|_|\___/ \__,_|\___|
-          | |
-          |_|
-]]--
-
-mobs.explode_attack_walk = function(self,dtime)
-
-    --this needs an exception
-    if self.attacking == nil or not self.attacking:is_player() then
-        self.attacking = nil
-        return
-    end
-
-    mobs.set_yaw_while_attacking(self)
-
-    local distance_from_attacking = vector_distance(self.object:get_pos(), self.attacking:get_pos())
-
-    --make mob walk up to player within 2 nodes distance then start exploding
-    if distance_from_attacking >= self.reach and
-    --don't allow explosion to cancel unless out of the reach boundary
-    not (self.explosion_animation ~= nil and self.explosion_animation > 0 and distance_from_attacking <= self.defuse_reach) then
-
-        mobs.set_velocity(self, self.run_velocity)
-        mobs.set_mob_animation(self,"run")
-
-        mobs.reverse_explosion_animation(self,dtime)
-    else
-        mobs.set_velocity(self,0)
-
-        --this is the only way I can reference this without dumping extra data on all mobs
-        if not self.explosion_animation then
-            self.explosion_animation = 0
-        end
-
-        --play ignite sound
-        if self.explosion_animation == 0 then
-            mobs.play_sound(self,"attack")
-        end
-
-        mobs.set_mob_animation(self,"stand")
-
-        mobs.handle_explosion_animation(self)
-
-        self.explosion_animation = self.explosion_animation + (dtime/2.5)
-    end
-
-    --make explosive mobs jump
-    --check for nodes to jump over
-    --explosive mobs will just ride against walls for now
-	local node_in_front_of = mobs.jump_check(self)
-	if node_in_front_of == 1 then
-		mobs.jump(self)
-    end
-
-    --do biggening explosion thing
-    if self.explosion_animation and self.explosion_animation > self.explosion_timer then
-        mcl_explosions.explode(self.object:get_pos(), self.explosion_strength,{ drop_chance = 1.0 })
-        self.object:remove()
-    end
-end
-
-
---this is a small helper function to make working with explosion animations easier
-mobs.reverse_explosion_animation = function(self,dtime)
-
-    --if explosion animation was greater than 0 then reverse it
-    if self.explosion_animation ~= nil and self.explosion_animation > 0 then
-        self.explosion_animation = self.explosion_animation - dtime
-        if self.explosion_animation < 0 then
-            self.explosion_animation = 0
-        end
-    end
-
-    mobs.handle_explosion_animation(self)
-end
-
-
-
-
---[[
-______                 _
-| ___ \               | |
-| |_/ /   _ _ __   ___| |__
-|  __/ | | | '_ \ / __| '_ \
-| |  | |_| | | | | (__| | | |
-\_|   \__,_|_| |_|\___|_| |_|
-]]--
-
-
-
-mobs.punch_attack_walk = function(self,dtime)
-    --this needs an exception
-    if self.attacking == nil or not self.attacking:is_player() then
-        self.attacking = nil
-        return
-    end
-
-    local distance_from_attacking = mobs.get_2d_distance(self.object:get_pos(), self.attacking:get_pos())
-
-    if distance_from_attacking >= self.minimum_follow_distance then
-        mobs.set_velocity(self, self.run_velocity)
-        mobs.set_mob_animation(self, "run")
-    else
-        mobs.set_velocity(self, 0)
-        mobs.set_mob_animation(self, "stand")
-    end
-
-    mobs.set_yaw_while_attacking(self)
-
-    --make punchy mobs jump
-    --check for nodes to jump over
-    --explosive mobs will just ride against walls for now
-	local node_in_front_of = mobs.jump_check(self)
-
-	if node_in_front_of == 1 then
-		mobs.jump(self)
-    end
-
-    --mobs that can climb over stuff
-    if self.always_climb and node_in_front_of > 0 then
-        mobs.climb(self)
-    end
-
-
-    --auto reset punch_timer
-    if not self.punch_timer then
-        self.punch_timer = 0
-    end
-
-    if self.punch_timer > 0 then
-        self.punch_timer = self.punch_timer - dtime
-    end
-end
-
-mobs.punch_attack = function(self)
-
-    self.attacking:punch(self.object, 1.0, {
-        full_punch_interval = 1.0,
-        damage_groups = {fleshy = self.damage}
-    }, nil)
-
-    self.punch_timer = self.punch_timer_cooloff
-
-
-    --knockback
-    local pos1 = self.object:get_pos()
-    pos1.y = 0
-    local pos2 = self.attacking:get_pos()
-    pos2.y = 0
-    local dir = vector_direction(pos1,pos2)
-
-    dir = vector_multiply(dir,3)
-
-    if self.attacking:get_velocity().y <= 1 then
-        dir.y = 5
-    end
-
-    self.attacking:add_velocity(dir)
-end
-
-
-
-
---[[
-______          _           _   _ _
-| ___ \        (_)         | | (_) |
-| |_/ / __ ___  _  ___  ___| |_ _| | ___
-|  __/ '__/ _ \| |/ _ \/ __| __| | |/ _ \
-| |  | | | (_) | |  __/ (__| |_| | |  __/
-\_|  |_|  \___/| |\___|\___|\__|_|_|\___|
-              _/ |
-             |__/
-]]--
-
-
-mobs.projectile_attack_walk = function(self,dtime)
-
-    --this needs an exception
-    if self.attacking == nil or not self.attacking:is_player() then
-        self.attacking = nil
-        return
-    end
-
-    mobs.set_yaw_while_attacking(self)
-
-    local distance_from_attacking = vector_distance(self.object:get_pos(), self.attacking:get_pos())
-
-
-    if distance_from_attacking >= self.reach then
-        mobs.set_velocity(self, self.run_velocity)
-        mobs.set_mob_animation(self,"run")
-    else
-        mobs.set_velocity(self,0)
-        mobs.set_mob_animation(self,"stand")
-    end
-
-    --do this to not load data into other mobs
-    if not self.projectile_timer then
-        self.projectile_timer = math_random(self.projectile_cooldown_min, self.projectile_cooldown_max)
-    end
-
-    --run projectile timer
-    if self.projectile_timer > 0 then
-        self.projectile_timer = self.projectile_timer - dtime
-
-        --shoot
-        if self.projectile_timer <= 0 then
-            --reset timer
-            self.projectile_timer = math_random(self.projectile_cooldown_min, self.projectile_cooldown_max)
-            mobs.shoot_projectile(self)
-        end
-    end
-
-    --make shooty mobs jump
-    --check for nodes to jump over
-    --explosive mobs will just ride against walls for now
-	local node_in_front_of = mobs.jump_check(self)
-	if node_in_front_of == 1 then
-		mobs.jump(self)
-    end
-
-end
-
-
-
-
-
-
-
-
-
---[[
- _  ______ _         _
-| | |  ___| |       | |
-| | | |_  | |_   _  | |
-| | |  _| | | | | | | |
-|_| | |   | | |_| | |_|
-(_) \_|   |_|\__, | (_)
-              __/ |
-             |___/
-]]--
-
-
-
-
---[[
-______          _           _   _ _
-| ___ \        (_)         | | (_) |
-| |_/ / __ ___  _  ___  ___| |_ _| | ___
-|  __/ '__/ _ \| |/ _ \/ __| __| | |/ _ \
-| |  | | | (_) | |  __/ (__| |_| | |  __/
-\_|  |_|  \___/| |\___|\___|\__|_|_|\___|
-              _/ |
-             |__/
-]]--
-
-local random_pitch_multiplier = {-1,1}
-
-mobs.projectile_attack_fly = function(self, dtime)
-    --this needs an exception
-    if self.attacking == nil or not self.attacking:is_player() then
-        self.attacking = nil
-        return
-    end
-
-    --this is specifically for random ghast movement
-    if self.fly_random_while_attack then
-
-        --enable rotation locking
-		mobs.movement_rotation_lock(self)
-
-        self.walk_timer = self.walk_timer - dtime
-
-        --reset the walk timer
-        if self.walk_timer <= 0 then
-            --re-randomize the walk timer
-            self.walk_timer = math.random(1,6) + math.random()
-            --set the mob into a random direction
-            self.yaw = (math_random() * (math.pi * 2))
-            --create a truly random pitch, since there is no easy access to pitch math that I can find
-            self.pitch = math_random() * math.random(1,3) * random_pitch_multiplier[math_random(1,2)]
-        end
-
-        mobs.set_fly_velocity(self, self.run_velocity)
-
-    else
-
-        mobs.set_yaw_while_attacking(self)
-
-        local distance_from_attacking = vector_distance(self.object:get_pos(), self.attacking:get_pos())
-
-        if distance_from_attacking >= self.reach then
-            mobs.set_pitch_while_attacking(self)
-            mobs.set_fly_velocity(self, self.run_velocity)
-            mobs.set_mob_animation(self,"run")
-        else
-            mobs.set_pitch_while_attacking(self)
-            mobs.set_fly_velocity(self, 0)
-            mobs.set_mob_animation(self,"stand")
-        end
-    end
-
-
-    --do this to not load data into other mobs
-    if not self.projectile_timer then
-        self.projectile_timer = math_random(self.projectile_cooldown_min, self.projectile_cooldown_max)
-    end
-
-    --run projectile timer
-    if self.projectile_timer > 0 then
-        self.projectile_timer = self.projectile_timer - dtime
-
-        --shoot
-        if self.projectile_timer <= 0 then
-
-            if self.fly_random_while_attack then
-                mobs.set_yaw_while_attacking(self)
-                self.walk_timer = 0
-            end
-            --reset timer
-            self.projectile_timer = math_random(self.projectile_cooldown_min, self.projectile_cooldown_max)
-            mobs.shoot_projectile(self)
-        end
-    end
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/breeding.lua

@@ -1,179 +0,0 @@
-local minetest_get_objects_inside_radius = minetest.get_objects_inside_radius
-
-local vector = vector
-
---check to see if someone nearby has some tasty food
-mobs.check_following = function(self) -- returns true or false
-    --ignore
-    if not self.follow then
-        self.following_person = nil
-        return false
-    end
-
-    --hey look, this thing works for passive mobs too!
-    local follower = mobs.detect_closest_player_within_radius(self,true,self.view_range,self.eye_height)
-
-    --check if the follower is a player incase they log out
-    if follower and follower:is_player() then
-        local stack = follower:get_wielded_item()
-        --safety check
-        if not stack then
-            self.following_person = nil
-            return false
-        end
-
-        local item_name = stack:get_name()
-        --all checks have passed, that guy has some good looking food
-        if item_name == self.follow then
-            self.following_person = follower
-            return true
-        end
-    end
-
-    --everything failed
-    self.following_person = nil
-    return false
-end
-
---a function which attempts to make mobs enter
---the breeding state
-mobs.enter_breed_state = function(self,clicker)
-
-    --do not breed if baby
-    if self.baby then
-        return false
-    end
-
-    --do not do anything if looking for mate or
-    --if cooling off from breeding
-    if self.breed_lookout_timer > 0 or self.breed_timer > 0 then
-        return false
-    end
-
-    --if this is caught, that means something has gone
-    --seriously wrong
-    if not clicker or not clicker:is_player() then
-        return false
-    end
-
-    local stack = clicker:get_wielded_item()
-    --safety check
-    if not stack then
-        return false
-    end
-
-    local item_name = stack:get_name()
-    --all checks have passed, that guy has some good looking food
-    if item_name == self.follow then
-        if not minetest.is_creative_enabled(clicker:get_player_name()) then
-            stack:take_item()
-            clicker:set_wielded_item(stack)
-        end
-        self.breed_lookout_timer = self.breed_lookout_timer_goal
-        self.bred = true
-        mobs.play_sound_specific(self,"mobs_mc_animal_eat_generic")
-        return true
-    end
-
-    --everything failed
-    return false
-end
-
-
---find the closest mate in the area
-mobs.look_for_mate = function(self)
-
-	local pos1 = self.object:get_pos()
-    pos1.y = pos1.y + self.eye_height
-
-	local mates_in_area = {}
-	local winner_mate = nil
-	local mates_detected = 0
-    local radius = self.view_range
-
-	--get mates in radius
-	for _,mate in pairs(minetest_get_objects_inside_radius(pos1, radius)) do
-
-        --look for a breeding mate
-		if mate and mate:get_luaentity()
-        and mate:get_luaentity()._cmi_is_mob
-        and mate:get_luaentity().name == self.name
-        and mate:get_luaentity().breed_lookout_timer > 0
-        and mate:get_luaentity() ~= self then
-
-			local pos2 = mate:get_pos()
-
-			local distance = vector.distance(pos1,pos2)
-
-			if distance <= radius then
-				if minetest.line_of_sight then
-					--must add eye height or stuff breaks randomly because of
-					--seethrough nodes being a blocker (like grass)
-					if minetest.line_of_sight(
-							vector.new(pos1.x, pos1.y, pos1.z),
-							vector.new(pos2.x, pos2.y + mate:get_properties().eye_height, pos2.z)
-						) then
-						mates_detected = mates_detected + 1
-						mates_in_area[mate] = distance
-					end
-				else
-					mates_detected = mates_detected + 1
-					mates_in_area[mate] = distance
-				end
-			end
-		end
-	end
-
-
-	--return if there's no one near by
-	if mates_detected <= 0 then --handle negative numbers for some crazy error that could possibly happen
-		return nil
-	end
-
-	--do a default radius max
-	local shortest_distance = radius + 1
-
-	--sort through mates and find the closest mate
-	for mate,distance in pairs(mates_in_area) do
-		if distance < shortest_distance then
-			shortest_distance = distance
-			winner_mate = mate
-		end
-	end
-	return winner_mate
-end
-
---make the baby grow up
-mobs.baby_grow_up = function(self)
-    self.baby = nil
-    self.visual_size  = self.backup_visual_size
-    self.collisionbox = self.backup_collisionbox
-    self.selectionbox = self.backup_selectionbox
-    self.object:set_properties(self)
-end
-
---makes the baby grow up faster with diminishing returns
-mobs.make_baby_grow_faster = function(self,clicker)
-    if clicker and clicker:is_player() then
-        local stack = clicker:get_wielded_item()
-        --safety check
-        if not stack then
-            return false
-        end
-
-        local item_name = stack:get_name()
-        --all checks have passed, that guy has some good looking food
-        if item_name == self.follow then
-            self.grow_up_timer = self.grow_up_timer - (self.grow_up_timer * 0.10) --take 10 percent off - diminishing returns
-
-            if not minetest.is_creative_enabled(clicker:get_player_name()) then
-                stack:take_item()
-                clicker:set_wielded_item(stack)
-            end
-
-            mobs.play_sound_specific(self,"mobs_mc_animal_eat_generic")
-            return true
-        end
-    end
-    return false
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/collision.lua

@@ -1,135 +0,0 @@
-local minetest_get_objects_inside_radius    = minetest.get_objects_inside_radius
-
-local math_random = math.random
-local vector_multiply = vector.multiply
-
-local vector_direction = vector.direction
-
-local integer_test = {-1,1}
-
-mobs.collision = function(self)
-	local pos = self.object:get_pos()
-
-	if not self or not self.object or not self.object:get_luaentity() then
-		return
-	end
-
-	--do collision detection from the base of the mob
-	local collisionbox = self.object:get_properties().collisionbox
-
-	pos.y = pos.y + collisionbox[2]
-
-	local collision_boundary = collisionbox[4]
-
-	local radius = collision_boundary
-
-	if collisionbox[5] > collision_boundary then
-		radius = collisionbox[5]
-	end
-
-	local collision_count = 0
-
-
-	local check_for_attack = false
-
-	if self.attack_type == "punch" and self.hostile and self.attacking then
-		check_for_attack = true
-	end
-
-	for _,object in ipairs(minetest_get_objects_inside_radius(pos, radius*1.25)) do
-		if object and object ~= self.object and (object:is_player() or (object:get_luaentity() and object:get_luaentity()._cmi_is_mob == true and object:get_luaentity().health > 0)) and
-		--don't collide with rider, rider don't collide with thing
-		(not object:get_attach() or (object:get_attach() and object:get_attach() ~= self.object)) and
-		(not self.object:get_attach() or (self.object:get_attach() and self.object:get_attach() ~= object)) then
-			--stop infinite loop
-			collision_count = collision_count + 1
-			--mob cramming
-			if collision_count > 30 then
-				self.health = -20
-				break
-			end
-
-			local pos2 = object:get_pos()
-
-			local object_collisionbox = object:get_properties().collisionbox
-
-			pos2.y = pos2.y + object_collisionbox[2]
-
-			local object_collision_boundary = object_collisionbox[4]
-
-
-			--this is checking the difference of the object collided with's possision
-			--if positive top of other object is inside (y axis) of current object
-			local y_base_diff = (pos2.y + object_collisionbox[5]) - pos.y
-
-			local y_top_diff = (pos.y + collisionbox[5]) - pos2.y
-
-
-			local distance = vector.distance(vector.new(pos.x,0,pos.z),vector.new(pos2.x,0,pos2.z))
-
-			if distance <= collision_boundary + object_collision_boundary and y_base_diff >= 0 and y_top_diff >= 0 then
-
-				local dir = vector.direction(pos,pos2)
-
-				dir.y = 0
-
-				--eliminate mob being stuck in corners
-				if dir.x == 0 and dir.z == 0 then
-					--slightly adjust mob position to prevent equal length
-					--corner/wall sticking
-					dir.x = dir.x + ((math_random()/10)*integer_test[math.random(1,2)])
-					dir.z = dir.z + ((math_random()/10)*integer_test[math.random(1,2)])
-				end
-
-				local velocity = dir
-
-				--0.5 is the max force multiplier
-				local force = 0.5 - (0.5 * distance / (collision_boundary + object_collision_boundary))
-
-				local vel1 = vector.multiply(velocity, -1.5)
-				local vel2 = vector.multiply(velocity,  1.5)
-
-				vel1 = vector.multiply(vel1, force * 10)
-				vel2 = vector.multiply(vel2, force)
-
-				if object:is_player() then
-					vel2 = vector_multiply(vel2, 2.5)
-
-					--integrate mob punching into collision detection
-					if check_for_attack and self.punch_timer <= 0 then
-						if object == self.attacking then
-							mobs.punch_attack(self)
-						end
-					end
-				end
-				self.object:add_velocity(vel1)
-				object:add_velocity(vel2)
-			end
-		end
-	end
-end
-
-
---this is used for arrow collisions
-mobs.arrow_hit = function(self, player)
-    player:punch(self.object, 1.0, {
-        full_punch_interval = 1.0,
-        damage_groups = {fleshy = self._damage}
-    }, nil)
-
-
-    --knockback
-    local pos1 = self.object:get_pos()
-	pos1.y = 0
-    local pos2 = player:get_pos()
-    pos2.y = 0
-    local dir = vector_direction(pos1,pos2)
-
-    dir = vector_multiply(dir,3)
-
-    if player:get_velocity().y <= 1 then
-        dir.y = 5
-    end
-
-    player:add_velocity(dir)
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/death_logic.lua

@@ -1,158 +0,0 @@
-local minetest_add_item = minetest.add_item
---local minetest_sound_play = minetest.sound_play
-
-local math_pi     = math.pi
-local math_random = math.random
-local math_floor  = math.floor
-local HALF_PI     = math_pi / 2
-
-local vector_new = vector.new
-
-
--- drop items
-local item_drop = function(self, cooked, looting_level)
-
-	looting_level = looting_level or 0
-
-	-- no drops for child mobs (except monster)
-	if (self.child and self.type ~= "monster") then
-		return
-	end
-
-	local obj, item
-	local pos = self.object:get_pos()
-
-	self.drops = self.drops or {} -- nil check
-
-	for n = 1, #self.drops do
-		local dropdef = self.drops[n]
-		local chance = 1 / dropdef.chance
-		local looting_type = dropdef.looting
-
-		if looting_level > 0 then
-			local chance_function = dropdef.looting_chance_function
-			if chance_function then
-				chance = chance_function(looting_level)
-			elseif looting_type == "rare" then
-				chance = chance + (dropdef.looting_factor or 0.01) * looting_level
-			end
-		end
-
-		local num = 0
-		local do_common_looting = (looting_level > 0 and looting_type == "common")
-		if math_random() < chance then
-			num = math_random(dropdef.min or 1, dropdef.max or 1)
-		elseif not dropdef.looting_ignore_chance then
-			do_common_looting = false
-		end
-
-		if do_common_looting then
-			num = num + math_floor(math_random(0, looting_level) + 0.5)
-		end
-
-		if num > 0 then
-			item = dropdef.name
-
-			-- cook items when true
-			if cooked then
-
-				local output = minetest.get_craft_result({
-					method = "cooking",
-                    width = 1,
-                    items = {item},
-                })
-
-				if output and output.item and not output.item:is_empty() then
-					item = output.item:get_name()
-				end
-			end
-
-			-- add item if it exists
-			for x = 1, num do
-				obj = minetest_add_item(pos, ItemStack(item .. " " .. 1))
-			end
-
-			if obj and obj:get_luaentity() then
-
-				obj:set_velocity({
-					x = math_random(-10, 10) / 9,
-					y = 6,
-					z = math_random(-10, 10) / 9,
-				})
-			elseif obj then
-				obj:remove() -- item does not exist
-			end
-		end
-	end
-
-	self.drops = {}
-end
-
-
-mobs.death_logic = function(self, dtime)
-
-	--stop crashing game when object is nil
-	if not self or not self.object or not self.object:get_luaentity() then
-		return
-	end
-
-    self.death_animation_timer = self.death_animation_timer + dtime
-
-	--get all attached entities and sort through them
-	local attached_entities = self.object:get_children()
-	if #attached_entities > 0 then
-		for _,entity in pairs(attached_entities) do
-			--kick the player off
-			if entity:is_player() then
-				mobs.detach(entity)
-			--kick mobs off
-			--if there is scaling issues, this needs an additional check
-			else
-				entity:set_detach()
-			end
-		end
-	end
-
-	--stop mob from getting in the way of other mobs you're fighting
-	if self.object:get_properties().pointable then
-		self.object:set_properties({pointable = false})
-	end
-
-    --the final POOF of a mob despawning
-    if self.death_animation_timer >= 1.25 then
-        item_drop(self,false,1)
-        mobs.death_effect(self)
-		mcl_experience.throw_experience(self.object:get_pos(), math_random(self.xp_min, self.xp_max))
-        self.object:remove()
-        return
-    end
-
-    --I'm sure there's a more efficient way to do this
-    --but this is the easiest, easier to work with 1 variable synced
-    --this is also not smooth
-    local death_animation_roll = self.death_animation_timer * 2 -- * 2 to make it faster
-    if death_animation_roll > 1 then
-        death_animation_roll = 1
-    end
-
-    local rot = self.object:get_rotation() --(no pun intended)
-
-    rot.z = death_animation_roll * HALF_PI
-
-    self.object:set_rotation(rot)
-
-    mobs.set_mob_animation(self,"stand", true)
-
-
-    --flying and swimming mobs just fall down
-    if self.fly or self.swim then
-        if self.object:get_acceleration().y ~= -self.gravity then
-            self.object:set_acceleration(vector_new(0,-self.gravity,0))
-        end
-    end
-
-    --when landing allow mob to slow down and just fall if in air
-    if self.pause_timer <= 0 then
-        mobs.set_velocity(self,0)
-    end
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/environment.lua

@@ -1,250 +0,0 @@
-local minetest_line_of_sight = minetest.line_of_sight
---local minetest_dir_to_yaw    = minetest.dir_to_yaw
-local minetest_yaw_to_dir    = minetest.yaw_to_dir
-local minetest_get_node      = minetest.get_node
-local minetest_get_item_group = minetest.get_item_group
-local minetest_get_objects_inside_radius = minetest.get_objects_inside_radius
-local minetest_get_node_or_nil = minetest.get_node_or_nil
-local minetest_registered_nodes = minetest.registered_nodes
-local minetest_get_connected_players = minetest.get_connected_players
-
-local vector_new = vector.new
-local vector_add = vector.add
-local vector_multiply = vector.multiply
-local vector_distance = vector.distance
-
-local table_copy = table.copy
-
-local math_abs = math.abs
-
--- default function when mobs are blown up with TNT
---[[local function do_tnt(obj, damage)
-	obj.object:punch(obj.object, 1.0, {
-		full_punch_interval = 1.0,
-		damage_groups = {fleshy = damage},
-	}, nil)
-	return false, true, {}
-end]]
-
---a fast function to be able to detect only players without using objects_in_radius
-mobs.detect_closest_player_within_radius = function(self, line_of_sight, radius, object_height_adder)
-	local pos1 = self.object:get_pos()
-	local players_in_area = {}
-	local winner_player = nil
-	local players_detected = 0
-
-	--get players in radius
-	for _,player in pairs(minetest.get_connected_players()) do
-		if player and player:get_hp() > 0 then
-
-			local pos2 = player:get_pos()
-
-			local distance = vector_distance(pos1,pos2)
-
-			if distance <= radius then
-				if line_of_sight then
-					--must add eye height or stuff breaks randomly because of
-					--seethrough nodes being a blocker (like grass)
-					if minetest_line_of_sight(
-							vector_new(pos1.x, pos1.y + object_height_adder, pos1.z),
-							vector_new(pos2.x, pos2.y + player:get_properties().eye_height, pos2.z)
-						) then
-						players_detected = players_detected + 1
-						players_in_area[player] = distance
-					end
-				else
-					players_detected = players_detected + 1
-					players_in_area[player] = distance
-				end
-			end
-		end
-	end
-
-
-	--return if there's no one near by
-	if players_detected <= 0 then --handle negative numbers for some crazy error that could possibly happen
-		return nil
-	end
-
-	--do a default radius max
-	local shortest_distance = radius + 1
-
-	--sort through players and find the closest player
-	for player,distance in pairs(players_in_area) do
-		if distance < shortest_distance then
-			shortest_distance = distance
-			winner_player = player
-		end
-	end
-	return winner_player
-end
-
-
---check if a mob needs to jump
-mobs.jump_check = function(self,dtime)
-
-    local pos = self.object:get_pos()
-    pos.y = pos.y + 0.1
-    local dir = minetest_yaw_to_dir(self.yaw)
-
-    local collisionbox = self.object:get_properties().collisionbox
-	local radius = collisionbox[4] + 0.5
-
-    vector_multiply(dir, radius)
-
-	--only jump if there's a node and a non-solid node above it
-    local test_dir = vector_add(pos,dir)
-
-	local green_flag_1 = minetest_get_item_group(minetest_get_node(test_dir).name, "solid") ~= 0
-
-	test_dir.y = test_dir.y + 1
-
-	local green_flag_2 = minetest_get_item_group(minetest_get_node(test_dir).name, "solid") == 0
-
-    if green_flag_1 and green_flag_2 then
-		--can jump over node
-        return 1
-	elseif green_flag_1 and not green_flag_2 then
-		--wall in front of mob
-		return 2
-    end
-	--nothing to jump over
-	return 0
-end
-
--- a helper function to quickly turn neutral passive mobs hostile
-local turn_hostile = function(self,detected_mob)
-	--drop in variables for attacking (stops crash)
-	detected_mob.punch_timer = 0
-	--set to hostile
-	detected_mob.hostile = true
-	--hostile_cooldown timer is initialized here
-	detected_mob.hostile_cooldown_timer = detected_mob.hostile_cooldown
-	--set target to the same
-	detected_mob.attacking = self.attacking
-end
-
---allow hostile mobs to signal to other mobs
---to switch from neutal passive to neutral hostile
-mobs.group_attack_initialization = function(self)
-
-	--get basic data
-	local friends_list
-
-	if self.group_attack == true then
-		friends_list = {self.name}
-	else
-		friends_list = table_copy(self.group_attack)
-	end
-
-	local objects_in_area = minetest_get_objects_inside_radius(self.object:get_pos(), self.view_range)
-
-	--get the player's name
-	local name = self.attacking:get_player_name()
-
-	--re-use local variable
-	local detected_mob
-
-	--run through mobs in viewing distance
-	for _,object in pairs(objects_in_area) do
-		if object and object:get_luaentity() then
-			detected_mob = object:get_luaentity()
-			-- only alert members of same mob or friends
-			if detected_mob._cmi_is_mob and detected_mob.state ~= "attack" and detected_mob.owner ~= name then
-				if detected_mob.name == self.name then
-					turn_hostile(self,detected_mob)
-				else
-					for _,id in pairs(friends_list) do
-						if detected_mob.name == id then
-							turn_hostile(self,detected_mob)
-							break
-						end
-					end
-				end
-			end
-
-			--THIS NEEDS TO BE RE-IMPLEMENTED AS A GLOBAL HIT IN MOB_PUNCH!!
-			-- have owned mobs attack player threat
-			--if obj.owner == name and obj.owner_loyal then
-			--	do_attack(obj, self.object)
-			--end
-		end
-	end
-end
-
--- check if within physical map limits (-30911 to 30927)
--- within_limits, wmin, wmax = nil, -30913, 30928
-mobs.within_limits = function(pos, radius)
-    local wmin, wmax
-	if mcl_vars then
-		if mcl_vars.mapgen_edge_min and mcl_vars.mapgen_edge_max then
-			wmin, wmax = mcl_vars.mapgen_edge_min, mcl_vars.mapgen_edge_max
-		end
-	end
-	return pos
-		and (pos.x - radius) > wmin and (pos.x + radius) < wmax
-		and (pos.y - radius) > wmin and (pos.y + radius) < wmax
-		and (pos.z - radius) > wmin and (pos.z + radius) < wmax
-end
-
--- get node but use fallback for nil or unknown
-mobs.node_ok = function(pos, fallback)
-
-	fallback = fallback or mobs.fallback_node
-
-	local node = minetest_get_node_or_nil(pos)
-
-	if node and minetest_registered_nodes[node.name] then
-		return node
-	end
-
-	return minetest_registered_nodes[fallback]
-end
-
-
---a teleport functoin
-mobs.teleport = function(self, target)
-	if self.do_teleport then
-		if self.do_teleport(self, target) == false then
-			return
-		end
-	end
-end
-
---a function used for despawning mobs
-mobs.check_for_player_within_area = function(self, radius)
-	local pos1 = self.object:get_pos()
-	--get players in radius
-	for _,player in pairs(minetest_get_connected_players()) do
-		if player and player:get_hp() > 0 then
-			local pos2 = player:get_pos()
-			local distance = vector_distance(pos1,pos2)
-			if distance < radius then
-				--found a player
-				return true
-			end
-		end
-	end
-	--did not find a player
-	return false
-end
-
-
---a simple helper function for mobs following
-mobs.get_2d_distance = function(pos1,pos2)
-	pos1.y = 0
-	pos2.y = 0
-	return vector_distance(pos1, pos2)
-end
-
--- fall damage onto solid ground
-mobs.calculate_fall_damage = function(self)
-	if self.old_velocity and self.old_velocity.y < -7 and self.object:get_velocity().y == 0 then
-		local vel = self.object:get_velocity()
-		if vel then
-			local damage = math_abs(self.old_velocity.y + 7) * 2
-			self.pause_timer = 0.4
-			self.health = self.health - damage
-		end
-	end
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/head_logic.lua

@@ -1,98 +0,0 @@
-local math = math
-local vector = vector
-
---converts yaw to degrees
-local degrees = function(yaw)
-	return yaw*180.0/math.pi
-end
-
-mobs.do_head_logic = function(self,dtime)
-
-	local player = minetest.get_player_by_name("singleplayer")
-
-	local look_at = player:get_pos()
-	look_at.y = look_at.y + player:get_properties().eye_height
-
-	local pos = self.object:get_pos()
-
-	local body_yaw = self.object:get_yaw()
-
-	local body_dir = minetest.yaw_to_dir(body_yaw)
-
-	pos.y = pos.y + self.head_height_offset
-
-	local head_offset = vector.multiply(body_dir, self.head_direction_offset)
-
-	pos = vector.add(pos, head_offset)
-
-	minetest.add_particle({
-		pos = pos,
-		velocity = {x=0, y=0, z=0},
-		acceleration = {x=0, y=0, z=0},
-		expirationtime = 0.2,
-		size = 1,
-		texture = "default_dirt.png",
-	})
-
-	local bone_pos = vector.new(0,0,0)
-
-	--(horizontal)
-	bone_pos.y = self.head_bone_pos_y
-
-	--(vertical)
-	bone_pos.z = self.head_bone_pos_z
-
-	--print(yaw)
-
-	--local _, bone_rot = self.object:get_bone_position("head")
-
-	--bone_rot.x = bone_rot.x + (dtime * 10)
-	--bone_rot.z = bone_rot.z + (dtime * 10)
-
-	local head_yaw = minetest.dir_to_yaw(vector.direction(pos,look_at)) - body_yaw
-
-	if self.reverse_head_yaw then
-		head_yaw = head_yaw * -1
-	end
-
-	--over rotation protection
-	--stops radians from going out of spec
-	if head_yaw > math.pi then
-		head_yaw = head_yaw - (math.pi * 2)
-	elseif head_yaw < -math.pi then
-		head_yaw = head_yaw + (math.pi * 2)
-	end
-
-
-	local check_failed = false
-	--upper check + 90 degrees or upper math.radians (3.14/2)
-	if head_yaw > math.pi - (math.pi/2) then
-		head_yaw = 0
-		check_failed = true
-	--lower check - 90 degrees or lower negative math.radians (-3.14/2)
-	elseif head_yaw < -math.pi + (math.pi/2) then
-		head_yaw = 0
-		check_failed = true
-	end
-
-	local head_pitch = 0
-
-	--DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG
-	--head_yaw = 0
-	--DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG
-
-	if not check_failed then
-		head_pitch = minetest.dir_to_yaw(vector.new(vector.distance(vector.new(pos.x,0,pos.z),vector.new(look_at.x,0,look_at.z)),0,pos.y-look_at.y))+(math.pi/2)
-	end
-
-	if self.head_pitch_modifier then
-		head_pitch = head_pitch + self.head_pitch_modifier
-	end
-
-	if self.swap_y_with_x then
-		self.object:set_bone_position(self.head_bone, bone_pos, vector.new(degrees(head_pitch),degrees(head_yaw),0))
-	else
-		self.object:set_bone_position(self.head_bone, bone_pos, vector.new(degrees(head_pitch),0,degrees(head_yaw)))
-	end
-	--set_bone_position([bone, position, rotation])
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/interaction.lua

@@ -1,276 +0,0 @@
-local minetest_after      = minetest.after
-local minetest_sound_play = minetest.sound_play
-local minetest_dir_to_yaw = minetest.dir_to_yaw
-
-local math = math
-local vector = vector
-
-local MAX_MOB_NAME_LENGTH = 30
-
-local mod_hunger = minetest.get_modpath("mcl_hunger")
-
-mobs.feed_tame = function(self)
-    return nil
-end
-
--- Code to execute before custom on_rightclick handling
-local function on_rightclick_prefix(self, clicker)
-	local item = clicker:get_wielded_item()
-
-	-- Name mob with nametag
-	if not self.ignores_nametag and item:get_name() == "mcl_mobs:nametag" then
-
-		local tag = item:get_meta():get_string("name")
-		if tag ~= "" then
-			if string.len(tag) > MAX_MOB_NAME_LENGTH then
-				tag = string.sub(tag, 1, MAX_MOB_NAME_LENGTH)
-			end
-			self.nametag = tag
-
-			mobs.update_tag(self)
-
-			if not mobs.is_creative(clicker:get_player_name()) then
-				item:take_item()
-				clicker:set_wielded_item(item)
-			end
-			return true
-		end
-
-	end
-	return false
-end
-
--- I have no idea what this does
-mobs.create_mob_on_rightclick = function(on_rightclick)
-	return function(self, clicker)
-		--don't allow rightclicking dead mobs
-		if self.health <= 0 then
-			return
-		end
-		local stop = on_rightclick_prefix(self, clicker)
-		if (not stop) and (on_rightclick) then
-			on_rightclick(self, clicker)
-		end
-	end
-end
-
-
--- deal damage and effects when mob punched
-mobs.mob_punch = function(self, hitter, tflp, tool_capabilities, dir)
-	--don't do anything if the mob is already dead
-	if self.health <= 0 then
-		return
-	end
-
-	--neutral passive mobs switch to neutral hostile
-	if self.neutral then
-		--drop in variables for attacking (stops crash)
-		self.attacking   = hitter
-		self.punch_timer = 0
-		self.hostile = true
-		--hostile_cooldown timer is initialized here
-		self.hostile_cooldown_timer = self.hostile_cooldown
-
-		--initialize the group attack (check for other mobs in area, make them neutral hostile)
-		if self.group_attack then
-			mobs.group_attack_initialization(self)
-		end
-	end
-
-	--turn skittish mobs away and RUN
-	if self.skittish then
-
-		self.state = "run"
-
-		self.run_timer = 5 --arbitrary 5 seconds
-
-		local pos1 = self.object:get_pos()
-		pos1.y = 0
-		local pos2 = hitter:get_pos()
-		pos2.y = 0
-
-
-		local dir = vector.direction(pos2,pos1)
-
-		local yaw = minetest_dir_to_yaw(dir)
-
-		self.yaw = yaw
-	end
-
-	-- custom punch function
-	if self.do_punch then
-		-- when false skip going any further
-		if self.do_punch(self, hitter, tflp, tool_capabilities, dir) == false then
-			return
-		end
-	end
-
-	--don't do damage until pause timer resets
-	if self.pause_timer > 0 then
-		return
-	end
-
-	-- error checking when mod profiling is enabled
-	if not tool_capabilities then
-		minetest.log("warning", "[mobs_mc] Mod profiling enabled, damage not enabled")
-		return
-	end
-
-	local is_player = hitter:is_player()
-
-	-- punch interval
-	local weapon = hitter:get_wielded_item()
-
-	--local punch_interval = 1.4
-
-	-- exhaust attacker
-	if mod_hunger and is_player then
-		mcl_hunger.exhaust(hitter:get_player_name(), mcl_hunger.EXHAUST_ATTACK)
-	end
-
-	-- calculate mob damage
-	local damage = 0
-	local armor = self.object:get_armor_groups() or {}
-
-	--calculate damage groups
-	for group,_ in pairs( (tool_capabilities.damage_groups or {}) ) do
-		damage = damage + (tool_capabilities.damage_groups[group] or 0) * ((armor[group] or 0) / 100.0)
-	end
-
-	if weapon then
-		local fire_aspect_level = mcl_enchanting.get_enchantment(weapon, "fire_aspect")
-		if fire_aspect_level > 0 then
-			mcl_burning.set_on_fire(self.object, fire_aspect_level * 4)
-		end
-	end
-
-	-- check for tool immunity or special damage
-	for n = 1, #self.immune_to do
-		if self.immune_to[n][1] == weapon:get_name() then
-			damage = self.immune_to[n][2] or 0
-			break
-		end
-	end
-
-	-- healing
-	if damage <= -1 then
-		self.health = self.health - math.floor(damage)
-		return
-	end
-
-	--if tool_capabilities then
-	--	punch_interval = tool_capabilities.full_punch_interval or 1.4
-	--end
-
-	-- add weapon wear manually
-	-- Required because we have custom health handling ("health" property)
-	--minetest_is_creative_enabled("") ~= true --removed for now
-	if tool_capabilities then
-		if tool_capabilities.punch_attack_uses then
-			-- Without this delay, the wear does not work. Quite hacky ...
-			minetest_after(0, function(name)
-				local player = minetest.get_player_by_name(name)
-				if not player then return end
-				local weapon = hitter:get_wielded_item(player)
-				local def = weapon:get_definition()
-				if def.tool_capabilities and def.tool_capabilities.punch_attack_uses then
-					local wear = math.floor(65535/tool_capabilities.punch_attack_uses)
-					weapon:add_wear(wear)
-					hitter:set_wielded_item(weapon)
-				end
-			end, hitter:get_player_name())
-		end
-	end
-
-
-	--if player is falling multiply damage by 1.5
-	--critical hit
-	if hitter:get_velocity().y < 0 then
-		damage = damage * 1.5
-		mobs.critical_effect(self)
-	end
-
-
-	-- only play hit sound and show blood effects if damage is 1 or over; lower to 0.1 to ensure armor works appropriately.
-	if damage >= 0.1 then
-
-		minetest_sound_play("default_punch", {
-			object = self.object,
-			max_hear_distance = 16
-		}, true)
-
-		-- do damage
-		self.health = self.health - damage
-
-
-		--0.4 seconds until you can hurt the mob again
-		self.pause_timer = 0.4
-
-		--don't do knockback from a rider
-		for _,obj in pairs(self.object:get_children()) do
-			if obj == hitter then
-				return
-			end
-		end
-
-		-- knock back effect
-		local velocity = self.object:get_velocity()
-
-		--2d direction
-		local pos1 = self.object:get_pos()
-		pos1.y = 0
-		local pos2 = hitter:get_pos()
-		pos2.y = 0
-
-		local dir = vector.direction(pos2,pos1)
-
-		local up = 3
-
-		-- if already in air then dont go up anymore when hit
-		if velocity.y ~= 0 then
-			up = 0
-		end
-
-		--0.75 for perfect distance to not be too easy, and not be too hard
-		local multiplier = 0.75
-
-		-- check if tool already has specific knockback value
-		local knockback_enchant = mcl_enchanting.get_enchantment(hitter:get_wielded_item(), "knockback")
-		if knockback_enchant and knockback_enchant > 0 then
-			multiplier = knockback_enchant + 1 --(starts from 1, 1 would be no change)
-		end
-
-		--do this to sure you can punch a mob back when
-		--it's coming for you
-		if self.hostile then
-			multiplier = multiplier + 2
-		end
-		dir = vector.multiply(dir,multiplier)
-		dir.y = up
-		--add the velocity
-		self.object:add_velocity(dir)
-	end
-end
-
---do internal per mob projectile calculations
-mobs.shoot_projectile = function(self)
-	local pos1 = self.object:get_pos()
-	--add mob eye height
-	pos1.y = pos1.y + self.eye_height
-
-	local pos2 = self.attacking:get_pos()
-	--add player eye height
-	pos2.y = pos2.y + self.attacking:get_properties().eye_height
-
-	--get direction
-	local dir = vector.direction(pos1,pos2)
-
-	--call internal shoot_arrow function
-	self.shoot_arrow(self,pos1,dir)
-end
-
-mobs.update_tag = function(self)
-	self.object:set_properties({
-		nametag = self.nametag,
-	})
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/mob_effects.lua

@@ -1,150 +0,0 @@
-local minetest_add_particlespawner = minetest.add_particlespawner
-
-mobs.death_effect = function(self)
-    local pos = self.object:get_pos()
-    --local yaw = self.object:get_yaw()
-    local collisionbox = self.object:get_properties().collisionbox
-
-    local min, max
-
-    if collisionbox then
-        min = {x=collisionbox[1], y=collisionbox[2], z=collisionbox[3]}
-        max = {x=collisionbox[4], y=collisionbox[5], z=collisionbox[6]}
-    end
-
-    minetest_add_particlespawner({
-        amount = 50,
-        time = 0.0001,
-        minpos = vector.add(pos, min),
-        maxpos = vector.add(pos, max),
-        minvel = vector.new(-0.5,0.5,-0.5),
-        maxvel = vector.new(0.5,1,0.5),
-        minexptime = 1.1,
-        maxexptime = 1.5,
-        minsize = 1,
-        maxsize = 2,
-        collisiondetection = false,
-        vertical = false,
-        texture = "mcl_particles_mob_death.png", -- this particle looks strange
-    })
-end
-
-mobs.critical_effect = function(self)
-
-    local pos = self.object:get_pos()
-    --local yaw = self.object:get_yaw()
-    local collisionbox = self.object:get_properties().collisionbox
-
-    local min, max
-
-    if collisionbox then
-        min = {x=collisionbox[1], y=collisionbox[2], z=collisionbox[3]}
-        max = {x=collisionbox[4], y=collisionbox[5], z=collisionbox[6]}
-    end
-
-    minetest_add_particlespawner({
-        amount = 10,
-        time = 0.0001,
-        minpos = vector.add(pos, min),
-        maxpos = vector.add(pos, max),
-        minvel = vector.new(-1,1,-1),
-        maxvel = vector.new(1,3,1),
-        minexptime = 0.7,
-        maxexptime = 1,
-        minsize = 1,
-        maxsize = 2,
-        collisiondetection = false,
-        vertical = false,
-        texture = "heart.png^[colorize:black:255",
-    })
-end
-
---when feeding a mob
-mobs.feed_effect = function(self)
-    local pos = self.object:get_pos()
-    --local yaw = self.object:get_yaw()
-    local collisionbox = self.object:get_properties().collisionbox
-
-    local min, max
-
-    if collisionbox then
-        min = {x=collisionbox[1], y=collisionbox[2], z=collisionbox[3]}
-        max = {x=collisionbox[4], y=collisionbox[5], z=collisionbox[6]}
-    end
-
-    minetest_add_particlespawner({
-        amount = 10,
-        time = 0.0001,
-        minpos = vector.add(pos, min),
-        maxpos = vector.add(pos, max),
-        minvel = vector.new(-1,1,-1),
-        maxvel = vector.new(1,3,1),
-        minexptime = 0.7,
-        maxexptime = 1,
-        minsize = 1,
-        maxsize = 2,
-        collisiondetection = false,
-        vertical = false,
-        texture = "heart.png^[colorize:gray:255",
-    })
-end
-
---hearts when tamed
-mobs.tamed_effect = function(self)
-    local pos = self.object:get_pos()
-    --local yaw = self.object:get_yaw()
-    local collisionbox = self.object:get_properties().collisionbox
-
-    local min, max
-
-    if collisionbox then
-        min = {x=collisionbox[1], y=collisionbox[2], z=collisionbox[3]}
-        max = {x=collisionbox[4], y=collisionbox[5], z=collisionbox[6]}
-    end
-
-    minetest_add_particlespawner({
-        amount = 30,
-        time = 0.0001,
-        minpos = vector.add(pos, min),
-        maxpos = vector.add(pos, max),
-        minvel = vector.new(-1,1,-1),
-        maxvel = vector.new(1,3,1),
-        minexptime = 0.7,
-        maxexptime = 1,
-        minsize = 1,
-        maxsize = 2,
-        collisiondetection = false,
-        vertical = false,
-        texture = "heart.png",
-    })
-end
-
---hearts when breeding
-mobs.breeding_effect = function(self)
-    local pos = self.object:get_pos()
-    --local yaw = self.object:get_yaw()
-    local collisionbox = self.object:get_properties().collisionbox
-
-    local min, max
-
-    if collisionbox then
-        min = {x=collisionbox[1], y=collisionbox[2], z=collisionbox[3]}
-        max = {x=collisionbox[4], y=collisionbox[5], z=collisionbox[6]}
-    end
-
-    minetest_add_particlespawner({
-        amount = 2,
-        time = 0.0001,
-        minpos = vector.add(pos, min),
-        maxpos = vector.add(pos, max),
-        minvel = vector.new(-1,1,-1),
-        maxvel = vector.new(1,3,1),
-        minexptime = 0.7,
-        maxexptime = 1,
-        minsize = 1,
-        maxsize = 2,
-        collisiondetection = false,
-        vertical = false,
-        texture = "heart.png",
-    })
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/movement.lua

@@ -1,387 +0,0 @@
--- localize math functions
-local math = math
-local HALF_PI     = math.pi / 2
-local DOUBLE_PI   = math.pi * 2
-
--- localize vector functions
-local vector = vector
-
-local minetest_yaw_to_dir = minetest.yaw_to_dir
-local minetest_dir_to_yaw = minetest.dir_to_yaw
-
-local DEFAULT_JUMP_HEIGHT = 5
-local DEFAULT_FLOAT_SPEED = 4
-local DEFAULT_CLIMB_SPEED = 3
-
-mobs.stick_in_cobweb = function(self)
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = vector.multiply(vector.normalize(current_velocity), 0.4)
-
-	goal_velocity.y = -0.5
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-end
-
---this is a generic float function
-mobs.float = function(self)
-
-	local acceleration = self.object:get_acceleration()
-	if acceleration and acceleration.y ~= 0 then
-		self.object:set_acceleration(vector.new(0,0,0))
-	else
-		return
-	end
-
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = {
-		x = 0,
-		y = DEFAULT_FLOAT_SPEED,
-		z = 0,
-	}
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	new_velocity_addition.x = 0
-	new_velocity_addition.z = 0
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-end
-
---this is a generic climb function
-mobs.climb = function(self)
-
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = {
-		x = 0,
-		y = DEFAULT_CLIMB_SPEED,
-		z = 0,
-	}
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	new_velocity_addition.x = 0
-	new_velocity_addition.z = 0
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-end
-
-
-
---[[
- _                     _
-| |                   | |
-| |     __ _ _ __   __| |
-| |    / _` | '_ \ / _` |
-| |___| (_| | | | | (_| |
-\_____/\__,_|_| |_|\__,_|
-]]
-
-
--- move mob in facing direction
---this has been modified to be internal
---internal = lua (self.yaw)
---engine = c++ (self.object:get_yaw())
-mobs.set_velocity = function(self, v)
-
-	local yaw = (self.yaw or 0)
-
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = {
-		x = (math.sin(yaw) * -v),
-		y = 0,
-		z = (math.cos(yaw) * v),
-	}
-
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	if vector.length(new_velocity_addition) > vector.length(goal_velocity) then
-		vector.multiply(new_velocity_addition, (vector.length(goal_velocity) / vector.length(new_velocity_addition)))
-	end
-
-	new_velocity_addition.y = 0
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-end
-
-
-
--- calculate mob velocity
-mobs.get_velocity = function(self)
-
-	local v = self.object:get_velocity()
-
-	v.y = 0
-
-	if v then
-		return vector.length(v)
-	end
-
-	return 0
-end
-
---make mobs jump
-mobs.jump = function(self, velocity)
-
-    if self.object:get_velocity().y ~= 0 or not self.old_velocity or (self.old_velocity and self.old_velocity.y > 0) then
-        return
-    end
-
-	--fallback velocity to allow modularity
-    velocity = velocity or DEFAULT_JUMP_HEIGHT
-
-    self.object:add_velocity(vector.new(0,velocity,0))
-end
-
---make mobs fall slowly
-mobs.mob_fall_slow = function(self)
-
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = {
-		x = 0,
-		y = -2,
-		z = 0,
-	}
-
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	new_velocity_addition.x = 0
-	new_velocity_addition.z = 0
-
-	if vector.length(new_velocity_addition) > vector.length(goal_velocity) then
-		vector.multiply(new_velocity_addition, (vector.length(goal_velocity) / vector.length(new_velocity_addition)))
-	end
-
-	new_velocity_addition.x = 0
-	new_velocity_addition.z = 0
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-
-end
-
-
---[[
- _____          _
-/  ___|        (_)
-\ `--.__      ___ _ __ ___
- `--. \ \ /\ / / | '_ ` _ \
-/\__/ /\ V  V /| | | | | | |
-\____/  \_/\_/ |_|_| |_| |_|
-]]--
-
-
-
-
---make mobs flop
-mobs.flop = function(self, velocity)
-
-    if self.object:get_velocity().y ~= 0 or not self.old_velocity or (self.old_velocity and self.old_velocity.y > 0) then
-        return false
-    end
-
-	mobs.set_velocity(self, 0)
-
-	--fallback velocity to allow modularity
-    velocity = velocity or DEFAULT_JUMP_HEIGHT
-
-	--create a random direction (2d yaw)
-	local dir = DOUBLE_PI * math.random()
-
-	--create a random force value
-	local force = math.random(0,3) + math.random()
-
-	--convert the yaw to a direction vector then multiply it times the force
-	local final_additional_force = vector.multiply(minetest_yaw_to_dir(dir), force)
-
-	--place in the "flop" velocity to make the mob flop
-	final_additional_force.y = velocity
-
-    self.object:add_velocity(final_additional_force)
-
-	return true
-end
-
-
-
--- move mob in facing direction
---this has been modified to be internal
---internal = lua (self.yaw)
---engine = c++ (self.object:get_yaw())
-mobs.set_swim_velocity = function(self, v)
-
-	local yaw = (self.yaw or 0)
-	local pitch = (self.pitch or 0)
-
-	if v == 0 then
-		pitch = 0
-	end
-
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = {
-		x = (math.sin(yaw) * -v),
-		y = pitch,
-		z = (math.cos(yaw) * v),
-	}
-
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	if vector.length(new_velocity_addition) > vector.length(goal_velocity) then
-		vector.multiply(new_velocity_addition, (vector.length(goal_velocity) / vector.length(new_velocity_addition)))
-	end
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-end
-
---[[
-______ _
-|  ___| |
-| |_  | |_   _
-|  _| | | | | |
-| |   | | |_| |
-\_|   |_|\__, |
-          __/ |
-         |___/
-]]--
-
--- move mob in facing direction
---this has been modified to be internal
---internal = lua (self.yaw)
---engine = c++ (self.object:get_yaw())
-mobs.set_fly_velocity = function(self, v)
-
-	local yaw = (self.yaw or 0)
-	local pitch = (self.pitch or 0)
-
-	if v == 0 then
-		pitch = 0
-	end
-
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = {
-		x = (math.sin(yaw) * -v),
-		y = pitch,
-		z = (math.cos(yaw) * v),
-	}
-
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	if vector.length(new_velocity_addition) > vector.length(goal_velocity) then
-		vector.multiply(new_velocity_addition, (vector.length(goal_velocity) / vector.length(new_velocity_addition)))
-	end
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-end
-
---a quick and simple pitch calculation between two vector positions
-mobs.calculate_pitch = function(pos1, pos2)
-
-	if pos1 == nil or pos2 == nil then
-		return false
-	end
-
-    return minetest_dir_to_yaw(vector.new(vector.distance(vector.new(pos1.x,0,pos1.z),vector.new(pos2.x,0,pos2.z)),0,pos1.y - pos2.y)) + HALF_PI
-end
-
---make mobs fly up or down based on their y difference
-mobs.set_pitch_while_attacking = function(self)
-	local pos1 = self.object:get_pos()
-	local pos2 = self.attacking:get_pos()
-
-	local pitch = mobs.calculate_pitch(pos2,pos1)
-
-	self.pitch = pitch
-end
-
-
-
---[[
-   ___
-  |_  |
-    | |_   _ _ __ ___  _ __
-    | | | | | '_ ` _ \| '_ \
-/\__/ / |_| | | | | | | |_) |
-\____/ \__,_|_| |_| |_| .__/
-                      | |
-                      |_|
-]]--
-
---special mob jump movement
-mobs.jump_move = function(self, velocity)
-
-    if self.object:get_velocity().y ~= 0 or not self.old_velocity or (self.old_velocity and self.old_velocity.y > 0) then
-        return
-    end
-
-	--make the mob stick for a split second
-	mobs.set_velocity(self,0)
-
-	--fallback velocity to allow modularity
-    local jump_height = DEFAULT_JUMP_HEIGHT
-
-	local yaw = (self.yaw or 0)
-
-	local current_velocity = self.object:get_velocity()
-
-	local goal_velocity = {
-		x = (math.sin(yaw) * -velocity),
-		y = jump_height,
-		z = (math.cos(yaw) * velocity),
-	}
-
-
-	local new_velocity_addition = vector.subtract(goal_velocity,current_velocity)
-
-	if vector.length(new_velocity_addition) > vector.length(goal_velocity) then
-		vector.multiply(new_velocity_addition, (vector.length(goal_velocity) / vector.length(new_velocity_addition)))
-	end
-
-	--smooths out mobs a bit
-	if vector.length(new_velocity_addition) >= 0.0001 then
-		self.object:add_velocity(new_velocity_addition)
-	end
-end
-
---make it so mobs do not glitch out and freak out
---when moving around over nodes
-mobs.swap_auto_step_height_adjust = function(self)
-	local y_vel = self.object:get_velocity().y
-
-	if y_vel == 0 and self.stepheight ~= self.stepheight_backup then
-		self.stepheight = self.stepheight_backup
-	elseif y_vel ~= 0 and self.stepheight ~= 0 then
-		self.stepheight = 0
-	end
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/projectile_handling.lua

@@ -1,44 +0,0 @@
-local GRAVITY             = minetest.settings:get("movement_gravity")-- + 9.81
-
-mobs.shoot_projectile_handling = function(arrow_item, pos, dir, yaw, shooter, power, damage, is_critical, bow_stack, collectable, gravity)
-	local obj = minetest.add_entity({x=pos.x,y=pos.y,z=pos.z}, arrow_item.."_entity")
-	if power == nil then
-		power = 19
-	end
-	if damage == nil then
-		damage = 3
-	end
-
-    gravity = gravity or -GRAVITY
-
-	local knockback
-	if bow_stack then
-		local enchantments = mcl_enchanting.get_enchantments(bow_stack)
-		if enchantments.power then
-			damage = damage + (enchantments.power + 1) / 4
-		end
-		if enchantments.punch then
-			knockback = enchantments.punch * 3
-		end
-		if enchantments.flame then
-			mcl_burning.set_on_fire(obj, math.huge)
-		end
-	end
-	obj:set_velocity({x=dir.x*power, y=dir.y*power, z=dir.z*power})
-	obj:set_acceleration({x=0, y=gravity, z=0})
-	obj:set_yaw(yaw-math.pi/2)
-	local le = obj:get_luaentity()
-	le._shooter = shooter
-	le._damage = damage
-	le._is_critical = is_critical
-	le._startpos = pos
-	le._knockback = knockback
-	le._collectable = collectable
-
-    --play custom shoot sound
-    if shooter ~= nil and shooter.shoot_sound then
-        minetest.sound_play(shooter.shoot_sound, {pos=pos, max_hear_distance=16}, true)
-    end
-
-	return obj
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/set_up.lua

@@ -1,224 +0,0 @@
-local math_random = math.random
-
-local minetest_settings = minetest.settings
-
--- CMI support check
-local use_cmi = minetest.global_exists("cmi")
-
--- get entity staticdata
-mobs.mob_staticdata = function(self)
-	--despawn mechanism
-	--don't despawned tamed or bred mobs
-	if not self.tamed and not self.bred then
-		if not mobs.check_for_player_within_area(self, 64) then
-			--print("removing SERIALIZED!")
-			self.object:remove()
-			return
-		end
-	end
-
-	self.remove_ok = true
-	self.attack = nil
-	self.following = nil
-
-	if use_cmi then
-		self.serialized_cmi_components = cmi.serialize_components(self._cmi_components)
-	end
-
-	local tmp = {}
-
-	for _,stat in pairs(self) do
-
-		local t = type(stat)
-
-		if  t ~= "function"
-		and t ~= "nil"
-		and t ~= "userdata"
-		and _ ~= "_cmi_components" then
-			tmp[_] = self[_]
-		end
-	end
-
-	return minetest.serialize(tmp)
-end
-
-
--- activate mob and reload settings
-mobs.mob_activate = function(self, staticdata, def, dtime)
-
-	-- remove monsters in peaceful mode
-	if self.type == "monster" and minetest_settings:get_bool("only_peaceful_mobs", false) then
-		mcl_burning.extinguish(self.object)
-		self.object:remove()
-		return
-	end
-
-	-- load entity variables
-	local tmp = minetest.deserialize(staticdata)
-
-	if tmp then
-		for _,stat in pairs(tmp) do
-			self[_] = stat
-		end
-	end
-
-	--set up wandering
-	if not self.wandering then
-		self.wandering = true
-	end
-
-	--clear animation
-	self.current_animation = nil
-
-	-- select random texture, set model and size
-	if not self.base_texture then
-
-		-- compatiblity with old simple mobs textures
-		if type(def.textures[1]) == "string" then
-			def.textures = {def.textures}
-		end
-
-		self.base_texture = def.textures[math_random(1, #def.textures)]
-		self.base_mesh = def.mesh
-		self.base_size = self.visual_size
-		self.base_colbox = self.collisionbox
-		self.base_selbox = self.selectionbox
-	end
-
-	-- for current mobs that dont have this set
-	if not self.base_selbox then
-		self.base_selbox = self.selectionbox or self.base_colbox
-	end
-
-	-- set texture, model and size
-	local textures = self.base_texture
-	local mesh = self.base_mesh
-	local vis_size = self.base_size
-	local colbox = self.base_colbox
-	local selbox = self.base_selbox
-
-	-- specific texture if gotten
-	if self.gotten == true
-	and def.gotten_texture then
-		textures = def.gotten_texture
-	end
-
-	-- specific mesh if gotten
-	if self.gotten == true
-	and def.gotten_mesh then
-		mesh = def.gotten_mesh
-	end
-
-	-- set baby mobs to half size
-	if self.baby == true then
-
-		vis_size = {
-			x = self.base_size.x * self.baby_size,
-			y = self.base_size.y * self.baby_size,
-		}
-
-		if def.child_texture then
-			textures = def.child_texture[1]
-		end
-
-		colbox = {
-			self.base_colbox[1] * self.baby_size,
-			self.base_colbox[2] * self.baby_size,
-			self.base_colbox[3] * self.baby_size,
-			self.base_colbox[4] * self.baby_size,
-			self.base_colbox[5] * self.baby_size,
-			self.base_colbox[6] * self.baby_size
-		}
-		selbox = {
-			self.base_selbox[1] * self.baby_size,
-			self.base_selbox[2] * self.baby_size,
-			self.base_selbox[3] * self.baby_size,
-			self.base_selbox[4] * self.baby_size,
-			self.base_selbox[5] * self.baby_size,
-			self.base_selbox[6] * self.baby_size
-		}
-	end
-
-	--stop mobs from reviving
-	if not self.dead and not self.health then
-		self.health = math_random (self.hp_min, self.hp_max)
-	end
-
-	if not self.random_sound_timer then
-		self.random_sound_timer = math_random(self.random_sound_timer_min,self.random_sound_timer_max)
-	end
-
-	if self.breath == nil then
-		self.breath = self.breath_max
-	end
-
-	-- pathfinding init
-	self.path = {}
-	self.path.way = {} -- path to follow, table of positions
-	self.path.lastpos = {x = 0, y = 0, z = 0}
-	self.path.stuck = false
-	self.path.following = false -- currently following path?
-	self.path.stuck_timer = 0 -- if stuck for too long search for path
-
-	-- Armor groups
-	-- immortal=1 because we use custom health
-	-- handling (using "health" property)
-	local armor
-	if type(self.armor) == "table" then
-		armor = table.copy(self.armor)
-		armor.immortal = 1
-	else
-		armor = {immortal=1, fleshy = self.armor}
-	end
-	self.object:set_armor_groups(armor)
-	self.old_y = self.object:get_pos().y
-	self.old_health = self.health
-	self.sounds.distance = self.sounds.distance or 10
-	self.textures = textures
-	self.mesh = mesh
-	self.collisionbox = colbox
-	self.selectionbox = selbox
-	self.visual_size = vis_size
-	self.standing_in = "ignore"
-	self.standing_on = "ignore"
-	self.jump_sound_cooloff = 0 -- used to prevent jump sound from being played too often in short time
-	self.opinion_sound_cooloff = 0 -- used to prevent sound spam of particular sound types
-
-	self.texture_mods = {}
-
-	self.v_start = false
-	self.timer = 0
-	self.blinktimer = 0
-	self.blinkstatus = false
-
-
-	--continue mob effect on server restart
-	if self.dead or self.health <= 0 then
-		self.object:set_texture_mod("^[colorize:red:120")
-	else
-		self.object:set_texture_mod("")
-	end
-
-	-- set anything changed above
-	self.object:set_properties(self)
-
-	--update_tag(self)
-	--mobs.set_animation(self, "stand")
-
-	-- run on_spawn function if found
-	if self.on_spawn and not self.on_spawn_run then
-		if self.on_spawn(self) then
-			self.on_spawn_run = true --  if true, set flag to run once only
-		end
-	end
-
-	-- run after_activate
-	if def.after_activate then
-		def.after_activate(self, staticdata, def, dtime)
-	end
-
-	if use_cmi then
-		self._cmi_components = cmi.activate_components(self.serialized_cmi_components)
-		cmi.notify_activate(self.object, dtime)
-	end
-end

mods/ENTITIES/mcl_mobs/api/mob_functions/sound_handling.lua

@@ -1,59 +0,0 @@
-local math_random = math.random
-
-
---generic call for sound handler for mobs (data access)
-mobs.play_sound = function(self,sound)
-    local soundinfo = self.sounds
-
-    if not soundinfo then
-        return
-    end
-
-    local play_sound = soundinfo[sound]
-
-    if not play_sound then
-        return
-    end
-
-    mobs.play_sound_handler(self, play_sound)
-end
-
-
---generic sound handler for mobs
-mobs.play_sound_handler = function(self, sound)
-    local pitch = (100 + math_random(-15,15) + math_random()) / 100
-    local distance = self.sounds.distance or 16
-
-    minetest.sound_play(sound, {
-        object = self.object,
-        gain = 1.0,
-        max_hear_distance = distance,
-        pitch = pitch,
-    }, true)
-end
-
-
---random sound timing handler
-mobs.random_sound_handling = function(self,dtime)
-
-    self.random_sound_timer = self.random_sound_timer - dtime
-
-    --play sound and reset timer
-    if self.random_sound_timer <= 0 then
-        mobs.play_sound(self,"random")
-        self.random_sound_timer = math_random(self.random_sound_timer_min,self.random_sound_timer_max)
-    end
-end
-
---used for playing a non-mob internal sound at random pitches
-mobs.play_sound_specific = function(self,soundname)
-    local pitch = (100 + math_random(-15,15) + math_random()) / 100
-    local distance = self.sounds.distance or 16
-
-    minetest.sound_play(soundname, {
-        object = self.object,
-        gain = 1.0,
-        max_hear_distance = distance,
-        pitch = pitch,
-    }, true)
-end

mods/ENTITIES/mcl_mobs/init.lua

@@ -1,16 +1,14 @@
 
 local path = minetest.get_modpath(minetest.get_current_modname())
 
-local api_path = path.."/api"
-
 -- Mob API
-dofile(api_path .. "/api.lua")
+dofile(path .. "/api.lua")
 
 -- Spawning Algorithm
-dofile(api_path .. "/spawning.lua")
+dofile(path .. "/spawning.lua")
 
 -- Rideable Mobs
-dofile(api_path .. "/mount.lua")
+dofile(path .. "/mount.lua")
 
 -- Mob Items
 dofile(path .. "/crafts.lua")

mods/ENTITIES/mcl_mobs/locale/mcl_mobs.zh_TW.tr

@@ -0,0 +1,11 @@
+# textdomain: mcl_mobs
+Peaceful mode active! No monsters will spawn.=和平模式已啓用！不會生成怪物。
+This allows you to place a single mob.=允許你放置一個生物。
+Just place it where you want the mob to appear. Animals will spawn tamed, unless you hold down the sneak key while placing. If you place this on a mob spawner, you change the mob it spawns.=把它放在你希望生物出現的地方。除非你在放置的時候按住潛行鍵，否則動物會被馴服地產生。如果你把它放在一個生怪磚上，你就會改變它所產的生物。
+You need the “maphack” privilege to change the mob spawner.=你要「maphack」權限來修改生怪磚。
+Name Tag=命名牌
+A name tag is an item to name a mob.=命名牌是一個用於命名生物的物品
+Before you use the name tag, you need to set a name at an anvil. Then you can use the name tag to name a mob. This uses up the name tag.=在使用名字標籤之前，你需要在一個鐵砧上設置一個名字。然後你就可以用名字標籤來給生物命名。這會消耗命名牌。
+Only peaceful mobs allowed!=只允許和平生物！
+Give names to mobs=替生物命名
+Set name at anvil=在鐵砧上設置名字

mods/ENTITIES/mcl_mobs/lucky_block.lua

@@ -0,0 +1,8 @@
+
+if minetest.get_modpath("lucky_block") then
+
+	lucky_block:add_blocks({
+		{"dro", {"mcl_mobs:nametag"}, 1},
+		{"lig"},
+	})
+end

mods/ENTITIES/mcl_mobs/mod.conf

@@ -2,4 +2,4 @@ name = mcl_mobs
 author = PilzAdam
 description = Adds a mob API for mods to add animals or monsters, etc.
 depends = mcl_particles
-optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience
+optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience

mods/ENTITIES/mcl_mobs/mount.lua

@@ -1,11 +1,8 @@
 
 -- lib_mount by Blert2112 (edited by TenPlus1)
 
---local enable_crash = false
---local crash_threshold = 6.5 -- ignored if enable_crash=false
-
-local math = math
-local vector = vector
+local enable_crash = false
+local crash_threshold = 6.5 -- ignored if enable_crash=false
 
 ------------------------------------------------------------------------------
 
@@ -13,7 +10,7 @@ local vector = vector
 -- Helper functions
 --
 
---[[local function node_ok(pos, fallback)
+local node_ok = function(pos, fallback)
 
 	fallback = fallback or mobs.fallback_node
 
@@ -24,10 +21,10 @@ local vector = vector
 	end
 
 	return {name = fallback}
-end]]
+end
 
 
---[[local function node_is(pos)
+local function node_is(pos)
 
 	local node = node_ok(pos)
 
@@ -48,7 +45,7 @@ end]]
 	end
 
 	return "other"
-end]]
+end
 
 
 local function get_sign(i)
@@ -63,11 +60,13 @@ local function get_sign(i)
 end
 
 
---[[local function get_velocity(v, yaw, y)
+local function get_velocity(v, yaw, y)
+
 	local x = -math.sin(yaw) * v
 	local z =  math.cos(yaw) * v
+
 	return {x = x, y = y, z = z}
-end]]
+end
 
 
 local function get_v(v)
@@ -173,7 +172,7 @@ function mobs.detach(player, offset)
 
 	--pos = {x = pos.x + offset.x, y = pos.y + 0.2 + offset.y, z = pos.z + offset.z}
 
-	player:add_velocity(vector.new(math.random(-6,6), math.random(5,8), math.random(-6,6))) --throw the rider off
+	player:add_velocity(vector.new(math.random(-6,6),math.random(5,8),math.random(-6,6))) --throw the rider off
 
 	--[[
 	minetest.after(0.1, function(name, pos)
@@ -188,13 +187,13 @@ end
 
 function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
 
-	--local rot_view = 0
+	local rot_view = 0
 
-	--if entity.player_rotation.y == 90 then
-	--	rot_view = math.pi/2
-	--end
+	if entity.player_rotation.y == 90 then
+		rot_view = math.pi/2
+	end
 
-	--local acce_y = 0
+	local acce_y = 0
 	local velo = entity.object:get_velocity()
 
 	entity.v = get_v(velo) * get_sign(entity.v)
@@ -207,30 +206,21 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
 		-- move forwards
 		if ctrl.up then
 
-			mobs.set_velocity(entity, entity.run_velocity)
-
-			mobs.set_mob_animation(entity, moving_anim)
+			entity.v = entity.v + entity.accel / 10
 
 		-- move backwards
 		elseif ctrl.down then
 
-			mobs.set_velocity(entity, -entity.run_velocity)
-
-			mobs.set_mob_animation(entity, moving_anim)
-
-		--halt
-		else
-
-			mobs.set_velocity(entity, 0)
-
-			mobs.set_mob_animation(entity, stand_anim)
+			if entity.max_speed_reverse == 0 and entity.v == 0 then
+				return
 			end
 
-		-- mob rotation
-		entity.object:set_yaw(entity.driver:get_look_horizontal() - entity.rotate)
-		entity.yaw = entity.driver:get_look_horizontal() - entity.rotate
+			entity.v = entity.v - entity.accel / 10
+		end
+
+		-- fix mob rotation
+		entity.object:set_yaw(entity.driver:get_look_horizontal() - entity.rotate)
 
-		--[[
 		if can_fly then
 
 			-- fly up
@@ -254,21 +244,32 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
 			end
 
 		else
-			]]--
 
 			-- jump
 			if ctrl.jump then
 
-			mobs.jump(entity)
+				if velo.y == 0 then
+					velo.y = velo.y + entity.jump_height
+					acce_y = acce_y + (acce_y * 3) + 1
+				end
 			end
 
-		--end
+		end
+	end
+
+	-- if not moving then set animation and return
+	if entity.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
+
+		if stand_anim then
+			mobs:set_animation(entity, stand_anim)
+		end
+
+		return
 	end
 
-	--[[
 	-- set moving animation
 	if moving_anim then
-		mobs:set_mob_animation(entity, moving_anim)
+		mobs:set_animation(entity, moving_anim)
 	end
 
 	-- Stop!
@@ -382,17 +383,13 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
 	end
 
 	entity.v2 = v
-	]]--
 end
 
 
 -- directional flying routine by D00Med (edited by TenPlus1)
 
 function mobs.fly(entity, dtime, speed, shoots, arrow, moving_anim, stand_anim)
-	if true then
-		print("succ")
-		return
-	end
+
 	local ctrl = entity.driver:get_player_control()
 	local velo = entity.object:get_velocity()
 	local dir = entity.driver:get_look_dir()
@@ -443,9 +440,9 @@ function mobs.fly(entity, dtime, speed, shoots, arrow, moving_anim, stand_anim)
 	-- change animation if stopped
 	if velo.x == 0 and velo.y == 0 and velo.z == 0 then
 
-		mobs:set_mob_animation(entity, stand_anim)
+		mobs:set_animation(entity, stand_anim)
 	else
 		-- moving animation
-		mobs:set_mob_animation(entity, moving_anim)
+		mobs:set_animation(entity, moving_anim)
 	end
 end

mods/ENTITIES/mcl_mobs/sounds/attributes.txt

@@ -1,4 +0,0 @@
- 
-default_punch.1 = https://freesound.org/people/Merrick079/sounds/566436/
-default_punch.2 = https://freesound.org/people/Merrick079/sounds/566435/
-default_punch.3 = https://freesound.org/people/Merrick079/sounds/566434/

mods/ENTITIES/mcl_mobs/spawning.lua

@@ -3,28 +3,15 @@ local get_node                     = minetest.get_node
 local get_item_group = minetest.get_item_group
 local get_node_light = minetest.get_node_light
 local find_nodes_in_area_under_air = minetest.find_nodes_in_area_under_air
-local get_biome_name               = minetest.get_biome_name
-local get_objects_inside_radius    = minetest.get_objects_inside_radius
-
-
+local new_vector     = vector.new
 local math_random    = math.random
-local math_floor     = math.floor
---local max            = math.max
-
---local vector_distance = vector.distance
-local vector_new      = vector.new
-local vector_floor    = vector.floor
-
-local table_copy     = table.copy
-local table_remove   = table.remove
-
+local get_biome_name = minetest.get_biome_name
+local max            = math.max
+local get_objects_inside_radius = minetest.get_objects_inside_radius
+local vector_distance = vector.distance
 
 -- range for mob count
-local aoc_range = 48
-
---do mobs spawn?
-local mobs_spawn = minetest.settings:get_bool("mobs_spawn", true) ~= false
-
+local aoc_range = 32
 --[[
 
 THIS IS THE BIG LIST OF ALL BIOMES - used for programming/updating mobs
@@ -166,14 +153,28 @@ Overworld regular:
 
 
 
--- count how many mobs are in an area
-local function count_mobs(pos)
+
+local mobs_spawn = minetest.settings:get_bool("mobs_spawn", true) ~= false
+-- count how many mobs of one type are inside an area
+
+local count_mobs = function(pos,mobtype)
 	local num = 0
-	for _,object in pairs(get_objects_inside_radius(pos, aoc_range)) do
-		if object and object:get_luaentity() and object:get_luaentity()._cmi_is_mob then
+	local objs = get_objects_inside_radius(pos, aoc_range)
+	for n = 1, #objs do
+		local obj = objs[n]:get_luaentity()
+		if obj and obj.name and obj._cmi_is_mob then
+			-- count hostile mobs only
+			if mobtype == "hostile" then
+				if obj.spawn_class == "hostile" then
+					num = num + 1
+				end
+			-- count passive mobs only
+			else
 				num = num + 1
 			end
 		end
+	end
+
 	return num
 end
 
@@ -242,7 +243,8 @@ function mobs:spawn_specific(name, dimension, type_of_spawning, biomes, min_ligh
 	end
 
 	--[[
-	local function spawn_action(pos, node, active_object_count, active_object_count_wider, name)
+	local spawn_action
+	spawn_action = function(pos, node, active_object_count, active_object_count_wider, name)
 
 			local orig_pos = table.copy(pos)
 			-- is mob actually registered?
@@ -482,26 +484,25 @@ end
 
 local axis
 --inner and outer part of square donut radius
-local inner = 15
-local outer = 64
+local inner = 1
+local outer = 65
 local int = {-1,1}
+local position_calculation = function(pos)
 
-local function position_calculation(pos)
-
-	pos = vector_floor(pos)
+	pos = vector.floor(pos)
 
 	--this is used to determine the axis buffer from the player
-	axis = math_random(0,1)
+	axis = math.random(0,1)
 
 	--cast towards the direction
 	if axis == 0 then --x
-		pos.x = pos.x + math_random(inner,outer)*int[math_random(1,2)]
-		pos.z = pos.z + math_random(-outer,outer)
+		pos.x = pos.x + math.random(inner,outer)*int[math.random(1,2)]
+		pos.z = pos.z + math.random(-outer,outer)
 	else --z
-		pos.z = pos.z + math_random(inner,outer)*int[math_random(1,2)]
-		pos.x = pos.x + math_random(-outer,outer)
+		pos.z = pos.z + math.random(inner,outer)*int[math.random(1,2)]
+		pos.x = pos.x + math.random(-outer,outer)
 	end
-	return pos
+	return(pos)
 end
 
 --[[
@@ -515,7 +516,7 @@ local decypher_limits_dictionary = {
 local function decypher_limits(posy)
 	--local min_max_table = decypher_limits_dictionary[dimension]
 	--return min_max_table[1],min_max_table[2]
-	posy = math_floor(posy)
+	posy = math.floor(posy)
 	return posy - 32, posy + 32
 end
 
@@ -538,16 +539,13 @@ if mobs_spawn then
 	local timer = 0
 	minetest.register_globalstep(function(dtime)
 		timer = timer + dtime
-		if timer >= 10 then
+		if timer >= 8 then
 			timer = 0
 			for _,player in pairs(minetest.get_connected_players()) do
-				-- after this line each "break" means "continue"
-				local do_mob_spawning = true
-				repeat
-					--don't need to get these variables more than once
-					--they happen in a single server step
-
+				for i = 1,math_random(3,8) do
+					repeat -- after this line each "break" means "continue"
 						local player_pos = player:get_pos()
+
 						local _,dimension = mcl_worlds.y_to_layer(player_pos.y)
 
 						if dimension == "void" or dimension == "default" then
@@ -556,14 +554,9 @@ if mobs_spawn then
 
 						local min,max = decypher_limits(player_pos.y)
 
-					for i = 1,math_random(1,4) do
-						-- after this line each "break" means "continue"
-						local do_mob_algorithm = true
-						repeat
-
 						local goal_pos = position_calculation(player_pos)
 
-							local spawning_position_list = find_nodes_in_area_under_air(vector_new(goal_pos.x,min,goal_pos.z), vector_new(goal_pos.x,max,goal_pos.z), {"group:solid", "group:water", "group:lava"})
+						local spawning_position_list = find_nodes_in_area_under_air(new_vector(goal_pos.x,min,goal_pos.z), vector.new(goal_pos.x,max,goal_pos.z), {"group:solid", "group:water", "group:lava"})
 
 						--couldn't find node
 						if #spawning_position_list <= 0 then
@@ -572,21 +565,26 @@ if mobs_spawn then
 
 						local spawning_position = spawning_position_list[math_random(1,#spawning_position_list)]
 
-							--Prevent strange behavior   --- this is commented out: /too close to player --fixed with inner circle
-							if not spawning_position then --  or vector_distance(player_pos, spawning_position) < 15
+						--Prevent strange behavior/too close to player
+						if not spawning_position or vector_distance(player_pos, spawning_position) < 15 then
 							break
 						end
 
-							--hard code mob limit in area to 5 for now
-							if count_mobs(spawning_position) >= 5 then
+						local gotten_node = get_node(spawning_position)
+						local gotten_node_name = gotten_node.name
+						local gotten_node_def = minetest.registered_nodes[gotten_node_name]
+
+						if not gotten_node_name or not gotten_node_def or gotten_node_name == "air" then --skip air nodes
 							break
 						end
 
-							local gotten_node = get_node(spawning_position).name
-
-							if not gotten_node or gotten_node == "air" then --skip air nodes
+						if gotten_node_def.use_texture_alpha and gotten_node_def.use_texture_alpha ~= "opaque" then 
 							break
-							end
+						end --don't spawn on nonopaque nodes
+
+						local leaf = minetest.get_item_group(gotten_node_name,"leaves")
+						if leaf ~= 0 then
+							break end --don't spawn on treetops
 
 						local gotten_biome = minetest.get_biome_data(spawning_position)
 
@@ -596,92 +594,51 @@ if mobs_spawn then
 
 						gotten_biome = get_biome_name(gotten_biome.biome) --makes it easier to work with
 
+						--grab random mob
+						local mob_def = spawn_dictionary[math.random(1,#spawn_dictionary)]
+
+						if not mob_def then
+							break --skip if something ridiculous happens (nil mob def)
+						end
+
+						--skip if not correct dimension
+						if mob_def.dimension ~= dimension then
+							break
+						end
+
+						--skip if not in correct biome
+						if not biome_check(mob_def.biomes, gotten_biome) then
+							break
+						end
+
 						--add this so mobs don't spawn inside nodes
 						spawning_position.y = spawning_position.y + 1
 
+						if spawning_position.y < mob_def.min_height or spawning_position.y > mob_def.max_height then
+							break
+						end
+
 						--only need to poll for node light if everything else worked
 						local gotten_light = get_node_light(spawning_position)
 
-							local is_water = get_item_group(gotten_node, "water") ~= 0
-							local is_lava  = get_item_group(gotten_node, "lava") ~= 0
-
-							local mob_def = nil
-
-							--create a disconnected clone of the spawn dictionary
-							--prevents memory leak
-							local mob_library_worker_table = table_copy(spawn_dictionary)
-
-							--grab mob that fits into the spawning location
-							--randomly grab a mob, don't exclude any possibilities
-							local repeat_mob_search = true
-							repeat
-
-								--do not infinite loop
-								if #mob_library_worker_table <= 0 then
-									--print("breaking infinite loop")
-									break
-								end
-
-								local skip = false
-
-								--use this for removing table elements of mobs that do not match
-								local temp_index = math_random(1,#mob_library_worker_table)
-
-								local temp_def = mob_library_worker_table[temp_index]
-
-								--skip if something ridiculous happens (nil mob def)
-								--something truly horrible has happened if skip gets
-								--activated at this point
-								if not temp_def then
-									skip = true
-								end
-
-								if not skip and (spawning_position.y < temp_def.min_height or spawning_position.y > temp_def.max_height) then
-									skip = true
-								end
-
-								--skip if not correct dimension
-								if not skip and (temp_def.dimension ~= dimension) then
-									skip = true
-								end
-
-								--skip if not in correct biome
-								if not skip and (not biome_check(temp_def.biomes, gotten_biome)) then
-									skip = true
-								end
-
 						--don't spawn if not in light limits
-								if not skip and (gotten_light < temp_def.min_light or gotten_light > temp_def.max_light) then
-									skip = true
-								end
-
-								--skip if not in correct spawning type
-								if not skip and (temp_def.type_of_spawning == "ground" and is_water) then
-									skip = true
-								end
-
-								if not skip and (temp_def.type_of_spawning == "ground" and is_lava) then
-									skip = true
-								end
-
-								--found a mob, exit out of loop
-								if not skip then
-									--minetest.log("warning", "found mob:"..temp_def.name)
-									--print("found mob:"..temp_def.name)
-									mob_def = table_copy(temp_def)
+						if gotten_light < mob_def.min_light or gotten_light > mob_def.max_light then
 							break
-								else
-									--minetest.log("warning", "deleting temp index "..temp_index)
-									--print("deleting temp index")
-									table_remove(mob_library_worker_table, temp_index)
 						end
 
-							until repeat_mob_search == false --this is needed to sort through mobs randomly
+						local is_water = get_item_group(gotten_node_name, "water") ~= 0
+						local is_lava  = get_item_group(gotten_node_name, "lava") ~= 0
 
+						if mob_def.type_of_spawning == "ground" and is_water then
+							break
+						end
 
-							--catch if went through all mobs and something went horribly wrong
-							--could not find a valid mob to spawn that fits the environment
-							if not mob_def then
+						if mob_def.type_of_spawning == "ground" and is_lava then
+							break
+						end
+
+						--finally do the heavy check (for now) of mobs in area
+						if count_mobs(spawning_position, mob_def.spawn_class) >= mob_def.aoc then
 							break
 						end
 
@@ -690,17 +647,10 @@ if mobs_spawn then
 							spawning_position.y = spawning_position.y - 1
 						end
 
-							--print("spawning: " .. mob_def.name)
-
 						--everything is correct, spawn mob
 						minetest.add_entity(spawning_position, mob_def.name)
-
-							break
-						until do_mob_algorithm == false --this is a safety catch
+					until true --this is a safety catch
 				end
-
-					break
-				until do_mob_spawning == false --this is a performance catch
 			end
 		end
 	end)

mods/ENTITIES/mcl_mobs/todo.txt

@@ -1 +0,0 @@
---use vector.distance to count down mob despawn timer

mods/ENTITIES/mcl_paintings/init.lua

@@ -1,8 +1,9 @@
 mcl_paintings = {}
 
-dofile(minetest.get_modpath(minetest.get_current_modname()).."/paintings.lua")
+local modname = minetest.get_current_modname()
+dofile(minetest.get_modpath(modname).."/paintings.lua")
 
-local S = minetest.get_translator("mcl_paintings")
+local S = minetest.get_translator(modname)
 
 local math = math
 

mods/ENTITIES/mcl_paintings/locale/mcl_paintings.pl.tr

@@ -0,0 +1,2 @@
+# textdomain:mcl_paintings
+Painting=Obraz

mods/ENTITIES/mcl_paintings/locale/mcl_paintings.zh_TW.tr

@@ -0,0 +1,2 @@
+# textdomain:mcl_paintings
+Painting=畫

mods/ENTITIES/mobs_mc/0_gameconfig.lua

@@ -15,7 +15,7 @@ with name "mobs_mc_gameconfig". ]]
 -- Set to false in your gameconfig mod if you create your own monster egg nodes.
 mobs_mc.create_monster_egg_nodes = true
 
---mobs_mc.items = {}
+mobs_mc.items = {}
 
 mobs_mc.items = {
 	-- Items defined in mobs_mc
@@ -81,9 +81,7 @@ mobs_mc.items = {
 	gunpowder = "tnt:gunpowder",
 	flint_and_steel = "fire:flint_and_steel",
 	water_source = "default:water_source",
-	water_flowing = "default:water_flowing",
 	river_water_source = "default:river_water_source",
-	--water_flowing = "default:river_water_flowing",
 	black_dye = "dye:black",
 	poppy = "flowers:rose",
 	dandelion = "flowers:dandelion_yellow",
@@ -128,6 +126,7 @@ mobs_mc.items = {
 
 	nether_portal = "nether:portal",
 	netherrack = "nether:rack",
+	nether_brick_block = "nether:brick",
 
 	-- Wool (Minecraft color scheme)
 	wool_white = "wool:white",

mods/ENTITIES/mobs_mc/1_items_default.lua

@@ -8,7 +8,7 @@
 -- NOTE: Most strings intentionally not marked for translation, other mods already have these items.
 -- TODO: Remove this file eventually, most items are already outsourced in other mods.
 
-local S = minetest.get_translator("mobs_mc")
+local S = minetest.get_translator(minetest.get_current_modname())
 
 local c = mobs_mc.is_item_variable_overridden
 
@@ -234,8 +234,8 @@ end
 if c("ender_eye") and c("blaze_powder") and c("blaze_rod") then
 	minetest.register_craft({
 		type = "shapeless",
-		output = 'mobs_mc:ender_eye',
-		recipe = { 'mobs_mc:blaze_powder', 'mobs_mc:blaze_rod'},
+		output = "mobs_mc:ender_eye",
+		recipe = { "mobs_mc:blaze_powder", "mobs_mc:blaze_rod"},
 	})
 end
 
@@ -525,7 +525,7 @@ if c("totem") then
 		inventory_image = "mcl_totems_totem.png",
 		wield_image = "mcl_totems_totem.png",
 		stack_max = 1,
-		groups = {combat_item=1},
+		groups = {combat_item = 1, offhand_item = 1},
 	})
 end
 

mods/ENTITIES/mobs_mc/2_throwing.lua

@@ -6,7 +6,7 @@
 -- NOTE: Strings intentionally not marked for translation, other mods already have these items.
 -- TODO: Remove this file eventually, all items here are already outsourced in other mods.
 
---local S = minetest.get_translator("mobs_mc")
+local S = minetest.get_translator("mobs_mc")
 
 --maikerumines throwing code
 --arrow (weapon)

mods/ENTITIES/mobs_mc/3_shared.lua

@@ -50,8 +50,10 @@ mobs_mc.make_owner_teleport_function = function(dist, teleport_check_interval)
 					local telepos_below = {x=telepos.x, y=telepos.y-1, z=telepos.z}
 					table.remove(check_offsets, r)
 					-- Long story short, spawn on a platform
-					if minetest.registered_nodes[minetest.get_node(telepos).name].walkable == false and
-							minetest.registered_nodes[minetest.get_node(telepos_below).name].walkable == true then
+					local trynode = minetest.registered_nodes[minetest.get_node(telepos).name]
+					local trybelownode = minetest.registered_nodes[minetest.get_node(telepos_below).name]
+					if trynode and not trynode.walkable and
+							trybelownode and trybelownode.walkable then
 						-- Correct position found! Let's teleport.
 						self.object:set_pos(telepos)
 						return

mods/ENTITIES/mobs_mc/4_heads.lua

@@ -3,9 +3,8 @@
 
 -- NOTE: Strings intentionally not marked for translation, other mods already have these items.
 -- TODO: Remove this file eventually, all items here are already outsourced in other mods.
--- TODO: Add translation.
 
---local S = minetest.get_translator("mobs_mc")
+local S = minetest.get_translator("mobs_mc")
 
 -- Heads system
 

mods/ENTITIES/mobs_mc/bat.lua

@@ -8,9 +8,6 @@ mobs:register_mob("mobs_mc:bat", {
 	spawn_class = "ambient",
 	can_despawn = true,
 	passive = true,
-	rotate = 270,
-	tilt_fly = true,
-	fly = true,
 	hp_min = 6,
 	hp_max = 6,
 	collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25},
@@ -48,7 +45,9 @@ mobs:register_mob("mobs_mc:bat", {
 	fall_damage = 0,
 	view_range = 16,
 	fear_height = 0,
+
 	jump = false,
+	fly = true,
 	makes_footstep_sound = false,
 })
 

mods/ENTITIES/mobs_mc/blaze.lua

@@ -5,6 +5,8 @@
 
 local S = minetest.get_translator("mobs_mc")
 
+local mod_target = minetest.get_modpath("mcl_target")
+
 --###################
 --################### BLAZE
 --###################
@@ -18,9 +20,6 @@ mobs:register_mob("mobs_mc:blaze", {
 	hp_max = 20,
 	xp_min = 10,
 	xp_max = 10,
-	tilt_fly = false,
-	hostile = true,
-	--rotate = 270,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.79, 0.3},
 	rotate = -180,
 	visual = "mesh",
@@ -39,7 +38,7 @@ mobs:register_mob("mobs_mc:blaze", {
 	walk_velocity = .8,
 	run_velocity = 1.6,
 	damage = 6,
-	reach = 4, -- don't want blaze getting too close
+	reach = 2,
 	pathfinding = 1,
 	drops = {
 		{name = mobs_mc.items.blaze_rod,
@@ -67,7 +66,7 @@ mobs:register_mob("mobs_mc:blaze", {
 	fall_speed = -2.25,
 	light_damage = 0,
 	view_range = 16,
-	attack_type = "projectile",
+	attack_type = "dogshoot",
 	arrow = "mobs_mc:blaze_fireball",
 	shoot_interval = 3.5,
 	shoot_offset = 1.0,
@@ -79,18 +78,9 @@ mobs:register_mob("mobs_mc:blaze", {
 	fear_height = 0,
 	glow = 14,
 	fire_resistant = true,
-	eye_height = 0.75,
-	projectile_cooldown_min = 2,
-	projectile_cooldown_max = 3,
-	shoot_arrow = function(self, pos, dir)
-		-- 2-4 damage per arrow
-		local dmg = math.random(2,4)
-		mobs.shoot_projectile_handling("mobs_mc:blaze_fireball", pos, dir, self.object:get_yaw(), self.object, 7, dmg,nil,nil,nil,-0.4)
-	end,
-
 	do_custom = function(self)
-		if self.attacking and self.state == "attack" and vector.distance(self.object:get_pos(), self.attacking:get_pos()) < 1.2 then
-			mcl_burning.set_on_fire(self.attacking, 5)
+		if self.state == "attack" and self.attack:get_pos() and vector.distance(self.object:get_pos(), self.attack:get_pos()) < 1.2 then
+			mcl_burning.set_on_fire(self.attack, 5)
 		end
 		local pos = self.object:get_pos()
 		minetest.add_particle({
@@ -160,11 +150,6 @@ mobs:register_arrow("mobs_mc:blaze_fireball", {
 	visual_size = {x = 0.3, y = 0.3},
 	textures = {"mcl_fire_fire_charge.png"},
 	velocity = 15,
-	speed = 5,
-	tail = 1,
-	tail_texture = "mobs_mc_spit.png^[colorize:black:255", --repurpose spit texture
-	tail_size = 2,
-	tail_distance_divider = 3,
 	_is_fireball = true,
 
 	-- Direct hit, no fire... just plenty of pain
@@ -172,7 +157,7 @@ mobs:register_arrow("mobs_mc:blaze_fireball", {
 		mcl_burning.set_on_fire(player, 5)
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
-			damage_groups = {fleshy = self._damage},
+			damage_groups = {fleshy = 5},
 		}, nil)
 	end,
 
@@ -180,7 +165,7 @@ mobs:register_arrow("mobs_mc:blaze_fireball", {
 		mcl_burning.set_on_fire(mob, 5)
 		mob:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
-			damage_groups = {fleshy = self._damage},
+			damage_groups = {fleshy = 5},
 		}, nil)
 	end,
 
@@ -195,19 +180,20 @@ mobs:register_arrow("mobs_mc:blaze_fireball", {
 
 	-- Node hit, make fire
 	hit_node = function(self, pos, node)
-		if node.name ~= "air" then
-			local pos_above = table.copy(pos)
-			pos_above.y = pos_above.y + 1
-			minetest.set_node(pos_above, {name=mobs_mc.items.fire})
+		if node == "air" then
+			minetest.set_node(pos, {name = mobs_mc.items.fire})
 		else
-			local v = self.object:get_velocity()
-			v = vector.normalize(v)
+			if self._shot_from_dispenser and mod_target and node == "mcl_target:target_off" then
+				mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks
+			end
+			local v = vector.normalize(self.object:get_velocity())
 			local crashpos = vector.subtract(pos, v)
 			local crashnode = minetest.get_node(crashpos)
+			local cndef = minetest.registered_nodes[crashnode.name]
 			-- Set fire if node is air, or a replacable flammable node (e.g. a plant)
 			if crashnode.name == "air" or
-					(minetest.registered_nodes[crashnode.name].buildable_to and minetest.get_item_group(crashnode.name, "flammable") >= 1) then
-				minetest.set_node(crashpos, {name=mobs_mc.items.fire})
+					(cndef and cndef.buildable_to and minetest.get_item_group(crashnode.name, "flammable") >= 1) then
+				minetest.set_node(crashpos, {name = mobs_mc.items.fire})
 			end
 		end
 	end

mods/ENTITIES/mobs_mc/chicken.lua

@@ -18,8 +18,7 @@ mobs:register_mob("mobs_mc:chicken", {
 	xp_min = 1,
 	xp_max = 3,
 	collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.69, 0.2},
-	skittish = true,
-	fall_slow = true,
+	runaway = true,
 	floats = 1,
 	visual = "mesh",
 	mesh = "mobs_mc_chicken.b3d",
@@ -27,10 +26,9 @@ mobs:register_mob("mobs_mc:chicken", {
 		{"mobs_mc_chicken.png"},
 	},
 	visual_size = {x=2.2, y=2.2},
-	rotate = 270,
+
 	makes_footstep_sound = true,
 	walk_velocity = 1,
-	run_velocity = 3,
 	drops = {
 		{name = mobs_mc.items.chicken_raw,
 		chance = 1,
@@ -66,25 +64,14 @@ mobs:register_mob("mobs_mc:chicken", {
 		run_start = 0,		run_end = 40,
 	},
 
-	follow = "mcl_farming:wheat_seeds",
-	breed_distance = 1.5,
-	baby_size = 0.5,
-	follow_distance = 2,
+	follow = mobs_mc.follow.chicken,
 	view_range = 16,
 	fear_height = 4,
 
-	--why do chickend breed if they lay eggs??
 	on_rightclick = function(self, clicker)
-		--attempt to enter breed state
-		if mobs.enter_breed_state(self,clicker) then
-			return
-		end
-
-		--make baby grow faster
-		if self.baby then
-			mobs.make_baby_grow_faster(self,clicker)
-			return
-		end
+		if mobs:feed_tame(self, clicker, 1, true, true) then return end
+		if mobs:protect(self, clicker) then return end
+		if mobs:capture_mob(self, clicker, 0, 60, 5, false, nil) then return end
 	end,
 
 	do_custom = function(self, dtime)
@@ -111,21 +98,6 @@ mobs:register_mob("mobs_mc:chicken", {
 		}, true)
 	end,
 
-	--head code
-	has_head = true,
-	head_bone = "head",
-
-	swap_y_with_x = false,
-	reverse_head_yaw = false,
-
-	head_bone_pos_y = 1.675,
-	head_bone_pos_z = 0,
-
-	head_height_offset = 0.55,
-	head_direction_offset = 0.0925,
-
-	head_pitch_modifier = -math.pi/2,
-	--end head code
 })
 
 --spawn
@@ -134,53 +106,42 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-	"FlowerForest_beach",
-	"Forest_beach",
-	"StoneBeach",
-	"ColdTaiga_beach_water",
-	"Taiga_beach",
-	"Savanna_beach",
-	"Plains_beach",
-	"ExtremeHills_beach",
-	"ColdTaiga_beach",
-	"Swampland_shore",
-	"JungleM_shore",
-	"Jungle_shore",
-	"MesaPlateauFM_sandlevel",
-	"MesaPlateauF_sandlevel",
-	"MesaBryce_sandlevel",
-	"Mesa_sandlevel",
-	"Mesa",
-	"FlowerForest",
-	"Swampland",
-	"Taiga",
-	"ExtremeHills",
-	"Jungle",
-	"Savanna",
-	"BirchForest",
-	"MegaSpruceTaiga",
-	"MegaTaiga",
-	"ExtremeHills+",
-	"Forest",
-	"Plains",
-	"Desert",
-	"ColdTaiga",
+	"flat",
 	"IcePlainsSpikes",
-	"SunflowerPlains",
-	"IcePlains",
-	"RoofedForest",
-	"ExtremeHills+_snowtop",
-	"MesaPlateauFM_grasstop",
-	"JungleEdgeM",
+	"ColdTaiga",
+	"ColdTaiga_beach",
+	"ColdTaiga_beach_water",
+	"MegaTaiga",
+	"MegaSpruceTaiga",
+	"ExtremeHills",
+	"ExtremeHills_beach",
 	"ExtremeHillsM",
-	"JungleM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
+	"StoneBeach",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Taiga",
+	"Taiga_beach",
+	"Forest",
+	"Forest_beach",
+	"FlowerForest",
+	"FlowerForest_beach",
+	"BirchForest",
 	"BirchForestM",
-	"MesaPlateauF",
-	"MesaPlateauFM",
-	"MesaPlateauF_grasstop",
-	"MesaBryce",
-	"JungleEdge",
+	"RoofedForest",
+	"Savanna",
+	"Savanna_beach",
 	"SavannaM",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
+	"Swampland",
+	"Swampland_shore"
 },
 9,
 minetest.LIGHT_MAX+1,

mods/ENTITIES/mobs_mc/cow+mooshroom.lua

@@ -10,7 +10,6 @@ local cow_def = {
 	hp_max = 10,
 	xp_min = 1,
 	xp_max = 3,
-	rotate = 270,
 	collisionbox = {-0.45, -0.01, -0.45, 0.45, 1.39, 0.45},
 	visual = "mesh",
 	mesh = "mobs_mc_cow.b3d",
@@ -21,7 +20,6 @@ local cow_def = {
 	visual_size = {x=2.8, y=2.8},
 	makes_footstep_sound = true,
 	walk_velocity = 1,
-	run_velocity = 3,
 	drops = {
 		{name = mobs_mc.items.beef_raw,
 		chance = 1,
@@ -34,7 +32,7 @@ local cow_def = {
 		max = 2,
 		looting = "common",},
 	},
-	skittish = true,
+	runaway = true,
 	sounds = {
 		random = "mobs_mc_cow",
 		damage = "mobs_mc_cow_hurt",
@@ -49,17 +47,12 @@ local cow_def = {
 		walk_end = 40,      run_start = 0,
 		run_end = 40,
 	},
-	--follow = mobs_mc.follow.cow,
+	follow = mobs_mc.follow.cow,
 	on_rightclick = function(self, clicker)
+		if mobs:feed_tame(self, clicker, 1, true, true) then return end
+		if mobs:protect(self, clicker) then return end
 
-		--attempt to enter breed state
-		if mobs.enter_breed_state(self,clicker) then
-			return
-		end
-
-		--make baby grow faster
-		if self.baby then
-			mobs.make_baby_grow_faster(self,clicker)
+		if self.child then
 			return
 		end
 
@@ -78,28 +71,11 @@ local cow_def = {
 			end
 			return
 		end
+		mobs:capture_mob(self, clicker, 0, 5, 60, false, nil)
 	end,
-	breed_distance = 1.5,
-	baby_size = 0.5,
-	follow_distance = 2,
 	follow = mobs_mc.items.wheat,
 	view_range = 10,
 	fear_height = 4,
-
-	--head code
-	has_head = true,
-	head_bone = "head",
-
-	swap_y_with_x = false,
-	reverse_head_yaw = false,
-
-	head_bone_pos_y = 3.6,
-	head_bone_pos_z = -0.6,
-
-	head_height_offset = 1.0525,
-	head_direction_offset = 0.5,
-	head_pitch_modifier = 0,
-	--end head code
 }
 
 mobs:register_mob("mobs_mc:cow", cow_def)
@@ -110,17 +86,12 @@ mooshroom_def.description = S("Mooshroom")
 mooshroom_def.mesh = "mobs_mc_cow.b3d"
 mooshroom_def.textures = { {"mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png"}, {"mobs_mc_mooshroom_brown.png", "mobs_mc_mushroom_brown.png" } }
 mooshroom_def.on_rightclick = function(self, clicker)
-	--attempt to enter breed state
-	if mobs.enter_breed_state(self,clicker) then
+	if mobs:feed_tame(self, clicker, 1, true, true) then return end
+	if mobs:protect(self, clicker) then return end
+
+	if self.child then
 		return
 	end
-
-	--make baby grow faster
-	if self.baby then
-		mobs.make_baby_grow_faster(self,clicker)
-		return
-	end
-
 	local item = clicker:get_wielded_item()
 	-- Use shears to get mushrooms and turn mooshroom into cow
 	if item:get_name() == mobs_mc.items.shears then
@@ -169,6 +140,7 @@ mooshroom_def.on_rightclick = function(self, clicker)
 			minetest.add_item(pos, {name = mobs_mc.items.mushroom_stew})
 		end
 	end
+	mobs:capture_mob(self, clicker, 0, 5, 60, false, nil)
 end
 mobs:register_mob("mobs_mc:mooshroom", mooshroom_def)
 
@@ -179,53 +151,42 @@ mobs:spawn_specific(
 "overworld",
 "ground",
 {
-	"FlowerForest_beach",
-	"Forest_beach",
-	"StoneBeach",
-	"ColdTaiga_beach_water",
-	"Taiga_beach",
-	"Savanna_beach",
-	"Plains_beach",
-	"ExtremeHills_beach",
-	"ColdTaiga_beach",
-	"Swampland_shore",
-	"JungleM_shore",
-	"Jungle_shore",
-	"MesaPlateauFM_sandlevel",
-	"MesaPlateauF_sandlevel",
-	"MesaBryce_sandlevel",
-	"Mesa_sandlevel",
-	"Mesa",
-	"FlowerForest",
-	"Swampland",
-	"Taiga",
-	"ExtremeHills",
-	"Jungle",
-	"Savanna",
-	"BirchForest",
-	"MegaSpruceTaiga",
-	"MegaTaiga",
-	"ExtremeHills+",
-	"Forest",
-	"Plains",
-	"Desert",
-	"ColdTaiga",
+	"flat",
 	"IcePlainsSpikes",
-	"SunflowerPlains",
-	"IcePlains",
-	"RoofedForest",
-	"ExtremeHills+_snowtop",
-	"MesaPlateauFM_grasstop",
-	"JungleEdgeM",
+	"ColdTaiga",
+	"ColdTaiga_beach",
+	"ColdTaiga_beach_water",
+	"MegaTaiga",
+	"MegaSpruceTaiga",
+	"ExtremeHills",
+	"ExtremeHills_beach",
 	"ExtremeHillsM",
-	"JungleM",
+	"ExtremeHills+",
+	"ExtremeHills+_snowtop",
+	"StoneBeach",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Taiga",
+	"Taiga_beach",
+	"Forest",
+	"Forest_beach",
+	"FlowerForest",
+	"FlowerForest_beach",
+	"BirchForest",
 	"BirchForestM",
-	"MesaPlateauF",
-	"MesaPlateauFM",
-	"MesaPlateauF_grasstop",
-	"MesaBryce",
-	"JungleEdge",
+	"RoofedForest",
+	"Savanna",
+	"Savanna_beach",
 	"SavannaM",
+	"Jungle",
+	"Jungle_shore",
+	"JungleM",
+	"JungleM_shore",
+	"JungleEdge",
+	"JungleEdgeM",
+	"Swampland",
+	"Swampland_shore"
 },
 9,
 minetest.LIGHT_MAX+1,

mods/ENTITIES/mobs_mc/creeper.lua

@@ -12,8 +12,6 @@ local S = minetest.get_translator("mobs_mc")
 mobs:register_mob("mobs_mc:creeper", {
 	type = "monster",
 	spawn_class = "hostile",
-	hostile = true,
-	rotate = 270,
 	hp_min = 20,
 	hp_max = 20,
 	xp_min = 5,
@@ -35,39 +33,23 @@ mobs:register_mob("mobs_mc:creeper", {
 		explode = "tnt_explode",
 		distance = 16,
 	},
-	makes_footstep_sound = false,
+	makes_footstep_sound = true,
 	walk_velocity = 1.05,
-	run_velocity = 3.25,
+	run_velocity = 2.1,
 	runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
 	attack_type = "explode",
-	eye_height = 1.25,
+
 	--hssssssssssss
 
 	explosion_strength = 3,
-	--explosion_radius = 3,
-	--explosion_damage_radius = 6,
-	--explosiontimer_reset_radius = 6,
-	reach = 1.5,
-	defuse_reach = 4,
-	explosion_timer = 0.3,
+	explosion_radius = 3.5,
+	explosion_damage_radius = 3.5,
+	explosiontimer_reset_radius = 6,
+	reach = 3,
+	explosion_timer = 1.5,
 	allow_fuse_reset = true,
 	stop_to_explode = true,
 
-	--head code
-	has_head = true,
-	head_bone = "head",
-
-	swap_y_with_x = true,
-	reverse_head_yaw = true,
-
-	head_bone_pos_y = 2.4,
-	head_bone_pos_z = 0,
-
-	head_height_offset = 1.1,
-	head_direction_offset = 0,
-	head_pitch_modifier = 0,
-	--end head code
-
 	-- Force-ignite creeper with flint and steel and explode after 1.5 seconds.
 	-- TODO: Make creeper flash after doing this as well.
 	-- TODO: Test and debug this code.
@@ -148,7 +130,7 @@ mobs:register_mob("mobs_mc:creeper", {
 })
 
 mobs:register_mob("mobs_mc:creeper_charged", {
-	description = S("Charged Creeper"),
+	description = S("Creeper"),
 	type = "monster",
 	spawn_class = "hostile",
 	hp_min = 20,
@@ -167,7 +149,6 @@ mobs:register_mob("mobs_mc:creeper_charged", {
 		"mobs_mc_creeper_charge.png"},
 	},
 	visual_size = {x=3, y=3},
-	rotate = 270,
 	sounds = {
 		attack = "tnt_ignite",
 		death = "mobs_mc_creeper_death",
@@ -176,19 +157,18 @@ mobs:register_mob("mobs_mc:creeper_charged", {
 		explode = "tnt_explode",
 		distance = 16,
 	},
-	makes_footstep_sound = false,
+	makes_footstep_sound = true,
 	walk_velocity = 1.05,
 	run_velocity = 2.1,
 	runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
 	attack_type = "explode",
 
 	explosion_strength = 6,
-	--explosion_radius = 3,
-	--explosion_damage_radius = 6,
-	--explosiontimer_reset_radius = 3,
-	reach = 1.5,
-	defuse_reach = 4,
-	explosion_timer = 0.3,
+	explosion_radius = 8,
+	explosion_damage_radius = 8,
+	explosiontimer_reset_radius = 6,
+	reach = 3,
+	explosion_timer = 1.5,
 	allow_fuse_reset = true,
 	stop_to_explode = true,