diff --git a/.gitignore b/.gitignore index 42eb1d846..de181d31a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ *.blend2 *.blend3 /.idea/ -*.xcf \ No newline at end of file +*.xcf +.Rproj.user \ No newline at end of file diff --git a/.luacheckrc b/.luacheckrc index 9d0b8cb2a..69c015665 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,10 +1,12 @@ +---@diagnostic disable + unused_args = false allow_defined_top = true max_line_length = false redefined = false globals = { - "minetest", "core", + "minetest", "core", } read_globals = { @@ -40,16 +42,16 @@ read_globals = { "factorial" } }, - ------ - --MODS - ------ + ------ + --MODS + ------ - --GENERAL - "default", + --GENERAL + "default", - --ENTITIES - "cmi", + --ENTITIES + "cmi", - --HUD - "sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus", -} \ No newline at end of file + --HUD + "sfinv", "sfinv_buttons", "unified_inventory", "cmsg", "inventory_plus", +} diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 000000000..7e9e92042 --- /dev/null +++ b/.luarc.json @@ -0,0 +1,22 @@ +{ + "runtime.version": "LuaJIT", + "diagnostics": { "disable": ["lowercase-global"] }, + "diagnostics.globals": [ + "minetest", + "dump", + "dump2", + "Raycast", + "Settings", + "PseudoRandom", + "PerlinNoise", + "VoxelManip", + "SecureRandom", + "VoxelArea", + "PerlinNoiseMap", + "PcgRandom", + "ItemStack", + "AreaStore", + "vector" + ], + "workspace.ignoreDir": [".luacheckrc"] +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b5a11ee1e..781b1b85f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,10 +9,9 @@ You can help with MineClone2's development in many different ways, whether you're a programmer or not. ## 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, a lot of Minecraft features -are already implemented. +- Create a stable, peformant, moddable, free/libre game based on Minecraft +using the Minetest engine, usable in both singleplayer and multiplayer. +- Currently, a lot of features are already implemented. Polishing existing features is always welcome. ## Links @@ -120,11 +119,11 @@ 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. For older Minecraft -features that is mostly enough but a lot of the newer textures in it are -copies or slight modifications of the original MC textures so great caution -needs to be taken when using any textures coming from Minecraft texture -packs. +For textures we prefer original art, but in the absence of that will accept +Pixel Perfection texture pack contributions. Be warned many of the newer +textures in it are copies or slight modifications of the original MC textures +so great caution needs to be taken when using any textures coming from +Minecraft texture packs. If you want to make such contributions, join our Discord server. Demands for textures will be communicated there. @@ -135,7 +134,10 @@ 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. +play these sounds in game. All sounds should be released under an open +source license with clear information on the source, licencing and any +changes made by the contributor. Use the README files in the mod to +communicate this information. #### 3D Models Most of the 3D Models in MineClone2 come from @@ -145,9 +147,9 @@ 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. +Asset contributions will be credited in their mods and 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 @@ -182,7 +184,12 @@ 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 +We frequently will use profiling to optimise our code. We recommend use of +the JIT profiler (RIP Jude) to fully understand performance impact: + +https://content.minetest.net/packages/jwmhjwmh/jitprofiler/ + +Minetest also 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 @@ -213,10 +220,14 @@ they have made their donation Incognito). * 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 +* It is important that conflicts are resolved prior to merging the pull request. -* After the pull request got merged, you can delete the branch +* We update our branches via rebasing. Please avoid merging master into +your branch unless it's the only way you can resolve a conflict. We can +rebase branches from the GUI if the user has not merged master into the +branch. +* After the pull request got merged, you can delete the branch if the +merger hasn't done this already. ### Discuss first If you feel like a problem needs to fixed or you want to make a new @@ -262,9 +273,7 @@ excessive git bureaucracy commits in master) * Submodules should only be used if a) upstream is highly reliable and b) it is 100% certain that no mcl2 specific changes to the code will be needed (this has never been the case before, hence mcl2 is submodule free so far) -* Commit messages should be descriptive and never contain mcl2 specific -issueids - there are other projects who might use commits from mcl2 and -it will confuse their issue trackers. +* Commit messages should be descriptive * Try to group your submissions best as you can: * Try to keep your PRs small: In some cases things reasonably be can't split up but in general multiple small PRs are better than a big one. @@ -348,18 +357,24 @@ end ### Developer status Active and trusted contributors are often granted write access to the -MineClone2 repository. +MineClone2 repository as a contributor. Those that have demonstrated the right +technical skills and behaviours may be granted developer access. These are the +most trusted contributors who will contribute to ensure coding standards and +processes are followed. #### Developer responsibilities -- If you have developer privileges you can just open a new branch in the -mcl2 repository (which is preferred). From that you create a pull request. +- If you have developer/contributor privileges you can just open a new branch +in the mcl2 repository (which is preferred). From that you create a pull request. This way other people can review your changes and make sure they work before they get merged. - If you do not (yet) have developer privs you do your work on a branch on your private repository e.g. using the "fork" function on mesehub. -- Any developer is welcome to review, test and merge PRs. A PR needs -at least one approval (by someone else than the author) but the maintainers -are usually relatively quick to react to new submissions. +- Any developer is welcome to review, test and approve PRs. A maintainer may prefer +to merge the PR especially if it is in a similar area to what has been worked on +and could result in merge conflicts for a larger older branch, or needs +art/licencing reviewing. A PR needs at least one approval (by someone else other +than the author). +- The maintainers are usually relatively quick to react to new submissions. ### Maintainer status Maintainers carry the main responsibility for the project. diff --git a/CREDITS.md b/CREDITS.md index e45fcd7d6..fda075e79 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -6,40 +6,42 @@ ## Creator of MineClone2 * Wuzzy - ## Maintainers * AncientMariner * Nicu ## Previous Maintainers * Fleckenstein -* jordan4ibanez * cora ## Developers -* bzoss * AFCMS * epCode -* ryvnf -* iliekprogrammar -* MysticTempest -* Rootyjr -* aligator -* Code-Sploit -* NO11 -* kabou -* rudzik8 * chmodsayshello * PrairieWind -* RandomLegoBrick -* SumianVoice * MrRar -* talamh -* Faerraven / Michieal * FossFanatic * SmokeyDope +## Past Developers +* jordan4ibanez +* iliekprogrammar +* kabou +* kay27 +* Faerraven / Michieal +* MysticTempest +* NO11 +* SumianVoice + ## Contributors +* RandomLegoBrick +* rudzik8 +* Code-Sploit +* aligator +* Rootyjr +* ryvnf +* bzoss +* talamh * Laurent Rocher * HimbeerserverDE * TechDudie @@ -68,6 +70,10 @@ * Marcin Serwin * erlehmann * E +* n_to +* debiankaios +* Gustavo6046 / wallabra +* CableGuy67 * Benjamin Schötz * Doloment * Sydney Gems @@ -101,25 +107,18 @@ * gldrk * atomdmac * emptyshore +* FlamingRCCars +* uqers +* Niterux +* appgurueu +* seventeenthShulker -## MineClone5 -* kay27 -* Debiankaios -* epCode -* NO11 -* j45 -* chmodsayshello -* 3raven -* PrairieWind -* Gustavo6046 / wallabra -* CableGuy67 -* MrRar - -## Mineclonia -* erlehmann -* Li0n -* E -* n_to +## Music +* Jordach for the jukebox music compilation from Big Freaking Dig +* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/ +* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0) +* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0) +* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0) ## Original Mod Authors * Wuzzy @@ -151,14 +150,18 @@ * 4Evergreen4 * jordan4ibanez * paramat +* debian044 / debian44 +* chmodsayshello * cora * Faerraven / Michieal +* PrairieWind ## 3D Models * 22i * tobyplowy * epCode * Faerraven / Michieal +* SumianVoice ## Textures * XSSheep @@ -176,6 +179,8 @@ * Nicu * Exhale * Aeonix_Aeon (armor trim models) https://www.curseforge.com/minecraft/texture-packs/ozocraft-remix (CC BY 4.0) +* Wbjitscool +* SmokeyDope ## Translations * Wuzzy @@ -192,6 +197,9 @@ * SakuraRiu * anarquimico * syl +* Temak +* megustanlosfrijoles +* kbundg ## Funders * 40W @@ -199,12 +207,6 @@ * Cora ## Special thanks -* celeron55 for creating Minetest -* Jordach for the jukebox music compilation from Big Freaking Dig -* wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues. +* The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible * The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game * Notch and Jeb for being the major forces behind Minecraft -* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/ -* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0) -* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0) -* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0) diff --git a/LEGAL.md b/LEGAL.md index e54bdc41b..e378c1b59 100644 --- a/LEGAL.md +++ b/LEGAL.md @@ -5,7 +5,7 @@ Copying is an act of love. Please copy and share! <3 Here's the detailed legalese for those who need it: ## License of source code -MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others) +MineClone 2 (by Lizzy Fleckenstein, Wuzzy, davedevils and countless others) is an imitation of Minecraft. MineClone 2 is free software: you can redistribute it and/or modify @@ -38,11 +38,11 @@ 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]. +The glazed terracotta textures have been created by [MysticTempest](https://github.com/MysticTempest). Source: 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/) +The main menu images are released 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) diff --git a/MODELS.md b/MODELS.md index 4b9094c33..663313f30 100644 --- a/MODELS.md +++ b/MODELS.md @@ -1,13 +1,14 @@ -#Models in Minetest/Mineclone2 +# Models in Minetest/Mineclone2 Models are an important part of all entities & unique nodes in Mineclone2. They provide a 3 dimensional map of an object for which textures are then applied to. This document is for modders, it quickly highlights some important information for the software needed to open models in Mineclone2. ## Minetest Wiki + For more detailed information on actually using blender to create and modify models for Minetest/Mineclone2, please visit the Minetest wiki's page on using Blender [Here](https://wiki.minetest.net/Using_Blender) -##Recommended software +## Recommended software -###Blender +### Blender Blender is a very popular and free modeling software supported on Windows, MacOS, and most Linux distributions. It is recommended to use Blender to create and modify 3D models within the minetest engine. @@ -19,14 +20,16 @@ Blitz 3D (.b3d) Is one of the main animated model formats used for entities in t The most up to date version of this Blender plugin can be downloaded [Here](https://github.com/GreenXenith/io_scene_b3d/releases/tag/f189786) -##Types of model formats +## Types of model formats + +### Animated, skinned models -###Animated, skinned models * Blitz 3D files (.b3d) * Microsoft DirectX (.x) (binary & text, compression is not supported) -###Static meshes +### Static meshes + * Wavefront OBJ (.obj) Note: The sometimes accompanying .mtl files are not supported and can safely be deleted. @@ -45,16 +48,18 @@ Note: Do not use .b3d and .x files for static meshes at the moment, Minetest cur Note: Any formats not mentioned above but known to work in the past were removed in 5.5.0 and aren't supported anymore. -##Pros & Cons of .b3d vs .x +## Pros & Cons of .b3d vs .x + +### B3D -###B3D * [+] Binary format means a small size * [-] Difficult to postprocess after exporting * [-] Difficult to debug problems -###X (text version) +### X (text version) + * [+] Can be parsed easily with lua scripts * [+] Can be easily generated by scripts diff --git a/README.md b/README.md index 2d2eafb5d..287ded5d9 100644 --- a/README.md +++ b/README.md @@ -79,34 +79,32 @@ The MineClone2 repository is hosted at Mesehub. To contribute or report issues, * Mesehub: * Discord: * YouTube: -* IRC: -* Matrix: -* Reddit: -* Minetest forums: * ContentDB: * OpenCollective: +* Mastodon: +* Lemmy: +* Matrix space: +* Minetest forums: +* Reddit: +* IRC (barely used): ## Target -- Crucially, create a stable, moddable, free/libre clone of Minecraft -based on the Minetest engine with polished features, usable in both +- Create a stable, moddable, free/libre game based on Minecraft +on the Minetest engine with polished features, usable in both singleplayer and multiplayer. Currently, a lot of **Minecraft Java Edition** features are already implemented and polishing existing features are prioritized over new feature requests. -- With lessened priority yet strictly, implement features targetting +- Implement features targetting **Current Minecraft versions + 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 the Minetest Engine). +- Create a performant experience that will run relatively +well on really low spec computers. ## Completion status This game is currently in **beta** stage. It is playable, but not yet feature-complete. Backwards-compability is not entirely guaranteed, updating your world might cause small bugs. -If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable. The testing branch often features some experimental PRs and should be considered less stable. +If you want to use the development version of MineClone2 in production, the master branch is usually relatively stable. The following main features are available: diff --git a/RELEASE.md b/RELEASE.md index 4d82ab9e3..3984c4c84 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,10 +1,11 @@ ### Standard Release -#File to document release steps with a view to evolving into a script +# File to document release steps with a view to evolving into a script -#Update CREDITS.md -#Update version in game.conf +# Update CREDITS.md +# Update version in game.conf +``` lua tools/generate_ingame_credits.lua git add CREDITS.md @@ -18,10 +19,11 @@ git commit -m "Pre-release update credits and set version 0.83.0" git tag 0.83.0 git push origin 0.83.0 +``` -#Update version in game.conf to the next version with -SNAPSHOT suffix +# Update version in game.conf to the next version with -SNAPSHOT suffix -git commit -m "Post-release set version 0.84.0-SNAPSHOT" +`git commit -m "Post-release set version 0.84.0-SNAPSHOT"` ### Hotfix Release @@ -32,15 +34,17 @@ To mitigate this, you just release the last release, and the relevant bug fix. F * Create release branch from the last release tag, push it: +``` git checkout -b release/0.82.1 0.82.0 git push origin release/0.82.1 +``` ##### Prepare feature branch and fix * Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately) -git checkout -b hotfix_bug_1_branch +`git checkout -b hotfix_bug_1_branch` * Fix crash/serious bug and commit * Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed) @@ -53,11 +57,13 @@ git checkout -b hotfix_bug_1_branch * Tag it, push tag and branch: +``` git tag 0.82.1 git push origin 0.82.1 git push origin release/0.82.1 +``` Note: If you have to do more than 1 hotfix release, can do it on the same release branch. @@ -71,5 +77,13 @@ Note: If you have to do more than 1 hotfix release, can do it on the same releas ##### Inform people -* Add a comment to the forum post with the release number and what is involved, and maintainer will update main post. -* Add a comment in Discord announcement \ No newline at end of file +* Upload video to YouTube +* Add a comment to the forum post with the release number and change log. Maintainer will update main post with code link. +* Add a Discord announcement post and @everyone with link to video, forum post and release notes. +* Share the news on reddit + Lemmy. Good subs to share with: + * r/linux_gaming + * r/opensourcegames + * r/opensource + * r/freesoftware + * r/linuxmasterrace + * r/MineClone2 diff --git a/TEXTURES.md b/TEXTURES.md index 1cf10641f..157965ae6 100644 --- a/TEXTURES.md +++ b/TEXTURES.md @@ -12,13 +12,13 @@ GIMP Tutorials has an excellent guide to making pixel art in GIMP. If you would ### GIMP -GIMP (Gnu Image Manipulation Program) is a very popular and free image editing software supported on Windows, MacOS, and most Linux distributions. It is recommended to use GIMP to create and modify textures within the minetest engine. +GIMP (GNU Image Manipulation Program) is a very popular and free image editing software supported on Windows, MacOS, and most Linux distributions. It is recommended to use GIMP to create and modify textures within the minetest engine. Download GIMP [here](http://gimp.org/) # Getting Started ## Creating a new file -the first thing to do is open GIMP and create a new file to work in by opening the File menu and choosing New. +the first thing to do is open GIMP and create a new file to work in by opening the File menu and choosing "New". Choose width of 16 and height of 16 for the image size. While higher resolution textures are possible, The default size is 16x16. It is recommended you use this size as well, as it is universally supported on all systems. @@ -50,7 +50,7 @@ For those running a GNU/linux distribution, you most likely have the 'optipng' c First, Open up the terminal in the directory where your exported texture is located (or navigate to the directory with the 'cd your/directory/path/to/textures'), then run this command ``` -optipng -o7 -zm1-9 -nc -clobber *.png +optipng -o7 -zm1-9 -nc -clobber -strip all *.png ``` This will further optimize all the textures in the directory. diff --git a/description.txt b/description.txt index d45188894..922f5dceb 100644 --- a/description.txt +++ b/description.txt @@ -1 +1 @@ -A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. Faithful clone of Minecraft 1.12. This is a work in progress! Expect bugs! +A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. diff --git a/game.conf b/game.conf index a7716f284..3ad5a33a5 100644 --- a/game.conf +++ b/game.conf @@ -1,4 +1,4 @@ title = MineClone 2 description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more. disallowed_mapgens = v6 -version=0.84.0-SNAPSHOT \ No newline at end of file +version=0.85.0-SNAPSHOT \ No newline at end of file diff --git a/mods/CORE/_mcl_autogroup/init.lua b/mods/CORE/_mcl_autogroup/init.lua index c0c5021b5..1a259189b 100644 --- a/mods/CORE/_mcl_autogroup/init.lua +++ b/mods/CORE/_mcl_autogroup/init.lua @@ -215,6 +215,10 @@ function mcl_autogroup.can_harvest(nodename, toolname, player) return true end + if minetest.get_item_group(nodename, "dig_immediate_piston") >= 1 then + return true + end + -- Check if it can be dug by tool local tdef = minetest.registered_tools[toolname] if tdef and tdef._mcl_diggroups then diff --git a/mods/CORE/mcl_damage/init.lua b/mods/CORE/mcl_damage/init.lua index 8804b8561..f6058dbaa 100644 --- a/mods/CORE/mcl_damage/init.lua +++ b/mods/CORE/mcl_damage/init.lua @@ -96,8 +96,8 @@ function mcl_damage.finish_reason(mcl_reason) end function mcl_damage.from_mt(mt_reason) - if mt_reason._mcl_chached_reason then - return mt_reason._mcl_chached_reason + if mt_reason._mcl_cached_reason then + return mt_reason._mcl_cached_reason end local mcl_reason diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua index b4d98b1e2..fabfae91c 100644 --- a/mods/ENTITIES/mcl_boats/init.lua +++ b/mods/ENTITIES/mcl_boats/init.lua @@ -437,9 +437,9 @@ cboat.selectionbox = {-0.7, -0.15, -0.7, 0.7, 0.75, 0.7} minetest.register_entity("mcl_boats:chest_boat", cboat) mcl_entity_invs.register_inv("mcl_boats:chest_boat","Boat",27) -local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove" } -local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat") } -local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood" } +local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian", "boat_mangrove", "boat_cherry", "chest_boat", "chest_boat_spruce", "chest_boat_birch", "chest_boat_jungle", "chest_boat_acacia", "chest_boat_dark_oak", "chest_boat_mangrove", "chest_boat_cherry" } +local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat"), S("Mangrove Boat"), S("Cherry Boat"), S("Oak Chest Boat"), S("Spruce Chest Boat"), S("Birch Chest Boat"), S("Jungle Chest Boat"), S("Acacia Chest Boat"), S("Dark Oak Chest Boat"), S("Mangrove Chest Boat"), S("Cherry Chest Boat") } +local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian", "mcl_mangrove:mangrove_wood", "mcl_cherry_blossom:cherrywood" } for b=1, #boat_ids do local itemstring = "mcl_boats:"..boat_ids[b] diff --git a/mods/ENTITIES/mcl_boats/locale/mcl_boats.dk.tr b/mods/ENTITIES/mcl_boats/locale/mcl_boats.dk.tr new file mode 100644 index 000000000..53a6f50e7 --- /dev/null +++ b/mods/ENTITIES/mcl_boats/locale/mcl_boats.dk.tr @@ -0,0 +1,13 @@ +# textdomain: mcl_boats +Acacia Boat=Akaciebåd +Birch Boat=Birkebåd +Boat=Båd +Boats are used to travel on the surface of water.=Både blier brugt til at rejse på vandoverflader. +Dark Oak Boat=Mørk egetræsbåd +Jungle Boat=Junglebåd +Oak Boat=Egetræsbå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.=Højre-klik på en vand for at placere båden. Højre-klik på båden for at gå ombord. Brug [Left] og [Right] til at styre. [Forwards] for at øge hastigheden, og [Backwards] for at sænke farten eller sejle bagud. Brug [Sneak] for at forlade båden, slå båden for at lave den om til en genstand. +Spruce Boat=Granbåd +Water vehicle=Vandfartøj +Sneak to dismount=Snig for at stige ud +Obsidian Boat=Obsidianbåd \ No newline at end of file diff --git a/mods/ENTITIES/mcl_boats/locale/template.txt b/mods/ENTITIES/mcl_boats/locale/template.txt index 16c8b681e..c3919e8b9 100644 --- a/mods/ENTITIES/mcl_boats/locale/template.txt +++ b/mods/ENTITIES/mcl_boats/locale/template.txt @@ -12,6 +12,7 @@ Water vehicle= Sneak to dismount= Obsidian Boat= Mangrove Boat= +Cherry Boat= Oak Chest Boat= Spruce Chest Boat= Birch Chest Boat= @@ -19,3 +20,4 @@ Jungle Chest Boat= Acacia Chest Boat= Dark Oak Chest Boat= Mangrove Chest Boat= +Cherry Chest Boat= \ No newline at end of file diff --git a/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.dk.tr b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.dk.tr new file mode 100644 index 000000000..31918cbe8 --- /dev/null +++ b/mods/ENTITIES/mcl_falling_nodes/locale/mcl_falling_nodes.dk.tr @@ -0,0 +1,3 @@ +# textdomain: mcl_falling_nodes +@1 was smashed by a falling anvil.=@1 blev smadret af en nedfaldende ambolt. +@1 was smashed by a falling block.=@1 blev smadret af en nedfaldende blok. diff --git a/mods/ENTITIES/mcl_minecarts/init.lua b/mods/ENTITIES/mcl_minecarts/init.lua index 2d0cd78e9..b87175494 100644 --- a/mods/ENTITIES/mcl_minecarts/init.lua +++ b/mods/ENTITIES/mcl_minecarts/init.lua @@ -85,101 +85,93 @@ local function hopper_take_item(self, dtime) for k, v in pairs(objs) do local ent = v:get_luaentity() - if ent._removed or not ent.itemstring or ent.itemstring == "" then - --minetest.log("Ignore this item") - break - end + if ent and not ent._removed and ent.itemstring and ent.itemstring ~= "" then + local taken_items = false - -- Don't forget actual hoppers + mcl_log("ent.name: " .. tostring(ent.name)) + mcl_log("ent pos: " .. tostring(ent.object:get_pos())) - local taken_items = false + local inv = mcl_entity_invs.load_inv(self, 5) + if not inv then return false end - mcl_log("ent.name: " .. tostring(ent.name)) - mcl_log("ent pos: " .. tostring(ent.object:get_pos())) + local current_itemstack = ItemStack(ent.itemstring) - local inv = mcl_entity_invs.load_inv(self, 5) + mcl_log("inv. size: " .. self._inv_size) + if inv:room_for_item("main", current_itemstack) then + mcl_log("Room") + inv:add_item("main", current_itemstack) + ent.object:get_luaentity().itemstring = "" + ent.object:remove() + taken_items = true + else + mcl_log("no Room") + end - if not inv then - mcl_log("No inv") - return false - end + if not taken_items then + local items_remaining = current_itemstack:get_count() - local current_itemstack = ItemStack(ent.itemstring) + -- This will take part of a floating item stack if no slot can hold the full amount + for i = 1, self._inv_size, 1 do + local stack = inv:get_stack("main", i) - mcl_log("inv. size: " .. self._inv_size) - if inv:room_for_item("main", current_itemstack) then - mcl_log("Room") - inv:add_item("main", current_itemstack) - ent.object:get_luaentity().itemstring = "" - ent.object:remove() - taken_items = true - else - mcl_log("no Room") - end + mcl_log("i: " .. tostring(i)) + mcl_log("Items remaining: " .. items_remaining) + mcl_log("Name: " .. tostring(stack:get_name())) - if not taken_items then - local items_remaining = current_itemstack:get_count() + if current_itemstack:get_name() == stack:get_name() then + mcl_log("We have a match. Name: " .. tostring(stack:get_name())) - -- This will take part of a floating item stack if no slot can hold the full amount - for i = 1, self._inv_size, 1 do - local stack = inv:get_stack("main", i) + local room_for = stack:get_stack_max() - stack:get_count() + mcl_log("Room for: " .. tostring(room_for)) - mcl_log("i: " .. tostring(i)) - mcl_log("Items remaining: " .. items_remaining) - mcl_log("Name: " .. tostring(stack:get_name())) + if room_for == 0 then + -- Do nothing + mcl_log("No room") + elseif room_for < items_remaining then + mcl_log("We have more items remaining than space") - if current_itemstack:get_name() == stack:get_name() then - mcl_log("We have a match. Name: " .. tostring(stack:get_name())) + items_remaining = items_remaining - room_for + stack:set_count(stack:get_stack_max()) + inv:set_stack("main", i, stack) + taken_items = true + else + local new_stack_size = stack:get_count() + items_remaining + stack:set_count(new_stack_size) + mcl_log("We have more than enough space. Now holds: " .. new_stack_size) - local room_for = stack:get_stack_max() - stack:get_count() - mcl_log("Room for: " .. tostring(room_for)) + inv:set_stack("main", i, stack) + items_remaining = 0 - if room_for == 0 then - -- Do nothing - mcl_log("No room") - elseif room_for < items_remaining then - mcl_log("We have more items remaining than space") + ent.object:get_luaentity().itemstring = "" + ent.object:remove() - items_remaining = items_remaining - room_for - stack:set_count(stack:get_stack_max()) - inv:set_stack("main", i, stack) - taken_items = true - else - local new_stack_size = stack:get_count() + items_remaining - stack:set_count(new_stack_size) - mcl_log("We have more than enough space. Now holds: " .. new_stack_size) + taken_items = true + break + end - inv:set_stack("main", i, stack) - items_remaining = 0 - - ent.object:get_luaentity().itemstring = "" - ent.object:remove() - - taken_items = true - break + mcl_log("Count: " .. tostring(stack:get_count())) + mcl_log("stack max: " .. tostring(stack:get_stack_max())) + --mcl_log("Is it empty: " .. stack:to_string()) end - mcl_log("Count: " .. tostring(stack:get_count())) - mcl_log("stack max: " .. tostring(stack:get_stack_max())) - --mcl_log("Is it empty: " .. stack:to_string()) - end - - if i == self._inv_size and taken_items then - mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining) - current_itemstack:set_count(items_remaining) - --mcl_log("Itemstack2: " .. current_itemstack:to_string()) - ent.itemstring = current_itemstack:to_string() + if i == self._inv_size and taken_items then + mcl_log("We are on last item and still have items left. Set final stack size: " .. items_remaining) + current_itemstack:set_count(items_remaining) + --mcl_log("Itemstack2: " .. current_itemstack:to_string()) + ent.itemstring = current_itemstack:to_string() + end end end - end - --Add in, and delete - if taken_items then - mcl_log("Saving") - mcl_entity_invs.save_inv(ent) - return taken_items - else - mcl_log("No need to save") + --Add in, and delete + if taken_items then + mcl_log("Saving") + mcl_entity_invs.save_inv(ent) + return taken_items + else + mcl_log("No need to save") + end + end end end diff --git a/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.dk.tr b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.dk.tr new file mode 100644 index 000000000..f946b83e4 --- /dev/null +++ b/mods/ENTITIES/mcl_minecarts/locale/mcl_minecarts.dk.tr @@ -0,0 +1,36 @@ +# textdomain: mcl_minecarts +Minecart=Minevogn +Minecarts can be used for a quick transportion on rails.=Minevogne kan bruges til hurtig transport på spor. +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.=Minevogne kan kun køre på spor, og følger dem altid. Ved et T-kryds uden en vej ligeud drejer de altid til venstre. Farten påvirkes af sportypen. +You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=Du kan placere minevogne på spor. Højre-klik for at stige ombord. +To obtain the minecart, punch it while holding down the sneak key.=For at at få minevognen i din oppakning. +A minecart with TNT is an explosive vehicle that travels on rail.=En minevogn med TNT as et eksplosivt fartøj som kører på spor. +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.=Placér den på spor. Slå den for at flytte den. TNTet bliver antændt med flint og stål eller når minevognen er på et aktiveringsspor. +To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=For at få minevognen med TNT i din oppakning skal du slå den mens du holder snigeknappen nede. Du kan ikke gøre dette hvis TNTen er antændt. +A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=En minevogn med ovn er et fartøj som kører på spor. Den kan køre af sig selv med brændstof. +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.=Placér den på spor. Hvis du putter kul i den vil ovnen brænde i lang tid, og minevognen vil køre af sig selv. Slå den for at sætte den i bevægelse. +To obtain the minecart and furnace, punch them while holding down the sneak key.=For at få minevognen med ovn i din oppakning skal du slå den mens du holder snigeknappen nede. +Minecart with Chest=Minevogn med kiste +Minecart with Furnace=Minevogn med ovn +Minecart with Command Block=Minevogn med kommandoblok +Minecart with Hopper=Minevogn med tragt +Minecart with TNT=Minevogn med 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.=Placér dem på jorden for at bygge din jerbane. Sporene kobler sig automatisk sammen med hinanden og laver sving, T-kryds, kryds og skråninger efter behov. +Rail=Spor +Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=Spor kan bruges til at bygge jernbaner til minevogne. Normale spor sænker minevognene en smule på grund af friktionsmodstand. +Powered Rail=Strømspor +Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Strømspor kan accelerere eller bremse minevogne. +Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=Uden redstonekraft vil sporet bremse minevognen. For at accelerere minevognen skal den bruge redstoneskraft. +Activator Rail=Aktiveringsspor +Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=Spor kan bruges til at bygge jernbaner til minevogne. Aktiveringsspor bruges til at aktivere specielle minevogne. +To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=For at få dette spor til at aktiere minevogne skal du give det redstonekraft og sende en minevogn over dette sporstykke. +Detector Rail=Detektorspor +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.=Spor kan bruges til at bygge jernbaner til minevogne. Et detektorspor kan opdage en minevogn som kører over det og give kraft til redstonemekanismer. +To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=For at opdage en minevogn og give redstonekraft skal den forbindes til redstonestøv eller redstonemekanismer og send en hvilkensomhelst minevogn hen over sporet. +Track for minecarts=Spor til minevogne. +Speed up when powered, slow down when not powered=Accelerérer når der er strøm, sænk hastigheden når der ikke er strøm. +Activates minecarts when powered=Aktieverer minevogne når der er strøm. +Emits redstone power when a minecart is detected=Udsender redstonekraft når en minevogn bliver opdaget. +Vehicle for fast travel on rails=Fartøj til hurtig kørsel på spor. +Can be ignited by tools or powered activator rail=Kan antændes med værktøj eller et aktivatorspor med strøm. +Sneak to dismount=Snig for at stige af. diff --git a/mods/ENTITIES/mcl_mobs/combat.lua b/mods/ENTITIES/mcl_mobs/combat.lua index 3b53e0d1a..836f53753 100644 --- a/mods/ENTITIES/mcl_mobs/combat.lua +++ b/mods/ENTITIES/mcl_mobs/combat.lua @@ -873,10 +873,13 @@ function mob_class:do_states_attack (dtime) local dist = vector.distance(p, s) if self.attack_type == "explode" then - local vec = { x = p.x - s.x, z = p.z - s.z } - yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate - if p.x > s.x then yaw = yaw +math.pi end - yaw = self:set_yaw( yaw, 0, dtime) + + if target_line_of_sight then + local vec = { x = p.x - s.x, z = p.z - s.z } + yaw = (atan(vec.z / vec.x) +math.pi/ 2) - self.rotate + if p.x > s.x then yaw = yaw +math.pi end + yaw = self:set_yaw( yaw, 0, dtime) + end local node_break_radius = self.explosion_radius or 1 local entity_damage_radius = self.explosion_damage_radius @@ -900,10 +903,10 @@ function mob_class:do_states_attack (dtime) end -- walk right up to player unless the timer is active - if self.v_start and (self.stop_to_explode or dist < self.reach) then - self:set_velocity( 0) + if self.v_start and (self.stop_to_explode or dist < self.reach) or not target_line_of_sight then + self:set_velocity(0) else - self:set_velocity( self.run_velocity) + self:set_velocity(self.run_velocity) end if self.animation and self.animation.run_start then diff --git a/mods/ENTITIES/mcl_mobs/effects.lua b/mods/ENTITIES/mcl_mobs/effects.lua index 7953e6a47..aa44a67f7 100644 --- a/mods/ENTITIES/mcl_mobs/effects.lua +++ b/mods/ENTITIES/mcl_mobs/effects.lua @@ -316,8 +316,14 @@ local function who_are_you_looking_at (self, dtime) local stop_look_at_player = stop_look_at_player_chance == 1 - if self.attack or self.following then - self._locked_object = self.attack or self.following + if self.attack then + if not self.target_time_lost then + self._locked_object = self.attack + else + self._locked_object = nil + end + elseif self.following then + self._locked_object = self.following elseif self._locked_object then if stop_look_at_player then --minetest.log("Stop look: ".. self.name) diff --git a/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.dk.tr b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.dk.tr new file mode 100644 index 000000000..63f8e25cc --- /dev/null +++ b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.dk.tr @@ -0,0 +1,11 @@ +# textdomain: mcl_mobs +Peaceful mode active! No monsters will spawn.=Fredelig tilstand aktiveret! Ingen monstre vil spawne. +This allows you to place a single mob.=Dette gør dig i stand til at placere et enkelt monster. +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.=Placér det blot der hvor du ønsker, at monsteret skal komme. Dyr vil spawne tamme, medmindre du holder snige-knappen nede mens du placerer dem. Hvis du placerer denne på et monsterspawn, ændrer du hvilket monster det spawner. +You need the “maphack” privilege to change the mob spawner.=Du skal have "maphack" privilegier for at ændre monsterspawneren. +Name Tag=Navneskilt +A name tag is an item to name a mob.=Et navneskilt bruges til at navngive et monster. +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.=Før du bruger navneskiltet, skal du vælge navnet ved en ambolt. Derefter kan du bruge navneskiltet til at navngive et monster. Dette opbruger navneskiltet. +Only peaceful mobs allowed!=Kun fredelige monstre er tilladt! +Give names to mobs=Giv navne til monstre +Set name at anvil=Vælg navn ved en ambolt. diff --git a/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.ru.tr b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.ru.tr index 3fb2eb2f1..477d3d642 100644 --- a/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.ru.tr +++ b/mods/ENTITIES/mcl_mobs/locale/mcl_mobs.ru.tr @@ -1,11 +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”, чтобы изменить спаунер моба. +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.=Именная бирка это предмет, чтобы дать мобу имя. +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=Даёт имена мобам +Only peaceful mobs allowed!=Разрешены только мирные существа! +Give names to mobs=Даёт имена существам Set name at anvil=Задайте имя при помощи наковальни diff --git a/mods/ENTITIES/mcl_mobs/physics.lua b/mods/ENTITIES/mcl_mobs/physics.lua index e1b23d78a..341e28984 100644 --- a/mods/ENTITIES/mcl_mobs/physics.lua +++ b/mods/ENTITIES/mcl_mobs/physics.lua @@ -675,6 +675,9 @@ function mob_class:do_env_damage() self.standing_in = node_ok(pos, "air").name self.standing_on = node_ok(pos2, "air").name + local pos3 = vector.offset(pos, 0, 1, 0) + self.standing_under = node_ok(pos3, "air").name + -- don't fall when on ignore, just stand still if self.standing_in == "ignore" then self.object:set_velocity({x = 0, y = 0, z = 0}) @@ -682,6 +685,7 @@ function mob_class:do_env_damage() local nodef = minetest.registered_nodes[self.standing_in] local nodef2 = minetest.registered_nodes[self.standing_on] + local nodef3 = minetest.registered_nodes[self.standing_under] -- rain if self.rain_damage > 0 then @@ -761,7 +765,7 @@ function mob_class:do_env_damage() if minetest.get_item_group(self.standing_in, "water") == 0 then drowning = true end - elseif nodef.drowning > 0 then + elseif nodef.drowning > 0 and nodef3.drowning > 0 then drowning = true end @@ -939,7 +943,7 @@ function mob_class:falling(pos) -- in water then float up if registered_node.groups.water then - if acc and self.floats == 1 then + if acc and self.floats == 1 and minetest.registered_nodes[node_ok(vector.offset(pos,0,self.collisionbox[5] -0.25,0)).name].groups.water then self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0)) end else diff --git a/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.dk.tr b/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.dk.tr new file mode 100644 index 000000000..3c2844d01 --- /dev/null +++ b/mods/ENTITIES/mcl_paintings/locale/mcl_paintings.dk.tr @@ -0,0 +1,2 @@ +# textdomain:mcl_paintings +Painting=Maleri diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md index 4e3de49f1..c937097c9 100644 --- a/mods/ENTITIES/mobs_mc/LICENSE-media.md +++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md @@ -191,9 +191,10 @@ Origin of those models: * [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0) * `mcl_totems_totem.ogg` * Source: -* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) +* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author) * `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0) * Source: + * Based on: * [spookymodem](https://freesound.org/people/spookymodem/) * `mobs_mc_skeleton_death.ogg` (CC0) * @@ -307,4 +308,4 @@ Origin of those models: Note: Many of these sounds have been more or less modified to fit the game. -Sounds not mentioned hre are licensed under CC0. +Sounds not mentioned here are licensed under CC0. diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index 64f74c516..9d1aa1aaa 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -105,7 +105,7 @@ mooshroom_def.on_rightclick = function(self, clicker) end local item = clicker:get_wielded_item() -- Use shears to get mushrooms and turn mooshroom into cow - if item:get_name() == "mcl_tools:shears" then + if minetest.get_item_group(item:get_name(), "shears") > 0 then local pos = self.object:get_pos() minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true) diff --git a/mods/ENTITIES/mobs_mc/locale/mobs_mc.dk.tr b/mods/ENTITIES/mobs_mc/locale/mobs_mc.dk.tr new file mode 100644 index 000000000..5df92f2f8 --- /dev/null +++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.dk.tr @@ -0,0 +1,70 @@ +# textdomain: mobs_mc +Agent=Agent +Axolotl=Salamander +Bat=Flagermus +Blaze=Blaze +Chicken=Kylling +Cow=Ko +Mooshroom=Svamp +Creeper=Creeper +Ender Dragon=Enderdrage +Enderman=Enderman +Endermite=Endermide +Ghast=Ghast +Elder Guardian=Gammel beskytter +Guardian=Beskytter +Horse=Hest +Skeleton Horse=Skelethest +Zombie Horse=Zombiehest +Donkey=Æsel +Mule=Muldyr +Iron Golem=Jerngolem +Llama=Lama +Ocelot=Ozelot +Parrot=Papegøje +Pig=Gris +Polar Bear=Isbjørn +Rabbit=Kanin +Killer Bunny=Dræberkanin +Sheep=Får +Shulker=Shulker +Silverfish=Sølvfisk +Skeleton=Skelet +Stray=Omstrejfer +Wither Skeleton=Wither-skelet +Magma Cube=Magmakube +Slime=Slimklump +Snow Golem=Snegolem +Spider=Edderkop +Cave Spider=Huleedderkop +Squid=Blæksprutte +Vex=Vex +Evoker=Fremkalder +Illusioner=Illusionist +Villager=Landsbyboer +Vindicator=Hævner +Zombie Villager=Zombie landsbyboer +Witch=Heks +Wither=Wither +Wolf=Ulv +Husk=Udtørretskal +Zombie=Zombie +Zombie Pigman=Zombificeret piglin +Farmer=Landmand +Fisherman=Fisker +Fletcher=Pilemager +Shepherd=Fårehyrde +Librarian=Bibliotikar +Cartographer=Kartograf +Armorer=Rustningesmed +Leatherworker=Læderarbejder +Butcher=Slagter +Weapon Smith=Våbensmed +Tool Smith=Værktøjssmed +Cleric=Gejstlig +Nitwit=Tåbe +Cod=Torsk +Salmon=Laks +Dolphin=Delfin +Pillager=Plyndrer +Tropical fish=Tropisk fisk \ No newline at end of file diff --git a/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr b/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr index 7f81f0280..47e19cc42 100644 --- a/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr +++ b/mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr @@ -69,3 +69,6 @@ Salmon=Salmón Dolphin=Delfín Pillager=Saqueador Tropical fish=Pez tropical +Hoglin=Hoglin +Strider=Lavagante +Glow Squid=Calamar luminoso diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua index 6c095fc9b..af1222403 100644 --- a/mods/ENTITIES/mobs_mc/sheep.lua +++ b/mods/ENTITIES/mobs_mc/sheep.lua @@ -6,6 +6,8 @@ local S = minetest.get_translator("mobs_mc") --################### SHEEP --################### +local WOOL_REPLACE_RATE = 80 + local colors = { -- group = { wool, textures } unicolor_white = { "mcl_wool:white", "#FFFFFF00" }, @@ -113,7 +115,7 @@ mcl_mobs.register_mob("mobs_mc:sheep", { view_range = 12, -- Eat grass - replace_rate = 80, + replace_rate = WOOL_REPLACE_RATE, replace_delay = 1.3, replace_what = { { "mcl_core:dirt_with_grass", "mcl_core:dirt", -1 }, @@ -121,25 +123,42 @@ mcl_mobs.register_mob("mobs_mc:sheep", { }, -- Properly regrow wool after eating grass on_replace = function(self, pos, oldnode, newnode) + if not self.color or not colors[self.color] then + self.color = "unicolor_white" + end + self.base_texture = sheep_texture(self.color) + + self.drops = { + {name = "mcl_mobitems:mutton", + chance = 1, + min = 1, + max = 2,}, + {name = colors[self.color][1], + chance = 1, + min = 1, + max = 1,}, + } + self.state = "eat" self:set_animation("eat") self:set_velocity(0) + + + minetest.after(self.replace_delay, function() if self and self.object and self.object:get_velocity() and self.health > 0 then self.object:set_velocity(vector.zero()) - if not self.color or not colors[self.color] then - self.color = "unicolor_white" - end self.gotten = false - self.base_texture = sheep_texture(self.color) self.object:set_properties({ textures = self.base_texture }) end end) + minetest.after(2.5, function() - if self and self.object and self.state == 'eat' and self.health > 0 and self.object:get_velocity() then + if self and self.object and self.state == 'eat' and self.health > 0 then self.state = "walk" end end) + end, -- Set random color on spawn @@ -215,7 +234,7 @@ mcl_mobs.register_mob("mobs_mc:sheep", { if self:feed_tame(clicker, 1, true, false) then return end if mcl_mobs:protect(self, clicker) then return end - if item:get_name() == "mcl_tools:shears" and not self.gotten and not self.child then + if minetest.get_item_group(item:get_name(), "shears") > 0 and not self.gotten and not self.child then self.gotten = true local pos = self.object:get_pos() minetest.sound_play("mcl_tools_shears_cut", {pos = pos}, true) diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua index 0ee53e8ec..215047fdd 100644 --- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua +++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua @@ -105,8 +105,7 @@ local skeleton = { if self.attack then self.object:set_yaw(minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos()))) end - -- 2-4 damage per arrow - local dmg = math.max(4, math.random(2, 8)) + local dmg = math.random(2, 4) mcl_bows.shoot_arrow("mcl_bows:arrow", pos, dir, self.object:get_yaw(), self.object, nil, dmg) end end, diff --git a/mods/ENTITIES/mobs_mc/snowman.lua b/mods/ENTITIES/mobs_mc/snowman.lua index ec2a14675..62b988b9a 100644 --- a/mods/ENTITIES/mobs_mc/snowman.lua +++ b/mods/ENTITIES/mobs_mc/snowman.lua @@ -114,7 +114,7 @@ mcl_mobs.register_mob("mobs_mc:snowman", { -- Remove pumpkin if using shears on_rightclick = function(self, clicker) local item = clicker:get_wielded_item() - if self.gotten ~= true and item:get_name() == "mcl_tools:shears" then + if self.gotten ~= true and minetest.get_item_group(item:get_name(), "shears") > 0 then -- Remove pumpkin self.gotten = true self.object:set_properties({ diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 8fc18ccab..96c5c7233 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -351,7 +351,7 @@ local professions = { leatherworker = { name = N("Leatherworker"), texture = "mobs_mc_villager_leatherworker.png", - jobsite = "mcl_cauldrons:cauldron", + jobsite = "group:cauldron", trades = { { { { "mcl_mobitems:leather", 9, 12 }, E1 }, @@ -1008,7 +1008,15 @@ end ----- JOBSITE LOGIC local function get_profession_by_jobsite(js) for k,v in pairs(professions) do - if v.jobsite == js then return k end + if v.jobsite == js then + return k + -- Catch Nitwit doesn't have a jobsite + elseif v.jobsite and v.jobsite:find("^group:") then + local group = v.jobsite:gsub("^group:", "") + if minetest.get_item_group(js, group) > 0 then + return k + end + end end end diff --git a/mods/ENVIRONMENT/lightning/locale/lightning.dk.tr b/mods/ENVIRONMENT/lightning/locale/lightning.dk.tr new file mode 100644 index 000000000..4bd4b0992 --- /dev/null +++ b/mods/ENVIRONMENT/lightning/locale/lightning.dk.tr @@ -0,0 +1,3 @@ +# textdomain: lightning +Let lightning strike at the specified position or player. No parameter will strike yourself.=Lad lynet slå ned på den angivne position eller spiller. Hvis du ikke skriver et parameter vil lynet ramme dig selv. +No position specified and unknown player=Ingen position og ukendt spiller. diff --git a/mods/ENVIRONMENT/mcl_void_damage/locale/mcl_void_damage.dk.tr b/mods/ENVIRONMENT/mcl_void_damage/locale/mcl_void_damage.dk.tr new file mode 100644 index 000000000..d22e61379 --- /dev/null +++ b/mods/ENVIRONMENT/mcl_void_damage/locale/mcl_void_damage.dk.tr @@ -0,0 +1,3 @@ +# textdomain: mcl_void_damage +The void is off-limits to you!=Tomrummet er forbudt område for dig! +@1 fell into the endless void.=@1 faldt ned i det uendelige tomrum. diff --git a/mods/ENVIRONMENT/mcl_weather/locale/mcl_weather.dk.tr b/mods/ENVIRONMENT/mcl_weather/locale/mcl_weather.dk.tr new file mode 100644 index 000000000..9aff5d717 --- /dev/null +++ b/mods/ENVIRONMENT/mcl_weather/locale/mcl_weather.dk.tr @@ -0,0 +1,8 @@ +# textdomain: mcl_weather +Gives ability to control weather=Gør en i stand til at styre vejret +Changes the weather to the specified parameter.=Ændrer vejret til det angivne. +Error: No weather specified.=Fejl: Intet vejr angivet. +Error: Invalid parameters.=Fejl: Ugyldige parametre. +Error: Duration can't be less than 1 second.=Fejl: Vargihed kan ikke være under 1 sekund. +Error: Invalid weather specified. Use “clear”, “rain”, “snow” or “thunder”.=Fejl: Ugyldigt vejr angivet. Brug "clear","rain","snow" eller "thunder". +Toggles between clear weather and weather with downfall (randomly rain, thunderstorm or snow)=Skifter mellem klart vejr og vejr med nedbør (tilfældigt enten regn, tordenstorm eller sne) diff --git a/mods/HELP/doc/doc/locale/doc.dk.tr b/mods/HELP/doc/doc/locale/doc.dk.tr new file mode 100644 index 000000000..49fb8ace3 --- /dev/null +++ b/mods/HELP/doc/doc/locale/doc.dk.tr @@ -0,0 +1,51 @@ +# textdomain:doc +<=< +>=> +Access to the requested entry has been denied; this entry is secret. You may unlock access by progressing in the game. Figure out on your own how to unlock this entry.=Adgang til det forespurgte blev nægtet; det er hemmeligt. Du kan få adgang ved at nå længere i spillet. Find selv ud af, hvordan du får adgang. +All entries read.=Alle indtastninger læst. +All help entries revealed!=Alle hjælpeindtastninger afsløret! +All help entries are already revealed.=Alle hjælpeindtasterninger er allerede afsløret. +Allows you to reveal all hidden help entries with /help_reveal=Gør dig i stand til at afsløre alle skjulte hjælpeindtaster med /help_reveal +Category list=Kategoriliste +Currently all entries in this category are hidden from you.=Alle indtastninger i denne kategori er i øjeblikket skjult for dig. +Unlock new entries by progressing in the game.=Lås nye indtastninger op ved at nå længere i spillet. +Help=Hjælp +Entry=Indtastning +Entry list=Indtastningsliste +Error: Access denied.=Fejl: Adgang nægtet. +Error: No help available.=Fejl: Igen hjælp tilgængelig. +Go to category list=Gå til kategoriliste +Go to entry list=Gå til indtastningsliste +Help > @1=Hjælp > @1 +Help > @1 > @2= Hjælp > @1 > @2 +Help > @1 > (No Entry)=Hjælp > @1 > (Ingen indtasting) +Help > (No Category)=Hjælp > (Ingen kategori) +Hidden entries: @1=Skjult indtastning: @1 +Nameless entry (@1)=Unavngiven indtastning (@1) +New entries: @1=Nye indtastninger: @1 +New help entry unlocked: @1 > @2=Ny hjælpeindtastning låst op: @1 > @2 +No categories have been registered, but they are required to provide help.=Nye kategorier er blevet registreret, men de er påkrævede for at give hjælp. +The Documentation System [doc] does not come with help contents on its own, it needs additional mods to add help content. Please make sure such mods are enabled on for this world, and try again.= Dokumentationssystemet [doc] har ikke medfølgende hjælpeindhold, det behøver yderligere mods for at tilføje hjælpeindhold. +Number of entries: @1=Antal indtastninger: @1 +OK=OK +Open a window providing help entries about Minetest and more=Åbn et vindue med hjælpeindtastninger om Minetest og mere +Please select a category you wish to learn more about:=Vælg venlist en kategori som du ønsker at lære mere om: +Recommended mods: doc_basics, doc_items, doc_identifier, doc_encyclopedia.=Anbefalede mods: doc_basics, doc_items, doc_identifier, doc_encyclopedia. +Reveal all hidden help entries to you=Afslør alle gemte hjælpeindtastninger for dig. +Show entry=Vis indtastning +Show category=Vis kategori +Show next entry=Vis næste indtastning +Show previous entry=Vis forrige indtastning +This category does not have any entries.=Denne kategori har ingen indtastninger. +This category has the following entries:=Denne kategori har følgende indtastninger: +This category is empty.=Denne kategori er tom. +This is the help.=Dette er hjælpen. +You haven't chosen a category yet. Please choose one in the category list first.=Du har endnu ikke vagt en kategori. Vælg venligst én i kategoriliste før. +You haven't chosen an entry yet. Please choose one in the entry list first.=Du har ikke valgt en indtastning endnu. Vælg venligst en fra indtastningslisten først. +Collection of help texts=Samling at hjælpetekster. +Notify me when new help is available=Giv mig besked når ny hjælp er tilgængelig. +Play notification sound when new help is available=Afspil lyd når ny hjælp er tilgængeig. +Show previous image=Vis forrige billede +Show previous gallery page=Vis forrige galleriside +Show next image=Vis næste billede +Show next gallery page=Vis næste galleriside diff --git a/mods/HELP/doc/doc_identifier/locale/doc_identifier.dk.tr b/mods/HELP/doc/doc_identifier/locale/doc_identifier.dk.tr new file mode 100644 index 000000000..5840b4319 --- /dev/null +++ b/mods/HELP/doc/doc_identifier/locale/doc_identifier.dk.tr @@ -0,0 +1,18 @@ +# textdomain:doc_identifier +Error: This node, item or object is undefined. This is always an error.=Fejl: Dette knudepunkt, genstand eller objekt er ikke defineret. +This can happen for the following reasons:=Dette kan ske af følgende grunde: +• The mod which is required for it is not enabled=• Det mod som er krævet er ikke aktiveret +• The author of the game or a mod has made a mistake=• Ophavsmanden til spillet eller moddet har lavet en fejltagelse +It appears to originate from the mod “@1”, which is enabled.=Det ser ud til at stamme fra moddet "@1" som er aktiveret. +It appears to originate from the mod “@1”, which is not enabled!=Det ser ud til at stamme fra moddet "01" som er deaktiveret! +Its identifier is “@1”.=Dets identificering er "@1". +Lookup Tool=Opslagsværktøj +No help entry for this block could be found.=Der kunne ikke findes nogen hjælpeindtastning til denne blok. +No help entry for this item could be found.=Der kunne ikke findes nogen hjælpeindtastning til denne genstand. +No help entry for this object could be found.=Der kunne ikke findes nogen hjælpeindtastning for stte objekt. +OK=OK +Punch any block, item or other thing about you wish to learn more about. This will open up the appropriate help entry. The tool comes in two modes which are changed by using. In liquid mode, this tool points to liquids as well while in solid mode this is not the case.=Slå en hvilkensomhelst blok, genstand eller andre ting som du ønsker at vide mere om. Dette vil åbne den relevante hjælpeindtastning. Værktøjet findes i to tilstande som skiftes ved brug. I flydende tilstand vil værktøjet også peje på væsker, mens dette ikke er tilfældet i fast tilstand. +This block cannot be identified because the world has not materialized at this point yet. Try again in a few seconds.=Denne blok kan ikke identificeres fordi verdenen ikke har materialiseret sig endnu. Forsøg igen om et par sekunder. +This is a player.=Dette er en spiller. +This useful little helper can be used to quickly learn more about about one's closer environment. It identifies and analyzes blocks, items and other things and it shows extensive information about the thing on which it is used.=Denne smarte lille hjælper kan bruges til hurtigt at lære mere om omgivelserne. Den identificerer og analyserer blokke, genstande og andre ting, og den viser udtømmende informationer om den ting den bliver brugt på. +Show help for pointed thing=Vis hjælp til tingen diff --git a/mods/HELP/doc/doc_items/locale/doc_items.dk.tr b/mods/HELP/doc/doc_items/locale/doc_items.dk.tr new file mode 100644 index 000000000..1dd3eff8a --- /dev/null +++ b/mods/HELP/doc/doc_items/locale/doc_items.dk.tr @@ -0,0 +1,143 @@ +# textdomain:doc_items +Using it as fuel turns it into: @1.=At bruge det som brændstof laver det om til: @1. +@1 seconds=@1 sekunder +# Item count times item name +@1×@2=@1x@2 +# Itemname (25%) +@1 (@2%)=@1 (@2%) +# Itemname (<0.5%) +@1 (<0.5%)= @1 (<0.5%) +# Itemname (ca. 25%) +@1 (ca. @2%)=@1 (ca. @2%) +# List separator (e.g. “one, two, three”) +, = , +# Final list separator (e.g. “One, two and three”) + and = and +1 second=1 sekund +A transparent block, basically empty space. It is usually left behind after digging something.=En gennemsigtig blok, egentlig bare tom luft. Det efterlades typisk efter at have gravet. +Air=Luft +Blocks=Blokke +Building another block at this block will place it inside and replace it.=At sætte en ny blok ved denne blok vil placere den indeni og erstatte den. +Building this block is completely silent.=Det er helt lydløst at bygge denne blok. +Collidable: @1=Kan kollidere: @1 +Description: @1=Beskrivelse: @1 +Falling blocks can go through this block; they destroy it when doing so.=Faldende blokke kan gå igennem denne blok; de ødelægger den idet i går igennem den. +Full punch interval: @1 s=Tid mellem hele slag: @1 +Hand=Hånd +Hold it in your hand, then leftclick to eat it.=Hold det i din hånd, og venstre-klik for at spise det. +Hold it in your hand, then leftclick to eat it. But why would you want to do this?=Hold det i din hånd, og venstre-klik for at spise det. Men hvorfor i alverden ville du have lyst til dét? +Item reference of all wieldable tools and weapons=Genstandsreference til alt værktøj og alle våden man kan bære. +Item reference of blocks and other things which are capable of occupying space=Genstandsreference til blokke og andre ting som kan optage plads. +Item reference of items which are neither blocks, tools or weapons (esp. crafting items)=Genstandsreference til genstanse som hverken er blokke, værktøj eller våben (især håndværksmateriale) +Liquids can flow into this block and destroy it.=Væsker kan flyde ind i denne blok og ødelægge den. +Maximum stack size: @1=Største stakstørrelse: @1 +Mining level: @1=Udvindingsevneevne: @1 +Mining ratings:=Udvindelsesvurdering +• @1, rating @2: @3 s - @4 s=• @1, vurdering @2: @3 s -@4 s +• @1, rating @2: @3 s=• @1, vurdering @2: @3 s +Mining times:=Udvindingstider +Mining this block is completely silent.=Det er helt lydløst at udvinde denne blok. +Miscellaneous items=Diverse genstande +No=Nej +Pointable: No=Retningsbestemt: Nej +Pointable: Only by special items=Retningsbestemt: Kun af særlige genstande +Pointable: Yes=Retningsbestemt: Ja +Punches with this block don't work as usual; melee combat and mining are either not possible or work differently.=Slag med denne blok virker ikke som normalt; nærkamp og udvinding er enten umulig eller virker anderledes. +Punches with this item don't work as usual; melee combat and mining are either not possible or work differently.=Slag med dette objekt virker ikke som normalt; nærkamp og udvinding er enten umulig eller virker anderledes. +Punches with this tool don't work as usual; melee combat and mining are either not possible or work differently.=Slag med dette værktøj virker ikke som normalt; nærkamp og udvinding er enten umulig eller virker anderledes. +Range: @1=Rækkevidde: @1 +# Range: () +Range: @1 (@2)=Rækkevidde: @1 (@2) +Range: 4=Rækkevidde: 4 +# Rating used for digging times +Rating @1=Vurdering: @1 +# @1 is minimal rating, @2 is maximum rating +Rating @1-@2=Vurdering @1-@2 +The fall damage on this block is increased by @1%.=Faldskade på denne blok er øget med @1%. +The fall damage on this block is reduced by @1%.=Faldskade på denne blok er reduceret med @1%. +This block allows light to propagate with a small loss of brightness, and sunlight can even go through losslessly.=Denne blok lader lys sprede sig med et lille tab af styrke, og sollys kan endda gå igennem uden tab. +This block allows light to propagate with a small loss of brightness.=Denne blok tillader lys at sprede med et lille tab af styrke. +This block allows sunlight to propagate without loss in brightness.=Denne blok tillader sollys at sprede sig uden tab af styrke. +This block belongs to the @1 group.=Denne blok tilhører @1gruppen +This block belongs to these groups: @1.=Denne blok hører til følgende grupper: @1. +This block can be climbed.=Man kan klatre på denne blok. +This block can be destroyed by any mining tool immediately.=Denne blok kan ødelægges straks med ethvert udvindingsværktøj. +This block can be destroyed by any mining tool in half a second.=Denne blok kan ødelægges på et halvt sekund med ethvert udvindingsværktøj. +This block can be mined by any mining tool immediately.=Denne blok kan udvindes straks med ethvert udvindingsværktøj. +This block can be mined by any mining tool in half a second.=Denne blok kan udvindes på et halvt sekund med ethvert udvindingsværktøj. +This block can be mined by mining tools which match any of the following mining ratings and its toughness level.=Denne blok kan udvindes med ethvert udvindingsværktøj som svarer til en hvilkensomhelst af følgende udvindingsvurderinger og hårdhedsgrad. +This block can not be destroyed by ordinary mining tools.=Denne blok kan ikke ødelægges af normalt udvindingsværktøj. +This block can not be mined by ordinary mining tools.=Denne blok kan ikke udvindes med normalt udvindingsværktøj. +This block can serve as a smelting fuel with a burning time of @1.=Denne blok virker som brændstof til at smelte og har en brændetid på @1. +This block causes a damage of @1 hit point per second.=Denne blok giver @1 skade per sekund. +This block causes a damage of @1 hit points per second.=Denne blok giver @1 skade per sekund. +This block connects to blocks of the @1 group.=Denne blok forbindes til blokke i @1gruppen. +This block connects to blocks of the following groups: @1.=Denne blok forbindes til blokke i følgende grupper: @1. +This block connects to these blocks: @1.=Denne blok forbindes til disse blokke: @1. +This block connects to this block: @1.=Denne blok forbindes til denne blok: @1. +This block decreases your breath and causes a drowning damage of @1 hit point every 2 seconds.=Denne blok nedsætter dit åndedræt og giver @1 drukningsskade hvert 2. sekund. +This block decreases your breath and causes a drowning damage of @1 hit points every 2 seconds.=Denne blok nedsætter dit åndedræt og giver @1 drukneskade hvert 2. sekund. +This block is a light source with a light level of @1.=Denne blok er en lyskilde med lysniveau @1. +This block glows faintly with a light level of @1.=Denne blok gløder svagt med et lysniveau på @1. +This block is a building block for creating various buildings.=Denne blok er en byggesten til at bygge forskellige bygninger. +This block is a liquid with these properties:=Denne blok er en væske med følgende egenskaber: +This block is affected by gravity and can fall.=Denne blok påvirkes af tyngdekraften og kan falde ned. +This block is completely silent when mined or built.=Denne blok er helt lydløs når den udvindes eller bygges. +This block is completely silent when walked on, mined or built.=Denne blok er helt lydløs når den betrædes, udvindes eller bygges. +This block is destroyed when a falling block ends up inside it.=Denne blok ødelægges når en nedfaldende blok ender indeni den. +This block negates all fall damage.=Denne blok modvirker al faldskade. +This block points to liquids.=Denne blok orienteres mod væsker. +This block will drop as an item when a falling block ends up inside it.=Denne blok dropper som genstand når en faldende blok ender indeni den. +This block will drop as an item when it is not attached to a surrounding block.=Denne blok dropper som genstand når den ikke sidder fast på en tilstødende blok. +This block will drop as an item when no collidable block is below it.=Denne blok dropper som genstand når der ikke er en bæredygtig blok under den. +This block will drop the following items when mined: @1.=Denne blok dropper følgende genstande når den udvindes: @1. +This block will drop the following when mined: @1×@2.=Denne blok dropper følgende når den udvindes: @1x@2. +This block will drop the following when mined: @1.=Denne blok dropper følgende når den udvindes: @1. +This block will drop the following when mined: @1.=Denne blok dropper følgende når den udvindes: @1. +This block will make you bounce off with an elasticity of @1%.=Denne blok får dig til at hoppe af med en elasticitet på @1%. +This block will randomly drop one of the following when mined: @1.=Denne blok dropper en vilkårlig af følgende genstande når den udvindes: @1. +This block will randomly drop up to @1 drops of the following possible drops when mined: @2.=Denne blok dropper et vilkårligt antal op til @1 af følgende mulige ting når den udvindes: @2. +This block won't drop anything when mined.=Denne blok dropper ikke noget når den udvindes. +This is a decorational block.=Dette er en pynteblok. +This is a melee weapon which deals damage by punching.=Dette er et nærkampsvåben som giver skade ved at slå. +Maximum damage per hit:=Højeste skade per slag: +This item belongs to the @1 group.=Denne genstand hører til @1gruppen. +This item belongs to these groups: @1.=Denne genstand hører til disse grupper: @1. +This item can serve as a smelting fuel with a burning time of @1.=Denne genstand virker som brændstof til at smelte og har en brændetid på @1. +This item is primarily used for crafting other items.=Denne genstand bruges mest til at lave andre genstande. +This item points to liquids.=Denne genstand orienterer sig mod væsker. +This tool belongs to the @1 group.=Dette værktøj hører til @1gruppen +This tool belongs to these groups: @1.=Dette værktøj hører til disse grupper: +This tool can serve as a smelting fuel with a burning time of @1.=Dette værktøj virker som brændstof til at smelte og har en brændetid på @1. +This tool is capable of mining.=Dette værktøj kan bruges til udvinding. +Maximum toughness levels:=Højeste hårdhedsgrad. +This tool points to liquids.=Dette værktøj orienterer sig mod væsker. +Tools and weapons=Værktøj og våben +Unknown Node=Ukendt knudepunkt +Usage help: @1=Hjælp til brug: @1 +Walking on this block is completely silent.=Det er helt lydløst at gå på denne blok. +Whenever you are not wielding any item, you use the hand which acts as a tool with its own capabilities. When you are wielding an item which is not a mining tool or a weapon it will behave as if it would be the hand.=Når du ikke anvender en genstand, bruger du din hånd som fungerer som et værktøj med sine egne egenskaber. Når du anvender en genstand som ikke er et værktøj til udvinding eller våben virker det som om du bruger din hånd. +Yes=Ja +You can not jump while standing on this block.=Du kan ikke hoppe mens du står på dene blok. +any level=hvilketsomhelst level +level 0=level 0 +level 0-@1=level 0-@1 +unknown=ukendt +Unknown item (@1)=ukendt genstand (@1) +• @1: @2= +• @1: @2 HP=• @1: @2 HP +• @1: @2, @3=• @1: @2, @3 +• Flowing range: @1=• Flydende rækkevidde: @1 +• No flowing=• Ingen strøm +• Not renewable=• Kan ikke genopfriskes +• Renewable=• Kan genopfriskes +• Viscosity: @1=• Viskositet: @1 +Itemstring: "@1"=Genstandsstreng: "@1" +Durability: @1 uses=Holdbarhed: @1 anvendelser +Durability: @1=Holdbarhed: @1 +Mining durability:=Udvindingsholdbarhed: +• @1, level @2: @3 uses=• @1, level @2: @3 anvendelser +• @1, level @2: Unlimited=• @1, level @2: Uendelig +This block's rotation is affected by the way you place it: Place it on the floor or ceiling for a vertical orientation; place it at the side for a horizontal orientation. Sneaking while placing it leads to a perpendicular orientation instead.=Denne bloks rotation påvirkes af måden du placerer den på: Placér den på gulvet eller loftet for en lodret orientering; placér den på siden for en horisontal orientering. Hvis du sniger dig mens den placeres den vinkelret i stedet. +Toughness level: @1=Hårdhedsgrad: @1 +This block is slippery.=Denne blok er glat. diff --git a/mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr b/mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr index 648e14569..abcf11547 100644 --- a/mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr +++ b/mods/HELP/doc/doc_items/locale/doc_items.pt_BR.tr @@ -53,8 +53,8 @@ Range: 4=Range: 4 Rating @1=Classificação @1 # @1 is minimal rating, @2 is maximum rating Rating @1-@2=Classificação @1-@2 -The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @ 1%. -The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @ 1%. +The fall damage on this block is increased by @1%.=O dano por queda nesse bloco é aumentado em @1%. +The fall damage on this block is reduced by @1%.=O dano por queda nesse bloco é reduzido em @1%. This block allows light to propagate with a small loss of brightness, and sunlight can even go through losslessly.=Esse bloco permite que a luz se propague com uma pequena perda de brilho, e a luz solar pode até passar sem perdas. This block allows light to propagate with a small loss of brightness.=Esse bloco permite que a luz se propague com uma pequena perda de brilho. This block allows sunlight to propagate without loss in brightness.=Esse bloco permite que a luz solar se propague sem perda de brilho. @@ -78,7 +78,7 @@ This block connects to this block: @1.=Esse bloco se conecta a esse bloco: @1. This block decreases your breath and causes a drowning damage of @1 hit point every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 ponto de vida a cada 2 segundos. This block decreases your breath and causes a drowning damage of @1 hit points every 2 seconds.=Esse bloco diminui a sua respiração e causa um dano por afogamento de @1 pontos de vida a cada 2 segundos. This block is a light source with a light level of @1.=Esse bloco é uma fonte de luz com um nível de luz de @1. -This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @ 1. +This block glows faintly with a light level of @1.=Esse bloco tem um brilho fraco com um nível de luz de @1. This block is a building block for creating various buildings.=Esse bloco é um bloco de construção para criar vários edifícios. This block is a liquid with these properties:=Esse bloco é um líquido com as seguintes propriedades: This block is affected by gravity and can fall.=Esse bloco é afetado pela gravidade e pode cair. @@ -123,7 +123,7 @@ any level=qualquer nível level 0=nível 0 level 0-@1=nivel 0-@1 unknown=desconhecido -Unknown item (@1)=Item desconhecido +Unknown item (@1)=Item desconhecido (@1) • @1: @2= • @1: @2 HP= • @1: @2, @3= diff --git a/mods/HELP/mcl_craftguide/locale/mcl_craftguide.dk.tr b/mods/HELP/mcl_craftguide/locale/mcl_craftguide.dk.tr new file mode 100644 index 000000000..9fe6a6ac8 --- /dev/null +++ b/mods/HELP/mcl_craftguide/locale/mcl_craftguide.dk.tr @@ -0,0 +1,37 @@ +# textdomain: craftguide +Any shulker box=Hvilkensomhelst shulkerboks +Any wool=Hvilkensomhelst uld +Any wood planks=Hvilkensomhelst træplanker +Any wood=Hvilkensomhelst træ +Any sand=Hvilkensomhelst sand +Any normal sandstone=Hvilkensomhelst normal sandsten +Any red sandstone=Hvilkensomhelst rød sandsten +Any carpet=HVilketsomhelst tæppe +Any dye=Hvilkensomhelst farvestof +Any water bucket=Hvilkensomhelst vandpand +Any flower=Hvilkensomhelst blomst +Any mushroom=Hvilkensomhelst svamp +Any wooden slab=Hvilkensomhelst træplade +Any wooden stairs=Hvilkensomhelst trætrappe +Any coal=Hvilketsomhelst kul +Any kind of quartz block=Hvilkensomhelst quartzblok +Any kind of purpur block=Hvilkensomhelst pupurblok +Any stone bricks=Hvilkensomhelst mursten af sten +Any stick=Hvilkensomhelst pind +Any item belonging to the @1 group=Hvilkensomhelst genstant i @1gruppen +Any item belonging to the groups: @1=Hvilkensomhelst genstand som hører til grupperne: @1 +Search=Søg +Reset=Nulstil +Previous page=Forrige side +Next page=Næste side +Usage @1 of @2=Brug @1 af @2 +Recipe @1 of @2=Opskrift @1 af @2 +Burning time: @1=Brændetid: @1 +Cooking time: @1=Tilberedelsestid: @1 +Recipe is too big to be displayed (@1×@2)=Formen er for stor til at blive vist (@1x@2) +Shapeless=Uformelig +Cooking=Madlavning +Increase window size=Øg vinduesstørrelsen +Decrease window size=Mindsk vinduesstørrelsen +No item to show=Ingen genstande at vise +Collect items to reveal more recipes=Saml genstande for at afsløre flere opskrifter diff --git a/mods/HELP/mcl_doc/locale/mcl_doc.dk.tr b/mods/HELP/mcl_doc/locale/mcl_doc.dk.tr new file mode 100644 index 000000000..7dfc40fdf --- /dev/null +++ b/mods/HELP/mcl_doc/locale/mcl_doc.dk.tr @@ -0,0 +1,79 @@ +# textdomain: mcl_doc +Water can flow into this block and cause it to drop as an item.=Der kan flyde vandt i denne blok, hvilket får den til at droppe som en genstand. +This block can be turned into dirt with a hoe.=Denne blok kan omdannes til jord med en hakke. +This block can be turned into farmland with a hoe.=Denne blok kan omdannes til landbrugsjord med en hakke. +This block acts as a soil for all saplings.=Denne blok virker som jord for alle spirer. +This block acts as a soil for some saplings.=Denne blok virker som jord for nogle spirer. +Sugar canes will grow on this block.=Sukkerrør gror på denne blok. +Nether wart will grow on this block.=Nethervorder gror på denne blok. +This block quickly decays when there is no wood block of any species within a distance of @1. When decaying, it disappears and may drop one of its regular drops. The block does not decay when the block has been placed by a player.=Denne blok forgår hurtigt når der ikke er træblokke af nogen art af træblokke indenfor en afstand af @1. Når den forgår, forsvinder den, og dropper måske et af sine normale drops. Blokken forgår ikke når den er blevet placeret af en spiller. +This block quickly decays and disappears when there is no wood block of any species within a distance of @1. The block does not decay when the block has been placed by a player.=Denne blok forgår hurtigt og forsvinder når der ikke er nogen art af træblokke indenfor en afstand af @1. Blokken forgår ikke når den er blevet placeret af en spiller. +This plant can only grow on grass blocks and dirt. To survive, it needs to have an unobstructed view to the sky above or be exposed to a light level of 8 or higher.=Denne plante kan kun gro på græsblokke eller jord. For at overleve, har den brug for direkte udsyn til himlen, eller et lysniveau på 8 eller derover. +This plant can grow on grass blocks, podzol, dirt and coarse dirt. To survive, it needs to have an unobstructed view to the sky above or be exposed to a light level of 8 or higher.=Denne plante kan gro på græsblokke, podsol, jord eller grov jord. For at overleve, har den brug for direkte udsyn til himlen, eller et lysniveau på 8 eller derover. +This block is flammable.=Denne blok er brændfarlig. +This block destroys any item it touches.=Denne blok ødelægger enhver genstand den berør. +To eat it, wield it, then rightclick.=For at spise det skal du bære det og højre-klikke. +You can eat this even when your hunger bar is full.=Du kan spise dette selvom din sultbjælke er fuld. +You cannot eat this when your hunger bar is full.=Du kan ikke spise dette når din sultbjælke er fuld. +To drink it, wield it, then rightclick.=For at drikke det skal du bære det og højre-klikke. +You cannot drink this when your hunger bar is full.=Du kan ikke drikke dette når din sultbjælke er fuld. +To consume it, wield it, then rightclick.=For at indtage det skal du bære det og højre-klikke. +You cannot consume this when your hunger bar is full.=Du kan ikke indtage dette når din sultbjælke er fuld. +You have to wait for about 2 seconds before you can eat or drink again.=Du er nødt til at vente omkring 2 sekunder før du kan drikke eller spise igen. +Hunger points restored: @1=Sultpoint genvundet: @1 +Saturation points restored: @1%.1f=Mæthedspoint genvundet: @1%.1f +This item can be repaired at an anvil with: @1.=Denne genstand kan repareres ved en ambolt med: @1. +This item can be repaired at an anvil with any wooden planks.=Denne genstand kan repareres ved en ambolt med hvilkensomhelst træplanke. +This item can be repaired at an anvil with any item in the “@1” group.=Denne genstand kan repareres ved en ambolt med hvilkensomhelst genstand i "@1"gruppen +This item cannot be renamed at an anvil.=Denne genstand kan ikke omdøbes ved en ambolt. +This block crushes any block it falls into.=Denn blok knuser enhver blok den falder ind i. +When this block falls deeper than 1 block, it causes damage to any player it hits. The damage dealt is B×2−2 hit points with B @= number of blocks fallen. The damage can never be more than 40 HP.=Denne blok falder dybere end 1 blok, og giver skade til enhver spiller den rammer. Skaden givet er Bx2-2 ned B @= antal faldne blokke. +Diamond Pickaxe=Minehakke i diamant +Iron Pickaxe=Jernhakke +Stone Pickaxe=Stenhakke +Golden Pickaxe=Guldhakke +Wooden Pickaxe=Træhakke +Diamond Axe=Diamantøkse +Iron Axe=Jernøkse +Stone Axe=Stenøkse +Golden Axe=Guldøkse +Wooden Axe=Træøkse +Diamond Shovel=Diamantskovl +Iron Shovel=Jernskovl +Stone Shovel=Stenskovl +Golden Shovel=Guldskovl +Wooden Shovel=Træskovl +This block can be mined by any tool instantly.=Denne blok kan udvindes momentant med ethvert værktøj. +This block can be mined by:=Denne blok kan udvindes med: +Hardness: ∞= Hårdhed:∞ +Hardness: @1=Hårdhed @1 +This block will not be destroyed by TNT explosions.=Denne blok ødelægges ikke af TNT-eksplosioner. +This block drops itself when mined by shears.=Denne blok dropper sig selv når den udvindes med sakse. +@1×@2=@1x@2 +This blocks drops the following when mined by shears: @1=Denne blok dropper følgende når den udvindes med sakse: @1 +, =, +• Shears=• Sakse +• Sword=• Sværd +• Hand=• Hånd +This is a melee weapon which deals damage by punching.=Dette er et nærkampsvåben som giver skade ved at slå. +Maximum damage: @1 HP=Højeste skade: @1 +Full punch interval: @1 s=Helt interval mellem slag: @1 s +This tool is capable of mining.=Dette værktøj kan bruges til udvinding. +Mining speed: @1=Udvindingshastighed: @1 +Painfully slow=Pinagtig langsom +Very slow=Meget langsom +Slow=Langsom +Fast=Hurtig +Very fast=Meget hurtig +Extremely fast=Ekstremt hurtig +Instantaneous=Momentan +@1 uses=@1 anvendelser +Unlimited uses=Uendelige anvendelser +Block breaking strength: @1=Blokkens brudstyrke: @1 +Mining durability: @1=Udvindingsholdbarhed: @1 +Armor points: @1=Rustningspoint: @1 +Armor durability: @1=Rustningens holdbarhed: @1 +It can be worn on the head.=Den kan bæres på hovedet. +It can be worn on the torso.=Den kan bæres på kroppen. +It can be worn on the legs.=De kan bæres på benene. +It can be worn on the feet.=De kan bæres på fødderne. diff --git a/mods/HUD/awards/locale/awards.ru.tr b/mods/HUD/awards/locale/awards.ru.tr index 8495c270f..6f7a6d1bf 100644 --- a/mods/HUD/awards/locale/awards.ru.tr +++ b/mods/HUD/awards/locale/awards.ru.tr @@ -1,25 +1,24 @@ # textdomain:awards @1/@2 chat messages=@1/@2 сообщений чата -@1/@2 crafted=@1/@2 скрафчено +@1/@2 crafted=@1/@2 создано @1/@2 deaths=@1/@2 смертей @1/@2 dug=@1/@2 выкопано @1/@2 game joins=@1/@2 присоединений к игре -@1/@2 placed=@1/@2 помещено +@1/@2 placed=@1/@2 размещено @1 (got)=@1 (получено) -@1: @1=@1: @1 +@1: @2=@1: @2 @1’s awards:=Награды @1: -(Secret Award)=(Секретная награда) +(Secret Award)=(Тайная награда) =<идентификатор достижения> =<имя> -A Cat in a Pop-Tart?!=Кот в печеньке?! -Achievement gotten!=Получено достижение! -Achievement gotten:=Получено достижение: -Achievement gotten: @1=Получено достижение: @1 +Advancement Made!=Получено достижение! +Advancement Made:=Получено достижение: +Advancement: @1=Достижение: @1 Achievement not found.=Достижение не найдено. All your awards and statistics have been cleared. You can now start again.=Ваши награды удалены вместе со всей статистикой. Теперь можно начать всё сначала. Awards=Награды -Craft: @1×@2=Скрафчено: @1×@2 -Craft: @1=Скрафчено: @1 +Craft: @1×@2=Создано: @1×@2 +Craft: @1=Создано: @1 Die @1 times.=Умер(ла) @1 раз(а). Die.=Умер(ла). Get the achievements statistics for the given player or yourself=Получение статистики достижений для заданного игрока или для себя @@ -28,35 +27,44 @@ Join the game.=Присоединился(ась) к игре. List awards in chat (deprecated)=Вывести список наград в чат (устарело). Place a block: @1=Разметил(а) блок: @1 Place blocks: @1×@2=Разместил(а) блоки: @1×@2 -Secret Achievement gotten!=Секретное достижение получено! -Secret Achievement gotten:=Секретное достижение получено: -Secret Achievement gotten: @1=Секретное достижение получено: @1 +Secret Advancement Made!=Тайное достижение получено! +Secret Advancement Made:=Тайное достижение получено: +Secret Advancement Made: @1=Тайное достижение получено: @1 Show details of an achievement=Показать подробности достижения -Show, clear, disable or enable your achievements=Отобразить, очистить, запретить или разрешить ваши достижения -Get this achievement to find out what it is.=Получите это достижение, чтобы узнать, что это. -Write @1 chat messages.=Написано @1 сообщений(е,я) в чате. -Write something in chat.=Написал(а) что-то в чате. -You have disabled your achievements.=Вы запретили ваши достижения. -You have enabled your achievements.=Вы разрешили ваши достижения. +Show, clear, disable or enable your advancements.=Отобразить, очистить, запретить или разрешить ваши достижения +Make this advancement to find out what it is.=Получите это достижение, чтобы узнать, что это. +Write @1 chat messages.=Написано @1 сообщений(е,я) в беседе. +Write something in chat.=Написал(а) что-то в беседе. +You have disabled your advancements.=Вы запретили ваши достижения. +You have enabled your advancements.=Вы разрешили ваши достижения. You have not gotten any awards.=Вы пока не получали наград. You've disabled awards. Type /awards enable to reenable.=Вы запретили награды. Выполните /awards enable, чтобы разрешить их обратно. -[c|clear|disable|enable]=[c|clear - очистить|disable - запретить|enable - разрешить] -OK=О'кей -Error: No awards available.=Ошибка: Награды недоступны +[c|clear|disable|enable]=[c|clear — очистить|disable — запретить|enable — разрешить] +OK=Ладно +Error: No awards available.=Ошибка: награды недоступны Eat: @1×@2=Съедено: @1×@2 Eat: @1=Съедено: @1 @1/@2 eaten=@1/@2 съедено -Place @1 block(s).=Поместил(а) @1 блок(а,ов). +Place @1 block(s).=Разместил(а) @1 блок(а,ов). Dig @1 block(s).=Выкопал(а) @1 блок(а,ов). Eat @1 item(s).=Съел(а) @1 предмет(а,ов). -Craft @1 item(s).=Скрафтил(а) @1 предмет(а,ов). -Can give achievements to any player=Может выдавать достижения любому игроку -(grant ( | all)) | list=(grant <игрок> (<достижение> | all - всем)) | список -Give achievement to player or list all achievements=Выдать достижение игроку или отобразить все достижения +Craft @1 item(s).=Сделал(а) @1 предмет(а,ов). +Can give advancements to any player=Может выдавать достижения любому игроку +(grant ( | all)) | list=(grant <игрок> (<достижение> | all — всем)) | список +Give advancement to player or list all advancements=Выдать достижение игроку или отобразить все достижения @1 (@2)=@1 (@2) -Invalid syntax.=Неверный синтаксис. +Invalid syntax.=Неверное составление. Invalid action.=Непредусмотренное действие. Player is not online.=Игрок не подключён. -Done.=Сделано. -Achievement “@1” does not exist.=Достижения “@1” не существует. -@1 has made the achievement @2=@1 получил(а) достижение @2 +Done.=Готово. +Advancement “@1” does not exist.=Достижения «@1» не существует. +@1 has made the advancement @2=@1 получил(а) достижение @2 +Mine a block: @1=Добыл(а) блок: @1 +Mine blocks: @1×@2=Добыл(а) блоки: @1×@2 +Awards are disabled, enable them first by using /awards enable!=Награды отключены, сначала включите их с помощью /awards enable! +Goal Completed:=Цель выполнена: +Goal Completed!=Цель выполнена! +Goal Completed: @1=Цель выполнена: @1 +Challenge Completed:=Задача выполнена: +Challenge Completed!=Задача выполнена! +Challenge Completed: @1=Задача выполнена: @1 \ No newline at end of file diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 016536303..4d272fe86 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -518,7 +518,7 @@ awards.register_achievement("mcl:stoneAge", { awards.register_achievement("mcl:hotStuff", { title = S("Hot Stuff"), description = S("Put lava in a bucket."), - icon = "bucket_lava.png", + icon = "mcl_buckets_lava_bucket.png", type = "Advancement", group = "Overworld", }) diff --git a/mods/HUD/mcl_achievements/locale/mcl_achievements.ru.tr b/mods/HUD/mcl_achievements/locale/mcl_achievements.ru.tr index 9bc23f6be..9a180d89b 100644 --- a/mods/HUD/mcl_achievements/locale/mcl_achievements.ru.tr +++ b/mods/HUD/mcl_achievements/locale/mcl_achievements.ru.tr @@ -3,7 +3,7 @@ Acquire Hardware=Куй Железо Bake Bread=Хлеб всему голова Benchmarking=Верстак Cow Tipper=Кожа да кости -Craft a bookshelf.=Создание книжной полки +Craft a bookshelf.=Создание книжной полки. Craft a cake using wheat, sugar, milk and an egg.=Создание торта из пшеницы, сахара, молока и яйца. Craft a crafting table from 4 wooden planks.=Создание верстака из 4 досок. Craft a stone pickaxe using sticks and cobblestone.=Создание каменного топора из палок и булыжников. @@ -15,12 +15,12 @@ Eat a cooked porkchop.=Употребление в пищу приготовле Eat a cooked rabbit.=Употребление в пищу приготовленного кролика. Get really desperate and eat rotten flesh.=Отчаянное и необдуманное употребление в пищу гнилого мяса Getting Wood=Рубка Леса -Getting an Upgrade=Модернизация -Hit a skeleton, wither skeleton or stray by bow and arrow from a distance of at least 20 meters.=Удар по скелету, скелету-иссушителю либо уклонение от стрелы на расстоянии не менее 20 метров. -Hot Topic=Автор Жжёт -Into Fire=В Огне -Into the Nether=В Аду -Iron Belly=Железный Живот +Getting an Upgrade=Обновка +Hit a skeleton, wither skeleton or stray by bow and arrow from a distance of at least 20 meters.=Попадание по скелету, скелету-иссушителю либо уклонение от стрелы на расстоянии не менее 20 метров. +Hot Topic=Печник жжёт +Into Fire=В огне +We Need to Go Deeper=В глубь +Iron Belly=Железный живот Librarian=Библиотекарь Mine emerald ore.=Добыча изумрудной руды. On A Rail=На Рельсах @@ -30,20 +30,84 @@ Pick up a wood item from the ground.@nHint: Punch a tree trunk until it pops out Pick up leather from the floor.@nHint: Cows and some other animals have a chance to drop leather, when killed.=Поднятие кожи с пола.@nПодсказка: Коровы и некоторые другие животные могут оставлять кожу, если их убивать. Place a dispenser.=Установка диспенсера. Place a flower pot.=Установка цветочного горшка. -Pork Chop=Свиная Отбивная -Pot Planter=Сажатель Горшков -Rabbit Season=Кроличий Сезон -Sniper Duel=Снайперская Дуэль +Pork Chop=Свиная отбивная +Pot Planter=Сажатель горшков +Rabbit Season=Заячья пора +Sniper Duel=Лучный бой Take a cooked fish from a furnace.@nHint: Use a fishing rod to catch a fish and cook it in a furnace.=Приготовление рыбы в печи.@nПодсказка: Ловите рыбу удочкой и готовьте её в печи. Take an iron ingot from a furnace's output slot.@nHint: To smelt an iron ingot, put a fuel (like coal) and iron ore into a furnace.=Получение слитка железа из печи.@nПодсказка: чтобы переплавить железную руду, нужно положить её в печь и туда же поместить топливо (уголь или другое). -The Haggler=Хагглер +The Haggler=Торговец The Lie=Тортик -Time to Farm!=Время фермерства! +Time to Farm!=Время земледелия! Time to Mine!=Время добывать! Time to Strike!=Время сражаться! Travel by minecart for at least 1000 meters from your starting point in a single ride.=Поездка на вагонетке минимум на 1000 метров от стартовой точки за один раз. Use 8 cobblestones to craft a furnace.=Создание печи из 8 булыжников. Use a crafting table to craft a wooden hoe from wooden planks and sticks.=Создание деревянной мотыги из досок и палок на верстаке. Use a crafting table to craft a wooden pickaxe from wooden planks and sticks.=Создание деревянной кирки из досок и палок на верстаке. -Use obsidian and a fire starter to construct a Nether portal.=Создание Адского портала при помощи обсидиана и огнива. +Use obsidian and a fire starter to construct a Nether portal.=Создание при помощи обсидиана и огнива. Use wheat to craft a bread.=Использование пшеницы для приготовления хлеба. +Who is Cutting Onions?= +Pick up a crying obsidian from the floor.= +Hidden in the Depths= +Pick up an Ancient Debris from the floor.= +The Nether=Преисподняя +Bring summer clothes.@nHint: Enter the Nether.=Возьмите с собой летнюю одежду.@nПодсказка: войдите в преисподнюю. +Isn't It Iron Pick= +Craft a iron pickaxe using sticks and iron.= +Postmortal= +Use a Totem of Undying to cheat death.= +Sweet Dreams= +Sleep in a bed to change your respawn point.= +Not Quite "Nine" Lives= +Charge a Respawn Anchor to the maximum.= +What A Deal!=Вот так сделка! +Successfully trade with a Villager.=Успешная торговля с жителем. +Withering Heights= +Summon the wither from the dead.= +The Cutest Predator= +Catch an Axolotl with a bucket!= +Fishy Business= +Catch a fish.@nHint: Catch a fish, salmon, clownfish, or pufferfish.= +Country Lode, Take Me Home= +Use a compass on a Lodestone.= +Serious Dedication= +Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices.= +Local Brewery= +Brew a Potion.@nHint: Take a potion or glass bottle out of the brewing stand.= +Enchanter= +Enchant an item using an Enchantment Table.= +Bring Home the Beacon= +Use a beacon.= +Beaconator= +Use a fully powered beacon.= +The Next Generation= +Hold the Dragon Egg.@nHint: Pick up the egg from the ground and have it in your inventory.= +The End... Again...= +Respawn the Ender Dragon.= +Sky's the Limit= +Find the elytra and prepare to fly above and beyond!= +Free the End= +Kill the ender dragon. Good Luck!= +Bee Our Guest= +Use a campfire to collect a bottle of honey from a beehive without aggrivating the bees inside.= +Total Beelocation= +Move a bee nest, with 3 bees inside, using a silk touch enchanted tool.= +Wax On= +Apply honeycomb to a copper block to protect it from the elements.= +Wax Off= +Scrape wax off of a copper block.= +The End?= +Or the beginning?@nHint: Enter an end portal.= +Stone Age= +Mine a stone with new pickaxe.= +Ice Bucket Challenge= +Obtain an obsidian block.= +Hot Stuff= +Put lava in a bucket.= +Hero of the Village= +Successfully defend a village from a raid= +Voluntary Exile= +Kill a raid captain. Maybe consider staying away from the local villages for the time being...= +Tactical Fishing= +Catch a fish... without a fishing rod!= \ No newline at end of file diff --git a/mods/HUD/mcl_base_textures/init.lua b/mods/HUD/mcl_base_textures/init.lua deleted file mode 100644 index 643c51108..000000000 --- a/mods/HUD/mcl_base_textures/init.lua +++ /dev/null @@ -1 +0,0 @@ --- This mod has no code and is only a collection of textures. diff --git a/mods/HUD/mcl_base_textures/mod.conf b/mods/HUD/mcl_base_textures/mod.conf deleted file mode 100644 index b36dccfe4..000000000 --- a/mods/HUD/mcl_base_textures/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = mcl_base_textures -author = Wuzzy -description = Provides core textures needed by Minetest. diff --git a/mods/HUD/mcl_credits/people.lua b/mods/HUD/mcl_credits/people.lua index 660cde11e..7421350d0 100644 --- a/mods/HUD/mcl_credits/people.lua +++ b/mods/HUD/mcl_credits/people.lua @@ -14,33 +14,36 @@ return { }}, {S("Previous Maintainers"), 0xFFFFFF, { "Fleckenstein", - "jordan4ibanez", "cora", }}, {S("Developers"), 0xF84355, { - "bzoss", "AFCMS", "epCode", - "ryvnf", - "iliekprogrammar", - "MysticTempest", - "Rootyjr", - "aligator", - "Code-Sploit", - "NO11", - "kabou", - "rudzik8", "chmodsayshello", "PrairieWind", - "RandomLegoBrick", - "SumianVoice", "MrRar", - "talamh", - "Faerraven / Michieal", "FossFanatic ", "SmokeyDope", }}, + {S("Past Developers"), 0xF84355, { + "jordan4ibanez", + "iliekprogrammar", + "kabou", + "kay27", + "Faerraven / Michieal", + "MysticTempest", + "NO11", + "SumianVoice", + }}, {S("Contributors"), 0x52FF00, { + "RandomLegoBrick", + "rudzik8", + "Code-Sploit", + "aligator", + "Rootyjr", + "ryvnf", + "bzoss", + "talamh", "Laurent Rocher", "HimbeerserverDE", "TechDudie", @@ -69,6 +72,10 @@ return { "Marcin Serwin", "erlehmann", "E", + "n_to", + "debiankaios", + "Gustavo6046 / wallabra", + "CableGuy67", "Benjamin Schötz", "Doloment", "Sydney Gems", @@ -102,25 +109,18 @@ return { "gldrk", "atomdmac", "emptyshore", + "FlamingRCCars", + "uqers", + "Niterux", + "appgurueu", + "seventeenthShulker", }}, - {S("MineClone5"), 0xA60014, { - "kay27", - "Debiankaios", - "epCode", - "NO11", - "j45", - "chmodsayshello", - "3raven", - "PrairieWind", - "Gustavo6046 / wallabra", - "CableGuy67", - "MrRar", - }}, - {S("Mineclonia"), 0xFFFFFF, { - "erlehmann", - "Li0n", - "E", - "n_to", + {S("Music"), 0xA60014, { + "Jordach for the jukebox music compilation from Big Freaking Dig", + "Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/", + "Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)", + "Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)", + "Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)", }}, {S("Original Mod Authors"), 0x343434, { "Wuzzy", @@ -152,14 +152,18 @@ return { "4Evergreen4", "jordan4ibanez", "paramat", + "debian044 / debian44", + "chmodsayshello", "cora", "Faerraven / Michieal", + "PrairieWind", }}, {S("3D Models"), 0x0019FF, { "22i", "tobyplowy", "epCode", "Faerraven / Michieal", + "SumianVoice", }}, {S("Textures"), 0xFF9705, { "XSSheep", @@ -176,6 +180,8 @@ return { "Faerraven / Michieal", "Nicu", "Exhale", + "Wbjitscool", + "SmokeyDope", }}, {S("Translations"), 0x00FF60, { "Wuzzy", @@ -192,6 +198,9 @@ return { "SakuraRiu", "anarquimico", "syl", + "Temak", + "megustanlosfrijoles", + "kbundg", }}, {S("Funders"), 0xF7FF00, { "40W", @@ -199,14 +208,8 @@ return { "Cora", }}, {S("Special thanks"), 0x00E9FF, { - "celeron55 for creating Minetest", - "Jordach for the jukebox music compilation from Big Freaking Dig", - "wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.", + "The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible", "The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game", "Notch and Jeb for being the major forces behind Minecraft", - "Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/", - "Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)", - "Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)", - "Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)", }}, } diff --git a/mods/HUD/mcl_experience/init.lua b/mods/HUD/mcl_experience/init.lua index 359e68918..47e48d36c 100644 --- a/mods/HUD/mcl_experience/init.lua +++ b/mods/HUD/mcl_experience/init.lua @@ -147,13 +147,13 @@ function mcl_experience.throw_xp(pos, total_xp) obj:set_velocity(vector.new( math.random(-2, 2) * math.random(), - math.random( 2, 5), + math.random(2, 5), math.random(-2, 2) * math.random() )) i = i + xp j = j + 1 - table.insert(obs,obj) + table.insert(obs, obj) end return obs end @@ -179,18 +179,18 @@ function mcl_experience.setup_hud(player) if not minetest.is_creative_enabled(player:get_player_name()) then hud_bars[player] = player:hud_add({ hud_elem_type = "image", - position = {x = 0.5, y = 1}, - offset = {x = (-9 * 28) - 3, y = -(48 + 24 + 16 - 5)}, - scale = {x = 0.35, y = 0.375}, - alignment = {x = 1, y = 1}, + position = { x = 0.5, y = 1 }, + offset = { x = (-9 * 28) - 3, y = -(48 + 24 + 16 - 5) }, + scale = { x = 0.35, y = 0.375 }, + alignment = { x = 1, y = 1 }, z_index = 11, }) hud_levels[player] = player:hud_add({ hud_elem_type = "text", - position = {x = 0.5, y = 1}, + position = { x = 0.5, y = 1 }, number = 0x80FF20, - offset = {x = 0, y = -(48 + 24 + 24)}, + offset = { x = 0, y = -(48 + 24 + 24) }, z_index = 12, }) end @@ -221,7 +221,7 @@ function mcl_experience.update(player) end function mcl_experience.register_on_add_xp(func, priority) - table.insert(mcl_experience.on_add_xp, {func = func, priority = priority or 0}) + table.insert(mcl_experience.on_add_xp, { func = func, priority = priority or 0 }) end -- callbacks @@ -232,9 +232,9 @@ minetest.register_on_joinplayer(function(player) end) minetest.register_on_leaveplayer(function(player) - hud_bars[player] = nil - hud_levels[player] = nil - caches[player] = nil + hud_bars[player] = nil + hud_levels[player] = nil + caches[player] = nil end) minetest.register_on_dieplayer(function(player) @@ -247,3 +247,12 @@ end) minetest.register_on_mods_loaded(function() table.sort(mcl_experience.on_add_xp, function(a, b) return a.priority < b.priority end) end) + +mcl_gamemode.register_on_gamemode_change(function(player, old_gamemode, new_gamemode) + if new_gamemode == "survival" then + mcl_experience.setup_hud(player) + mcl_experience.update(player) + elseif new_gamemode == "creative" then + mcl_experience.remove_hud(player) + end +end) diff --git a/mods/HUD/mcl_experience/mod.conf b/mods/HUD/mcl_experience/mod.conf index 211249b30..a8e992c06 100644 --- a/mods/HUD/mcl_experience/mod.conf +++ b/mods/HUD/mcl_experience/mod.conf @@ -1,3 +1,4 @@ name = mcl_experience author = oilboi description = eXPerience mod +depends = mcl_gamemode diff --git a/mods/HUD/mcl_formspec/API.md b/mods/HUD/mcl_formspec/API.md new file mode 100644 index 000000000..64795f8c3 --- /dev/null +++ b/mods/HUD/mcl_formspec/API.md @@ -0,0 +1,40 @@ +# MineClone2 Formspec API + +## `mcl_formspec.label_color` + +Contains the color used for formspec labels, currently `#313131`. + +## `mcl_formspec.get_itemslot_bg(x, y, w, h)` + +Get the background of inventory slots (formspec version = 1) + +ex: + +```lua +local formspec = table.concat({ + mcl_formspec.get_itemslot_bg(0, 0, 5, 2), + "list[current_player;super_inventory;0,0;5,2;]", +}) +``` + +## `mcl_formspec.get_itemslot_bg_v4(x, y, w, h, size, texture)` + +Get the background of inventory slots (formspec version > 1) + +Works basically the same as `mcl_formspec.get_itemslot_bg(x, y, w, h)` but have more customisation options: + +- `size`: allow you to customize the size of the slot borders, default is 0.05 +- `texture`: allow you to specify a custom texture tu use instead of the default one + +ex: + +```lua +local formspec = table.concat({ + mcl_formspec.get_itemslot_bg_v4(0.375, 0.375, 5, 2, 0.1, "super_slot_background.png"), + "list[current_player;super_inventory;0.375,0.375;5,2;]", +}) +``` + +## `mcl_formspec.itemslot_border_size` + +Contains the default item slot border size used by `mcl_formspec.get_itemslot_bg_v4`, currently 0.05 diff --git a/mods/HUD/mcl_formspec/FORMSPEC_GUIDE.md b/mods/HUD/mcl_formspec/FORMSPEC_GUIDE.md new file mode 100644 index 000000000..a5f3d4745 --- /dev/null +++ b/mods/HUD/mcl_formspec/FORMSPEC_GUIDE.md @@ -0,0 +1,21 @@ +# MineClone2 Formspec Guide + +**_This guide will teach you the rules for creating formspecs for the MineClone2 game._** + +Formspecs are an important part of game and mod development. + +First of all, MineClone2 aims to support ONLY last formspec version. Many utility functions will not work with formspec v1 or v2. + +The typical width of an 9 slots width inventory formspec is `0.375 + 9 + ((9-1) * 0.25) + 0.375 = 11.75` + +Margins are 0.375. + +The labels color is `mcl_formspec.label_color` + +Space between 1st inventory line and the rest of inventory is 0.45 + +Labels should have 0.375 space above if there is no other stuff above and 0.45 between content + +- 0.375 under + +According to minetest modding book, table.concat is faster than string concatenation, so this method should be prefered (the code is also more clear) diff --git a/mods/HUD/mcl_formspec/init.lua b/mods/HUD/mcl_formspec/init.lua index 7013fc0ee..d449e937f 100644 --- a/mods/HUD/mcl_formspec/init.lua +++ b/mods/HUD/mcl_formspec/init.lua @@ -1,10 +1,55 @@ mcl_formspec = {} +mcl_formspec.label_color = "#313131" + +---Get the background of inventory slots (formspec version = 1) +---@param x number +---@param y number +---@param w number +---@param h number +---@return string function mcl_formspec.get_itemslot_bg(x, y, w, h) local out = "" for i = 0, w - 1, 1 do for j = 0, h - 1, 1 do - out = out .."image["..x+i..","..y+j..";1,1;mcl_formspec_itemslot.png]" + out = out .. "image[" .. x + i .. "," .. y + j .. ";1,1;mcl_formspec_itemslot.png]" + end + end + return out +end + +---This function will replace mcl_formspec.get_itemslot_bg then every formspec will be upgrade to version 4 +---@param x number +---@param y number +---@param size number +---@param texture? string +---@return string +---@nodiscard +local function get_slot(x, y, size, texture) + local t = "image[" .. x - size .. "," .. y - size .. ";" .. 1 + (size * 2) .. + "," .. 1 + (size * 2) .. ";" .. (texture and texture or "mcl_formspec_itemslot.png") .. "]" + return t +end + +mcl_formspec.itemslot_border_size = 0.05 + +---Get the background of inventory slots (formspec version > 1) +---@param x number +---@param y number +---@param w integer +---@param h integer +---@param size? number Optional size of the slot border (default: 0.05) +---@param texture? string Optional texture to replace the default one +---@return string +---@nodiscard +function mcl_formspec.get_itemslot_bg_v4(x, y, w, h, size, texture) + if not size then + size = mcl_formspec.itemslot_border_size + end + local out = "" + for i = 0, w - 1, 1 do + for j = 0, h - 1, 1 do + out = out .. get_slot(x + i + (i * 0.25), y + j + (j * 0.25), size, texture) end end return out diff --git a/mods/HUD/mcl_inventory/API.md b/mods/HUD/mcl_inventory/API.md new file mode 100644 index 000000000..5fc5a8d6e --- /dev/null +++ b/mods/HUD/mcl_inventory/API.md @@ -0,0 +1,35 @@ +# `mcl_inventory` + +## `mcl_inventory.register_survival_inventory_tab(def)` + +```lua +mcl_inventory.register_survival_inventory_tab({ + -- Page identifier + -- Used to uniquely identify the tab + id = "test", + + -- The tab description, can be translated + description = "Test", + + -- The name of the item that will be used as icon + item_icon = "mcl_core:stone", + + -- If true, the main inventory will be shown at the bottom of the tab + -- Listrings need to be added by hand + show_inventory = true, + + -- This function must return the tab's formspec for the player + build = function(player) + return "label[1,1;Hello hello]button[2,2;2,2;Hello;hey]" + end, + + -- This function will be called in the on_player_receive_fields callback if the tab is currently open + handle = function(player, fields) + print(dump(fields)) + end, + + -- This function will be called to know if a player can see the tab + -- Returns true by default + access = function(player) + end, +``` diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index 32bb226f0..bb2f226a2 100644 --- a/mods/HUD/mcl_inventory/creative.lua +++ b/mods/HUD/mcl_inventory/creative.lua @@ -3,19 +3,35 @@ local F = minetest.formspec_escape local C = minetest.colorize -- Prepare player info table +---@type table local players = {} -- Containing all the items for each Creative Mode tab +---@type table local inventory_lists = {} ---local mod_player = minetest.get_modpath("mcl_player") - -- Create tables -local builtin_filter_ids = {"blocks","deco","redstone","rail","food","tools","combat","mobs","brew","matr","misc","all"} +---@type string[] +local builtin_filter_ids = { + "blocks", + "deco", + "redstone", + "rail", + "food", + "tools", + "combat", + "mobs", + "brew", + "matr", + "misc", + "all" +} + for _, f in pairs(builtin_filter_ids) do inventory_lists[f] = {} end +---@param tbl string[] local function replace_enchanted_books(tbl) for k, item in ipairs(tbl) do if item:find("mcl_enchanting:book_enchanted") == 1 then @@ -28,20 +44,32 @@ local function replace_enchanted_books(tbl) end end ---[[ Populate all the item tables. We only do this once. Note this code must be -executed after loading all the other mods in order to work. ]] +-- Populate all the item tables. We only do this once. +-- Note this code must be executed after loading all the other mods in order to work. minetest.register_on_mods_loaded(function() - for name,def in pairs(minetest.registered_items) do - if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) and def.description and def.description ~= "" then + for name, def in pairs(minetest.registered_items) do + if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) and def.description and + def.description ~= "" then + ---@param def mt.ItemDef|mt.NodeDef local function is_redstone(def) - return def.mesecons or def.groups.mesecon or def.groups.mesecon_conductor_craftable or def.groups.mesecon_effecor_off + return def.mesecons or def.groups.mesecon or def.groups.mesecon_conductor_craftable or + def.groups.mesecon_effecor_off end + + ---@param def mt.ItemDef|mt.NodeDef local function is_tool(def) return def.groups.tool or (def.tool_capabilities and def.tool_capabilities.damage_groups == nil) end + + ---@param def mt.ItemDef|mt.NodeDef local function is_weapon_or_armor(def) - return def.groups.weapon or def.groups.weapon_ranged or def.groups.ammo or def.groups.combat_item or ((def.groups.armor_head or def.groups.armor_torso or def.groups.armor_legs or def.groups.armor_feet or def.groups.horse_armor) and def.groups.non_combat_armor ~= 1) + return def.groups.weapon or def.groups.weapon_ranged or def.groups.ammo or def.groups.combat_item or + ( + ( + def.groups.armor_head or def.groups.armor_torso or def.groups.armor_legs or def.groups.armor_feet or + def.groups.horse_armor) and def.groups.non_combat_armor ~= 1) end + -- Is set to true if it was added in any category besides misc local nonmisc = false if def.groups.building_block then @@ -110,6 +138,11 @@ minetest.register_on_mods_loaded(function() end end) +---@param name string +---@param description string +---@param lang mt.LangCode +---@param filter string +---@return integer local function filter_item(name, description, lang, filter) local desc if not lang then @@ -120,13 +153,16 @@ local function filter_item(name, description, lang, filter) return string.find(name, filter, nil, true) or string.find(desc, filter, nil, true) end +---@param filter string +---@param player mt.PlayerObjectRef local function set_inv_search(filter, player) local playername = player:get_player_name() - local inv = minetest.get_inventory({type="detached", name="creative_"..playername}) + local inv = minetest.get_inventory({ type = "detached", name = "creative_" .. playername }) local creative_list = {} local lang = minetest.get_player_information(playername).lang_code - for name,def in pairs(minetest.registered_items) do - if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) and def.description and def.description ~= "" then + for name, def in pairs(minetest.registered_items) do + if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) and def.description and + def.description ~= "" then if filter_item(string.lower(def.name), def.description, lang, filter) then table.insert(creative_list, name) end @@ -147,9 +183,11 @@ local function set_inv_search(filter, player) inv:set_list("main", creative_list) end +---@param page string +---@param player mt.PlayerObjectRef local function set_inv_page(page, player) local playername = player:get_player_name() - local inv = minetest.get_inventory({type="detached", name="creative_"..playername}) + local inv = minetest.get_inventory({ type = "detached", name = "creative_" .. playername }) inv:set_size("main", 0) local creative_list = {} if inventory_lists[page] then -- Standard filter @@ -160,9 +198,11 @@ local function set_inv_page(page, player) inv:set_list("main", creative_list) end + +---@param player mt.PlayerObjectRef local function init(player) local playername = player:get_player_name() - minetest.create_detached_inventory("creative_"..playername, { + minetest.create_detached_inventory("creative_" .. playername, { allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) if minetest.is_creative_enabled(playername) then return count @@ -197,24 +237,45 @@ local trash = minetest.create_detached_inventory("trash", { inv:set_stack(listname, index, "") end, }) + trash:set_size("main", 1) -local noffset = {} -- numeric tab offset -local offset = {} -- string offset: -local boffset = {} -- -local hoch = {} -local filtername = {} ---local bg = {} +------------------------------ +-- Formspec Precalculations -- +------------------------------ -local noffset_x_start = -0.24 +-- Numeric position of tab background image, indexed by tab name +---@type table +local noffset = {} + +-- String position of tab button background image, indexed by tab name +---@type table +local offset = {} + +-- String position of tab button, indexed by tab name +---@type table +local boffset = {} + +-- Used to determine the tab button background image +---@type table +local button_bg_postfix = {} + +-- Tab caption/tooltip translated string, indexed by tab name +---@type table +local filtername = {} + +local noffset_x_start = 0.2 local noffset_x = noffset_x_start -local noffset_y = -0.25 +local noffset_y = -1.34 + +---@param id string +---@param right? boolean local function next_noffset(id, right) if right then - noffset[id] = { 8.94, noffset_y } + noffset[id] = { 11.3, noffset_y } else noffset[id] = { noffset_x, noffset_y } - noffset_x = noffset_x + 1.25 + noffset_x = noffset_x + 1.6 end end @@ -228,7 +289,7 @@ next_noffset("misc") next_noffset("nix", true) noffset_x = noffset_x_start -noffset_y = 8.12 +noffset_y = 8.64 -- Lower row next_noffset("food") @@ -238,25 +299,25 @@ next_noffset("mobs") next_noffset("matr") next_noffset("inv", true) -for k,v in pairs(noffset) do +for k, v in pairs(noffset) do offset[k] = tostring(v[1]) .. "," .. tostring(v[2]) - boffset[k] = tostring(v[1]+0.19) .. "," .. tostring(v[2]+0.25) + boffset[k] = tostring(v[1] + 0.24) .. "," .. tostring(v[2] + 0.25) end -hoch["blocks"] = "" -hoch["deco"] = "" -hoch["redstone"] = "" -hoch["rail"] = "" -hoch["brew"] = "" -hoch["misc"] = "" -hoch["nix"] = "" -hoch["default"] = "" -hoch["food"] = "_down" -hoch["tools"] = "_down" -hoch["combat"] = "_down" -hoch["mobs"] = "_down" -hoch["matr"] = "_down" -hoch["inv"] = "_down" +button_bg_postfix["blocks"] = "" +button_bg_postfix["deco"] = "" +button_bg_postfix["redstone"] = "" +button_bg_postfix["rail"] = "" +button_bg_postfix["brew"] = "" +button_bg_postfix["misc"] = "" +button_bg_postfix["nix"] = "" +button_bg_postfix["default"] = "" +button_bg_postfix["food"] = "_down" +button_bg_postfix["tools"] = "_down" +button_bg_postfix["combat"] = "_down" +button_bg_postfix["mobs"] = "_down" +button_bg_postfix["matr"] = "_down" +button_bg_postfix["inv"] = "_down" filtername["blocks"] = S("Building Blocks") filtername["deco"] = S("Decoration Blocks") @@ -291,197 +352,252 @@ filtername["inv"] = S("Survival Inventory") bg["default"] = dark_bg end]] +-- Item name representing a tab, indexed by tab name +---@type table +local tab_icon = { + blocks = "mcl_core:brick_block", + deco = "mcl_flowers:peony", + redstone = "mesecons:redstone", + rail = "mcl_minecarts:golden_rail", + misc = "mcl_buckets:bucket_lava", + nix = "mcl_compass:compass", + food = "mcl_core:apple", + tools = "mcl_core:axe_iron", + combat = "mcl_core:sword_gold", + mobs = "mobs_mc:cow", + brew = "mcl_potions:dragon_breath", + matr = "mcl_core:stick", + inv = "mcl_chests:chest", +} + +-- Get the player configured stack size when taking items from creative inventory +---@param player mt.PlayerObjectRef +---@return integer local function get_stack_size(player) return player:get_meta():get_int("mcl_inventory:switch_stack") end +-- Set the player configured stack size when taking items from creative inventory +---@param player mt.PlayerObjectRef +---@param n integer local function set_stack_size(player, n) player:get_meta():set_int("mcl_inventory:switch_stack", n) end -minetest.register_on_joinplayer(function (player) +minetest.register_on_joinplayer(function(player) if get_stack_size(player) == 0 then set_stack_size(player, 64) end end) +---@param player mt.PlayerObjectRef function mcl_inventory.set_creative_formspec(player) local playername = player:get_player_name() if not players[playername] then return end local start_i = players[playername].start_i - local pagenum = start_i / (9*5) + 1 - local name = players[playername].page + local pagenum = start_i / (9 * 5) + 1 + local page = players[playername].page local inv_size = players[playername].inv_size local filter = players[playername].filter - local pagemax = math.max(1, math.floor((inv_size-1) / (9*5) + 1)) + + if not inv_size then + if page == "nix" then + local inv = minetest.get_inventory({ type = "detached", name = "creative_" .. playername }) + inv_size = inv:get_size("main") + elseif page and page ~= "inv" then + inv_size = #(inventory_lists[page]) + else + inv_size = 0 + end + end + local pagemax = math.max(1, math.floor((inv_size - 1) / (9 * 5) + 1)) + local name = "nix" local main_list - local listrings = "listring[detached:creative_"..playername..";main]".. - "listring[current_player;main]".. - "listring[detached:trash;main]" + local listrings = table.concat({ + "listring[detached:creative_" .. playername .. ";main]", + "listring[current_player;main]", + "listring[detached:trash;main]", + }) + + if page then + name = page + if players[playername] then + players[playername].page = page + end + end - local inv_bg = "crafting_inventory_creative.png" if name == "inv" then - inv_bg = "crafting_inventory_creative_survival.png" - -- Background images for armor slots (hide if occupied) local armor_slot_imgs = "" local inv = player:get_inventory() if inv:get_stack("armor", 2):is_empty() then - armor_slot_imgs = armor_slot_imgs .. "image[2.5,1.3;1,1;mcl_inventory_empty_armor_slot_helmet.png]" + armor_slot_imgs = armor_slot_imgs .. "image[3.5,0.375;1,1;mcl_inventory_empty_armor_slot_helmet.png]" end if inv:get_stack("armor", 3):is_empty() then - armor_slot_imgs = armor_slot_imgs .. "image[2.5,2.75;1,1;mcl_inventory_empty_armor_slot_chestplate.png]" + armor_slot_imgs = armor_slot_imgs .. "image[3.5,2.125;1,1;mcl_inventory_empty_armor_slot_chestplate.png]" end if inv:get_stack("armor", 4):is_empty() then - armor_slot_imgs = armor_slot_imgs .. "image[5.5,1.3;1,1;mcl_inventory_empty_armor_slot_leggings.png]" + armor_slot_imgs = armor_slot_imgs .. "image[7.25,0.375;1,1;mcl_inventory_empty_armor_slot_leggings.png]" end if inv:get_stack("armor", 5):is_empty() then - armor_slot_imgs = armor_slot_imgs .. "image[5.5,2.75;1,1;mcl_inventory_empty_armor_slot_boots.png]" + armor_slot_imgs = armor_slot_imgs .. "image[7.25,2.125;1,1;mcl_inventory_empty_armor_slot_boots.png]" end if inv:get_stack("offhand", 1):is_empty() then - armor_slot_imgs = armor_slot_imgs .. "image[1.5,2.025;1,1;mcl_inventory_empty_armor_slot_shield.png]" + armor_slot_imgs = armor_slot_imgs .. "image[2.25,1.25;1,1;mcl_inventory_empty_armor_slot_shield.png]" end local stack_size = get_stack_size(player) -- Survival inventory slots - main_list = "list[current_player;main;0,3.75;9,3;9]" .. - mcl_formspec.get_itemslot_bg(0, 3.75, 9, 3) .. - + main_list = table.concat({ + mcl_formspec.get_itemslot_bg_v4(0.375, 3.375, 9, 3), + "list[current_player;main;0.375,3.375;9,3;9]", + -- Armor - "list[current_player;armor;2.5,1.3;1,1;1]" .. - "list[current_player;armor;2.5,2.75;1,1;2]" .. - "list[current_player;armor;5.5,1.3;1,1;3]" .. - "list[current_player;armor;5.5,2.75;1,1;4]" .. - mcl_formspec.get_itemslot_bg(2.5, 1.3, 1, 1) .. - mcl_formspec.get_itemslot_bg(2.5, 2.75, 1, 1) .. - mcl_formspec.get_itemslot_bg(5.5, 1.3, 1, 1) .. - mcl_formspec.get_itemslot_bg(5.5, 2.75, 1, 1) .. - "list[current_player;offhand;1.5,2.025;1,1]" .. - mcl_formspec.get_itemslot_bg(1.5, 2.025, 1, 1) .. - armor_slot_imgs .. - + mcl_formspec.get_itemslot_bg_v4(3.5, 0.375, 1, 1), + mcl_formspec.get_itemslot_bg_v4(3.5, 2.125, 1, 1), + mcl_formspec.get_itemslot_bg_v4(7.25, 0.375, 1, 1), + mcl_formspec.get_itemslot_bg_v4(7.25, 2.125, 1, 1), + "list[current_player;armor;3.5,0.375;1,1;1]", + "list[current_player;armor;3.5,2.125;1,1;2]", + "list[current_player;armor;7.25,0.375;1,1;3]", + "list[current_player;armor;7.25,2.125;1,1;4]", + + -- Offhand + mcl_formspec.get_itemslot_bg_v4(2.25, 1.25, 1, 1), + "list[current_player;offhand;2.25,1.25;1,1]", + + armor_slot_imgs, + -- Player preview - mcl_player.get_player_formspec_model(player, 3.9, 1.4, 1.2333, 2.4666, "") .. - + "image[4.75,0.33;2.25,2.83;mcl_inventory_background9.png;2]", + mcl_player.get_player_formspec_model(player, 4.75, 0.45, 2.25, 2.75, ""), + -- Crafting guide button - "image_button[9,1;1,1;craftguide_book.png;__mcl_craftguide;]" .. - "tooltip[__mcl_craftguide;"..F(S("Recipe book")) .. "]" .. - + "image_button[11.575,0.825;1.1,1.1;craftguide_book.png;__mcl_craftguide;]", + "tooltip[__mcl_craftguide;" .. F(S("Recipe book")) .. "]", + -- Help button - "image_button[9,2;1,1;doc_button_icon_lores.png;__mcl_doc;]" .. - "tooltip[__mcl_doc;" .. F(S("Help")) .. "]" .. - - -- Achievements button - "image_button[9,3;1,1;mcl_achievements_button.png;__mcl_achievements;]" .. - --"style_type[image_button;border=;bgimg=;bgimg_pressed=]" .. - "tooltip[__mcl_achievements;"..F(S("Advancements")) .. "]" .. - + "image_button[11.575,2.075;1.1,1.1;doc_button_icon_lores.png;__mcl_doc;]", + "tooltip[__mcl_doc;" .. F(S("Help")) .. "]", + + -- Advancements button + "image_button[11.575,3.325;1.1,1.1;mcl_achievements_button.png;__mcl_achievements;]", + --"style_type[image_button;border=;bgimg=;bgimg_pressed=]", + "tooltip[__mcl_achievements;" .. F(S("Advancements")) .. "]", + -- Switch stack size button - "image_button[9,4;1,1;default_apple.png;__switch_stack;]" .. - "label[9.4,4.4;" .. F(C("#FFFFFF", stack_size ~= 1 and stack_size or "")) .. "]" .. - "tooltip[__switch_stack;" .. F(S("Switch stack size")) .. "]" - - -- Skins button - if minetest.global_exists("mcl_skins") then - main_list = main_list .. - "image_button[9,5;1,1;mcl_skins_button.png;__mcl_skins;]" .. - "tooltip[__mcl_skins;"..F(S("Select player skin")) .. "]" - end + "image_button[11.575,4.575;1.1,1.1;default_apple.png;__switch_stack;]", + "label[12.275,5.35;" .. F(C("#FFFFFF", tostring(stack_size ~= 1 and stack_size or ""))) .. "]", + "tooltip[__switch_stack;" .. F(S("Switch stack size")) .. "]", + + -- Skins button + "image_button[11.575,5.825;1.1,1.1;mcl_skins_button.png;__mcl_skins;]", + "tooltip[__mcl_skins;" .. F(S("Select player skin")) .. "]", + }) -- For shortcuts listrings = listrings .. - "listring[detached:"..playername.."_armor;armor]".. + "listring[detached:" .. playername .. "_armor;armor]" .. "listring[current_player;main]" else + + --local nb_lines = math.ceil(inv_size / 9) -- Creative inventory slots - main_list = "list[detached:creative_"..playername..";main;0,1.75;9,5;"..tostring(start_i).."]".. - mcl_formspec.get_itemslot_bg(0,1.75,9,5).. - -- Page buttons - "label[9.0,5.5;"..F(S("@1/@2", pagenum, pagemax)).."]".. - "image_button[9.0,6.0;0.7,0.7;crafting_creative_prev.png;creative_prev;]".. - "image_button[9.5,6.0;0.7,0.7;crafting_creative_next.png;creative_next;]" + main_list = table.concat({ + mcl_formspec.get_itemslot_bg_v4(0.375, 0.875, 9, 5), + + -- Basic code to replace buttons by scrollbar + -- Require Minetest 5.8 + -- + --"scroll_container[0.375,0.875;11.575,6;scroll;vertical;1.25]", + --"list[detached:creative_" .. playername .. ";main;0,0;9," .. nb_lines .. ";]", + --"scroll_container_end[]", + --"scrollbaroptions[min=0;max=" .. math.max(nb_lines - 5, 0) .. ";smallstep=1;largesteps=1;arrows=hide]", + --"scrollbar[11.75,0.825;0.75,6.1;vertical;scroll;0]", + + "list[detached:creative_" .. playername .. ";main;0.375,0.875;9,5;" .. tostring(start_i) .. "]", + + -- Page buttons + "label[11.65,4.33;" .. F(S("@1 / @2", pagenum, pagemax)) .. "]", + "image_button[11.575,4.58;1.1,1.1;crafting_creative_prev.png^[transformR270;creative_prev;]", + "image_button[11.575,5.83;1.1,1.1;crafting_creative_next.png^[transformR270;creative_next;]", + }) end - local tab_icon = { - blocks = "mcl_core:brick_block", - deco = "mcl_flowers:peony", - redstone = "mesecons:redstone", - rail = "mcl_minecarts:golden_rail", - misc = "mcl_buckets:bucket_lava", - nix = "mcl_compass:compass", - food = "mcl_core:apple", - tools = "mcl_core:axe_iron", - combat = "mcl_core:sword_gold", - mobs = "mobs_mc:cow", - brew = "mcl_potions:dragon_breath", - matr = "mcl_core:stick", - inv = "mcl_chests:chest", - } + ---@param current_tab string + ---@param this_tab string + ---@return string local function tab(current_tab, this_tab) local bg_img if current_tab == this_tab then - bg_img = "crafting_creative_active"..hoch[this_tab]..".png" + bg_img = "crafting_creative_active" .. button_bg_postfix[this_tab] .. ".png" else - bg_img = "crafting_creative_inactive"..hoch[this_tab]..".png" + bg_img = "crafting_creative_inactive" .. button_bg_postfix[this_tab] .. ".png" end - return - "style["..this_tab..";border=false;bgimg=;bgimg_pressed=]".. - "item_image_button[" .. boffset[this_tab] ..";1,1;"..tab_icon[this_tab]..";"..this_tab..";]".. - "image[" .. offset[this_tab] .. ";1.5,1.44;" .. bg_img .. "]" + return table.concat({ + "style[" .. this_tab .. ";border=false;bgimg=;bgimg_pressed=;noclip=true]", + "image[" .. offset[this_tab] .. ";1.5,1.44;" .. bg_img .. "]", + "item_image_button[" .. boffset[this_tab] .. ";1,1;" .. tab_icon[this_tab] .. ";" .. this_tab .. ";]", + "tooltip[blocks;" .. F(filtername[this_tab]) .. "]" + }) end + local caption = "" if name ~= "inv" and filtername[name] then - caption = "label[0,1.2;"..F(minetest.colorize("#313131", filtername[name])).."]" + caption = "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, filtername[name])) .. "]" end - local formspec = "size[10,9.3]".. - "no_prepend[]".. - mcl_vars.gui_nonbg..mcl_vars.gui_bg_color.. - "background[-0.19,-0.25;10.5,9.87;"..inv_bg.."]".. - "label[-5,-5;"..name.."]".. - tab(name, "blocks") .. - "tooltip[blocks;"..F(filtername["blocks"]).."]".. - tab(name, "deco") .. - "tooltip[deco;"..F(filtername["deco"]).."]".. - tab(name, "redstone") .. - "tooltip[redstone;"..F(filtername["redstone"]).."]".. - tab(name, "rail") .. - "tooltip[rail;"..F(filtername["rail"]).."]".. - tab(name, "misc") .. - "tooltip[misc;"..F(filtername["misc"]).."]".. - tab(name, "nix") .. - "tooltip[nix;"..F(filtername["nix"]).."]".. - caption.. - "list[current_player;main;0,7;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7,9,1).. - main_list.. - tab(name, "food") .. - "tooltip[food;"..F(filtername["food"]).."]".. - tab(name, "tools") .. - "tooltip[tools;"..F(filtername["tools"]).."]".. - tab(name, "combat") .. - "tooltip[combat;"..F(filtername["combat"]).."]".. - tab(name, "mobs") .. - "tooltip[mobs;"..F(filtername["mobs"]).."]".. - tab(name, "brew") .. - "tooltip[brew;"..F(filtername["brew"]).."]".. - tab(name, "matr") .. - "tooltip[matr;"..F(filtername["matr"]).."]".. - tab(name, "inv") .. - "tooltip[inv;"..F(filtername["inv"]).."]".. - "list[detached:trash;main;9,7;1,1;]".. - mcl_formspec.get_itemslot_bg(9,7,1,1).. - "image[9,7;1,1;crafting_creative_trash.png]".. - listrings + local formspec = table.concat({ + "formspec_version[6]", + "size[13,8.75]", + + "style_type[image;noclip=true]", + + -- Hotbar + mcl_formspec.get_itemslot_bg_v4(0.375, 7.375, 9, 1), + "list[current_player;main;0.375,7.375;9,1;]", + + -- Trash + mcl_formspec.get_itemslot_bg_v4(11.625, 7.375, 1, 1, nil, "crafting_creative_trash.png"), + "list[detached:trash;main;11.625,7.375;1,1;]", + + main_list, + + caption, + + listrings, + + tab(name, "blocks"), + tab(name, "deco"), + tab(name, "redstone"), + tab(name, "rail"), + tab(name, "misc"), + tab(name, "nix"), + + tab(name, "food"), + tab(name, "tools"), + tab(name, "combat"), + tab(name, "mobs"), + tab(name, "brew"), + tab(name, "matr"), + tab(name, "inv"), + }) if name == "nix" then - formspec = formspec .. "field[5.3,1.34;4,0.75;search;;"..minetest.formspec_escape(filter).."]" - formspec = formspec .. "field_close_on_enter[search;false]" + if filter == nil then + filter = "" + end + + formspec = formspec .. table.concat({ + "field[5.325,0.15;6.1,0.6;search;;" .. minetest.formspec_escape(filter) .. "]", + "field_close_on_enter[search;false]", + "set_focus[search;true]", + }) end - if pagenum then formspec = formspec .. "p"..tostring(pagenum) end + if pagenum then formspec = formspec .. "p" .. tostring(pagenum) end player:set_inventory_formspec(formspec) end @@ -500,50 +616,50 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.blocks then if players[name].page == "blocks" then return end - set_inv_page("blocks",player) + set_inv_page("blocks", player) page = "blocks" elseif fields.deco then if players[name].page == "deco" then return end - set_inv_page("deco",player) + set_inv_page("deco", player) page = "deco" elseif fields.redstone then if players[name].page == "redstone" then return end - set_inv_page("redstone",player) + set_inv_page("redstone", player) page = "redstone" elseif fields.rail then if players[name].page == "rail" then return end - set_inv_page("rail",player) + set_inv_page("rail", player) page = "rail" elseif fields.misc then if players[name].page == "misc" then return end - set_inv_page("misc",player) + set_inv_page("misc", player) page = "misc" elseif fields.nix then - set_inv_page("all",player) + set_inv_page("all", player) page = "nix" elseif fields.food then if players[name].page == "food" then return end - set_inv_page("food",player) + set_inv_page("food", player) page = "food" elseif fields.tools then if players[name].page == "tools" then return end - set_inv_page("tools",player) + set_inv_page("tools", player) page = "tools" elseif fields.combat then if players[name].page == "combat" then return end - set_inv_page("combat",player) + set_inv_page("combat", player) page = "combat" elseif fields.mobs then if players[name].page == "mobs" then return end - set_inv_page("mobs",player) + set_inv_page("mobs", player) page = "mobs" elseif fields.brew then if players[name].page == "brew" then return end - set_inv_page("brew",player) + set_inv_page("brew", player) page = "brew" elseif fields.matr then if players[name].page == "matr" then return end - set_inv_page("matr",player) + set_inv_page("matr", player) page = "matr" elseif fields.inv then if players[name].page == "inv" then return end @@ -552,7 +668,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) set_inv_page("all", player) page = "nix" elseif fields.search and not fields.creative_next and not fields.creative_prev then - set_inv_search(string.lower(fields.search),player) + set_inv_search(string.lower(fields.search), player) page = "nix" elseif fields.__switch_stack then local switch = 1 @@ -570,20 +686,20 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local start_i = players[name].start_i if fields.creative_prev then - start_i = start_i - 9*5 + start_i = start_i - 9 * 5 elseif fields.creative_next then - start_i = start_i + 9*5 + start_i = start_i + 9 * 5 else -- Reset scroll bar if not scrolled start_i = 0 end if start_i < 0 then - start_i = start_i + 9*5 + start_i = start_i + 9 * 5 end local inv_size if page == "nix" then - local inv = minetest.get_inventory({type="detached", name="creative_"..name}) + local inv = minetest.get_inventory({ type = "detached", name = "creative_" .. name }) inv_size = inv:get_size("main") elseif page and page ~= "inv" then inv_size = #(inventory_lists[page]) @@ -593,7 +709,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) players[name].inv_size = inv_size if start_i >= inv_size then - start_i = start_i - 9*5 + start_i = start_i - 9 * 5 end if start_i < 0 or start_i >= inv_size then start_i = 0 @@ -609,11 +725,34 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) mcl_inventory.set_creative_formspec(player) end) - minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack) return placer and placer:is_player() and minetest.is_creative_enabled(placer:get_player_name()) end) +if minetest.is_creative_enabled("") then + minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack) + -- Place infinite nodes, except for shulker boxes + local group = minetest.get_item_group(itemstack:get_name(), "shulker_box") + return group == 0 or group == nil + end) + + function minetest.handle_node_drops(pos, drops, digger) + if not digger or not digger:is_player() then + for _, item in ipairs(drops) do + minetest.add_item(pos, item) + end + end + local inv = digger:get_inventory() + if inv then + for _, item in ipairs(drops) do + if not inv:contains_item("main", item, true) then + inv:add_item("main", item) + end + end + end + end +end + minetest.register_on_joinplayer(function(player) -- Initialize variables and inventory local name = player:get_player_name() @@ -629,7 +768,8 @@ minetest.register_on_joinplayer(function(player) end) minetest.register_on_player_inventory_action(function(player, action, inventory, inventory_info) - if minetest.is_creative_enabled(player:get_player_name()) and get_stack_size(player) == 64 and action == "put" and inventory_info.listname == "main" then + if minetest.is_creative_enabled(player:get_player_name()) and get_stack_size(player) == 64 and action == "put" and + inventory_info.listname == "main" then local stack = inventory_info.stack stack:set_count(stack:get_stack_max()) player:get_inventory():set_stack("main", inventory_info.index, stack) diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua index 4ca0f2a73..cf484101c 100644 --- a/mods/HUD/mcl_inventory/init.lua +++ b/mods/HUD/mcl_inventory/init.lua @@ -1,13 +1,17 @@ -local S = minetest.get_translator(minetest.get_current_modname()) -local F = minetest.formspec_escape - mcl_inventory = {} +dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/creative.lua") +dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/survival.lua") + --local mod_player = minetest.get_modpath("mcl_player") --local mod_craftguide = minetest.get_modpath("mcl_craftguide") --- Returns a single itemstack in the given inventory to the main inventory, or drop it when there's no space left -function return_item(itemstack, dropper, pos, inv) +---Returns a single itemstack in the given inventory to the main inventory, or drop it when there's no space left. +---@param itemstack mt.ItemStack +---@param dropper mt.ObjectRef +---@param pos mt.Vector +---@param inv mt.InvRef +local function return_item(itemstack, dropper, pos, inv) if dropper:is_player() then -- Return to main inventory if inv:room_for_item("main", itemstack) then @@ -15,14 +19,14 @@ function return_item(itemstack, dropper, pos, inv) else -- Drop item on the ground local v = dropper:get_look_dir() - local p = {x=pos.x, y=pos.y+1.2, z=pos.z} - p.x = p.x+(math.random(1,3)*0.2) - p.z = p.z+(math.random(1,3)*0.2) + local p = vector.offset(pos, 0, 1.2, 0) + p.x = p.x + (math.random(1, 3) * 0.2) + p.z = p.z + (math.random(1, 3) * 0.2) local obj = minetest.add_item(p, itemstack) if obj then - v.x = v.x*4 - v.y = v.y*4 + 2 - v.z = v.z*4 + v.x = v.x * 4 + v.y = v.y * 4 + 2 + v.z = v.z * 4 obj:set_velocity(v) obj:get_luaentity()._insta_collect = false end @@ -34,111 +38,53 @@ function return_item(itemstack, dropper, pos, inv) return itemstack end --- Return items in the given inventory list (name) to the main inventory, or drop them if there is no space left -function return_fields(player, name) +---Return items in the given inventory list (name) to the main inventory, or drop them if there is no space left. +---@param player mt.PlayerObjectRef +---@param name string +local function return_fields(player, name) local inv = player:get_inventory() + local list = inv:get_list(name) if not list then return end - for i,stack in ipairs(list) do + for i, stack in ipairs(list) do return_item(stack, player, player:get_pos(), inv) stack:clear() inv:set_stack(name, i, stack) end end -local function set_inventory(player) +---@param player mt.PlayerObjectRef +---@param armor_change_only? boolean +local function set_inventory(player, armor_change_only) if minetest.is_creative_enabled(player:get_player_name()) then - mcl_inventory.set_creative_formspec(player) + if armor_change_only then + -- Stay on survival inventory plage if only the armor has been changed + mcl_inventory.set_creative_formspec(player, 0, 0, nil, nil, "inv") + else + mcl_inventory.set_creative_formspec(player, 0, 1) + end return end - local inv = player:get_inventory() - inv:set_width("craft", 2) - inv:set_size("craft", 4) - local armor_slots = {"helmet", "chestplate", "leggings", "boots"} - local armor_slot_imgs = "" - for a=1,4 do - if inv:get_stack("armor", a+1):is_empty() then - armor_slot_imgs = armor_slot_imgs .. "image[0,"..(a-1)..";1,1;mcl_inventory_empty_armor_slot_"..armor_slots[a]..".png]" - end - end - - if inv:get_stack("offhand", 1):is_empty() then - armor_slot_imgs = armor_slot_imgs .. "image[3,2;1,1;mcl_inventory_empty_armor_slot_shield.png]" - end - - local form = "size[9,8.75]" .. - "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png]" .. - mcl_player.get_player_formspec_model(player, 1.0, 0.0, 2.25, 4.5, "") .. - - -- Armor - "list[current_player;armor;0,0;1,1;1]" .. - "list[current_player;armor;0,1;1,1;2]" .. - "list[current_player;armor;0,2;1,1;3]" .. - "list[current_player;armor;0,3;1,1;4]" .. - mcl_formspec.get_itemslot_bg(0,0,1,1) .. - mcl_formspec.get_itemslot_bg(0,1,1,1) .. - mcl_formspec.get_itemslot_bg(0,2,1,1) .. - mcl_formspec.get_itemslot_bg(0,3,1,1) .. - "list[current_player;offhand;3,2;1,1]" .. - mcl_formspec.get_itemslot_bg(3,2,1,1) .. - armor_slot_imgs .. - - -- Craft and inventory - "label[0,4;"..F(minetest.colorize("#313131", S("Inventory"))) .. "]" .. - "list[current_player;main;0,4.5;9,3;9]" .. - "list[current_player;main;0,7.74;9,1;]" .. - "label[4,0.5;"..F(minetest.colorize("#313131", S("Crafting"))) .. "]" .. - "list[current_player;craft;4,1;2,2]" .. - "list[current_player;craftpreview;7,1.5;1,1;]" .. - mcl_formspec.get_itemslot_bg(0, 4.5, 9, 3) .. - mcl_formspec.get_itemslot_bg(0, 7.74, 9, 1) .. - mcl_formspec.get_itemslot_bg(4, 1,2, 2) .. - mcl_formspec.get_itemslot_bg(7, 1.5, 1, 1) .. - - -- Crafting guide button - "image_button[4.5,3;1,1;craftguide_book.png;__mcl_craftguide;]" .. - "tooltip[__mcl_craftguide;"..F(S("Recipe book")) .. "]" .. - - -- Help button - "image_button[8,3;1,1;doc_button_icon_lores.png;__mcl_doc;]" .. - "tooltip[__mcl_doc;" .. F(S("Help")) .. "]" - - -- Skins button - if minetest.global_exists("mcl_skins") then - form = form .. - "image_button[3,3;1,1;mcl_skins_button.png;__mcl_skins;]" .. - "tooltip[__mcl_skins;" .. F(S("Select player skin")) .. "]" - end - - form = form .. - -- Achievements button - "image_button[7,3;1,1;mcl_achievements_button.png;__mcl_achievements;]" .. - "tooltip[__mcl_achievements;" .. F(S("Advancements")) .. "]" .. - - -- For shortcuts - "listring[current_player;main]" .. - "listring[current_player;armor]" .. - "listring[current_player;main]" .. - "listring[current_player;craft]" .. - "listring[current_player;main]" - - player:set_inventory_formspec(form) + player:set_inventory_formspec(mcl_inventory.build_survival_formspec(player)) end -- Drop items in craft grid and reset inventory on closing minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.quit then - return_fields(player,"craft") - return_fields(player,"enchanting_lapis") - return_fields(player,"enchanting_item") + return_fields(player, "craft") + return_fields(player, "enchanting_lapis") + return_fields(player, "enchanting_item") if not minetest.is_creative_enabled(player:get_player_name()) and (formname == "" or formname == "main") then set_inventory(player) end end end) -mcl_inventory.update_inventory_formspec = set_inventory + +function mcl_inventory.update_inventory_formspec(player) + set_inventory(player) +end -- Drop crafting grid items on leaving minetest.register_on_leaveplayer(function(player) @@ -150,6 +96,7 @@ end) minetest.register_on_joinplayer(function(player) --init inventory local inv = player:get_inventory() + inv:set_width("main", 9) inv:set_size("main", 36) inv:set_size("offhand", 1) @@ -174,73 +121,18 @@ minetest.register_on_joinplayer(function(player) return_fields(player, "enchanting_lapis") end) -dofile(minetest.get_modpath(minetest.get_current_modname()).."/creative.lua") +---@param player mt.PlayerObjectRef +function mcl_inventory.update_inventory(player) + local player_gamemode = mcl_gamemode.get_gamemode(player) + if player_gamemode == "creative" then + mcl_inventory.set_creative_formspec(player) + elseif player_gamemode == "survival" then + player:set_inventory_formspec(mcl_inventory.build_survival_formspec(player)) + end +end + +mcl_gamemode.register_on_gamemode_change(function(player, old_gamemode, new_gamemode) + set_inventory(player) +end) mcl_player.register_on_visual_change(mcl_inventory.update_inventory_formspec) - -local mt_is_creative_enabled = minetest.is_creative_enabled - -function minetest.is_creative_enabled(name) - if mt_is_creative_enabled(name) then return true end - if not name then return false end - local p = minetest.get_player_by_name(name) - if p then - return p:get_meta():get_string("gamemode") == "creative" - end - return false -end - -local function in_table(n,h) - for k,v in pairs(h) do - if v == n then return true end - end - return false -end - -local gamemodes = { - "survival", - "creative" -} - -function mcl_inventory.player_set_gamemode(p,g) - local m = p:get_meta() - m:set_string("gamemode",g) - if g == "survival" then - mcl_experience.setup_hud(p) - mcl_experience.update(p) - elseif g == "creative" then - mcl_experience.remove_hud(p) - end - mcl_meshhand.update_player(p) - set_inventory(p) -end - -minetest.register_chatcommand("gamemode",{ - params = S("[] []"), - description = S("Change gamemode (survival/creative) for yourself or player"), - privs = { server = true }, - func = function(n,param) - -- Full input validation ( just for @erlehmann <3 ) - local p - local args = param:split(" ") - if args[2] ~= nil then - p = minetest.get_player_by_name(args[2]) - n = args[2] - else - p = minetest.get_player_by_name(n) - end - if not p then - return false, S("Player not online") - end - if args[1] ~= nil and not in_table(args[1],gamemodes) then - return false, S("Gamemode " .. args[1] .. " does not exist.") - elseif args[1] ~= nil then - mcl_inventory.player_set_gamemode(p,args[1]) - end - - --Result message - show effective game mode - local gm = p:get_meta():get_string("gamemode") - if gm == "" then gm = gamemodes[1] end - return true, S("Gamemode for player ")..n..S(": "..gm) - end -}) diff --git a/mods/HUD/mcl_inventory/locale/mcl_inventory.ru.tr b/mods/HUD/mcl_inventory/locale/mcl_inventory.ru.tr index d378e168b..a5c52bc1d 100644 --- a/mods/HUD/mcl_inventory/locale/mcl_inventory.ru.tr +++ b/mods/HUD/mcl_inventory/locale/mcl_inventory.ru.tr @@ -1,21 +1,21 @@ # textdomain: mcl_inventory Recipe book=Книга рецептов -Help=Помощь -Select player skin=Выбор скина +Help=Справка +Select player skin=Выбор внешности Achievements=Достижения Building Blocks=Строительные блоки -Decoration Blocks=Декоративные блоки -Redstone=Редстоун (красный камень) +Decoration Blocks=Отделочные блоки +Redstone=Красный камень Transportation=Транспорт Brewing=Зелья Miscellaneous=Прочее -Search Items=Искать предметы +Search Items=Поиск предметов Foodstuffs=Продовольствие Tools=Инструменты Combat=Битва -Mobs=Мобы +Mobs=Сущности Materials=Материалы Survival Inventory=Инвентарь выживания -Crafting=Крафтинг (изготовление) +Crafting=Создание Inventory=Инвентарь @1/@2=@1/@2 diff --git a/mods/HUD/mcl_inventory/mod.conf b/mods/HUD/mcl_inventory/mod.conf index e42213d4f..66f175c3b 100644 --- a/mods/HUD/mcl_inventory/mod.conf +++ b/mods/HUD/mcl_inventory/mod.conf @@ -1,5 +1,5 @@ name = mcl_inventory author = BlockMen description = Adds the player inventory and creative inventory. -depends = mcl_init, mcl_formspec, mcl_enchanting, mcl_player -optional_depends = mcl_armor, mcl_brewing, mcl_potions, mcl_enchanting, mcl_craftguide +depends = mcl_init, mcl_formspec, mcl_enchanting, mcl_gamemode +optional_depends = mcl_armor, mcl_brewing, mcl_potions, mcl_enchanting, mcl_craftguide, mcl_player diff --git a/mods/HUD/mcl_inventory/survival.lua b/mods/HUD/mcl_inventory/survival.lua new file mode 100644 index 000000000..5b5c6032c --- /dev/null +++ b/mods/HUD/mcl_inventory/survival.lua @@ -0,0 +1,224 @@ +---@diagnostic disable need-check-nil + +local table = table +local ipairs = ipairs + +local S = minetest.get_translator("mcl_inventory") +local F = minetest.formspec_escape + +---@type {id: string, description: string, item_icon: string, build: (fun(player: ObjectRef): string), handle: fun(player: ObjectRef, fields: table), access: (fun(player): boolean), show_inventory: boolean}[] +mcl_inventory.registered_survival_inventory_tabs = {} + +---@param def {id: string, description: string, item_icon: string, build: (fun(player: ObjectRef): string), handle: fun(player: ObjectRef, fields: table), access: (fun(player): boolean), show_inventory: boolean} +function mcl_inventory.register_survival_inventory_tab(def) + if #mcl_inventory.registered_survival_inventory_tabs == 7 then + error("Too much tabs registered!") + end + + assert(def.id) + assert(def.description) + assert(def.item_icon) + assert(def.build) + assert(def.handle) + + for _, d in ipairs(mcl_inventory.registered_survival_inventory_tabs) do + assert(d.id ~= def.id, "Another tab exists with the same name!") + end + + if not def.access then + function def.access(player) + return true + end + end + + if def.show_inventory == nil then + def.show_inventory = true + end + + table.insert(mcl_inventory.registered_survival_inventory_tabs, def) +end + +local player_current_tab = {} + +minetest.register_on_joinplayer(function(player, last_login) + player_current_tab[player] = "main" +end) + +minetest.register_on_leaveplayer(function(player, timed_out) + player_current_tab[player] = nil +end) + +---@param player ObjectRef +---@param content string +---@param inventory boolean +---@param tabname string +local function build_page(player, content, inventory, tabname) + local tab_buttons = "style_type[image;noclip=true]" + + if #mcl_inventory.registered_survival_inventory_tabs ~= 1 then + for i, d in ipairs(mcl_inventory.registered_survival_inventory_tabs) do + local btn_name = "tab_" .. d.id + + tab_buttons = tab_buttons .. table.concat({ + "style[" .. btn_name .. ";border=false;bgimg=;bgimg_pressed=;noclip=true]", + "image[" .. + (0.2 + (i - 1) * 1.6) .. + ",-1.34;1.5,1.44;" .. (tabname == d.id and "crafting_creative_active.png" or "crafting_creative_inactive.png") .. + "]", + "item_image_button[" .. (0.44 + (i - 1) * 1.6) .. ",-1.1;1,1;" .. d.item_icon .. ";" .. btn_name .. ";]", + "tooltip[" .. btn_name .. ";" .. F(d.description) .. "]" + }) + end + end + + return table.concat({ + "formspec_version[6]", + "size[11.75,10.9]", + + inventory and table.concat({ + --Main inventory + mcl_formspec.get_itemslot_bg_v4(0.375, 5.575, 9, 3), + "list[current_player;main;0.375,5.575;9,3;9]", + + --Hotbar + mcl_formspec.get_itemslot_bg_v4(0.375, 9.525, 9, 1), + "list[current_player;main;0.375,9.525;9,1;]" + }) or "", + + content, + tab_buttons, + }) +end + +local main_page_static = table.concat({ + --Armor slots + mcl_formspec.get_itemslot_bg_v4(0.375, 0.375, 1, 4), + "list[current_player;armor;0.375,0.375;1,1;1]", + "list[current_player;armor;0.375,1.625;1,1;2]", + "list[current_player;armor;0.375,2.875;1,1;3]", + "list[current_player;armor;0.375,4.125;1,1;4]", + + --Player model background + "image[1.57,0.343;3.62,4.85;mcl_inventory_background9.png;2]", + + --Offhand + mcl_formspec.get_itemslot_bg_v4(5.375, 4.125, 1, 1), + "list[current_player;offhand;5.375,4.125;1,1]", + + --Craft grid + "label[6.61,0.5;" .. F(minetest.colorize(mcl_formspec.label_color, S("Crafting"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(6.625, 0.875, 2, 2), + "list[current_player;craft;6.625,0.875;2,2]", + + "image[9.125,1.5;1,1;crafting_formspec_arrow.png]", + + mcl_formspec.get_itemslot_bg_v4(10.375, 1.5, 1, 1), + "list[current_player;craftpreview;10.375,1.5;1,1;]", + + --Crafting guide button + "image_button[6.575,4.075;1.1,1.1;craftguide_book.png;__mcl_craftguide;]", + "tooltip[__mcl_craftguide;" .. F(S("Recipe book")) .. "]", + + --Help button + "image_button[7.825,4.075;1.1,1.1;doc_button_icon_lores.png;__mcl_doc;]", + "tooltip[__mcl_doc;" .. F(S("Help")) .. "]", + + --Skins button + "image_button[9.075,4.075;1.1,1.1;mcl_skins_button.png;__mcl_skins;]", + "tooltip[__mcl_skins;" .. F(S("Select player skin")) .. "]", + + --Achievements button + "image_button[10.325,4.075;1.1,1.1;mcl_achievements_button.png;__mcl_achievements;]", + "tooltip[__mcl_achievements;" .. F(S("Achievements")) .. "]", + + --Listring + "listring[current_player;main]", + "listring[current_player;armor]", + "listring[current_player;main]", + "listring[current_player;craft]", + "listring[current_player;main]", +}) + +mcl_inventory.register_survival_inventory_tab({ + id = "main", + description = "Main Inventory", + item_icon = "mcl_crafting_table:crafting_table", + show_inventory = true, + build = function(player) + local inv = player:get_inventory() + + local armor_slots = { "helmet", "chestplate", "leggings", "boots" } + local armor_slot_imgs = "" + + for a = 1, 4 do + if inv:get_stack("armor", a + 1):is_empty() then + armor_slot_imgs = armor_slot_imgs .. + "image[0.375," .. (0.375 + (a - 1) * 1.25) .. ";1,1;mcl_inventory_empty_armor_slot_" .. armor_slots[a] .. ".png]" + end + end + + if inv:get_stack("offhand", 1):is_empty() then + armor_slot_imgs = armor_slot_imgs .. "image[5.375,4.125;1,1;mcl_inventory_empty_armor_slot_shield.png]" + end + return main_page_static .. armor_slot_imgs .. mcl_player.get_player_formspec_model(player, 1.57, 0.4, 3.62, 4.85, "") + end, + handle = function() end, +}) + +--[[ +mcl_inventory.register_survival_inventory_tab({ + id = "test", + description = "Test", + item_icon = "mcl_core:stone", + show_inventory = true, + build = function(player) + return "label[1,1;Hello hello]button[2,2;2,2;Hello;hey]" + end, + handle = function(player, fields) + print(dump(fields)) + end, +})]] + +---@param player ObjectRef +function mcl_inventory.build_survival_formspec(player) + local inv = player:get_inventory() + + inv:set_width("craft", 2) + inv:set_size("craft", 4) + + local tab = player_current_tab[player] + + local tab_def = nil + + for _, d in ipairs(mcl_inventory.registered_survival_inventory_tabs) do + if tab == d.id then + tab_def = d + break + end + end + + local form = build_page(player, tab_def.build(player), tab_def.show_inventory, tab) + + return form +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname == "" and #mcl_inventory.registered_survival_inventory_tabs ~= 1 and + mcl_gamemode.get_gamemode(player) == "survival" then + for _, d in ipairs(mcl_inventory.registered_survival_inventory_tabs) do + if fields["tab_" .. d.id] and d.access(player) then + player_current_tab[player] = d.id + mcl_inventory.update_inventory(player) + return + end + end + + for _, d in ipairs(mcl_inventory.registered_survival_inventory_tabs) do + if player_current_tab[player] == d.id and d.access(player) then + d.handle(player, fields) + return + end + end + end +end) diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua index dce69f26a..ae419a512 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua @@ -8,23 +8,36 @@ All node definitions share a lot of code, so this is the reason why there are so many weird tables below. ]] local S = minetest.get_translator(minetest.get_current_modname()) +local C = minetest.colorize +local F = minetest.formspec_escape --- For after_place_node +local dispenser_formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + + "label[4.125,0.375;" .. F(C(mcl_formspec.label_color, S("Dispenser"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(4.125, 0.75, 3, 3), + "list[context;main;4.125,0.75;3,3;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + "listring[context;main]", + "listring[current_player;main]", +}) + +---For after_place_node +---@param pos Vector local function setup_dispenser(pos) -- Set formspec and inventory - local form = "size[9,8.75]".. - "label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dispenser"))).."]".. - "list[context;main;3,0.5;3,3;]".. - mcl_formspec.get_itemslot_bg(3,0.5,3,3).. - "listring[context;main]".. - "listring[current_player;main]" local meta = minetest.get_meta(pos) - meta:set_string("formspec", form) + meta:set_string("formspec", dispenser_formspec) local inv = meta:get_inventory() inv:set_size("main", 9) end @@ -38,9 +51,9 @@ local function orientate_dispenser(pos, placer) local node = minetest.get_node(pos) if pitch > 55 then - minetest.swap_node(pos, {name="mcl_dispensers:dispenser_up", param2 = node.param2}) + minetest.swap_node(pos, { name = "mcl_dispensers:dispenser_up", param2 = node.param2 }) elseif pitch < -55 then - minetest.swap_node(pos, {name="mcl_dispensers:dispenser_down", param2 = node.param2}) + minetest.swap_node(pos, { name = "mcl_dispensers:dispenser_down", param2 = node.param2 }) end end @@ -85,11 +98,10 @@ local dispenserdef = { local meta2 = meta:to_table() meta:from_table(oldmetadata) local inv = meta:get_inventory() - for i=1, inv:get_size("main") do + for i = 1, inv:get_size("main") do local stack = inv:get_stack("main", i) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} - minetest.add_item(p, stack) + minetest.add_item(vector.offset(pos, math.random(0, 10) / 10 - 0.5, 0, math.random(0, 10) / 10 - 0.5), stack) end end meta:from_table(meta2) @@ -107,19 +119,19 @@ local dispenserdef = { dropdir = vector.multiply(minetest.facedir_to_dir(node.param2), -1) droppos = vector.add(pos, dropdir) elseif node.name == "mcl_dispensers:dispenser_up" then - dropdir = {x=0, y=1, z=0} - droppos = {x=pos.x, y=pos.y+1, z=pos.z} + dropdir = vector.new(0, 1, 0) + droppos = vector.offset(pos, 0, 1, 0) elseif node.name == "mcl_dispensers:dispenser_down" then - dropdir = {x=0, y=-1, z=0} - droppos = {x=pos.x, y=pos.y-1, z=pos.z} + dropdir = vector.new(0, -1, 0) + droppos = vector.offset(pos, 0, -1, 0) end local dropnode = minetest.get_node(droppos) local dropnodedef = minetest.registered_nodes[dropnode.name] local stacks = {} - for i=1,inv:get_size("main") do + for i = 1, inv:get_size("main") do local stack = inv:get_stack("main", i) if not stack:is_empty() then - table.insert(stacks, {stack = stack, stackpos = i}) + table.insert(stacks, { stack = stack, stackpos = i }) end end if #stacks >= 1 then @@ -143,9 +155,10 @@ local dispenserdef = { -- Armor, mob heads and pumpkins if igroups.armor then - local droppos_below = {x = droppos.x, y = droppos.y - 1, z = droppos.z} + local droppos_below = vector.offset(droppos, 0, -1, 0) - for _, objs in ipairs({minetest.get_objects_inside_radius(droppos, 1), minetest.get_objects_inside_radius(droppos_below, 1)}) do + for _, objs in ipairs({ minetest.get_objects_inside_radius(droppos, 1), + minetest.get_objects_inside_radius(droppos_below, 1) }) do for _, obj in ipairs(objs) do stack = mcl_armor.equip(stack, obj) if stack:is_empty() then @@ -157,11 +170,11 @@ local dispenserdef = { end end - -- Place head or pumpkin as node, if equipping it as armor has failed + -- Place head or pumpkin as node, if equipping it as armor has failed if not stack:is_empty() then if igroups.head or iname == "mcl_farming:pumpkin_face" then if dropnodedef.buildable_to then - minetest.set_node(droppos, {name = iname, param2 = node.param2}) + minetest.set_node(droppos, { name = iname, param2 = node.param2 }) stack:take_item() end end @@ -169,7 +182,7 @@ local dispenserdef = { inv:set_stack("main", stack_id, stack) - -- Use shears on sheeps + -- Use shears on sheeps elseif igroups.shears then for _, obj in pairs(minetest.get_objects_inside_radius(droppos, 1)) do local entity = obj:get_luaentity() @@ -178,7 +191,9 @@ local dispenserdef = { local pos = obj:get_pos() local used, texture = false if entname == "mobs_mc:sheep" then - minetest.add_item(pos, entity.drops[2].name .. " " .. math.random(1, 3)) + if entity.drops[2] then + minetest.add_item(pos, entity.drops[2].name .. " " .. math.random(1, 3)) + end if not entity.color then entity.color = "unicolor_white" end @@ -218,7 +233,7 @@ local dispenserdef = { end end - -- Spawn Egg + -- Spawn Egg elseif igroups.spawn_egg then -- Spawn mob if not dropnodedef.walkable then @@ -229,7 +244,7 @@ local dispenserdef = { inv:set_stack("main", stack_id, stack) end - -- Generalized dispension + -- Generalized dispension elseif (not dropnodedef.walkable or stackdef._dispense_into_walkable) then --[[ _on_dispense(stack, pos, droppos, dropnode, dropdir) * stack: Itemstack which is dispense @@ -261,7 +276,7 @@ local dispenserdef = { local item_entity = minetest.add_item(droppos, dropitem) local drop_vel = vector.subtract(droppos, pos) local speed = 3 - item_entity:set_velocity(vector.multiply(drop_vel,speed)) + item_entity:set_velocity(vector.multiply(drop_vel, speed)) end else stack:take_item() @@ -278,7 +293,7 @@ local dispenserdef = { local item_entity = minetest.add_item(droppos, dropitem) local drop_vel = vector.subtract(droppos, pos) local speed = 3 - item_entity:set_velocity(vector.multiply(drop_vel,speed)) + item_entity:set_velocity(vector.multiply(drop_vel, speed)) stack:take_item() inv:set_stack("main", stack_id, stack) end @@ -297,27 +312,28 @@ local dispenserdef = { local horizontal_def = table.copy(dispenserdef) horizontal_def.description = S("Dispenser") -horizontal_def._tt_help = S("9 inventory slots").."\n"..S("Launches item when powered by redstone power") +horizontal_def._tt_help = S("9 inventory slots") .. "\n" .. S("Launches item when powered by redstone power") horizontal_def._doc_items_longdesc = S("A dispenser is a block which acts as a redstone component which, when powered with redstone power, dispenses an item. It has a container with 9 inventory slots.") -horizontal_def._doc_items_usagehelp = S("Place the dispenser in one of 6 possible directions. The “hole” is where items will fly out of the dispenser. Use the dispenser to access its inventory. Insert the items you wish to dispense. Supply the dispenser with redstone energy once to dispense a random item.").."\n\n".. +horizontal_def._doc_items_usagehelp = S("Place the dispenser in one of 6 possible directions. The “hole” is where items will fly out of the dispenser. Use the dispenser to access its inventory. Insert the items you wish to dispense. Supply the dispenser with redstone energy once to dispense a random item.") + .. "\n\n" .. -S("The dispenser will do different things, depending on the dispensed item:").."\n\n".. + S("The dispenser will do different things, depending on the dispensed item:") .. "\n\n" .. -S("• Arrows: Are launched").."\n".. -S("• Eggs and snowballs: Are thrown").."\n".. -S("• Fire charges: Are fired in a straight line").."\n".. -S("• Armor: Will be equipped to players and armor stands").."\n".. -S("• Boats: Are placed on water or are dropped").."\n".. -S("• Minecart: Are placed on rails or are dropped").."\n".. -S("• Bone meal: Is applied on the block it is facing").."\n".. -S("• Empty buckets: Are used to collect a liquid source").."\n".. -S("• Filled buckets: Are used to place a liquid source").."\n".. -S("• Heads, pumpkins: Equipped to players and armor stands, or placed as a block").."\n".. -S("• Shulker boxes: Are placed as a block").."\n".. -S("• TNT: Is placed and ignited").."\n".. -S("• Flint and steel: Is used to ignite a fire in air and to ignite TNT").."\n".. -S("• Spawn eggs: Will summon the mob they contain").."\n".. -S("• Other items: Are simply dropped") + S("• Arrows: Are launched") .. "\n" .. + S("• Eggs and snowballs: Are thrown") .. "\n" .. + S("• Fire charges: Are fired in a straight line") .. "\n" .. + S("• Armor: Will be equipped to players and armor stands") .. "\n" .. + S("• Boats: Are placed on water or are dropped") .. "\n" .. + S("• Minecart: Are placed on rails or are dropped") .. "\n" .. + S("• Bone meal: Is applied on the block it is facing") .. "\n" .. + S("• Empty buckets: Are used to collect a liquid source") .. "\n" .. + S("• Filled buckets: Are used to place a liquid source") .. "\n" .. + S("• Heads, pumpkins: Equipped to players and armor stands, or placed as a block") .. "\n" .. + S("• Shulker boxes: Are placed as a block") .. "\n" .. + S("• TNT: Is placed and ignited") .. "\n" .. + S("• Flint and steel: Is used to ignite a fire in air and to ignite TNT") .. "\n" .. + S("• Spawn eggs: Will summon the mob they contain") .. "\n" .. + S("• Other items: Are simply dropped") function horizontal_def.after_place_node(pos, placer, itemstack, pointed_thing) setup_dispenser(pos) @@ -330,7 +346,7 @@ horizontal_def.tiles = { "default_furnace_side.png", "mcl_dispensers_dispenser_front_horizontal.png" } horizontal_def.paramtype2 = "facedir" -horizontal_def.groups = {pickaxey=1, container=2, material_stone=1} +horizontal_def.groups = { pickaxey = 1, container = 2, material_stone = 1 } minetest.register_node("mcl_dispensers:dispenser", horizontal_def) @@ -343,7 +359,7 @@ down_def.tiles = { "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png" } -down_def.groups = {pickaxey=1, container=2,not_in_creative_inventory=1, material_stone=1} +down_def.groups = { pickaxey = 1, container = 2, not_in_creative_inventory = 1, material_stone = 1 } down_def._doc_items_create_entry = false down_def.drop = "mcl_dispensers:dispenser" minetest.register_node("mcl_dispensers:dispenser_down", down_def) @@ -363,9 +379,9 @@ minetest.register_node("mcl_dispensers:dispenser_up", up_def) minetest.register_craft({ output = "mcl_dispensers:dispenser", recipe = { - {"mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble",}, - {"mcl_core:cobble", "mcl_bows:bow", "mcl_core:cobble",}, - {"mcl_core:cobble", "mesecons:redstone", "mcl_core:cobble",}, + { "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble", }, + { "mcl_core:cobble", "mcl_bows:bow", "mcl_core:cobble", }, + { "mcl_core:cobble", "mesecons:redstone", "mcl_core:cobble", }, } }) @@ -382,6 +398,6 @@ minetest.register_lbm({ nodenames = { "mcl_dispensers:dispenser", "mcl_dispensers:dispenser_down", "mcl_dispensers:dispenser_up" }, action = function(pos, node) setup_dispenser(pos) - minetest.log("action", "[mcl_dispenser] Node formspec updated at "..minetest.pos_to_string(pos)) + minetest.log("action", "[mcl_dispenser] Node formspec updated at " .. minetest.pos_to_string(pos)) end, }) diff --git a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua index 5f8f94d84..09e221a4d 100644 --- a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua @@ -9,23 +9,36 @@ are so many weird tables below. ]] local S = minetest.get_translator(minetest.get_current_modname()) +local C = minetest.colorize +local F = minetest.formspec_escape --- For after_place_node +local dropper_formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + + "label[4.125,0.375;" .. F(C(mcl_formspec.label_color, S("Dropper"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(4.125, 0.75, 3, 3), + "list[context;main;4.125,0.75;3,3;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + "listring[context;main]", + "listring[current_player;main]", +}) + +---For after_place_node +---@param pos Vector local function setup_dropper(pos) -- Set formspec and inventory - local form = "size[9,8.75]".. - "label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[3,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Dropper"))).."]".. - "list[context;main;3,0.5;3,3;]".. - mcl_formspec.get_itemslot_bg(3,0.5,3,3).. - "listring[context;main]".. - "listring[current_player;main]" local meta = minetest.get_meta(pos) - meta:set_string("formspec", form) + meta:set_string("formspec", dropper_formspec) local inv = meta:get_inventory() inv:set_size("main", 9) end @@ -38,9 +51,9 @@ local function orientate_dropper(pos, placer) local pitch = placer:get_look_vertical() * (180 / math.pi) if pitch > 55 then - minetest.swap_node(pos, {name="mcl_droppers:dropper_up"}) + minetest.swap_node(pos, { name = "mcl_droppers:dropper_up" }) elseif pitch < -55 then - minetest.swap_node(pos, {name="mcl_droppers:dropper_down"}) + minetest.swap_node(pos, { name = "mcl_droppers:dropper_down" }) end end @@ -58,11 +71,10 @@ local dropperdef = { local meta2 = meta:to_table() meta:from_table(oldmetadata) local inv = meta:get_inventory() - for i=1, inv:get_size("main") do + for i = 1, inv:get_size("main") do local stack = inv:get_stack("main", i) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} - minetest.add_item(p, stack) + minetest.add_item(vector.offset(pos, math.random(0, 10) / 10 - 0.5, 0, math.random(0, 10) / 10 - 0.5), stack) end end meta:from_table(meta2) @@ -96,7 +108,7 @@ local dropperdef = { end, _mcl_blast_resistance = 3.5, _mcl_hardness = 3.5, - mesecons = {effector = { + mesecons = { effector = { -- Drop random item when triggered action_on = function(pos, node) if not pos then return end @@ -104,11 +116,11 @@ local dropperdef = { local inv = meta:get_inventory() local droppos if node.name == "mcl_droppers:dropper" then - droppos = vector.subtract(pos, minetest.facedir_to_dir(node.param2)) + droppos = vector.subtract(pos, minetest.facedir_to_dir(node.param2)) elseif node.name == "mcl_droppers:dropper_up" then - droppos = {x=pos.x, y=pos.y+1, z=pos.z} + droppos = vector.offset(pos, 0, 1, 0) elseif node.name == "mcl_droppers:dropper_down" then - droppos = {x=pos.x, y=pos.y-1, z=pos.z} + droppos = vector.offset(pos, 0, -1, 0) end local dropnode = minetest.get_node(droppos) -- Do not drop into solid nodes, unless they are containers @@ -117,10 +129,10 @@ local dropperdef = { return end local stacks = {} - for i=1,inv:get_size("main") do + for i = 1, inv:get_size("main") do local stack = inv:get_stack("main", i) if not stack:is_empty() then - table.insert(stacks, {stack = stack, stackpos = i}) + table.insert(stacks, { stack = stack, stackpos = i }) end end if #stacks >= 1 then @@ -136,22 +148,22 @@ local dropperdef = { if not dropped and not dropnodedef.groups.container then -- Drop item normally local pos_variation = 100 - droppos = { - x = droppos.x + math.random(-pos_variation, pos_variation) / 1000, - y = droppos.y + math.random(-pos_variation, pos_variation) / 1000, - z = droppos.z + math.random(-pos_variation, pos_variation) / 1000, - } + droppos = vector.offset(droppos, + math.random(-pos_variation, pos_variation) / 1000, + math.random(-pos_variation, pos_variation) / 1000, + math.random(-pos_variation, pos_variation) / 1000 + ) local item_entity = minetest.add_item(droppos, dropitem) local drop_vel = vector.subtract(droppos, pos) local speed = 3 - item_entity:set_velocity(vector.multiply(drop_vel,speed)) + item_entity:set_velocity(vector.multiply(drop_vel, speed)) stack:take_item() inv:set_stack("main", stack_id, stack) end end end, rules = mesecon.rules.alldirs, - }}, + } }, on_rotate = on_rotate, } @@ -159,20 +171,21 @@ local dropperdef = { local horizontal_def = table.copy(dropperdef) horizontal_def.description = S("Dropper") -horizontal_def._tt_help = S("9 inventory slots").."\n"..S("Drops item when powered by redstone power") +horizontal_def._tt_help = S("9 inventory slots") .. "\n" .. S("Drops item when powered by redstone power") horizontal_def._doc_items_longdesc = S("A dropper is a redstone component and a container with 9 inventory slots which, when supplied with redstone power, drops an item or puts it into a container in front of it.") horizontal_def._doc_items_usagehelp = S("Droppers can be placed in 6 possible directions, items will be dropped out of the hole. Use the dropper to access its inventory. Supply it with redstone energy once to make the dropper drop or transfer a random item.") function horizontal_def.after_place_node(pos, placer, itemstack, pointed_thing) setup_dropper(pos) orientate_dropper(pos, placer) end + horizontal_def.tiles = { "default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", "mcl_droppers_dropper_front_horizontal.png" } horizontal_def.paramtype2 = "facedir" -horizontal_def.groups = {pickaxey=1, container=2, material_stone=1} +horizontal_def.groups = { pickaxey = 1, container = 2, material_stone = 1 } minetest.register_node("mcl_droppers:dropper", horizontal_def) @@ -185,7 +198,7 @@ down_def.tiles = { "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png" } -down_def.groups = {pickaxey=1, container=2,not_in_creative_inventory=1, material_stone=1} +down_def.groups = { pickaxey = 1, container = 2, not_in_creative_inventory = 1, material_stone = 1 } down_def._doc_items_create_entry = false down_def.drop = "mcl_droppers:dropper" minetest.register_node("mcl_droppers:dropper_down", down_def) @@ -207,9 +220,9 @@ minetest.register_node("mcl_droppers:dropper_up", up_def) minetest.register_craft({ output = "mcl_droppers:dropper", recipe = { - {"mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble",}, - {"mcl_core:cobble", "", "mcl_core:cobble",}, - {"mcl_core:cobble", "mesecons:redstone", "mcl_core:cobble",}, + { "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble", }, + { "mcl_core:cobble", "", "mcl_core:cobble", }, + { "mcl_core:cobble", "mesecons:redstone", "mcl_core:cobble", }, } }) @@ -226,6 +239,6 @@ minetest.register_lbm({ nodenames = { "mcl_droppers:dropper", "mcl_droppers:dropper_down", "mcl_droppers:dropper_up" }, action = function(pos, node) setup_dropper(pos) - minetest.log("action", "[mcl_droppers] Node formspec updated at "..minetest.pos_to_string(pos)) + minetest.log("action", "[mcl_droppers] Node formspec updated at " .. minetest.pos_to_string(pos)) end, }) diff --git a/mods/ITEMS/REDSTONE/mesecons/internal.lua b/mods/ITEMS/REDSTONE/mesecons/internal.lua index 06a5d08b9..d7983d353 100644 --- a/mods/ITEMS/REDSTONE/mesecons/internal.lua +++ b/mods/ITEMS/REDSTONE/mesecons/internal.lua @@ -177,7 +177,7 @@ end function mesecon.effector_get_rules(node) local effector = mesecon.get_effector(node.name) - if effector then + if effector and effector.rules then local rules = effector.rules if type(rules) == "function" then return rules(node) diff --git a/mods/ITEMS/REDSTONE/mesecons_button/init.lua b/mods/ITEMS/REDSTONE/mesecons_button/init.lua index f7d6c7105..275cac2e2 100644 --- a/mods/ITEMS/REDSTONE/mesecons_button/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_button/init.lua @@ -92,6 +92,7 @@ function mesecon.register_button(basename, description, texture, recipeitem, sou groups_off.dig_by_water=1 groups_off.destroy_by_lava_flow=1 groups_off.dig_by_piston=1 + groups_off.dig_immediate_piston=1 groups_off.button=1 -- button (off) local groups_on = table.copy(groups_off) @@ -103,6 +104,14 @@ function mesecon.register_button(basename, description, texture, recipeitem, sou end button_sounds["mesecons_button:button_"..basename.."_off"] = button_sound + if not longdesc then + if groups_off.material_wood ~= 0 then + longdesc = S("A wooden button is a redstone component made out of wood which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1.5 seconds. Wooden buttons may also be pushed by arrows.") + else + longdesc = S("A button is a redstone compent which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for @1 seconds.", button_timer) + end + end + if push_by_arrow then groups_off.button_push_by_arrow = 1 groups_on.button_push_by_arrow = 1 @@ -251,7 +260,7 @@ for w=1, #woods do {material_wood=1,handy=1,axey=1}, 1.5, true, - S("A wooden button is a redstone component made out of wood which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1.5 seconds. Wooden buttons may also be pushed by arrows."), + nil, "mesecons_button_push_wood") minetest.register_craft({ diff --git a/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt b/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt index 4fb2bc19d..d42a03741 100644 --- a/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt +++ b/mods/ITEMS/REDSTONE/mesecons_button/locale/template.txt @@ -17,3 +17,4 @@ A wooden button is a redstone component made out of wood which can be pushed to Provides redstone power when pushed= Push duration: @1s= Pushable by arrow= +A button is a redstone compent which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for @1 seconds.= diff --git a/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua b/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua index 8ae4153cc..663d0f727 100644 --- a/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_mvps/init.lua @@ -415,8 +415,13 @@ mesecon.register_mvps_stopper("mcl_banners:standing_banner") -- Unmovable by technical restrictions. -- Open formspec would screw up if node is destroyed (minor problem) -- Would screw up on/off state of trapped chest (big problem) +-- Would duplicate xp when moved mesecon.register_mvps_stopper("mcl_furnaces:furnace") mesecon.register_mvps_stopper("mcl_furnaces:furnace_active") +mesecon.register_mvps_stopper("mcl_blast_furnace:blast_furnace") +mesecon.register_mvps_stopper("mcl_blast_furnace:blast_furnace_active") +mesecon.register_mvps_stopper("mcl_smoker:smoker") +mesecon.register_mvps_stopper("mcl_smoker:smoker_active") mesecon.register_mvps_stopper("mcl_hoppers:hopper") mesecon.register_mvps_stopper("mcl_hoppers:hopper_side") mesecon.register_mvps_stopper("mcl_droppers:dropper") diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua index 41cc8211a..a4043fb5f 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua @@ -153,7 +153,11 @@ function mesecon.register_pressure_plate(basename, description, textures_off, te groups_on.not_in_creative_inventory = 1 groups_on.pressure_plate = 2 if not longdesc then - longdesc = S("A pressure plate is a redstone component which supplies its surrounding blocks with redstone power while someone or something rests on top of it.") + if groups_off.material_wood ~= 0 then + longdesc = S("A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.") + else + longdesc = S("A pressure plate is a redstone component which supplies its surrounding blocks with redstone power while someone or something rests on top of it.") + end end local tt = S("Provides redstone power when pushed") if not activated_by then @@ -238,8 +242,7 @@ for w=1, #woods do {{woods[w][2], woods[w][2]}}, mcl_sounds.node_sound_wood_defaults(), {axey=1, material_wood=1}, - nil, - S("A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.")) + nil) minetest.register_craft({ type = "fuel", diff --git a/mods/ITEMS/mcl_amethyst/locale/mcl_amethyst.dk.tr b/mods/ITEMS/mcl_amethyst/locale/mcl_amethyst.dk.tr new file mode 100644 index 000000000..2a7d6307c --- /dev/null +++ b/mods/ITEMS/mcl_amethyst/locale/mcl_amethyst.dk.tr @@ -0,0 +1,19 @@ +# textdomain: mcl_amethyst +Amethyst Cluster=Ametystklynge +Amethyst Cluster is the final growth of amethyst bud.=En ameystklynge er den sidste udvikling af en ametystspire. +Amethyst Shard=Ametystskår +An amethyst shard is a crystalline mineral.=Et ametystskår er et krystallisk mineral. +Block of Amethyst=Blok af ametyst +Budding Amethyst=Spirende ametyst +Calcite=Calcedon +Calcite can be found as part of amethyst geodes.=Calcedon kan findes som en del af krystalhuler med ametyst. +Large Amethyst Bud=Stor ametystknop +Large Amethyst Bud is the third growth of amethyst bud.=En stor ametystknop er den trejde udvikling af en ametystspire. +Medium Amethyst Bud=Mellem ametystknop +Medium Amethyst Bud is the second growth of amethyst bud.=En mellem ametystknop er den anden udvikling af en ametystspire. +Small Amethyst Bud=Lille ametystknop +Small Amethyst Bud is the first growth of amethyst bud.=En lille ametystknop er den første udvikling af en ametystspire. +The Block of Amethyst is a decoration block crafted from amethyst shards.=En blok af ametyst er en udsmykningsblok som kan laves ametystskår. +The Budding Amethyst can grow amethyst=Den spirende ametyst kan gro ametyst +Tinted Glass=Farvet glas +Tinted Glass is a type of glass which blocks lights while it is visually transparent.=Farvet glas er en glastype som er gennemsigtig, men lukker lys ude. diff --git a/mods/ITEMS/mcl_anvils/init.lua b/mods/ITEMS/mcl_anvils/init.lua index a56299cd9..b41411f15 100644 --- a/mods/ITEMS/mcl_anvils/init.lua +++ b/mods/ITEMS/mcl_anvils/init.lua @@ -1,4 +1,6 @@ local S = minetest.get_translator(minetest.get_current_modname()) +local F = minetest.formspec_escape +local C = minetest.colorize local MAX_NAME_LENGTH = 35 local MAX_WEAR = 65535 @@ -10,41 +12,65 @@ local MATERIAL_TOOL_REPAIR_BOOST = { MAX_WEAR, -- 100% } +---@param set_name? string local function get_anvil_formspec(set_name) if not set_name then set_name = "" end - return "size[9,8.75]".. - "background[-0.19,-0.25;9.41,9.49;mcl_anvils_inventory.png]".. - "label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "list[context;input;1,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(1,2.5,1,1).. - "list[context;input;4,2.5;1,1;1]".. - mcl_formspec.get_itemslot_bg(4,2.5,1,1).. - "list[context;output;8,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(8,2.5,1,1).. - "label[3,0.1;"..minetest.formspec_escape(minetest.colorize("#313131", S("Repair and Name"))).."]".. - "field[3.25,1;4,1;name;;"..minetest.formspec_escape(set_name).."]".. - "field_close_on_enter[name;false]".. - "button[7,0.7;2,1;name_button;"..minetest.formspec_escape(S("Set Name")).."]".. - "listring[context;output]".. - "listring[current_player;main]".. - "listring[context;input]".. - "listring[current_player;main]" + + return table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + + "label[4.125,0.375;" .. F(C(mcl_formspec.label_color, S("Repair and Name"))) .. "]", + + "image[0.875,0.375;1.75,1.75;mcl_anvils_inventory_hammer.png]", + + "field[4.125,0.75;7.25,1;name;;" .. F(set_name) .. "]", + "field_close_on_enter[name;false]", + "set_focus[name;true]", + + mcl_formspec.get_itemslot_bg_v4(1.625, 2.6, 1, 1), + "list[context;input;1.625,2.6;1,1;]", + + "image[3.5,2.6;1,1;mcl_anvils_inventory_cross.png]", + + mcl_formspec.get_itemslot_bg_v4(5.375, 2.6, 1, 1), + "list[context;input;5.375,2.6;1,1;1]", + + "image[6.75,2.6;2,1;mcl_anvils_inventory_arrow.png]", + + mcl_formspec.get_itemslot_bg_v4(9.125, 2.6, 1, 1), + "list[context;output;9.125,2.6;1,1;]", + + -- Player Inventory + + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + -- Listrings + + "listring[context;output]", + "listring[current_player;main]", + "listring[context;input]", + "listring[current_player;main]", + }) end -- Given a tool and material stack, returns how many items of the material stack -- needs to be used up to repair the tool. +---@param tool ItemStack +---@param material ItemStack +---@return integer local function get_consumed_materials(tool, material) local wear = tool:get_wear() --local health = (MAX_WEAR - wear) local matsize = material:get_count() local materials_used = 0 - for m=1, math.min(4, matsize) do + for m = 1, math.min(4, matsize) do materials_used = materials_used + 1 if (wear - MATERIAL_TOOL_REPAIR_BOOST[m]) <= 0 then break @@ -53,27 +79,20 @@ local function get_consumed_materials(tool, material) return materials_used end -local function contains(table, value) - for _, i in pairs(table) do - if i == value then - return true - end - end - return false -end - -- Given 2 input stacks, tells you which is the tool and which is the material. -- Returns ("tool", input1, input2) if input1 is tool and input2 is material. -- Returns ("material", input2, input1) if input1 is material and input2 is tool. -- Returns nil otherwise. +---@param input1 ItemStack +---@param input2 ItemStack local function distinguish_tool_and_material(input1, input2) local def1 = input1:get_definition() local def2 = input2:get_definition() local r1 = def1._repair_material local r2 = def2._repair_material - if def1.type == "tool" and r1 and type(r1) == "table" and contains(r1, input2) then + if def1.type == "tool" and r1 and type(r1) == "table" and table.indexof(r1, input2) ~= -1 then return "tool", input1, input2 - elseif def2.type == "tool" and r2 and type(r2) == "table" and contains(r2, input1) then + elseif def2.type == "tool" and r2 and type(r2) == "table" and table.indexof(r1, input1) ~= -1 then return "material", input2, input1 elseif def1.type == "tool" and r1 then return "tool", input1, input2 @@ -84,7 +103,8 @@ local function distinguish_tool_and_material(input1, input2) end end --- Helper function to make sure update_anvil_slots NEVER overstacks the output slot +---Helper function to make sure update_anvil_slots NEVER overstacks the output slot +---@param stack ItemStack local function fix_stack_size(stack) if not stack or stack == "" then return "" end local count = stack:get_count() @@ -99,6 +119,7 @@ end -- Update the inventory slots of an anvil node. -- meta: Metadata of anvil node +---@param meta NodeMetaRef local function update_anvil_slots(meta) local inv = meta:get_inventory() local new_name = meta:get_string("set_name") @@ -137,7 +158,7 @@ local function update_anvil_slots(meta) name_item = input1 new_output = name_item - -- Tool + repair item + -- Tool + repair item else -- Any tool can have a repair item. This may be defined in the tool's item definition -- as an itemstring in the field `_repair_material`. Only if this field is set, the @@ -159,7 +180,7 @@ local function update_anvil_slots(meta) has_correct_material = true end else - if contains(repair, material_name) then + if table.indexof(repair, material_name) ~= -1 then has_correct_material = true else for _, r in pairs(repair) do @@ -185,7 +206,7 @@ local function update_anvil_slots(meta) new_output = "" end end - -- Exactly 1 input slot occupied + -- Exactly 1 input slot occupied elseif (not input1:is_empty() and input2:is_empty()) or (input1:is_empty() and not input2:is_empty()) then -- Just rename item if input1:is_empty() then @@ -231,28 +252,32 @@ local function update_anvil_slots(meta) end end --- Drop input items of anvil at pos with metadata meta +---Drop input items of anvil at pos with metadata meta +---@param pos Vector +---@param meta NodeMetaRef local function drop_anvil_items(pos, meta) local inv = meta:get_inventory() - for i=1, inv:get_size("input") do + for i = 1, inv:get_size("input") do local stack = inv:get_stack("input", i) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} + local p = vector.offset(pos, math.random(0, 10) / 10 - 0.5, 0, math.random(0, 10) / 10 - 0.5) minetest.add_item(p, stack) end end end +---@param pos Vector +---@param node node local function damage_particles(pos, node) minetest.add_particlespawner({ amount = 30, time = 0.1, - minpos = vector.add(pos, {x=-0.5, y=-0.5, z=-0.5}), - maxpos = vector.add(pos, {x=0.5, y=-0.25, z=0.5}), - minvel = {x=-0.5, y=0.05, z=-0.5}, - maxvel = {x=0.5, y=0.3, z=0.5}, - minacc = {x=0, y=-9.81, z=0}, - maxacc = {x=0, y=-9.81, z=0}, + minpos = vector.offset(pos, -0.5, -0.5, -0.5), + maxpos = vector.offset(pos, 0.5, -0.25, 0.5), + minvel = vector.new(-0.5, 0.05, -0.5), + maxvel = vector.new(0.5, 0.3, 0.5), + minacc = vector.new(0, -9.81, 0), + maxacc = vector.new(0, -9.81, 0), minexptime = 0.1, maxexptime = 0.5, minsize = 0.4, @@ -267,12 +292,12 @@ local function destroy_particles(pos, node) minetest.add_particlespawner({ amount = math.random(20, 30), time = 0.1, - minpos = vector.add(pos, {x=-0.4, y=-0.4, z=-0.4}), - maxpos = vector.add(pos, {x=0.4, y=0.4, z=0.4}), - minvel = {x=-0.5, y=-0.1, z=-0.5}, - maxvel = {x=0.5, y=0.2, z=0.5}, - minacc = {x=0, y=-9.81, z=0}, - maxacc = {x=0, y=-9.81, z=0}, + minpos = vector.offset(pos, -0.4, -0.4, -0.4), + maxpos = vector.offset(pos, 0.4, 0.4, 0.4), + minvel = vector.new(-0.5, -0.1, -0.5), + maxvel = vector.new(0.5, 0.2, 0.5), + minacc = vector.new(0, -9.81, 0), + maxacc = vector.new(0, -9.81, 0), minexptime = 0.2, maxexptime = 0.65, minsize = 0.8, @@ -289,28 +314,29 @@ end local function damage_anvil(pos) local node = minetest.get_node(pos) if node.name == "mcl_anvils:anvil" then - minetest.swap_node(pos, {name="mcl_anvils:anvil_damage_1", param2=node.param2}) + minetest.swap_node(pos, { name = "mcl_anvils:anvil_damage_1", param2 = node.param2 }) damage_particles(pos, node) - minetest.sound_play(mcl_sounds.node_sound_metal_defaults().dig, {pos=pos, max_hear_distance=16}, true) + minetest.sound_play(mcl_sounds.node_sound_metal_defaults().dig, { pos = pos, max_hear_distance = 16 }, true) return false elseif node.name == "mcl_anvils:anvil_damage_1" then - minetest.swap_node(pos, {name="mcl_anvils:anvil_damage_2", param2=node.param2}) + minetest.swap_node(pos, { name = "mcl_anvils:anvil_damage_2", param2 = node.param2 }) damage_particles(pos, node) - minetest.sound_play(mcl_sounds.node_sound_metal_defaults().dig, {pos=pos, max_hear_distance=16}, true) + minetest.sound_play(mcl_sounds.node_sound_metal_defaults().dig, { pos = pos, max_hear_distance = 16 }, true) return false elseif node.name == "mcl_anvils:anvil_damage_2" then -- Destroy anvil local meta = minetest.get_meta(pos) drop_anvil_items(pos, meta) - minetest.sound_play(mcl_sounds.node_sound_metal_defaults().dug, {pos=pos, max_hear_distance=16}, true) + minetest.sound_play(mcl_sounds.node_sound_metal_defaults().dug, { pos = pos, max_hear_distance = 16 }, true) minetest.remove_node(pos) destroy_particles(pos, node) - minetest.check_single_for_falling({x=pos.x, y=pos.y+1, z=pos.z}) + minetest.check_single_for_falling(vector.offset(pos, 0, 1, 0)) return true end end --- Roll a virtual dice and damage anvil at a low chance. +---Roll a virtual dice and damage anvil at a low chance. +---@param pos Vector local function damage_anvil_by_using(pos) local r = math.random(1, 100) -- 12% chance @@ -321,25 +347,30 @@ local function damage_anvil_by_using(pos) end end +---@param pos Vector +---@param distance number local function damage_anvil_by_falling(pos, distance) local r = math.random(1, 100) if distance > 1 then - if r <= (5*distance) then + if r <= (5 * distance) then damage_anvil(pos) end end end +---@type nodebox local anvilbox = { type = "fixed", fixed = { { -8 / 16, -8 / 16, -6 / 16, 8 / 16, 8 / 16, 6 / 16 }, }, } + +---@type node_definition local anvildef = { - groups = {pickaxey=1, falling_node=1, falling_node_damage=1, crush_after_fall=1, deco_block=1, anvil=1}, - tiles = {"mcl_anvils_anvil_top_damaged_0.png^[transformR90", "mcl_anvils_anvil_base.png", "mcl_anvils_anvil_side.png"}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + groups = { pickaxey = 1, falling_node = 1, falling_node_damage = 1, crush_after_fall = 1, deco_block = 1, anvil = 1 }, + tiles = { "mcl_anvils_anvil_top_damaged_0.png^[transformR90", "mcl_anvils_anvil_base.png", "mcl_anvils_anvil_side.png" }, + use_texture_alpha = "opaque", _tt_help = S("Repair and rename items"), paramtype = "light", sunlight_propagates = true, @@ -353,7 +384,7 @@ local anvildef = { { -5 / 16, -4 / 16, -4 / 16, 5 / 16, -3 / 16, 4 / 16 }, { -4 / 16, -3 / 16, -2 / 16, 4 / 16, 2 / 16, 2 / 16 }, { -8 / 16, 2 / 16, -5 / 16, 8 / 16, 8 / 16, 5 / 16 }, - } + }, }, selection_box = anvilbox, collision_box = anvilbox, @@ -416,7 +447,7 @@ local anvildef = { local meta = minetest.get_meta(pos) if from_list == "output" and to_list == "input" then local inv = meta:get_inventory() - for i=1, inv:get_size("input") do + for i = 1, inv:get_size("input") do if i ~= to_index then local istack = inv:get_stack("input", i) istack:set_count(math.max(0, istack:get_count() - count)) @@ -504,22 +535,20 @@ local anvildef = { minetest.record_protection_violation(pos, sender_name) return end - if fields.name_button or fields.name then - local set_name - if fields.name == nil then - set_name = "" - else - set_name = fields.name - end + + if fields.name then local meta = minetest.get_meta(pos) + -- Limit name length - set_name = string.sub(set_name, 1, MAX_NAME_LENGTH) + local set_name = string.sub(fields.name, 1, MAX_NAME_LENGTH) + meta:set_string("set_name", set_name) update_anvil_slots(meta) meta:set_string("formspec", get_anvil_formspec(set_name)) end end, } + if minetest.get_modpath("screwdriver") then anvildef.on_rotate = screwdriver.rotate_simple end @@ -527,29 +556,34 @@ end local anvildef0 = table.copy(anvildef) anvildef0.description = S("Anvil") anvildef0._doc_items_longdesc = -S("The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!") + S("The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!") anvildef0._doc_items_usagehelp = -S("To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.").."\n".. -S("To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.").."\n".. -S("There are two possibilities to repair tools (and armor):").."\n".. -S("• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.").."\n".. -S("• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.").."\n".. -S("Armor counts as a tool. It is possible to repair and rename a tool in a single step.").."\n\n".. -S("The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.") + S("To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.") .. "\n" .. + S("To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.") + .. "\n" .. + S("There are two possibilities to repair tools (and armor):") .. "\n" .. + S("• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.") + .. "\n" .. + S("• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.") + .. "\n" .. + S("Armor counts as a tool. It is possible to repair and rename a tool in a single step.") .. "\n\n" .. + S("The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.") local anvildef1 = table.copy(anvildef) anvildef1.description = S("Slightly Damaged Anvil") anvildef1._doc_items_create_entry = false anvildef1.groups.anvil = 2 anvildef1._doc_items_create_entry = false -anvildef1.tiles = {"mcl_anvils_anvil_top_damaged_1.png^[transformR90", "mcl_anvils_anvil_base.png", "mcl_anvils_anvil_side.png"} +anvildef1.tiles = { "mcl_anvils_anvil_top_damaged_1.png^[transformR90", "mcl_anvils_anvil_base.png", + "mcl_anvils_anvil_side.png" } local anvildef2 = table.copy(anvildef) anvildef2.description = S("Very Damaged Anvil") anvildef2._doc_items_create_entry = false anvildef2.groups.anvil = 3 anvildef2._doc_items_create_entry = false -anvildef2.tiles = {"mcl_anvils_anvil_top_damaged_2.png^[transformR90", "mcl_anvils_anvil_base.png", "mcl_anvils_anvil_side.png"} +anvildef2.tiles = { "mcl_anvils_anvil_top_damaged_2.png^[transformR90", "mcl_anvils_anvil_base.png", + "mcl_anvils_anvil_side.png" } minetest.register_node("mcl_anvils:anvil", anvildef0) minetest.register_node("mcl_anvils:anvil_damage_1", anvildef1) @@ -562,7 +596,7 @@ if minetest.get_modpath("mcl_core") then { "mcl_core:ironblock", "mcl_core:ironblock", "mcl_core:ironblock" }, { "", "mcl_core:iron_ingot", "" }, { "mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot" }, - } + }, }) end diff --git a/mods/ITEMS/mcl_anvils/locale/mcl_anvils.dk.tr b/mods/ITEMS/mcl_anvils/locale/mcl_anvils.dk.tr new file mode 100644 index 000000000..8649aabc2 --- /dev/null +++ b/mods/ITEMS/mcl_anvils/locale/mcl_anvils.dk.tr @@ -0,0 +1,16 @@ +# textdomain: mcl_anvils +Set Name=Navngiv +Repair and Name=Reparér og navngiv +Inventory=Oppakning +Anvil=Ambolt +The anvil allows you to repair tools and armor, and to give names to items. It has a limited durability, however. Don't let it fall on your head, it could be quite painful!=Ambolten gør dig i stand til at reparere værktøj og rustninger, og til at navngive genstande. Den har dog begrænset holdbarhed. Lad den ikke falde ned i hovedet på dig, det kunne gøre meget ondt! +To use an anvil, rightclick it. An anvil has 2 input slots (on the left) and one output slot.=For at bruge ambolten skal du højre-klikke på den. En ambolt har to indgangspladser (til venstre), og én udgangsplads. +To rename items, put an item stack in one of the item slots while keeping the other input slot empty. Type in a name, hit enter or “Set Name”, then take the renamed item from the output slot.=For at omdøbe en genstande skal du putte dem i den ene indgangsplads og lade den anden indgangsplads være tom. Skriv et navn, tryk på enter eller "Giv navn", og tag så den omdøbte genstand fra udgangspladsen. +There are two possibilities to repair tools (and armor):=Der er to muligheder for at reparere værktøj (og rustninger) +• Tool + Tool: Place two tools of the same type in the input slots. The “health” of the repaired tool is the sum of the “health” of both input tools, plus a 12% bonus.=• Værktøj + Værktøj: Placér to stykker værktøj af samme type i indgangspladserne. Holbarheden af det reparerede stykke værktøj er summen af holdbarheden på begge stykker værktøj plus 12% bonus. +• Tool + Material: Some tools can also be repaired by combining them with an item that it's made of. For example, iron pickaxes can be repaired with iron ingots. This repairs the tool by 25%.=• Værktøj + Materiale: Noget værktøj kan også repareres ved at kombinere dem med en genstand de er lavet af. For eksempel kan en jernhakke repareres med jernbarre. Dette reparerer værktøjet med 25%. +Armor counts as a tool. It is possible to repair and rename a tool in a single step.=Rustninger tæller som værktøj. Det er muligt at reparere og omdøbe værktøj i ét enkelt trin. +The anvil has limited durability and 3 damage levels: undamaged, slightly damaged and very damaged. Each time you repair or rename something, there is a 12% chance the anvil gets damaged. Anvils also have a chance of being damaged when they fall by more than 1 block. If a very damaged anvil is damaged again, it is destroyed.=Ambolten har en begrænset holdbarhed og 3 skadeniveauer: Ubeskadiget, let beskadiget og meget beskadiget. Hver gang du reparerer eller omdøber noget er der en 12% chance for, at ambolten bliver beskadiget. Ambolte har også en risiko for at blive beskadiget når de falder mere end én blok ned. Hvis en beskadiget ambolt beskadiges igen bliver den ødelagt. +Slightly Damaged Anvil=Let beskadiget ambolt +Very Damaged Anvil=Meget beskadiget ambolt +Repair and rename items=Reparér og omdøb genstande diff --git a/mods/ITEMS/mcl_armor/locale/mcl_armor.dk.tr b/mods/ITEMS/mcl_armor/locale/mcl_armor.dk.tr new file mode 100644 index 000000000..b7b92fd95 --- /dev/null +++ b/mods/ITEMS/mcl_armor/locale/mcl_armor.dk.tr @@ -0,0 +1,48 @@ +# textdomain: mcl_armor +This is a piece of equippable armor which reduces the amount of damage you receive.=Dette er et stykke rustning du kan tage på for at reducere den mængde du tager. +To equip it, put it on the corresponding armor slot in your inventory menu.=For at tage den på, skal du putte den i den tilsvarende rustningsplads i din oppakningsmenu. +Leather Cap=Læderhat +Iron Helmet=Jernhjelm +Golden Helmet=Guldhjelm +Diamond Helmet=Diamanthjelm +Chain Helmet=Brynjehjelm +Netherite Helmet=Netherritehjelm +Leather Tunic=Lædertunika +Iron Chestplate=Jernbrystplade +Golden Chestplate=Guldbrystplade +Diamond Chestplate=Diamantbrystplade +Chain Chestplate=Brynjeskjorte +Netherite Chestplate=Netheritebrystplade +Leather Pants=Læderbukser +Iron Leggings=Jernbenplader +Golden Leggings=Guldbenplader +Diamond Leggings=Diamantbenplader +Chain Leggings=Brynjebukser +Netherite Leggings=Netheritebenplader +Leather Boots=Læderstøvler +Iron Boots=Jernstøvler +Golden Boots=Guldstøvler +Diamond Boots=Diamantstøvler +Chain Boots=Brynjestøvler +Netherite Boots=Netheritestøvler +Elytra=Elytra + +#Translations of enchantements +Increases underwater mining speed.=Øger udvindingshastigheden under vand. +Blast Protection=Eksplosionsbeskyttelse +Reduces explosion damage and knockback.=Reducerer eksplosionsskade og -tilbageslag. +Curse of Binding=Bindende forbandelse. +Item cannot be removed from armor slots except due to death, breaking or in Creative Mode.=Objektet kan ikke fjernes fra rustninspladser undtagen ved død, hvis den går i stykker ikke i kreativ tilstand. +Feather Falling=Fjerfald +Reduces fall damage.=Reduerer faldskade. +Fire Protection=Ildbeskyttelse +Reduces fire damage.=Reducerer ildskade. +Shooting consumes no regular arrows.=Det bruger ingen normale pile at skyde. +Shoot 3 arrows at the cost of one.=Skyd 3 pile for én pils pris. +Projectile Protection=Projektilbeskyttelse +Reduces projectile damage.=Reducerer projektilskade +Protection=Beskyttelse +Reduces most types of damage by 4% for each level.=Reducerer det fleste skadestyper med 4% for hvert level. +Thorns=Torne +Reflects some of the damage taken when hit, at the cost of reducing durability with each proc.=Reflekterer skade ved træfning, men koster holdbarhed ved hver brug. +Aqua Affinity=Vandaffinitet \ No newline at end of file diff --git a/mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.dk.tr b/mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.dk.tr new file mode 100644 index 000000000..72056e26a --- /dev/null +++ b/mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.dk.tr @@ -0,0 +1,5 @@ +# textdomain: mcl_armor_stand +Armor Stand=Rustningsstativ +An armor stand is a decorative object which can display different pieces of armor. Anything which players can wear as armor can also be put on an armor stand.=Et rustningsstativ er en udsmykningsgenstand som kan fremvise forskellige rustninger. Alt hvad spillere kan bære som rusning kan sættes på rustningsstativet. +Just place an armor item on the armor stand. To take the top piece of armor from the armor stand, select your hand and use the place key on the armor stand.=Placér blot et rustningsstykke på rustningsstativet. For at take den øverste rustningsstykke skal du vælge din hånd og bruge placér knappen på rustningsstativet. +Displays pieces of armor=Fremviser rustningsstykker. diff --git a/mods/ITEMS/mcl_bamboo/bamboo_base.lua b/mods/ITEMS/mcl_bamboo/bamboo_base.lua index b9f67fc64..4ccb9bb1b 100644 --- a/mods/ITEMS/mcl_bamboo/bamboo_base.lua +++ b/mods/ITEMS/mcl_bamboo/bamboo_base.lua @@ -203,11 +203,11 @@ local bamboo_def = { if node_above_name ~= "mcl_core:water_source" and node_above_name ~= "mcl_core:lava_source" and node_above_name ~= "mcl_nether:nether_lava_source" then local _, position = minetest.item_place(place_item, placer, pointed_thing, fdir) - if not minetest.is_creative_enabled(placer:get_player_name()) then - itemstack:take_item(1) - end - if rand_height and rand_height > 1 then - if position then + if position then + if not minetest.is_creative_enabled(placer:get_player_name()) then + itemstack:take_item(1) + end + if rand_height and rand_height > 1 then mcl_bamboo.mcl_log("Setting Height Data...") meta = minetest.get_meta(position) if meta then diff --git a/mods/ITEMS/mcl_bamboo/bamboo_items.lua b/mods/ITEMS/mcl_bamboo/bamboo_items.lua index 63f07f896..dbc8e6946 100644 --- a/mods/ITEMS/mcl_bamboo/bamboo_items.lua +++ b/mods/ITEMS/mcl_bamboo/bamboo_items.lua @@ -4,10 +4,6 @@ --- DateTime: 12/29/22 12:38 PM -- Restructure Date --- Copyright (C) 2022 - 2023, Michieal. See License.txt --- CONSTS --- Due to door fix #2736, doors are displayed backwards. When this is fixed, set this variable to false. -local BROKEN_DOORS = true - -- FUTURE USE VARIABLE. MUST REMAIN FALSE UNTIL IT HAS BEEN FULLY IMPLEMENTED. DO NOT ENABLE. local SIDE_SCAFFOLDING = false local SIDE_SCAFFOLD_NAME = "mcl_bamboo:scaffolding_horizontal" @@ -49,17 +45,6 @@ end if minetest.get_modpath("mcl_doors") then if mcl_doors then - local top_door_tiles = {} - local bot_door_tiles = {} - - if BROKEN_DOORS then - top_door_tiles = { "mcl_bamboo_door_top_alt.png", "mcl_bamboo_door_top.png" } - bot_door_tiles = { "mcl_bamboo_door_bottom_alt.png", "mcl_bamboo_door_bottom.png" } - else - top_door_tiles = { "mcl_bamboo_door_top.png", "mcl_bamboo_door_top.png" } - bot_door_tiles = { "mcl_bamboo_door_bottom.png", "mcl_bamboo_door_bottom.png" } - end - local name = "mcl_bamboo:bamboo_door" local def = { description = S("Bamboo Door"), @@ -70,8 +55,8 @@ if minetest.get_modpath("mcl_doors") then groups = { handy = 1, axey = 1, material_wood = 1, flammable = -1 }, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = bot_door_tiles, - tiles_top = top_door_tiles, + tiles_bottom = "mcl_bamboo_door_bottom.png", + tiles_top = "mcl_bamboo_door_top.png", sounds = mcl_sounds.node_sound_wood_defaults(), } diff --git a/mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.dk.tr b/mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.dk.tr new file mode 100644 index 000000000..5e05302df --- /dev/null +++ b/mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.dk.tr @@ -0,0 +1,36 @@ +# textdomain: mcl_bamboo + + +### init.lua ### + +A bamboo button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second.=En bambusknap er en rødstenskomponent lavet af sten som giver rødstensenergi når den aktiveres. Når den aktiveres forsyner den tilstøende rødstenskomponenter i 1 sekund. + +A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.=En trætrykplade er en rødstenskomponent som forsyner omkringliggende blokke med rødstensenergi når et bevægeligt objekt (inklusiv tabte genstande, spillere og monstre) er ovenpå den. + +Bamboo=Bambus +Bamboo Button=Bambusknap +Bamboo Door.=Bambusdør +Bamboo Fence=Bambushegn +Bamboo Fence Gate=Bambushegnslåge +Bamboo Plank=Bambusplanke +Bamboo Plank Slab=Bambusplankeplade +Bamboo Plank Stair=Bambusplanketrappe +Bamboo Pressure Plate=Bambustrykplade +Bamboo Sign=Bambusskilt +Bamboo Slab=Bambusplade +Bamboo Stair=Bambustrappe +Bamboo Trapdoor.=Bambusfaldlem +Double Bamboo Plank Slab=Dobbelbambusplanke +Double Bamboo Slab=Dobbelbambusplade +Double Stripped Bamboo Slab=Afbarket dobbelbambus +Nether Brick Fence=Netherstenshegn +Scaffolding=Stillads +Scaffolding (horizontal)=Stillads (horisontal) +Scaffolding block used to climb up or out across areas.=Stilladsblok som bruges til at kravle op ad eller på tværs af områder +Stripped Bamboo Slab=Afbarket bambusplade +Stripped Bamboo Stair=Afbarket bambustrappe + +To open or close the trapdoor, rightclick it or send a redstone signal to it.=Højre-klik eller send rødstensenergi til en faldlem for at åbne eller lukke den, + +Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.=Træfaldlemme er horisontale barrierer som kan åbnes og lukkes med håndkraft eller med rødstensenergi. De kan udgøre den øverste eller den nederste del af en blok afhængigt af hvordan de placeres. Når de er åbne, kan man bruge dem ligesom en stige. + diff --git a/mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.ru.tr b/mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.ru.tr new file mode 100644 index 000000000..3ae22d3c6 --- /dev/null +++ b/mods/ITEMS/mcl_bamboo/locale/mcl_bamboo.ru.tr @@ -0,0 +1,45 @@ +# textdomain: mcl_bamboo + +### bamboo_base.lua ### + +Bamboo=Бамбук +Bamboo Mosaic Plank=Бамбуковая мозаика +Bamboo Plank=Бамбуковые доски +Stripped Bamboo Block=Блок обтёсанного бамбука +Bamboo Block=Блок бамбука + +### bamboo_items.lua ### + +A bamboo button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second.=Бамбуковая кнопка - это компонент красного камня, который изготовлен из краснокаменной руды. Ее можно нажать, чтобы обеспечить питание красному камню. При нажатии он приводит в действие соседние компоненты красного камня на 1 секунду. + +A wooden pressure plate is a redstone component which supplies its surrounding blocks with redstone power while any movable object (including dropped items, players and mobs) rests on top of it.=Деревянная нажимная пластина - это компонент красного камня, который снабжает окружающие блоки энергией красного камня, в то время как любой подвижный объект (включая выпавшие предметы, игроков и мобов) стоит на ней. + +Bamboo=Бамбук +Bamboo Button=Бамбуковая кнопка +Bamboo Door=Бамбуковая дверь +Bamboo Fence=Бамбуковый забор +Bamboo Fence Gate=Бамбуковая калитка +Bamboo Mosaic Slab=Плита из бамбуковой мозаики +Bamboo Mosaic Stair=Ступеньки из бамбуковой мозаики +Bamboo Plank Slab=Бамбуковая плита из досок +Bamboo Plank Stair=Бамбуковые ступеньки из досок +Bamboo Pressure Plate=Бамбуковая нажимная плита +Bamboo Slab=Бамбуковая плита +Bamboo Stair=Бамбуковые ступеньки +Bamboo Trapdoor=Бамбуковый люк +Double Bamboo Mosaic Slab=Двойная бамбуковая мозаичная плита +Double Bamboo Plank Slab=Двойная бамбуковая дощатая плита +Double Bamboo Slab=Двойная бамбуковая плита +Double Stripped Bamboo Slab=Двойная обтесанная бамбуковая плита +Scaffolding=Строительные леса +Scaffolding (horizontal)=Строительные леса (горизонтальный) +Scaffolding block used to climb up or out across areas.=Блок строительных лесов, используемый для подъема вверх или перемещения по другим участкам. +Stripped Bamboo Slab=Обтесанная бамбуковая плита +Stripped Bamboo Stair=Обтесанные бамбуковые ступеньки + +To open or close the trapdoor, rightclick it or send a redstone signal to it.=Чтобы открыть или закрыть люк, щелкните по нему правой кнопкой мыши или отправьте на него сигнал redstone. + +Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder.=Деревянные люки - это горизонтальные барьеры, которые можно открывать и закрывать вручную или по сигналу красного камня. Они занимают верхнюю или нижнюю часть блока, в зависимости от того, как они были размещены. Когда они открыты, по ним можно подниматься, как по лестнице. + +Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal.=Деревянные двери представляют собой барьеры высотой в 2 блока, которые можно открывать или закрывать вручную и по сигналу redstone. +To open or close a wooden door, rightclick it or supply its lower half with a redstone signal.=Чтобы открыть или закрыть деревянную дверь, щелкните по ней правой кнопкой мыши или снабдите ее нижнюю половину сигналом красного камня. diff --git a/mods/ITEMS/mcl_banners/locale/mcl_banners.dk.tr b/mods/ITEMS/mcl_banners/locale/mcl_banners.dk.tr new file mode 100644 index 000000000..6b1f2fc7d --- /dev/null +++ b/mods/ITEMS/mcl_banners/locale/mcl_banners.dk.tr @@ -0,0 +1,77 @@ +# textdomain: mcl_banners +White Banner=Hvidt vanner +White=Hvid +Grey Banner=Gråt banner +Grey=Grå +Light Grey Banner=Lysegråt banner +Light Grey=Lysegrå +Black Banner=Sort banner +Black=Sort +Red Banner=Rødt banner +Red=Rød +Yellow Banner=Gult banner +Yellow=Gul +Green Banner=Grønt banner +Green=Grøn +Cyan Banner=Cyanblåt banner +Cyan=Cyanblå +Blue Banner=Blåt banner +Blue=Blå +Magenta Banner=Magenta banner +Magenta=Magenta +Orange Banner=Orange banner +Orange=Orange +Purple Banner=Lilla banner +Violet=Lilla +Brown Banner=Brunt banner +Brown=Brund +Pink Banner=Lyserødt banner +Pink=Lyserøde +Lime Banner=Limegrønt banner +Lime=Limegrøn +Light Blue Banner=Lyseblåt banner +Light Blue=Lyseblå +Banners are tall colorful decorative blocks. They can be placed on the floor and at walls. Banners can be emblazoned with a variety of patterns using a lot of dye in crafting.=Bannere er høje, farverige udsmykningsblokke. De kan placeres på gulve og vægge. Bannere kan præges med et væld af mønste ved at bruge meget farvestof ved produktion. +Use crafting to draw a pattern on top of the banner. Emblazoned banners can be emblazoned again to combine various patterns. You can draw up to 12 layers on a banner that way. If the banner includes a gradient, only 3 layers are possible.=Brug håndværk til at tegne et mønster på banneret. Prægede bannere kan præges igen for at skabe forskellige mønstre. Du kan lave op til 12 lag ovenpå hinanden. Hvis banneret har en gradient, kan du kun lave 3 lag. +You can copy the pattern of a banner by placing two banners of the same color in the crafting grid—one needs to be emblazoned, the other one must be clean. Finally, you can use a banner on a cauldron with water to wash off its top-most layer.=Du kan kopiere menteret på et banner ved at placere to bannere i den samme farve i håndværksgitteret. Det ene skal være præget, det andet rent. Du kan også bruge et banner på en keddel med vand for at vaske det øverste lag af. +@1 Bordure=@1 kantbånd +@1 Bricks=@1 mursten +@1 Roundel=@1 rundstok +@1 Creeper Charge=@1 creeper +@1 Saltire=@1 saltire +@1 Bordure Indented=@1 kantbånd med savtakker +@1 Per Bend Inverted=@1 nederste venstre diagnoal halvfarvning +@1 Per Bend Sinister Inverted=@1 nederste højre diagonal halvfarvning +@1 Per Bend=@1 øverste højre diagonal halvfarvning +@1 Per Bend Sinister=@1 øverste venstre diagonal halvfarvning +@1 Flower Charge=@1 blomst +@1 Gradient=@1 gradvist oppefra +@1 Base Gradient=@1 gradvist nedefra +@1 Per Fess Inverted=@1 nederste halvdel +@1 Per Fess=@1 øverste halvdel +@1 Per Pale=@1 venstre halvdel +@1 Per Pale Inverted=@1 højre halvdel +@1 Thing Charge=Mojang +@1 Lozenge=Rhombe +@1 Skull Charge=@1 dødningehovde +@1 Paly=@1 lodrette striber +@1 Base Dexter Canton=@1 nederste højre hjørne +@1 Base Sinister Canton=@1 nederste venstre hjørne +@1 Chief Dexter Canton=@1 øverste højre hjørne +@1 Chief Sinister Canton=@1 øverste venstre hjørne +@1 Cross=@1 kryds +@1 Base=@1 bundstribe +@1 Pale=@1 lodret centerstribe +@1 Bend Sinister=@1 diagonal stribe fra nederste venstre hjørne +@1 Bend=@1 diagonal stribe fra nederste højre hjørne +@1 Pale Dexter=@1 venstrestribe +@1 Fess=@1 vandret midterstribe +@1 Pale Sinister=@1 højrestribe +@1 Chief=@1 topstribe +@1 Chevron=@1 bundtrekant +@1 Chevron Inverted=@1 toptrekant +@1 Base Indented=@1 savtakker i bunden +@1 Chief Indented=@1 savtakker i toppen +And one additional layer=Og ét yderligere lag +And @1 additional layers=Og @1 yderligere lag +Paintable decoration=Udsmykning som kan males diff --git a/mods/ITEMS/mcl_barrels/init.lua b/mods/ITEMS/mcl_barrels/init.lua index 714a80f09..e2f46be28 100644 --- a/mods/ITEMS/mcl_barrels/init.lua +++ b/mods/ITEMS/mcl_barrels/init.lua @@ -8,6 +8,7 @@ local open_barrels = {} local drop_content = mcl_util.drop_items_from_meta_container("main") +---@param pos Vector local function on_blast(pos) local node = minetest.get_node(pos) drop_content(pos, node) @@ -45,30 +46,34 @@ local function barrel_open(pos, node, clicker) local playername = clicker:get_player_name() minetest.show_formspec(playername, - "mcl_barrels:barrel_"..pos.x.."_"..pos.y.."_"..pos.z, + "mcl_barrels:barrel_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z, table.concat({ - "size[9,8.75]", - "label[0,0;"..F(C("#313131", name)).."]", - "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]", - mcl_formspec.get_itemslot_bg(0, 0.5, 9, 3), - "label[0,4.0;"..F(C("#313131", S("Inventory"))).."]", - "list[current_player;main;0,4.5;9,3;9]", - mcl_formspec.get_itemslot_bg(0, 4.5, 9, 3), - "list[current_player;main;0,7.74;9,1;]", - mcl_formspec.get_itemslot_bg(0, 7.74, 9, 1), - "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]", + "formspec_version[4]", + "size[11.75,10.425]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, name)) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3), + "list[nodemeta:" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ";main;0.375,0.75;9,3;]", + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + "listring[nodemeta:" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ";main]", "listring[current_player;main]", }) ) - minetest.swap_node(pos, { name = "mcl_barrels:barrel_open", param2 = node.param2 }) + minetest.swap_node(pos, { name = "mcl_barrels:barrel_open", param2 = node.param2 }) open_barrels[playername] = pos - minetest.sound_play({name="mcl_barrels_default_barrel_open", pos=pos, gain=0.5, max_hear_distance=16}, true) + minetest.sound_play({ name = "mcl_barrels_default_barrel_open", pos = pos, gain = 0.5, max_hear_distance = 16 }, true) end +---@param pos Vector local function close_forms(pos) local players = minetest.get_connected_players() - local formname = "mcl_barrels:barrel_"..pos.x.."_"..pos.y.."_"..pos.z + local formname = "mcl_barrels:barrel_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z for p = 1, #players do if vector.distance(players[p]:get_pos(), pos) <= 30 then minetest.close_formspec(players[p]:get_player_name(), formname) @@ -76,15 +81,18 @@ local function close_forms(pos) end end +---@param pos Vector local function update_after_close(pos) local node = minetest.get_node_or_nil(pos) if not node then return end if node.name == "mcl_barrels:barrel_open" then - minetest.swap_node(pos, {name = "mcl_barrels:barrel_closed", param2 = node.param2}) - minetest.sound_play({name="mcl_barrels_default_barrel_close", pos=pos, gain=0.5, max_hear_distance=16}, true) + minetest.swap_node(pos, { name = "mcl_barrels:barrel_closed", param2 = node.param2 }) + minetest.sound_play({ name = "mcl_barrels_default_barrel_close", pos = pos, gain = 0.5, max_hear_distance = 16 }, + true) end end +---@param player ObjectRef local function close_barrel(player) local name = player:get_player_name() local open = open_barrels[name] @@ -102,20 +110,22 @@ minetest.register_node("mcl_barrels:barrel_closed", { _tt_help = S("27 inventory slots"), _doc_items_longdesc = S("Barrels are containers which provide 27 inventory slots."), _doc_items_usagehelp = S("To access its inventory, rightclick it. When broken, the items will drop out."), - tiles = {"mcl_barrels_barrel_top.png^[transformR270", "mcl_barrels_barrel_bottom.png", "mcl_barrels_barrel_side.png"}, + tiles = { "mcl_barrels_barrel_top.png^[transformR270", "mcl_barrels_barrel_bottom.png", "mcl_barrels_barrel_side.png" }, paramtype = "light", paramtype2 = "facedir", on_place = function(itemstack, placer, pointed_thing) - minetest.rotate_and_place(itemstack, placer, pointed_thing, minetest.is_creative_enabled(placer:get_player_name()), {}, false) + minetest.rotate_and_place(itemstack, placer, pointed_thing, + minetest.is_creative_enabled(placer:get_player_name()), {} + , false) return itemstack end, stack_max = 64, sounds = mcl_sounds.node_sound_wood_defaults(), - groups = {handy = 1, axey = 1, container = 2, material_wood = 1, flammable = -1, deco_block = 1}, + groups = { handy = 1, axey = 1, container = 2, material_wood = 1, flammable = -1, deco_block = 1 }, on_construct = function(pos) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - inv:set_size("main", 9*3) + inv:set_size("main", 9 * 3) end, after_place_node = function(pos, placer, itemstack, pointed_thing) minetest.get_meta(pos):set_string("name", itemstack:get_meta():get_string("name")) @@ -124,16 +134,16 @@ minetest.register_node("mcl_barrels:barrel_closed", { allow_metadata_inventory_take = protection_check_put_take, allow_metadata_inventory_put = protection_check_put_take, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in barrel at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff in barrel at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to barrel at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff to barrel at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from barrel at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " takes stuff from barrel at " .. minetest.pos_to_string(pos)) end, after_dig_node = drop_content, on_blast = on_blast, @@ -149,27 +159,35 @@ minetest.register_node("mcl_barrels:barrel_open", { _doc_items_longdesc = S("Barrels are containers which provide 27 inventory slots."), _doc_items_usagehelp = S("To access its inventory, rightclick it. When broken, the items will drop out."), _doc_items_create_entry = false, - tiles = {"mcl_barrels_barrel_top_open.png", "mcl_barrels_barrel_bottom.png", "mcl_barrels_barrel_side.png"}, + tiles = { "mcl_barrels_barrel_top_open.png", "mcl_barrels_barrel_bottom.png", "mcl_barrels_barrel_side.png" }, paramtype = "light", paramtype2 = "facedir", drop = "mcl_barrels:barrel_closed", stack_max = 64, sounds = mcl_sounds.node_sound_wood_defaults(), - groups = {handy = 1, axey = 1, container = 2, material_wood = 1, flammable = -1, deco_block = 1, not_in_creative_inventory = 1}, + groups = { + handy = 1, + axey = 1, + container = 2, + material_wood = 1, + flammable = -1, + deco_block = 1, + not_in_creative_inventory = 1 + }, allow_metadata_inventory_move = protection_check_move, allow_metadata_inventory_take = protection_check_put_take, allow_metadata_inventory_put = protection_check_put_take, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in barrel at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff in barrel at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to barrel at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff to barrel at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from barrel at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " takes stuff from barrel at " .. minetest.pos_to_string(pos)) end, after_dig_node = drop_content, on_blast = on_blast, @@ -193,10 +211,10 @@ end) minetest.register_craft({ output = "mcl_barrels:barrel_closed", recipe = { - {"group:wood", "group:wood_slab", "group:wood"}, - {"group:wood", "", "group:wood"}, - {"group:wood", "group:wood_slab", "group:wood"}, - } + { "group:wood", "group:wood_slab", "group:wood" }, + { "group:wood", "", "group:wood" }, + { "group:wood", "group:wood_slab", "group:wood" }, + }, }) minetest.register_craft({ diff --git a/mods/ITEMS/mcl_barrels/locale/mcl_barrels.dk.tr b/mods/ITEMS/mcl_barrels/locale/mcl_barrels.dk.tr new file mode 100644 index 000000000..316305623 --- /dev/null +++ b/mods/ITEMS/mcl_barrels/locale/mcl_barrels.dk.tr @@ -0,0 +1,5 @@ +# textdomain: mcl_barrels +Barrel=Tønde +Barrels are containers which provide 27 inventory slots.=Tønder er beholdere som kan give 27 oppakningspladser. +To access its inventory, rightclick it. When broken, the items will drop out.=For at tilgå dens indhold kan du højre-klikke. Når den ødelægges falder genstandene ud. +27 inventory slots=27 indholdsspladser. \ No newline at end of file diff --git a/mods/ITEMS/mcl_barrels/locale/mcl_barrels.ru.tr b/mods/ITEMS/mcl_barrels/locale/mcl_barrels.ru.tr index e1fa1b603..2d860c532 100644 --- a/mods/ITEMS/mcl_barrels/locale/mcl_barrels.ru.tr +++ b/mods/ITEMS/mcl_barrels/locale/mcl_barrels.ru.tr @@ -1,5 +1,5 @@ # textdomain: mcl_barrels -Barrel= -Barrels are containers which provide 27 inventory slots.= -To access its inventory, rightclick it. When broken, the items will drop out.= -27 inventory slots= \ No newline at end of file +Barrel=Бочка +Barrels are containers which provide 27 inventory slots.=Бочки — это хранилища, у которых 27 ячеек хранения. +To access its inventory, rightclick it. When broken, the items will drop out.=Чтобы получить доступ к хранилищу, нажмите по нему правой кнопкой мыши. Если его сломать, тогда выпадут предметы. +27 inventory slots=27 ячеек хранения \ No newline at end of file diff --git a/mods/ITEMS/mcl_beacons/init.lua b/mods/ITEMS/mcl_beacons/init.lua index 30a80bc32..9941e9e50 100644 --- a/mods/ITEMS/mcl_beacons/init.lua +++ b/mods/ITEMS/mcl_beacons/init.lua @@ -89,7 +89,7 @@ local function get_beacon_beam(glass_nodename) end minetest.register_node("mcl_beacons:beacon_beam", { - tiles = {"^[colorize:#b8bab9"}, + tiles = {"blank.png^[noalpha^[colorize:#b8bab9"}, drawtype = "nodebox", node_box = { type = "fixed", diff --git a/mods/ITEMS/mcl_beacons/locale/mcl_beacons.dk.tr b/mods/ITEMS/mcl_beacons/locale/mcl_beacons.dk.tr new file mode 100644 index 000000000..cd019fe7c --- /dev/null +++ b/mods/ITEMS/mcl_beacons/locale/mcl_beacons.dk.tr @@ -0,0 +1,6 @@ +# textdomain: mcl_beacons +Beacon=Magisk fyrtårn +Beacon:=Magisk fyrtårn: +Primary Power:=Primær kraft: +Inventory:=Indhold: + diff --git a/mods/ITEMS/mcl_beacons/locale/mcl_beacons.ru.tr b/mods/ITEMS/mcl_beacons/locale/mcl_beacons.ru.tr new file mode 100644 index 000000000..26d430452 --- /dev/null +++ b/mods/ITEMS/mcl_beacons/locale/mcl_beacons.ru.tr @@ -0,0 +1,6 @@ +# textdomain: mcl_beacons +Beacon=Маяк +Beacon:=Маяк: +Primary Power:=Основной эффект: +Inventory:=Инвентарь: + diff --git a/mods/ITEMS/mcl_beds/locale/mcl_beds.dk.tr b/mods/ITEMS/mcl_beds/locale/mcl_beds.dk.tr new file mode 100644 index 000000000..453ec05df --- /dev/null +++ b/mods/ITEMS/mcl_beds/locale/mcl_beds.dk.tr @@ -0,0 +1,43 @@ +# textdomain: mcl_beds +Beds allow you to sleep at night and make the time pass faster.=Senge giver dig mulighed for at sove om natten, og få tiden til at gå hurtigere. +To use a bed, stand close to it and right-click the bed to sleep in it. Sleeping only works when the sun sets, at night or during a thunderstorm. The bed must also be clear of any danger.=For at lægge dig til at sove i en seng skal du stå tæt på den og højre-klikke. Man kan kun sove når solen går ned, om natten eller i tordenvejr. +You have heard of other worlds in which a bed would set the start point for your next life. But this world is not one of them.=Du har hørt om andre verdener hvor en seng var udgangspunktet for dit næste liv, men denne verden er ikke en af dem. +By using a bed, you set the starting point for your next life. If you die, you will start your next life at this bed, unless it is obstructed or destroyed.=Ved at bruge en sætter du udgangspunktet for dit næste liv. Hvis du dør, vil dit næste liv starte i denne seng, medmindre sengen bliver blokeret eller ødelagt. +In this world, going to bed won't skip the night, but it will skip thunderstorms.=I denne verden, springer det ikke natten over at sove, men det springer tordenvejr over. +Sleeping allows you to skip the night. The night is skipped when all players in this world went to sleep. The night is skipped after sleeping for a few seconds. Thunderstorms can be skipped in the same manner.=Du kan springe natten over ved at sove. Natten bliver sprunget over hvis alle spillere i verdenen sover. Natten bliver sprunget over efter at have sovet i nogle få sekunder. Tordenvejr kan springes over på samme måde. +Bed=Seng +Red Bed=Rød seng +Blue Bed=Blå seng +Cyan Bed=Cyanblå seng +Grey Bed=Grå seng +Light Grey Bed=Lysegrå seng +Black Bed=Sort senge +Yellow Bed=Gul senge +Green Bed=Grøn seng +Magenta Bed=Magenta seng +Orange Bed=Orange seng +Purple Bed=Lilla seng +Brown Bed=Brun seng +Pink Bed=Lyserød seng +Lime Bed=Limegrøn seng +Light Blue Bed=Lyseblå seng +White Bed=Hvid seng +You can't sleep, the bed's too far away!=Du kan ikke gå i seng, sengen er for langt væk! +This bed is already occupied!=Denne seng er optaget! +You have to stop moving before going to bed!=Du skal stå stille før du kan gå i seng. +You can't sleep now, monsters are nearby!=Du kan ikke lægge dig til at sove nu, der er monstre tæt på! +You can't sleep, the bed is obstructed!=Du kan ikke gå i seng, denne seng er blokeret! +It's too dangerous to sleep here!=Det er for farligt at sove her! +New respawn position set! But you can only sleep at night or during a thunderstorm.=Nyt genopståelsespunt sat! Men du kan kun sover om natten eller under et tordenvejr. +You can only sleep at night or during a thunderstorm.=Du kan kun sover om natten eller under et tordenvejr. +New respawn position set!=Nyt genopståelsespunkt sat! +Leave bed=Forlad seng +Abort sleep=Afbryd søvn +Players in bed: @1/@2=@1 af @2 spillere er gået i seng. +Note: Night skip is disabled.=Bemærk: Det er slået fra at springe natten over. +You're sleeping.=Du sover. +You will fall asleep when all players are in bed.=Du falder i søvn når alle andre spillere er gået i seng. +You will fall asleep when @1% of all players are in bed.=Du falder i søvn når @1% af alle spillere er gået i seng. +You're in bed.=Du er gået i seng. +Allows you to sleep=Gør dig i stand til at sove. +Respawn Anchor=Genopståelsesanker diff --git a/mods/ITEMS/mcl_beehives/init.lua b/mods/ITEMS/mcl_beehives/init.lua index 82b3cae5f..d20370ca7 100644 --- a/mods/ITEMS/mcl_beehives/init.lua +++ b/mods/ITEMS/mcl_beehives/init.lua @@ -8,7 +8,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) -- Function to allow harvesting honey and honeycomb from the beehive and bee nest. local honey_harvest = function(pos, node, player, itemstack, pointed_thing) local inv = player:get_inventory() - local shears = player:get_wielded_item():get_name() == "mcl_tools:shears" + local shears = minetest.get_item_group(player:get_wielded_item():get_name(), "shears") > 0 local bottle = player:get_wielded_item():get_name() == "mcl_potions:glass_bottle" local beehive = "mcl_beehives:beehive" local is_creative = minetest.is_creative_enabled(player:get_player_name()) diff --git a/mods/ITEMS/mcl_beehives/locale/mcl_beehives.dk.tr b/mods/ITEMS/mcl_beehives/locale/mcl_beehives.dk.tr new file mode 100644 index 000000000..61510cbc1 --- /dev/null +++ b/mods/ITEMS/mcl_beehives/locale/mcl_beehives.dk.tr @@ -0,0 +1,4 @@ +Beehive=Bistade +Artificial bee nest.=Kunstigt bibo. +Bee Nest=Bibo +A naturally generating block that houses bees and a tasty treat...if you can get it.=En naturligt genereret blok som indeholde bier og velsmagende godter... hvis du kan få fat i dem. \ No newline at end of file diff --git a/mods/ITEMS/mcl_bells/locale/mcl_bells.dk.tr b/mods/ITEMS/mcl_bells/locale/mcl_bells.dk.tr new file mode 100644 index 000000000..6089d8f6b --- /dev/null +++ b/mods/ITEMS/mcl_bells/locale/mcl_bells.dk.tr @@ -0,0 +1,2 @@ +# textdomain: mcl_bells +Bell=Klokke diff --git a/mods/ITEMS/mcl_blackstone/init.lua b/mods/ITEMS/mcl_blackstone/init.lua index c428fe7c6..fd05465d3 100644 --- a/mods/ITEMS/mcl_blackstone/init.lua +++ b/mods/ITEMS/mcl_blackstone/init.lua @@ -36,7 +36,13 @@ minetest.register_node("mcl_blackstone:blackstone_gilded", { _mcl_blast_resistance = 2, _mcl_hardness = 2, _mcl_silk_touch_drop = true, - _mcl_fortune_drop = mcl_core.fortune_drop_ore, + _mcl_fortune_drop = { + discrete_uniform_distribution = true, + items = {"mcl_core:gold_nugget"}, + min_count = 2, + max_count = 5, + cap = 5, + }, }) minetest.register_node("mcl_blackstone:nether_gold", { description = S("Nether Gold Ore"), diff --git a/mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.dk.tr b/mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.dk.tr new file mode 100644 index 000000000..0a5f4ce38 --- /dev/null +++ b/mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.dk.tr @@ -0,0 +1,28 @@ +# textdomain: mcl_blackstone +Blackstone=Sortsten +Polished Blackstone=Poleret sortsten +Chiseled Polished Blackstone=Majslet poleret sortsten +Polished Blackstone Bricks=Poleret sortsten-mursten +Basalt=Basalt +Polished Basalt=Poleret basalt +Blackstone Slab=Sortstensflise +Polished Blackstone Slab=Poleret sortstensflise +Chiseled Polished Blackstone Slab=Majslet poleret sortstensflise +Polished Blackstone Brick Slab=Poleret sortstens-murstensflise +Blackstone Stair=Sortstenstrappe +Polished Blackstone Stair=Poleret sortstenstrappe +Chiseled Polished Blackstone Stair=Majslet poleret sortstenstrappe +Polished Blackstone Brick Stair=Poleret sortstens-murstenstrappe +Quartz Bricks=Qvarts-mursten +Soul Torch=Sjæleildsfakkel +Soul Lantern=Sjældeildslaterne +Soul Soil=Sjælejord +Eternal Soul Fire=Evig sjæleild +Gilded Blackstone=Forgyldt sortsten +Nether Gold Ore=Nether guldmalm +Smooth Basalt=Glat basalt +Blackstone Wall=Sorstensmur +Double Blackstone Slab=Dobbelt sortstensflise +Polished Double Blackstone Slab=Poleret dobbelt sortstensflise +Double Chiseled Polished Blackstone Slab=Dobbelt majslet poleret sortstensflise +Double Polished Blackstone Brick Slab=Dobbelt poleret sortstens-murstensflise \ No newline at end of file diff --git a/mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.ru.tr b/mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.ru.tr new file mode 100644 index 000000000..8e27983ea --- /dev/null +++ b/mods/ITEMS/mcl_blackstone/locale/mcl_blackstone.ru.tr @@ -0,0 +1,29 @@ +# textdomain: mcl_blackstone +Blackstone=Чернит +Polished Blackstone=Полированный чернит +Chiseled Polished Blackstone=Резной полированный чернит +Polished Blackstone Bricks=Полированный чернокаменный кирпич +Basalt=Базальт +Polished Basalt=Полированный базальт +Blackstone Slab=Чернитная плита +Polished Blackstone Slab=Плита из полированного чернита +Chiseled Polished Blackstone Slab=Резная полированная чернитная плита +Polished Blackstone Brick Slab=Плита из полированно-чернитного кирпича +Blackstone Stair=Чернитные ступеньки +Polished Blackstone Stair=Ступеньки из полированно-чернитного кирпича +Chiseled Polished Blackstone Stair=Резные полированные чернитные ступеньки +Polished Blackstone Brick Stair=Ступеньки из полированно-чернитного кирпича +Quartz Bricks=Кварцевые кирпичи +Soul Torch=Факел душ +Torches are light sources which can be placed at the side or on the top of most blocks.=Факелы - это источники света, которые могут быть размещены сбоку или сверху большинства блоков. +Soul Lantern=Фонарь душ +Soul Soil=Почва душ +Eternal Soul Fire=Пламя душ +Gilded Blackstone=Золочёный чернит +Nether Gold Ore=Незерская золотая руда +Smooth Basalt=Гладкий базальт +Blackstone Wall=Чернитная стена +Double Blackstone Slab=Двойная чернитная плита +Polished Double Blackstone Slab=Полированная двойная чернитная плита +Double Chiseled Polished Blackstone Slab=Двойная резная полированная чернитная плита +Double Polished Blackstone Brick Slab=Двойная плита из полированно-чернитного кирпича diff --git a/mods/ITEMS/mcl_blast_furnace/init.lua b/mods/ITEMS/mcl_blast_furnace/init.lua index e8e6e81c8..51a8f193a 100644 --- a/mods/ITEMS/mcl_blast_furnace/init.lua +++ b/mods/ITEMS/mcl_blast_furnace/init.lua @@ -1,5 +1,6 @@ - local S = minetest.get_translator(minetest.get_current_modname()) +local C = minetest.colorize +local F = minetest.formspec_escape local LIGHT_ACTIVE_FURNACE = 13 @@ -8,60 +9,82 @@ local LIGHT_ACTIVE_FURNACE = 13 -- local function active_formspec(fuel_percent, item_percent) - return "size[9,8.75]".. - "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Blast Furnace"))).."]".. - "list[context;src;2.75,0.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. - "list[context;fuel;2.75,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. - "list[context;dst;5.75,1.5;1,1;]".. - mcl_formspec.get_itemslot_bg(5.75,1.5,1,1).. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. - (100-fuel_percent)..":default_furnace_fire_fg.png]".. - "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[lowpart:".. - (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]".. - -- Craft guide button temporarily removed due to Minetest bug. - -- TODO: Add it back when the Minetest bug is fixed. - --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. - --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. - "listring[context;dst]".. - "listring[current_player;main]".. - "listring[context;src]".. - "listring[current_player;main]".. - "listring[context;fuel]".. - "listring[current_player;main]" + return table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Blast Furnace"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(3.5, 0.75, 1, 1), + "list[context;src;3.5,0.75;1,1;]", + + "image[3.5,2;1,1;default_furnace_fire_bg.png^[lowpart:" .. + (100 - fuel_percent) .. ":default_furnace_fire_fg.png]", + + mcl_formspec.get_itemslot_bg_v4(3.5, 3.25, 1, 1), + "list[context;fuel;3.5,3.25;1,1;]", + + "image[5.25,2;1.5,1;gui_furnace_arrow_bg.png^[lowpart:" .. + (item_percent) .. ":gui_furnace_arrow_fg.png^[transformR270]", + mcl_formspec.get_itemslot_bg_v4(7.875, 2, 1, 1, 0.2), + "list[context;dst;7.875,2;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + -- Craft guide button temporarily removed due to Minetest bug. + -- TODO: Add it back when the Minetest bug is fixed. + --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. + --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. + + "listring[context;dst]", + "listring[current_player;main]", + "listring[context;src]", + "listring[current_player;main]", + "listring[context;fuel]", + "listring[current_player;main]", + }) end -local inactive_formspec = "size[9,8.75]".. - "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Blast Furnace"))).."]".. - "list[context;src;2.75,0.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. - "list[context;fuel;2.75,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. - "list[context;dst;5.75,1.5;1,1;]".. - mcl_formspec.get_itemslot_bg(5.75,1.5,1,1).. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. - "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[transformR270]".. +local inactive_formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Blast Furnace"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(3.5, 0.75, 1, 1), + "list[context;src;3.5,0.75;1,1;]", + + "image[3.5,2;1,1;default_furnace_fire_bg.png]", + + mcl_formspec.get_itemslot_bg_v4(3.5, 3.25, 1, 1), + "list[context;fuel;3.5,3.25;1,1;]", + + "image[5.25,2;1.5,1;gui_furnace_arrow_bg.png^[transformR270]", + + mcl_formspec.get_itemslot_bg_v4(7.875, 2, 1, 1, 0.2), + "list[context;dst;7.875,2;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + -- Craft guide button temporarily removed due to Minetest bug. -- TODO: Add it back when the Minetest bug is fixed. --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. - "listring[context;dst]".. - "listring[current_player;main]".. - "listring[context;src]".. - "listring[current_player;main]".. - "listring[context;fuel]".. - "listring[current_player;main]" + + "listring[context;dst]", + "listring[current_player;main]", + "listring[context;src]", + "listring[current_player;main]", + "listring[context;fuel]", + "listring[current_player;main]", +}) + local receive_fields = function(pos, formname, fields, sender) if fields.craftguide then @@ -71,7 +94,7 @@ end local function give_xp(pos, player) local meta = minetest.get_meta(pos) - local dir = vector.divide(minetest.facedir_to_dir(minetest.get_node(pos).param2),-1.95) + local dir = vector.divide(minetest.facedir_to_dir(minetest.get_node(pos).param2), -1.95) local xp = meta:get_int("xp") if xp > 0 then if player then @@ -99,7 +122,7 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player) -- Test stack with size 1 because we burn one fuel at a time local teststack = ItemStack(stack) teststack:set_count(1) - local output, decremented_input = minetest.get_craft_result({method="fuel", width=1, items={teststack}}) + local output, decremented_input = minetest.get_craft_result({ method = "fuel", width = 1, items = { teststack } }) if output.time ~= 0 then -- Only allow to place 1 item if fuel get replaced by recipe. -- This is the case for lava buckets. @@ -160,17 +183,17 @@ local function spawn_flames(pos, param2) local minrelpos, maxrelpos local dir = minetest.facedir_to_dir(param2) if dir.x > 0 then - minrelpos = { x = -0.6, y = -0.05, z = -0.25 } - maxrelpos = { x = -0.55, y = -0.45, z = 0.25 } + minrelpos = vector.new(-0.6, -0.05, -0.25) + maxrelpos = vector.new(-0.55, -0.45, 0.25) elseif dir.x < 0 then - minrelpos = { x = 0.55, y = -0.05, z = -0.25 } - maxrelpos = { x = 0.6, y = -0.45, z = 0.25 } + minrelpos = vector.new(0.55, -0.05, -0.25) + maxrelpos = vector.new(0.6, -0.45, 0.25) elseif dir.z > 0 then - minrelpos = { x = -0.25, y = -0.05, z = -0.6 } - maxrelpos = { x = 0.25, y = -0.45, z = -0.55 } + minrelpos = vector.new(-0.25, -0.05, -0.6) + maxrelpos = vector.new(0.25, 0.45, -0.55) elseif dir.z < 0 then - minrelpos = { x = -0.25, y = -0.05, z = 0.55 } - maxrelpos = { x = 0.25, y = -0.45, z = 0.6 } + minrelpos = vector.new(-0.25, -0.05, 0.55) + maxrelpos = vector.new(0.25, -0.45, 0.6) else return end @@ -179,8 +202,8 @@ local function spawn_flames(pos, param2) time = 0, minpos = vector.add(pos, minrelpos), maxpos = vector.add(pos, maxrelpos), - minvel = { x = -0.01, y = 0, z = -0.01 }, - maxvel = { x = 0.01, y = 0.1, z = 0.01 }, + minvel = vector.new(-0.01, 0, -0.01), + maxvel = vector.new(0.01, 0.1, 0.01), minexptime = 0.3, maxexptime = 0.6, minsize = 0.4, @@ -293,7 +316,7 @@ local function blast_furnace_node_timer(pos, elapsed) -- Check if we have cookable content: cookable local aftercooked - cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) + cooked, aftercooked = minetest.get_craft_result({ method = "cooking", width = 1, items = srclist }) cookable = minetest.get_item_group(inv:get_stack("src", 1):get_name(), "blast_furnace_smeltable") == 1 if cookable then -- Successful cooking requires space in dst slot and time @@ -311,7 +334,7 @@ local function blast_furnace_node_timer(pos, elapsed) if cookable and not active then -- We need to get new fuel local afterfuel - fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist}) + fuel, afterfuel = minetest.get_craft_result({ method = "fuel", width = 1, items = fuellist }) if fuel.time == 0 then -- No valid fuel in fuel list -- stop @@ -343,7 +366,7 @@ local function blast_furnace_node_timer(pos, elapsed) srclist = inv:get_list("src") src_time = 0 - meta:set_int("xp", meta:get_int("xp") + 1) -- ToDo give each recipe an idividial XP count + meta:set_int("xp", meta:get_int("xp") + 1) -- ToDo give each recipe an idividial XP count end end @@ -390,9 +413,9 @@ local function blast_furnace_node_timer(pos, elapsed) meta:set_float("fuel_time", fuel_time) meta:set_float("src_time", src_time) if srclist then - meta:set_string("src_item", src_item) + meta:set_string("src_item", src_item) else - meta:set_string("src_item", "") + meta:set_string("src_item", "") end meta:set_string("formspec", formspec) @@ -415,13 +438,14 @@ end minetest.register_node("mcl_blast_furnace:blast_furnace", { description = S("Blast Furnace"), _tt_help = S("Smelts ores faster than furnace"), - _doc_items_longdesc = S("Blast Furnaces smelt several items, mainly ores and armor, using a furnace fuel, but twice as fast as a normal furnace."), + _doc_items_longdesc = S( + "Blast Furnaces smelt several items, mainly ores and armor, using a furnace fuel, but twice as fast as a normal furnace."), _doc_items_usagehelp = - S("Use the blast furnace to open the furnace menu.").."\n".. - S("Place a furnace fuel in the lower slot and the source material in the upper slot.").."\n".. - S("The blast furnace will slowly use its fuel to smelt the item.").."\n".. - S("The result will be placed into the output slot at the right side.").."\n".. - S("Use the recipe book to see what ores you can smelt, what you can use as fuel and how long it will burn."), + S("Use the blast furnace to open the furnace menu.") .. "\n" .. + S("Place a furnace fuel in the lower slot and the source material in the upper slot.") .. "\n" .. + S("The blast furnace will slowly use its fuel to smelt the item.") .. "\n" .. + S("The result will be placed into the output slot at the right side.") .. "\n" .. + S("Use the recipe book to see what ores you can smelt, what you can use as fuel and how long it will burn."), _doc_items_hidden = false, tiles = { "blast_furnace_top.png", "blast_furnace_top.png", @@ -429,7 +453,7 @@ minetest.register_node("mcl_blast_furnace:blast_furnace", { "blast_furnace_side.png", "blast_furnace_front.png" }, paramtype2 = "facedir", - groups = {pickaxey=1, container=4, deco_block=1, material_stone=1}, + groups = { pickaxey = 1, container = 4, deco_block = 1, material_stone = 1 }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), @@ -439,11 +463,10 @@ minetest.register_node("mcl_blast_furnace:blast_furnace", { local meta2 = meta:to_table() meta:from_table(oldmetadata) local inv = meta:get_inventory() - for _, listname in ipairs({"src", "dst", "fuel"}) do + for _, listname in ipairs({ "src", "dst", "fuel" }) do local stack = inv:get_stack(listname, 1) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} - minetest.add_item(p, stack) + minetest.add_item(vector.offset(pos, math.random(0, 10) / 10 - 0.5, 0, math.random(0, 10) / 10 - 0.5), stack) end end meta:from_table(meta2) @@ -499,14 +522,16 @@ minetest.register_node("mcl_blast_furnace:blast_furnace_active", { tiles = { "blast_furnace_top.png", "blast_furnace_top.png", "blast_furnace_side.png", "blast_furnace_side.png", - "blast_furnace_side.png", {name = "blast_furnace_front_on.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 48}}, + "blast_furnace_side.png", { + name = "blast_furnace_front_on.png", + animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 48 } + }, }, paramtype2 = "facedir", paramtype = "light", light_source = LIGHT_ACTIVE_FURNACE, drop = "mcl_blast_furnace:blast_furnace", - groups = {pickaxey=1, container=4, deco_block=1, not_in_creative_inventory=1, material_stone=1}, + groups = { pickaxey = 1, container = 4, deco_block = 1, not_in_creative_inventory = 1, material_stone = 1 }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), on_timer = blast_furnace_node_timer, @@ -516,10 +541,14 @@ minetest.register_node("mcl_blast_furnace:blast_furnace_active", { local meta2 = meta meta:from_table(oldmetadata) local inv = meta:get_inventory() - for _, listname in ipairs({"src", "dst", "fuel"}) do + for _, listname in ipairs({ "src", "dst", "fuel" }) do local stack = inv:get_stack(listname, 1) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} + local p = vector.new( + pos.x + math.random(0, 10) / 10 - 0.5, + pos.y, + pos.z + math.random(0, 10) / 10 - 0.5 + ) minetest.add_item(p, stack) end end @@ -550,8 +579,8 @@ minetest.register_node("mcl_blast_furnace:blast_furnace_active", { minetest.register_craft({ output = "mcl_blast_furnace:blast_furnace", recipe = { - { "mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot" }, - { "mcl_core:iron_ingot", "mcl_furnaces:furnace", "mcl_core:iron_ingot" }, + { "mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot" }, + { "mcl_core:iron_ingot", "mcl_furnaces:furnace", "mcl_core:iron_ingot" }, { "mcl_core:stone_smooth", "mcl_core:stone_smooth", "mcl_core:stone_smooth" }, } }) @@ -564,10 +593,9 @@ end minetest.register_lbm({ label = "Active blast_furnace flame particles", name = "mcl_blast_furnace:flames", - nodenames = {"mcl_blast_furnace:blast_furnace_active"}, + nodenames = { "mcl_blast_furnace:blast_furnace_active" }, run_at_every_load = true, action = function(pos, node) spawn_flames(pos, node.param2) end, }) - diff --git a/mods/ITEMS/mcl_blast_furnace/locale/mcl_blast_furnace.dk.tr b/mods/ITEMS/mcl_blast_furnace/locale/mcl_blast_furnace.dk.tr new file mode 100644 index 000000000..82e74c0fe --- /dev/null +++ b/mods/ITEMS/mcl_blast_furnace/locale/mcl_blast_furnace.dk.tr @@ -0,0 +1,8 @@ +# textdomain: mcl_blast_furnace +Inventory=Indhold +Blast Furnace=Højovn +Smelts ores faster than furnace=Smelter malm hurtere end en normal ovn. +Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.=Brug opskriftsbogen for at se hvad du kan smelte, hvad du kan bruge som brændsel og hvor længe det brænder. +Use the furnace to open the furnace menu.\nPlace a furnace fuel in the lower slot and the source material in the upper slot.\nThe furnace will slowly use its fuel to smelt the item.\nThe result will be placed into the output slot at the right side.=Brug ovnen for at åbne ovnmenuen. \nPut ovnbrændsel i den nederste plads og det som skal smeltes i den øverste plads.\nOvnen vil langsom bruge dens brændsel til at smelte genstanden.\nResultatet vil blive puttet i pladsen på højre side. +Blast Furnaces smelt several items, mainly ores and armor, using a furnace fuel, into something else.=Højovne kan, ved brug af brændsel, smelte flere genstande, hovedsageligt malm og rustning, og lave dem til noget andet. +Active Blast Furnace=Aktiv højovn \ No newline at end of file diff --git a/mods/ITEMS/mcl_blast_furnace/locale/mcl_blast_furnace.es.tr b/mods/ITEMS/mcl_blast_furnace/locale/mcl_blast_furnace.es.tr new file mode 100644 index 000000000..bdae19760 --- /dev/null +++ b/mods/ITEMS/mcl_blast_furnace/locale/mcl_blast_furnace.es.tr @@ -0,0 +1,11 @@ +# textdomain: mcl_blast_furnace +Inventory=Inventario +Blast Furnace=Alto horno +Smelts ores faster than furnace=Funde menas más rápido que el horno +Use the recipe book to see what ores you can smelt, what you can use as fuel and how long it will burn.=Use el libro de recetas para ver que menas puede fundir, qué puede usar como combustible y durante cuánto tiempo arderá. +Use the blast furnace to open the furnace menu.=Use el alto horno para abrir el menú del horno. +Place a furnace fuel in the lower slot and the source material in the upper slot.=Coloque un combustible de horno en la ranura inferior y el material de origen en la ranura superior. +The blast furnace will slowly use its fuel to smelt the item.=El alto horno usará lentamente su combustible para fundir el artículo. +The result will be placed into the output slot at the right side.=El resultado se colocará en la ranura de salida en el lado derecho. +Blast Furnaces smelt several items, mainly ores and armor, using a furnace fuel, but twice as fast as a normal furnace.=Los altos hornos funden varios artículos, principalmente menas y armadura, usando combustible de horno, pero el doble de rápido que un horno normal. +Active Blast Furnace=Alto horno activo diff --git a/mods/ITEMS/mcl_books/init.lua b/mods/ITEMS/mcl_books/init.lua index af84feb66..e2f391b17 100644 --- a/mods/ITEMS/mcl_books/init.lua +++ b/mods/ITEMS/mcl_books/init.lua @@ -5,7 +5,7 @@ local C = minetest.colorize local max_text_length = 4500 -- TODO: Increase to 12800 when scroll bar was added to written book local max_title_length = 64 -local bookshelf_inv = minetest.settings:get_bool("mcl_bookshelf_inventories",true) +local bookshelf_inv = minetest.settings:get_bool("mcl_bookshelf_inventories", true) local header = "" if minetest.get_modpath("mcl_init") then @@ -19,7 +19,7 @@ minetest.register_craftitem("mcl_books:book", { _doc_items_longdesc = S("Books are used to make bookshelves and book and quills."), inventory_image = "default_book.png", stack_max = 64, - groups = { book=1, craftitem = 1, enchantability = 1 }, + groups = { book = 1, craftitem = 1, enchantability = 1 }, _mcl_enchanting_enchanted_tool = "mcl_enchanting:book_enchanted", }) @@ -85,18 +85,19 @@ local function write(itemstack, user, pointed_thing) local node = minetest.get_node(pointed_thing.under) if user and not user:get_player_control().sneak then if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then - return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack + return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or + itemstack end end end local text = get_text(itemstack) - local formspec = "size[8,9]".. - header.. - "background[-0.5,-0.5;9,10;mcl_books_book_bg.png]".. - "textarea[0.75,0.1;7.25,9;text;;"..minetest.formspec_escape(text).."]".. - "button[0.75,7.95;3,1;sign;"..minetest.formspec_escape(S("Sign")).."]".. - "button_exit[4.25,7.95;3,1;ok;"..minetest.formspec_escape(S("Done")).."]" + local formspec = "size[8,9]" .. + header .. + "background[-0.5,-0.5;9,10;mcl_books_book_bg.png]" .. + "textarea[0.75,0.1;7.25,9;text;;" .. minetest.formspec_escape(text) .. "]" .. + "button[0.75,7.95;3,1;sign;" .. minetest.formspec_escape(S("Sign")) .. "]" .. + "button_exit[4.25,7.95;3,1;ok;" .. minetest.formspec_escape(S("Done")) .. "]" minetest.show_formspec(user:get_player_name(), "mcl_books:writable_book", formspec) end @@ -106,17 +107,18 @@ local function read(itemstack, user, pointed_thing) local node = minetest.get_node(pointed_thing.under) if user and not user:get_player_control().sneak then if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then - return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack + return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or + itemstack end end end local text = get_text(itemstack) - local formspec = "size[8,9]".. - header.. - "background[-0.5,-0.5;9,10;mcl_books_book_bg.png]".. - "textarea[0.75,0.1;7.25,9;;"..minetest.formspec_escape(text)..";]".. - "button_exit[2.25,7.95;3,1;ok;"..minetest.formspec_escape(S("Done")).."]" + local formspec = "size[8,9]" .. + header .. + "background[-0.5,-0.5;9,10;mcl_books_book_bg.png]" .. + "textarea[0.75,0.1;7.25,9;;" .. minetest.formspec_escape(text) .. ";]" .. + "button_exit[2.25,7.95;3,1;ok;" .. minetest.formspec_escape(S("Done")) .. "]" minetest.show_formspec(user:get_player_name(), "mcl_books:written_book", formspec) end @@ -125,16 +127,18 @@ minetest.register_craftitem("mcl_books:writable_book", { description = S("Book and Quill"), _tt_help = S("Write down some notes"), _doc_items_longdesc = S("This item can be used to write down some notes."), - _doc_items_usagehelp = S("Hold it in the hand, then rightclick to read the current notes and edit then. You can edit the text as often as you like. You can also sign the book which turns it into a written book which you can stack, but it can't be edited anymore.").."\n".. - S("A book can hold up to 4500 characters. The title length is limited to 64 characters."), + _doc_items_usagehelp = S( + "Hold it in the hand, then rightclick to read the current notes and edit then. You can edit the text as often as you like. You can also sign the book which turns it into a written book which you can stack, but it can't be edited anymore.") + .. "\n" .. + S("A book can hold up to 4500 characters. The title length is limited to 64 characters."), inventory_image = "mcl_books_book_writable.png", - groups = { book=1 }, + groups = { book = 1 }, stack_max = 1, on_place = write, on_secondary_use = write, }) -minetest.register_on_player_receive_fields(function ( player, formname, fields ) +minetest.register_on_player_receive_fields(function(player, formname, fields) if ((formname == "mcl_books:writable_book") and fields and fields.text) then local stack = player:get_wielded_item() if (stack:get_name() and (stack:get_name() == "mcl_books:writable_book")) then @@ -148,14 +152,17 @@ minetest.register_on_player_receive_fields(function ( player, formname, fields ) player:set_wielded_item(stack) local name = player:get_player_name() - local formspec = "size[8,9]".. - header.. - "background[-0.5,-0.5;9,10;mcl_books_book_bg.png]".. - "field[0.75,1;7.25,1;title;"..minetest.formspec_escape(minetest.colorize("#000000", S("Enter book title:")))..";]".. - "label[0.75,1.5;"..minetest.formspec_escape(minetest.colorize("#404040", S("by @1", name))).."]".. - "button_exit[0.75,7.95;3,1;sign;"..minetest.formspec_escape(S("Sign and Close")).."]".. - "tooltip[sign;"..minetest.formspec_escape(S("Note: The book will no longer be editable after signing")).."]".. - "button[4.25,7.95;3,1;cancel;"..minetest.formspec_escape(S("Cancel")).."]" + local formspec = "size[8,9]" .. + header .. + "background[-0.5,-0.5;9,10;mcl_books_book_bg.png]" .. + "field[0.75,1;7.25,1;title;" .. + minetest.formspec_escape(minetest.colorize("#000000", S("Enter book title:"))) .. ";]" .. + "label[0.75,1.5;" .. + minetest.formspec_escape(minetest.colorize("#404040", S("by @1", name))) .. "]" .. + "button_exit[0.75,7.95;3,1;sign;" .. minetest.formspec_escape(S("Sign and Close")) .. "]" .. + "tooltip[sign;" .. + minetest.formspec_escape(S("Note: The book will no longer be editable after signing")) .. "]" .. + "button[4.25,7.95;3,1;cancel;" .. minetest.formspec_escape(S("Cancel")) .. "]" minetest.show_formspec(player:get_player_name(), "mcl_books:signing", formspec) end end @@ -181,7 +188,7 @@ minetest.register_on_player_receive_fields(function ( player, formname, fields ) player:set_wielded_item(newbook) else - minetest.log("error", "[mcl_books] "..name.." failed to sign a book!") + minetest.log("error", "[mcl_books] " .. name .. " failed to sign a book!") end elseif ((formname == "mcl_books:signing") and fields and fields.cancel) then local book = player:get_wielded_item() @@ -202,12 +209,16 @@ end -- Written Book minetest.register_craftitem("mcl_books:written_book", { description = S("Written Book"), - _doc_items_longdesc = S("Written books contain some text written by someone. They can be read and copied, but not edited."), - _doc_items_usagehelp = S("Hold it in your hand, then rightclick to read the book.").."\n\n".. - -S("To copy the text of the written book, place it into the crafting grid together with a book and quill (or multiple of those) and craft. The written book will not be consumed. Copies of copies can not be copied."), + _doc_items_longdesc = S( + "Written books contain some text written by someone. They can be read and copied, but not edited." + ), + _doc_items_usagehelp = S("Hold it in your hand, then rightclick to read the book.") .. + "\n\n" .. + S( + "To copy the text of the written book, place it into the crafting grid together with a book and quill (or multiple of those) and craft. The written book will not be consumed. Copies of copies can not be copied." + ), inventory_image = "mcl_books_book_written.png", - groups = { not_in_creative_inventory=1, book=1, no_rename=1 }, + groups = { not_in_creative_inventory = 1, book = 1, no_rename = 1 }, stack_max = 16, on_place = read, on_secondary_use = read @@ -219,19 +230,19 @@ S("To copy the text of the written book, place it into the crafting grid togethe local baq = "mcl_books:writable_book" local wb = "mcl_books:written_book" local recipes = { - {wb, baq}, - {baq, baq, wb}, - {baq, baq, wb, baq}, - {baq, baq, baq, baq, wb}, - {baq, baq, baq, baq, wb, baq}, - {baq, baq, baq, baq, wb, baq, baq}, - {baq, baq, baq, baq, wb, baq, baq, baq}, - {baq, baq, baq, baq, wb, baq, baq, baq, baq}, + { wb, baq }, + { baq, baq, wb }, + { baq, baq, wb, baq }, + { baq, baq, baq, baq, wb }, + { baq, baq, baq, baq, wb, baq }, + { baq, baq, baq, baq, wb, baq, baq }, + { baq, baq, baq, baq, wb, baq, baq, baq }, + { baq, baq, baq, baq, wb, baq, baq, baq, baq }, } -for r=#recipes, 1, -1 do +for r = #recipes, 1, -1 do minetest.register_craft({ type = "shapeless", - output = "mcl_books:written_book "..r, + output = "mcl_books:written_book " .. r, recipe = recipes[r], }) end @@ -367,6 +378,9 @@ local function protection_check_put_take(pos, listname, index, stack, player) end end +---@param pos Vector +---@param node node +---@param clicker ObjectRef local function bookshelf_gui(pos, node, clicker) if not bookshelf_inv then return end local name = minetest.get_meta(pos):get_string("name") @@ -378,18 +392,22 @@ local function bookshelf_gui(pos, node, clicker) local playername = clicker:get_player_name() minetest.show_formspec(playername, - "mcl_books:bookshelf_"..pos.x.."_"..pos.y.."_"..pos.z, + "mcl_books:bookshelf_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z, table.concat({ - "size[9,8.75]", - "label[0,0;"..F(C("#313131", name)).."]", - "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]", - mcl_formspec.get_itemslot_bg(0, 0.5, 9, 3), - "label[0,4.0;"..F(C("#313131", S("Inventory"))).."]", - "list[current_player;main;0,4.5;9,3;9]", - mcl_formspec.get_itemslot_bg(0, 4.5, 9, 3), - "list[current_player;main;0,7.74;9,1;]", - mcl_formspec.get_itemslot_bg(0, 7.74, 9, 1), - "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]", + "formspec_version[4]", + "size[11.75,10.425]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, name)) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3), + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3, 0, "mcl_book_book_empty_slot.png"), + "list[nodemeta:" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ";main;0.375,0.75;9,3;]", + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + "listring[nodemeta:" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ";main]", "listring[current_player;main]", }) ) @@ -397,7 +415,7 @@ end local function close_forms(pos) local players = minetest.get_connected_players() - local formname = "mcl_books:bookshelf_"..pos.x.."_"..pos.y.."_"..pos.z + local formname = "mcl_books:bookshelf_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z for p = 1, #players do if vector.distance(players[p]:get_pos(), pos) <= 30 then minetest.close_formspec(players[p]:get_player_name(), formname) @@ -409,12 +427,18 @@ end minetest.register_node("mcl_books:bookshelf", { description = S("Bookshelf"), _doc_items_longdesc = S("Bookshelves are used for decoration."), - tiles = {"mcl_books_bookshelf_top.png", "mcl_books_bookshelf_top.png", "default_bookshelf.png"}, + tiles = { "mcl_books_bookshelf_top.png", "mcl_books_bookshelf_top.png", "default_bookshelf.png" }, stack_max = 64, is_ground_content = false, groups = { - handy=1, axey=1, deco_block=1, material_wood=1, - flammable=3, fire_encouragement=30, fire_flammability=20, container=1 + handy = 1, + axey = 1, + deco_block = 1, + material_wood = 1, + flammable = 3, + fire_encouragement = 30, + fire_flammability = 20, + container = 1 }, drop = "mcl_books:book 3", sounds = wood_sound, @@ -424,7 +448,7 @@ minetest.register_node("mcl_books:bookshelf", { on_construct = function(pos) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - inv:set_size("main", 9*3) + inv:set_size("main", 9 * 3) end, after_place_node = function(pos, placer, itemstack, pointed_thing) minetest.get_meta(pos):set_string("name", itemstack:get_meta():get_string("name")) @@ -433,16 +457,16 @@ minetest.register_node("mcl_books:bookshelf", { allow_metadata_inventory_take = protection_check_put_take, allow_metadata_inventory_put = protection_check_put_take, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in bookshelf at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff in bookshelf at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to bookshelf at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff to bookshelf at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from bookshelf at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " takes stuff from bookshelf at " .. minetest.pos_to_string(pos)) end, after_dig_node = drop_content, on_blast = on_blast, @@ -453,9 +477,9 @@ minetest.register_node("mcl_books:bookshelf", { minetest.register_craft({ output = "mcl_books:bookshelf", recipe = { - {"group:wood", "group:wood", "group:wood"}, - {"mcl_books:book", "mcl_books:book", "mcl_books:book"}, - {"group:wood", "group:wood", "group:wood"}, + { "group:wood", "group:wood", "group:wood" }, + { "mcl_books:book", "mcl_books:book", "mcl_books:book" }, + { "group:wood", "group:wood", "group:wood" }, } }) @@ -464,4 +488,3 @@ minetest.register_craft({ recipe = "mcl_books:bookshelf", burntime = 15, }) - diff --git a/mods/ITEMS/mcl_books/locale/mcl_books.dk.tr b/mods/ITEMS/mcl_books/locale/mcl_books.dk.tr new file mode 100644 index 000000000..cdf19e542 --- /dev/null +++ b/mods/ITEMS/mcl_books/locale/mcl_books.dk.tr @@ -0,0 +1,28 @@ +# textdomain: mcl_books +Book=Bog +Books are used to make bookshelves and book and quills.=Bøger bruges til at lave bogreoler og bog og fjerpen +“@1”="@1" +Copy of “@1”=Kopi af "@1" +Copy of Copy of “@1”=Kopi af kopi af "@1" +Tattered Book=Flosset bog +by @1=af @1 +# as in “to sign a book” +Sign=Underskriv +Done=Færdig +This item can be used to write down some notes.=Denne genstand kan bruges til at skrive notater. +Hold it in the hand, then rightclick to read the current notes and edit then. You can edit the text as often as you like. You can also sign the book which turns it into a written book which you can stack, but it can't be edited anymore.=Hold den i hånden, højre-klik så for at læse og redigere aktuelle notater. Du kan redigere teksten så ofte du har lyst. Du kan også signere bogen hvilken gør den til en skrevet bog som du kan gemme, men som ikke kan redigeres mere. +A book can hold up to 4500 characters. The title length is limited to 64 characters.=En bog kan indeholde op til 4500 anslag. Titellængden er begrænset til 64 anslag. +Enter book title:=Indtast bogens titel: +by @1=af @1 +Note: The book will no longer be editable after signing=Bemærk: Bogen vil ikke længere kunne redigeres efter signering. +Sign and Close=Signér og luk +Cancel=Afbryd +Nameless Book=Unavngiven bog +Written Book=Skrevet bog +Written books contain some text written by someone. They can be read and copied, but not edited.=Skrevne bøger indeholder tekst som nogen har skrevet. De kan læses og kopieres, men ikke redigeres. +Hold it in your hand, then rightclick to read the book.=Hold den i hånden og højre-klik for at læse bogen. +To copy the text of the written book, place it into the crafting grid together with a book and quill (or multiple of those) and craft. The written book will not be consumed. Copies of copies can not be copied.=For at kopiere teksten i den skrevne bog skal du placere den i arbejdsgitteret sammen med en (eller flere) bog og fjerdpen og udfør. Den skrevne bog bliver ikke opbrugt. Kopier kan ikke kopieres. +Bookshelf=Bogreol +Bookshelves are used for decoration.=Bogreoler bruges til udsmykning. +Book and Quill=Bog og fjerdpen +Write down some notes=Skriv nogle notater diff --git a/mods/ITEMS/mcl_bows/crossbow.lua b/mods/ITEMS/mcl_bows/crossbow.lua index 73d3f96f4..752ccdc54 100644 --- a/mods/ITEMS/mcl_bows/crossbow.lua +++ b/mods/ITEMS/mcl_bows/crossbow.lua @@ -105,8 +105,20 @@ local function player_shoot_arrow(wielditem, player, power, damage, is_critical) local yaw = player:get_look_horizontal() if has_multishot_enchantment then - mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z + .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false) - mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir.x, y=dir.y, z=dir.z - .2}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false) + -- calculate rotation by 10 degrees 'left' and 'right' of facing direction + local pitch = player:get_look_vertical() + local pitch_c = math.cos(pitch) + local pitch_s = math.sin(pitch) + local yaw_c = math.cos(yaw + math.pi / 2) + local yaw_s = math.sin(yaw + math.pi / 2) + + local rot_left = {x = yaw_c * pitch_s * math.pi / 18, y = pitch_c * math.pi / 18, z = yaw_s * pitch_s * math.pi / 18} + local rot_right = {x = - yaw_c * pitch_s * math.pi / 18, y = - pitch_c * math.pi / 18, z = - yaw_s * pitch_s * math.pi / 18} + local dir_left = vector.rotate(dir, rot_left) + local dir_right = vector.rotate(dir, rot_right) + + mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir_left.x, y=dir_left.y, z=dir_left.z}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false) + mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, {x=dir_right.x, y=dir_right.y, z=dir_right.z}, yaw, player, power, damage, is_critical, player:get_wielded_item(), false) mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true) else mcl_bows_s.shoot_arrow_crossbow(arrow_itemstring, {x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, dir, yaw, player, power, damage, is_critical, player:get_wielded_item(), true) diff --git a/mods/ITEMS/mcl_campfires/locale/mcl_campfires.es.tr b/mods/ITEMS/mcl_campfires/locale/mcl_campfires.es.tr new file mode 100644 index 000000000..e941ad9bc --- /dev/null +++ b/mods/ITEMS/mcl_campfires/locale/mcl_campfires.es.tr @@ -0,0 +1,5 @@ +# textdomain: mcl_campfires +Campfire=Fogata +Soul Campfire=Fogata de almas +Cooks food and keeps bees happy.=Cocina comida y mantiene a las abejas felices. +Campfires have multiple uses, including keeping bees happy, cooking raw meat and fish, and as a trap.=Las fogatas tienen múltiples usos, incluyendo mantener a las abejas felices, cocinar carne cruda y pescado, y como trampa. diff --git a/mods/ITEMS/mcl_cherry_blossom/crafting.lua b/mods/ITEMS/mcl_cherry_blossom/crafting.lua new file mode 100644 index 000000000..f26b2af96 --- /dev/null +++ b/mods/ITEMS/mcl_cherry_blossom/crafting.lua @@ -0,0 +1,86 @@ +-- Crafting +local planks = "mcl_cherry_blossom:cherrywood" +local logs = "mcl_cherry_blossom:cherrytree" +local stripped_logs = "mcl_cherry_blossom:stripped_cherrytree" + +minetest.register_craft({ + output = "mcl_cherry_blossom:cherrytree_bark 3", + recipe = { + { logs, logs }, + { logs, logs }, + } +}) + +minetest.register_craft({ + output = "mcl_cherry_blossom:stripped_cherrytree_bark 3", + recipe = { + { stripped_logs, stripped_logs }, + { stripped_logs, stripped_logs }, + } +}) + +minetest.register_craft({ + output = "mcl_cherry_blossom:cherrywood 4", + recipe = { + { logs }, + } +}) + +minetest.register_craft({ + output = "mcl_cherry_blossom:cherry_door 3", + recipe = { + {planks, planks}, + {planks, planks}, + {planks, planks} + } +}) + +minetest.register_craft({ + output = "mcl_cherry_blossom:cherry_trapdoor 2", + recipe = { + {planks, planks, planks}, + {planks, planks, planks}, + } +}) + +minetest.register_craft({ + output = "mcl_cherry_blossom:cherry_fence 3", + recipe = { + {planks, "mcl_core:stick", planks}, + {planks, "mcl_core:stick", planks}, + } +}) +minetest.register_craft({ + output = "mcl_cherry_blossom:cherry_fence_gate", + recipe = { + {"mcl_core:stick", planks, "mcl_core:stick"}, + {"mcl_core:stick", planks, "mcl_core:stick"}, + } +}) + +mcl_signs.register_sign_craft("mcl_cherry_blossom", "mcl_cherry_blossom:cherrywood", "_cherrywood") + +-- Smelting +minetest.register_craft({ + type = "fuel", + recipe = "mcl_cherry_blossom:cherry_door", + burntime = 10, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_cherry_blossom:cherry_trapdoor", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_cherry_blossom:pressure_plate_cherrywood_off", + burntime = 15 +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mesecons_button:button_cherrywood_off", + burntime = 5, +}) diff --git a/mods/ITEMS/mcl_cherry_blossom/growth.lua b/mods/ITEMS/mcl_cherry_blossom/growth.lua new file mode 100644 index 000000000..28cedea28 --- /dev/null +++ b/mods/ITEMS/mcl_cherry_blossom/growth.lua @@ -0,0 +1,53 @@ +-- Tree Growth +-- TODO: Use better spawning behavior and wood api when wood api is finished. +function mcl_cherry_blossom.generate_cherry_tree(pos) + local pr = PseudoRandom(pos.x+pos.y+pos.z) + local r = pr:next(1,3) + local modpath = minetest.get_modpath("mcl_cherry_blossom") + local path = modpath.."/schematics/mcl_cherry_blossom_tree_"..tostring(r)..".mts" + if mcl_core.check_growth_width(pos,7,8) then + minetest.set_node(pos, {name = "air"}) + if r == 1 then + minetest.place_schematic(vector.offset(pos, -2, 0, -2), path, "random", nil, false) + elseif r == 2 then + minetest.place_schematic(vector.offset(pos, -2, 0, -2), path, nil, nil, false) + elseif r == 3 then + minetest.place_schematic(vector.offset(pos, -3, 0, -3), path, nil, nil, false) + end + end +end + +minetest.register_abm({ + label = "Cherry Tree Growth", + nodenames = "mcl_cherry_blossom:cherrysapling", + interval = 30, + chance = 5, + action = function(pos,node) + mcl_cherry_blossom.generate_cherry_tree(pos) + end, +}) + +local cherry_particle = { + velocity = vector.zero(), + acceleration = vector.new(0,-1,0), + size = math.random(1.3,2.5), + texture = "mcl_cherry_blossom_particle.png", + collision_removal = false, + collisiondetection = false, +} + + +minetest.register_abm({ + label = "Cherry Blossom Particles", + nodenames = {"mcl_cherry_blossom:cherryleaves"}, + interval = 5, + chance = 10, + action = function(pos, node) + minetest.after(math.random(0.1,1.5),function() + local pt = table.copy(cherry_particle) + pt.pos = vector.offset(pos,math.random(-0.5,0.5),-0.51,math.random(-0.5,0.5)) + pt.expirationtime = math.random(1.2,4.5) + minetest.add_particle(pt) + end) + end +}) diff --git a/mods/ITEMS/mcl_cherry_blossom/init.lua b/mods/ITEMS/mcl_cherry_blossom/init.lua new file mode 100644 index 000000000..f80d198c3 --- /dev/null +++ b/mods/ITEMS/mcl_cherry_blossom/init.lua @@ -0,0 +1,6 @@ +mcl_cherry_blossom = {} +local modpath = minetest.get_modpath("mcl_cherry_blossom") + +dofile(modpath.."/nodes.lua") -- Load Nodes +dofile(modpath.."/crafting.lua") -- Load Crafting Recipes +dofile(modpath.."/growth.lua") -- Load Cherry Blossom Tree Growth diff --git a/mods/ITEMS/mcl_cherry_blossom/locale/mcl_cherry_blossom.ru.tr b/mods/ITEMS/mcl_cherry_blossom/locale/mcl_cherry_blossom.ru.tr new file mode 100644 index 000000000..408af8b99 --- /dev/null +++ b/mods/ITEMS/mcl_cherry_blossom/locale/mcl_cherry_blossom.ru.tr @@ -0,0 +1,24 @@ +# textdomain: mcl_cherry_blossom +Cherry Log=Вишнёвое бревно +The trunk of a cherry blossom tree.=Ствол цветущего вишневого дерева. +Stripped Cherry Log=Обтёсанное вишнёвое бревно +The stripped trunk of a cherry blossom tree.=Обтёсанный ствол цветущей вишни. +Cherry Bark=Вишня +This is a decorative block surrounded by the bark of a tree trunk.=Это декоративный блок, окруженный корой ствола дерева. +Stripped Cherry Wood=Обтёсанная вишнёвая древесина +The stripped wood of a cherry blossom tree.=Обтёсанная древесина цветущей вишни. +Cherry Wood Planks=Вишнёвые доски +Cherry Leaves=Вишнёвые листья +Cherry blossom leaves are grown from cherry blossom trees.=Листья цветущей вишни выращивают на вишневых деревьях. +Cherry Sapling=Саженец вишни +Cherry blossom sapling can be planted to grow cherry trees.=Саженец цветущей вишни можно посадить для выращивания вишневых деревьев. +Cherry Door=Вишнёвая дверь +Cherry Trapdoor=Вишнёвый люк +Cherry Stairs=Вишнёвые ступеньки +Cherry Slab=Вишнёвая плита +Double Cherry Slab=Двойная вишнёвая плита +Cherry Sign=Вишнёвая табличка +Cherry Fence=Вишнёвый забор +Cherry Gate=Вишнёвая калитка +Cherry Pressure Plate=Вишнёвая нажимная плита +Cherry Button=Вишнёвая кнопка diff --git a/mods/ITEMS/mcl_cherry_blossom/locale/template.txt b/mods/ITEMS/mcl_cherry_blossom/locale/template.txt new file mode 100644 index 000000000..39ba7026a --- /dev/null +++ b/mods/ITEMS/mcl_cherry_blossom/locale/template.txt @@ -0,0 +1,24 @@ +# textdomain: mcl_cherry_blossom +Cherry Log= +The trunk of a cherry blossom tree.= +Stripped Cherry Log= +The stripped trunk of a cherry blossom tree.= +Cherry Bark= +This is a decorative block surrounded by the bark of a tree trunk.= +Stripped Cherry Wood= +The stripped wood of a cherry blossom tree.= +Cherry Wood Planks= +Cherry Leaves= +Cherry blossom leaves are grown from cherry blossom trees.= +Cherry Sapling= +Cherry blossom sapling can be planted to grow cherry trees.= +Cherry Door= +Cherry Trapdoor= +Cherry Stairs= +Cherry Slab= +Double Cherry Slab= +Cherry Sign= +Cherry Fence= +Cherry Gate= +Cherry Pressure Plate= +Cherry Button= diff --git a/mods/ITEMS/mcl_cherry_blossom/mod.conf b/mods/ITEMS/mcl_cherry_blossom/mod.conf new file mode 100644 index 000000000..91c346e85 --- /dev/null +++ b/mods/ITEMS/mcl_cherry_blossom/mod.conf @@ -0,0 +1,3 @@ +name = mcl_cherry_blossom +author = PrairieWind, Wbjitscool, SmokeyDope +depends = mcl_sounds, mcl_util, mcl_core, mcl_doors, mcl_stairs, mcl_signs, mcl_fences, mesecons_pressureplates, mesecons_button, mcl_boats diff --git a/mods/ITEMS/mcl_cherry_blossom/nodes.lua b/mods/ITEMS/mcl_cherry_blossom/nodes.lua new file mode 100644 index 000000000..4b6803123 --- /dev/null +++ b/mods/ITEMS/mcl_cherry_blossom/nodes.lua @@ -0,0 +1,96 @@ +local S = minetest.get_translator(minetest.get_current_modname()) + +-- Logs +mcl_core.register_tree_trunk("cherrytree", S("Cherry Log"), S("Cherry Bark"), + S("The trunk of a cherry blossom tree."), + "mcl_cherry_blossom_log_top.png", "mcl_cherry_blossom_log.png", "mcl_cherry_blossom:stripped_cherrytree") + +-- Stripped +mcl_core.register_stripped_trunk("stripped_cherrytree", S("Stripped Cherry Log"), S("Stripped Cherry Wood"), + S("The stripped trunk of a cherry blossom tree."), S("The stripped wood of a cherry blossom tree."), + "mcl_cherry_blossom_log_top_stripped.png", "mcl_cherry_blossom_log_stripped.png") + +--Planks +mcl_core.register_wooden_planks("cherrywood", S("Cherry Wood Planks"), {"mcl_cherry_blossom_planks.png"}) + +-- Leaves +mcl_core.register_leaves("cherryleaves", S("Cherry Leaves"), + S("Cherry blossom leaves are grown from cherry blossom trees."), {"mcl_cherry_blossom_leaves.png"}, + nil, "none", nil, "mcl_cherry_blossom:cherrysapling", false, {20, 16, 12, 10}) + +-- Sapling +mcl_core.register_sapling("cherrysapling", S("Cherry Sapling"), + S("Cherry blossom sapling can be planted to grow cherry trees."), nil, + "mcl_cherry_blossom_sapling.png", {-4/16, -0.5, -4/16, 4/16, 0.25, 4/16}) + +-- Door and Trapdoor +mcl_doors:register_door("mcl_cherry_blossom:cherry_door", { + description = S("Cherry Door"), + inventory_image = "mcl_cherry_blossom_door_inv.png", + groups = {handy=1,axey=1, material_wood=1, flammable=-1}, + _mcl_hardness = 3, + _mcl_blast_resistance = 3, + tiles_bottom = "mcl_cherry_blossom_door_bottom.png", + tiles_top = "mcl_cherry_blossom_door_top.png", + sounds = mcl_sounds.node_sound_wood_defaults(), +}) + +mcl_doors:register_trapdoor("mcl_cherry_blossom:cherry_trapdoor", { + description = S("Cherry Trapdoor"), + tile_front = "mcl_cherry_blossom_trapdoor.png", + tile_side = "mcl_cherry_blossom_trapdoor_side.png", + wield_image = "mcl_cherry_blossom_trapdoor.png", + groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, + _mcl_hardness = 3, + _mcl_blast_resistance = 3, + sounds = mcl_sounds.node_sound_wood_defaults(), +}) + +-- Stairs and Slabs +mcl_stairs.register_stair("cherrywood", "mcl_cherry_blossom:cherrywood", + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1, fire_encouragement=5, fire_flammability=20}, + {"mcl_cherry_blossom_planks.png"}, + S("Cherry Stairs"), + mcl_sounds.node_sound_wood_defaults(), 3, 2, + "woodlike") +mcl_stairs.register_slab("cherrywood", "mcl_cherry_blossom:cherrywood", + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1, fire_encouragement=5, fire_flammability=20}, + {"mcl_cherry_blossom_planks.png"}, + S("Cherry Slab"), + mcl_sounds.node_sound_wood_defaults(), 3, 2, + S("Double Cherry Slab")) + +-- Signs +mcl_signs.register_sign_custom("mcl_cherry_blossom", "_cherrywood", + "mcl_cherry_blossom_sign.png", nil, + "mcl_cherry_blossom_sign_inv.png", "mcl_cherry_blossom_sign_inv.png", S("Cherry Sign")) + +-- Fences & Gates +mcl_fences.register_fence_and_fence_gate("cherry_fence", S("Cherry Fence"), S("Cherry Gate"), + "mcl_cherry_blossom_planks.png", {handy=1, axey=1, flammable=2, fence_wood=1, fire_encouragement=5, fire_flammability=20}, 2, 15, + {"group:fence_wood"}, mcl_sounds.node_sound_wood_defaults()) + +-- Redstone +mesecon.register_pressure_plate( + "mcl_cherry_blossom:pressure_plate_cherrywood", + S("Cherry Pressure Plate"), + {"mcl_cherry_blossom_planks.png"}, + {"mcl_cherry_blossom_planks.png"}, + "mcl_cherry_blossom_planks.png", + nil, + {{"mcl_cherry_blossom:cherrywood", "mcl_cherry_blossom:cherrywood"}}, + mcl_sounds.node_sound_wood_defaults(), + {axey=1, material_wood=1}, + nil) + +mesecon.register_button( + "cherrywood", + S("Cherry Button"), + "mcl_cherry_blossom_planks.png", + "mcl_cherry_blossom:cherrywood", + mcl_sounds.node_sound_wood_defaults(), + {material_wood=1,handy=1,axey=1}, + 1.5, + true, + nil, + "mesecons_button_push_wood") diff --git a/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_1.mts b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_1.mts new file mode 100644 index 000000000..1b06acf8f Binary files /dev/null and b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_1.mts differ diff --git a/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_2.mts b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_2.mts new file mode 100644 index 000000000..0434e56e1 Binary files /dev/null and b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_2.mts differ diff --git a/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_3.mts b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_3.mts new file mode 100644 index 000000000..d436b47bc Binary files /dev/null and b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_3.mts differ diff --git a/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_1.mts b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_1.mts new file mode 100644 index 000000000..6cc8a5825 Binary files /dev/null and b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_1.mts differ diff --git a/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_2.mts b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_2.mts new file mode 100644 index 000000000..67d17f34d Binary files /dev/null and b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_2.mts differ diff --git a/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_3.mts b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_3.mts new file mode 100644 index 000000000..872599716 Binary files /dev/null and b/mods/ITEMS/mcl_cherry_blossom/schematics/mcl_cherry_blossom_tree_beehive_3.mts differ diff --git a/mods/ITEMS/mcl_chests/init.lua b/mods/ITEMS/mcl_chests/init.lua index 38437c73f..59ed2ba09 100644 --- a/mods/ITEMS/mcl_chests/init.lua +++ b/mods/ITEMS/mcl_chests/init.lua @@ -1,41 +1,50 @@ local S = minetest.get_translator(minetest.get_current_modname()) +local F = minetest.formspec_escape +local C = minetest.colorize + +local string = string +local table = table +local math = math + +local sf = string.format + local mod_doc = minetest.get_modpath("doc") -- Christmas chest setup local it_is_christmas = false local date = os.date("*t") if ( - date.month == 12 and ( - date.day == 24 or - date.day == 25 or - date.day == 26 - ) -) then + date.month == 12 and ( + date.day == 24 or + date.day == 25 or + date.day == 26 + ) + ) then it_is_christmas = true end -local tiles_chest_normal_small = {"mcl_chests_normal.png"} -local tiles_chest_normal_double = {"mcl_chests_normal_double.png"} +local tiles_chest_normal_small = { "mcl_chests_normal.png" } +local tiles_chest_normal_double = { "mcl_chests_normal_double.png" } if it_is_christmas then - tiles_chest_normal_small = {"mcl_chests_normal_present.png^mcl_chests_noise.png"} - tiles_chest_normal_double = {"mcl_chests_normal_double_present.png^mcl_chests_noise_double.png"} + tiles_chest_normal_small = { "mcl_chests_normal_present.png^mcl_chests_noise.png" } + tiles_chest_normal_double = { "mcl_chests_normal_double_present.png^mcl_chests_noise_double.png" } end -local tiles_chest_trapped_small = {"mcl_chests_trapped.png"} -local tiles_chest_trapped_double = {"mcl_chests_trapped_double.png"} +local tiles_chest_trapped_small = { "mcl_chests_trapped.png" } +local tiles_chest_trapped_double = { "mcl_chests_trapped_double.png" } if it_is_christmas then - tiles_chest_trapped_small = {"mcl_chests_trapped_present.png^mcl_chests_noise.png"} - tiles_chest_trapped_double = {"mcl_chests_trapped_double_present.png^mcl_chests_noise_double.png"} + tiles_chest_trapped_small = { "mcl_chests_trapped_present.png^mcl_chests_noise.png" } + tiles_chest_trapped_double = { "mcl_chests_trapped_double_present.png^mcl_chests_noise_double.png" } end -local tiles_chest_ender_small = {"mcl_chests_ender.png"} +local tiles_chest_ender_small = { "mcl_chests_ender.png" } -local ender_chest_texture = {"mcl_chests_ender.png"} +local ender_chest_texture = { "mcl_chests_ender.png" } if it_is_christmas then - tiles_chest_ender_small = {"mcl_chests_ender_present.png^mcl_chests_noise.png"} - ender_chest_texture = {"mcl_chests_ender_present.png"} + tiles_chest_ender_small = { "mcl_chests_ender_present.png^mcl_chests_noise.png" } + ender_chest_texture = { "mcl_chests_ender_present.png" } end -- Chest Entity @@ -43,14 +52,14 @@ local animate_chests = (minetest.settings:get_bool("animated_chests") ~= false) local entity_animations = { shulker = { speed = 50, - open = {x = 45, y = 95}, - close = {x = 95, y = 145}, + open = { x = 45, y = 95 }, + close = { x = 95, y = 145 }, }, chest = { speed = 25, - open = {x = 0, y = 7}, - close = {x = 13, y = 20}, - } + open = { x = 0, y = 7 }, + close = { x = 13, y = 20 }, + }, } minetest.register_entity("mcl_chests:chest", { @@ -72,7 +81,8 @@ minetest.register_entity("mcl_chests:chest", { self.players[playername] = true if not self.is_open then self:set_animation("open") - minetest.sound_play(self.sound_prefix .. "_open", {pos=self.node_pos, gain=0.5, max_hear_distance = 16}, true) + minetest.sound_play(self.sound_prefix .. "_open", { pos = self.node_pos, gain = 0.5, max_hear_distance = 16 }, + true) self.is_open = true end end, @@ -85,7 +95,9 @@ minetest.register_entity("mcl_chests:chest", { return end self:set_animation("close") - minetest.sound_play(self.sound_prefix .. "_close", {pos=self.node_pos, gain=0.3, max_hear_distance = 16}, true) + minetest.sound_play(self.sound_prefix .. "_close", + { pos = self.node_pos, gain = 0.3, max_hear_distance = 16 }, + true) self.is_open = false end end, @@ -124,7 +136,7 @@ minetest.register_entity("mcl_chests:chest", { end, on_activate = function(self) - self.object:set_armor_groups({immortal = 1}) + self.object:set_armor_groups({ immortal = 1 }) self.players = {} end, @@ -136,7 +148,7 @@ minetest.register_entity("mcl_chests:chest", { }) local function get_entity_pos(pos, dir, double) - pos = vector.new(pos) + pos = vector.copy(pos) if double then local add, mul, vec, cross = vector.add, vector.multiply, vector.new, vector.cross pos = add(pos, mul(cross(dir, vec(0, 1, 0)), -0.5)) @@ -158,7 +170,8 @@ local function get_entity_info(pos, param2, double, dir, entity_pos) return dir, get_entity_pos(pos, dir, double) end -local function create_entity(pos, node_name, textures, param2, double, sound_prefix, mesh_prefix, animation_type, dir, entity_pos) +local function create_entity(pos, node_name, textures, param2, double, sound_prefix, mesh_prefix, animation_type, dir, + entity_pos) dir, entity_pos = get_entity_info(pos, param2, double, dir, entity_pos) local obj = minetest.add_entity(entity_pos, "mcl_chests:chest") local luaentity = obj:get_luaentity() @@ -166,9 +179,12 @@ local function create_entity(pos, node_name, textures, param2, double, sound_pre return luaentity end -local function find_or_create_entity(pos, node_name, textures, param2, double, sound_prefix, mesh_prefix, animation_type, dir, entity_pos) +local function find_or_create_entity(pos, node_name, textures, param2, double, sound_prefix, mesh_prefix, animation_type + , dir, entity_pos) dir, entity_pos = get_entity_info(pos, param2, double, dir, entity_pos) - return find_entity(entity_pos) or create_entity(pos, node_name, textures, param2, double, sound_prefix, mesh_prefix, animation_type, dir, entity_pos) + return find_entity(entity_pos) or + create_entity(pos, node_name, textures, param2, double, sound_prefix, mesh_prefix, animation_type, dir, + entity_pos) end local no_rotate, simple_rotate @@ -179,7 +195,9 @@ if minetest.get_modpath("screwdriver") then local nodename = node.name local nodedef = minetest.registered_nodes[nodename] local dir = minetest.facedir_to_dir(new_param2) - find_or_create_entity(pos, nodename, nodedef._chest_entity_textures, new_param2, false, nodedef._chest_entity_sound, nodedef._chest_entity_mesh, nodedef._chest_entity_animation_type, dir):set_yaw(dir) + find_or_create_entity(pos, nodename, nodedef._chest_entity_textures, new_param2, false, + nodedef._chest_entity_sound, + nodedef._chest_entity_mesh, nodedef._chest_entity_animation_type, dir):set_yaw(dir) else return false end @@ -204,10 +222,21 @@ end]] -- To be called if a player opened a chest local function player_chest_open(player, pos, node_name, textures, param2, double, sound, mesh, shulker) local name = player:get_player_name() - open_chests[name] = {pos = pos, node_name = node_name, textures = textures, param2 = param2, double = double, sound = sound, mesh = mesh, shulker = shulker} + open_chests[name] = { + pos = pos, + node_name = node_name, + textures = textures, + param2 = param2, + double = double, + sound = sound, + mesh = mesh, + shulker = shulker + } if animate_chests then local dir = minetest.facedir_to_dir(param2) - find_or_create_entity(pos, node_name, textures, param2, double, sound, mesh, shulker and "shulker" or "chest", dir):open(name) + find_or_create_entity(pos, node_name, textures, param2, double, sound, mesh, shulker and "shulker" or "chest", + dir): + open(name) end end @@ -221,6 +250,7 @@ local function protection_check_move(pos, from_list, from_index, to_list, to_ind return count end end + local function protection_check_put_take(pos, listname, index, stack, player) local name = player:get_player_name() if minetest.is_protected(pos, name) then @@ -238,24 +268,27 @@ local function chest_update_after_close(pos) local node = minetest.get_node(pos) if node.name == "mcl_chests:trapped_chest_on_small" then - minetest.swap_node(pos, {name="mcl_chests:trapped_chest_small", param2 = node.param2}) - find_or_create_entity(pos, "mcl_chests:trapped_chest_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small") + minetest.swap_node(pos, { name = "mcl_chests:trapped_chest_small", param2 = node.param2 }) + find_or_create_entity(pos, "mcl_chests:trapped_chest_small", { "mcl_chests_trapped.png" }, node.param2, false, + "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_small") mesecon.receptor_off(pos, trapped_chest_mesecons_rules) elseif node.name == "mcl_chests:trapped_chest_on_left" then - minetest.swap_node(pos, {name="mcl_chests:trapped_chest_left", param2 = node.param2}) - find_or_create_entity(pos, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left") + minetest.swap_node(pos, { name = "mcl_chests:trapped_chest_left", param2 = node.param2 }) + find_or_create_entity(pos, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, + "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left") mesecon.receptor_off(pos, trapped_chest_mesecons_rules) local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "left") - minetest.swap_node(pos_other, {name="mcl_chests:trapped_chest_right", param2 = node.param2}) + minetest.swap_node(pos_other, { name = "mcl_chests:trapped_chest_right", param2 = node.param2 }) mesecon.receptor_off(pos_other, trapped_chest_mesecons_rules) elseif node.name == "mcl_chests:trapped_chest_on_right" then - minetest.swap_node(pos, {name="mcl_chests:trapped_chest_right", param2 = node.param2}) + minetest.swap_node(pos, { name = "mcl_chests:trapped_chest_right", param2 = node.param2 }) mesecon.receptor_off(pos, trapped_chest_mesecons_rules) local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "right") - minetest.swap_node(pos_other, {name="mcl_chests:trapped_chest_left", param2 = node.param2}) - find_or_create_entity(pos_other, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left") + minetest.swap_node(pos_other, { name = "mcl_chests:trapped_chest_left", param2 = node.param2 }) + find_or_create_entity(pos_other, "mcl_chests:trapped_chest_left", tiles_chest_trapped_double, node.param2, true, + "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_left") mesecon.receptor_off(pos_other, trapped_chest_mesecons_rules) end end @@ -268,7 +301,9 @@ local function player_chest_close(player) return end if animate_chests then - find_or_create_entity(open_chest.pos, open_chest.node_name, open_chest.textures, open_chest.param2, open_chest.double, open_chest.sound, open_chest.mesh, open_chest.shulker and "shulker" or "chest"):close(name) + find_or_create_entity(open_chest.pos, open_chest.node_name, open_chest.textures, open_chest.param2, + open_chest.double, + open_chest.sound, open_chest.mesh, open_chest.shulker and "shulker" or "chest"):close(name) end chest_update_after_close(open_chest.pos) @@ -276,12 +311,14 @@ local function player_chest_close(player) end -- This is a helper function to register both chests and trapped chests. Trapped chests will make use of the additional parameters -local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tiles_table, hidden, mesecons, on_rightclick_addendum, on_rightclick_addendum_left, on_rightclick_addendum_right, drop, canonical_basename) +local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tiles_table, hidden, mesecons, + on_rightclick_addendum, on_rightclick_addendum_left, on_rightclick_addendum_right, drop, + canonical_basename) -- START OF register_chest FUNCTION BODY if not drop then - drop = "mcl_chests:"..basename + drop = "mcl_chests:" .. basename else - drop = "mcl_chests:"..drop + drop = "mcl_chests:" .. drop end -- The basename of the "canonical" version of the node, if set (e.g.: trapped_chest_on → trapped_chest). -- Used to get a shared formspec ID and to swap the node back to the canonical version in on_construct. @@ -347,12 +384,12 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile return stack:get_count() - leftover:get_count() end - local small_name = "mcl_chests:"..basename.."_small" + local small_name = "mcl_chests:" .. basename .. "_small" local small_textures = tiles_table.small - local left_name = "mcl_chests:"..basename.."_left" + local left_name = "mcl_chests:" .. basename .. "_left" local left_textures = tiles_table.double - minetest.register_node("mcl_chests:"..basename, { + minetest.register_node("mcl_chests:" .. basename, { description = desc, _tt_help = tt_help, _doc_items_longdesc = longdesc, @@ -361,12 +398,11 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile drawtype = "mesh", mesh = "mcl_chests_chest.b3d", tiles = small_textures, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + use_texture_alpha = "opaque", paramtype = "light", paramtype2 = "facedir", - stack_max = 64, sounds = mcl_sounds.node_sound_wood_defaults(), - groups = {deco_block=1}, + groups = { deco_block = 1 }, on_construct = function(pos, node) local node = minetest.get_node(pos) node.name = small_name @@ -379,9 +415,10 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile local function close_forms(canonical_basename, pos) local players = minetest.get_connected_players() - for p=1, #players do + for p = 1, #players do if vector.distance(players[p]:get_pos(), pos) <= 30 then - minetest.close_formspec(players[p]:get_player_name(), "mcl_chests:"..canonical_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z) + minetest.close_formspec(players[p]:get_player_name(), + "mcl_chests:" .. canonical_basename .. "_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z) end end end @@ -395,19 +432,27 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile drawtype = "nodebox", node_box = { type = "fixed", - fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375}, + fixed = { -0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375 }, }, - tiles = {"blank.png^[resize:16x16"}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, + tiles = { "blank.png^[resize:16x16" }, + use_texture_alpha = "clip", _chest_entity_textures = small_textures, _chest_entity_sound = "default_chest", _chest_entity_mesh = "mcl_chests_chest", _chest_entity_animation_type = "chest", paramtype = "light", paramtype2 = "facedir", - stack_max = 64, drop = drop, - groups = {handy=1,axey=1, container=2, deco_block=1, material_wood=1,flammable=-1,chest_entity=1, not_in_creative_inventory=1}, + groups = { + handy = 1, + axey = 1, + container = 2, + deco_block = 1, + material_wood = 1, + flammable = -1, + chest_entity = 1, + not_in_creative_inventory = 1 + }, is_ground_content = false, sounds = mcl_sounds.node_sound_wood_defaults(), on_construct = function(pos) @@ -424,7 +469,7 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile meta:set_string("workaround", nil) -- Done to keep metadata clean -- END OF WORKAROUND -- local inv = meta:get_inventory() - inv:set_size("main", 9*3) + inv:set_size("main", 9 * 3) --[[ The "input" list is *another* workaround (hahahaha!) around the fact that Minetest does not support listrings to put items into an alternative list if the first one happens to be full. See . @@ -435,19 +480,26 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile -- BEGIN OF LISTRING WORKAROUND inv:set_size("input", 1) -- END OF LISTRING WORKAROUND - if minetest.get_node(mcl_util.get_double_container_neighbor_pos(pos, param2, "right")).name == "mcl_chests:"..canonical_basename.."_small" then - minetest.swap_node(pos, {name="mcl_chests:"..canonical_basename.."_right",param2=param2}) + if minetest.get_node(mcl_util.get_double_container_neighbor_pos(pos, param2, "right")).name == + "mcl_chests:" .. canonical_basename .. "_small" then + minetest.swap_node(pos, { name = "mcl_chests:" .. canonical_basename .. "_right", param2 = param2 }) local p = mcl_util.get_double_container_neighbor_pos(pos, param2, "right") - minetest.swap_node(p, { name = "mcl_chests:"..canonical_basename.."_left", param2 = param2 }) - create_entity(p, "mcl_chests:"..canonical_basename.."_left", left_textures, param2, true, "default_chest", "mcl_chests_chest", "chest") - elseif minetest.get_node(mcl_util.get_double_container_neighbor_pos(pos, param2, "left")).name == "mcl_chests:"..canonical_basename.."_small" then - minetest.swap_node(pos, {name="mcl_chests:"..canonical_basename.."_left",param2=param2}) - create_entity(pos, "mcl_chests:"..canonical_basename.."_left", left_textures, param2, true, "default_chest", "mcl_chests_chest", "chest") + minetest.swap_node(p, { name = "mcl_chests:" .. canonical_basename .. "_left", param2 = param2 }) + create_entity(p, "mcl_chests:" .. canonical_basename .. "_left", left_textures, param2, true, + "default_chest", + "mcl_chests_chest", "chest") + elseif minetest.get_node(mcl_util.get_double_container_neighbor_pos(pos, param2, "left")).name == + "mcl_chests:" .. canonical_basename .. "_small" then + minetest.swap_node(pos, { name = "mcl_chests:" .. canonical_basename .. "_left", param2 = param2 }) + create_entity(pos, "mcl_chests:" .. canonical_basename .. "_left", left_textures, param2, true, + "default_chest", + "mcl_chests_chest", "chest") local p = mcl_util.get_double_container_neighbor_pos(pos, param2, "left") - minetest.swap_node(p, { name = "mcl_chests:"..canonical_basename.."_right", param2 = param2 }) + minetest.swap_node(p, { name = "mcl_chests:" .. canonical_basename .. "_right", param2 = param2 }) else - minetest.swap_node(pos, { name = "mcl_chests:"..canonical_basename.."_small", param2 = param2 }) - create_entity(pos, small_name, small_textures, param2, false, "default_chest", "mcl_chests_chest", "chest") + minetest.swap_node(pos, { name = "mcl_chests:" .. canonical_basename .. "_small", param2 = param2 }) + create_entity(pos, small_name, small_textures, param2, false, "default_chest", "mcl_chests_chest", + "chest") end end, after_place_node = function(pos, placer, itemstack, pointed_thing) @@ -459,28 +511,28 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile allow_metadata_inventory_take = protection_check_put_take, allow_metadata_inventory_put = protection_check_put_take, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff in chest at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff to chest at " .. minetest.pos_to_string(pos)) -- BEGIN OF LISTRING WORKAROUND if listname == "input" then - local inv = minetest.get_inventory({type="node", pos=pos}) + local inv = minetest.get_inventory({ type = "node", pos = pos }) inv:add_item("main", stack) end -- END OF LISTRING WORKAROUND end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " takes stuff from chest at " .. minetest.pos_to_string(pos)) end, _mcl_blast_resistance = 2.5, _mcl_hardness = 2.5, on_rightclick = function(pos, node, clicker) - if minetest.registered_nodes[minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name].groups.opaque == 1 then + if minetest.registered_nodes[minetest.get_node({ x = pos.x, y = pos.y + 1, z = pos.z }).name].groups.opaque == 1 then -- won't open if there is no space from the top return false end @@ -490,24 +542,31 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile end minetest.show_formspec(clicker:get_player_name(), - "mcl_chests:"..canonical_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, - "size[9,8.75]".. - "label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", name)).."]".. - "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. - mcl_formspec.get_itemslot_bg(0,0.5,9,3).. - "label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]".. - "listring[current_player;main]") + sf("mcl_chests:%s_%s_%s_%s", canonical_basename, pos.x, pos.y, pos.z), + table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, name)) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3), + sf("list[nodemeta:%s,%s,%s;main;0.375,0.75;9,3;]", pos.x, pos.y, pos.z), + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + sf("listring[nodemeta:%s,%s,%s;main]", pos.x, pos.y, pos.z), + "listring[current_player;main]", + }) + ) if on_rightclick_addendum then on_rightclick_addendum(pos, node, clicker) end - player_chest_open(clicker, pos, small_name, small_textures, node.param2, false, "default_chest", "mcl_chests_chest") + player_chest_open(clicker, pos, small_name, small_textures, node.param2, false, "default_chest", + "mcl_chests_chest") end, on_destruct = function(pos) @@ -521,17 +580,26 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile drawtype = "nodebox", node_box = { type = "fixed", - fixed = {-0.4375, -0.5, -0.4375, 0.5, 0.375, 0.4375}, + fixed = { -0.4375, -0.5, -0.4375, 0.5, 0.375, 0.4375 }, }, - tiles = {"blank.png^[resize:16x16"}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, + tiles = { "blank.png^[resize:16x16" }, + use_texture_alpha = "clip", _chest_entity_textures = left_textures, _chest_entity_sound = "default_chest", _chest_entity_mesh = "mcl_chests_chest", _chest_entity_animation_type = "chest", paramtype = "light", paramtype2 = "facedir", - groups = {handy=1,axey=1, container=5,not_in_creative_inventory=1, material_wood=1,flammable=-1,chest_entity=1,double_chest=1}, + groups = { + handy = 1, + axey = 1, + container = 5, + not_in_creative_inventory = 1, + material_wood = 1, + flammable = -1, + chest_entity = 1, + double_chest = 1 + }, drop = drop, is_ground_content = false, sounds = mcl_sounds.node_sound_wood_defaults(), @@ -539,8 +607,8 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile local n = minetest.get_node(pos) local param2 = n.param2 local p = mcl_util.get_double_container_neighbor_pos(pos, param2, "left") - if not p or minetest.get_node(p).name ~= "mcl_chests:"..canonical_basename.."_right" then - n.name = "mcl_chests:"..canonical_basename.."_small" + if not p or minetest.get_node(p).name ~= "mcl_chests:" .. canonical_basename .. "_right" then + n.name = "mcl_chests:" .. canonical_basename .. "_small" minetest.swap_node(pos, n) end create_entity(pos, left_name, left_textures, param2, true, "default_chest", "mcl_chests_chest", "chest") @@ -558,7 +626,7 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile local param2 = n.param2 local p = mcl_util.get_double_container_neighbor_pos(pos, param2, "left") - if not p or minetest.get_node(p).name ~= "mcl_chests:"..basename.."_right" then + if not p or minetest.get_node(p).name ~= "mcl_chests:" .. basename .. "_right" then return end close_forms(canonical_basename, p) @@ -575,11 +643,11 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile if minetest.is_protected(pos, name) then minetest.record_protection_violation(pos, name) return 0 - -- BEGIN OF LISTRING WORKAROUND + -- BEGIN OF LISTRING WORKAROUND elseif listname == "input" then - local inv = minetest.get_inventory({type="node", pos=pos}) + local inv = minetest.get_inventory({ type = "node", pos = pos }) local other_pos = mcl_util.get_double_container_neighbor_pos(pos, minetest.get_node(pos).param2, "left") - local other_inv = minetest.get_inventory({type="node", pos=other_pos}) + local other_inv = minetest.get_inventory({ type = "node", pos = other_pos }) return limit_put(stack, inv, other_inv) --[[if inv:room_for_item("main", stack) then return -1 @@ -590,24 +658,25 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile else return 0 end - end]]-- - -- END OF LISTRING WORKAROUND + end]] + -- + -- END OF LISTRING WORKAROUND else return stack:get_count() end end, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff in chest at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff to chest at " .. minetest.pos_to_string(pos)) -- BEGIN OF LISTRING WORKAROUND if listname == "input" then - local inv = minetest.get_inventory({type="node", pos=pos}) + local inv = minetest.get_inventory({ type = "node", pos = pos }) local other_pos = mcl_util.get_double_container_neighbor_pos(pos, minetest.get_node(pos).param2, "left") - local other_inv = minetest.get_inventory({type="node", pos=other_pos}) + local other_inv = minetest.get_inventory({ type = "node", pos = other_pos }) inv:set_stack("input", 1, nil) @@ -616,16 +685,17 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile -- END OF LISTRING WORKAROUND end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " takes stuff from chest at " .. minetest.pos_to_string(pos)) end, _mcl_blast_resistance = 2.5, _mcl_hardness = 2.5, on_rightclick = function(pos, node, clicker) local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "left") - local above_def = minetest.registered_nodes[minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name] - local above_def_other = minetest.registered_nodes[minetest.get_node({x = pos_other.x, y = pos_other.y + 1, z = pos_other.z}).name] + local above_def = minetest.registered_nodes[minetest.get_node({ x = pos.x, y = pos.y + 1, z = pos.z }).name] + local above_def_other = minetest.registered_nodes[ + minetest.get_node({ x = pos_other.x, y = pos_other.y + 1, z = pos_other.z }).name] if not above_def or above_def.groups.opaque == 1 or not above_def_other or above_def_other.groups.opaque == 1 then -- won't open if there is no space from the top @@ -641,48 +711,64 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile end minetest.show_formspec(clicker:get_player_name(), - "mcl_chests:"..canonical_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, - "size[9,11.5]".. - "label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", name)).."]".. - "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. - mcl_formspec.get_itemslot_bg(0,0.5,9,3).. - "list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,3.5;9,3;]".. - mcl_formspec.get_itemslot_bg(0,3.5,9,3).. - "label[0,7;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,7.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,7.5,9,3).. - "list[current_player;main;0,10.75;9,1;]".. - mcl_formspec.get_itemslot_bg(0,10.75,9,1).. - -- BEGIN OF LISTRING WORKAROUND - "listring[current_player;main]".. - "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";input]".. - -- END OF LISTRING WORKAROUND - "listring[current_player;main]".. - "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]".. - "listring[current_player;main]".. - "listring[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main]") + sf("mcl_chests:%s_%s_%s_%s", canonical_basename, pos.x, pos.y, pos.z), + table.concat({ + "formspec_version[4]", + "size[11.75,14.15]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, name)) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3), + sf("list[nodemeta:%s,%s,%s;main;0.375,0.75;9,3;]", pos.x, pos.y, pos.z), + mcl_formspec.get_itemslot_bg_v4(0.375, 4.5, 9, 3), + sf("list[nodemeta:%s,%s,%s;main;0.375,4.5;9,3;]", pos_other.x, pos_other.y, pos_other.z), + "label[0.375,8.45;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 8.825, 9, 3), + "list[current_player;main;0.375,8.825;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 12.775, 9, 1), + "list[current_player;main;0.375,12.775;9,1;]", + + --BEGIN OF LISTRING WORKAROUND + "listring[current_player;main]", + sf("listring[nodemeta:%s,%s,%s;input]", pos.x, pos.y, pos.z), + --END OF LISTRING WORKAROUND + "listring[current_player;main]" .. + sf("listring[nodemeta:%s,%s,%s;main]", pos.x, pos.y, pos.z), + "listring[current_player;main]", + sf("listring[nodemeta:%s,%s,%s;main]", pos_other.x, pos_other.y, pos_other.z), + }) + ) if on_rightclick_addendum_left then on_rightclick_addendum_left(pos, node, clicker) end - player_chest_open(clicker, pos, left_name, left_textures, node.param2, true, "default_chest", "mcl_chests_chest") + player_chest_open(clicker, pos, left_name, left_textures, node.param2, true, "default_chest", + "mcl_chests_chest") end, mesecons = mesecons, on_rotate = no_rotate, }) - minetest.register_node("mcl_chests:"..basename.."_right", { + minetest.register_node("mcl_chests:" .. basename .. "_right", { drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", node_box = { type = "fixed", - fixed = {-0.5, -0.5, -0.4375, 0.4375, 0.375, 0.4375}, + fixed = { -0.5, -0.5, -0.4375, 0.4375, 0.375, 0.4375 }, + }, + tiles = { "blank.png^[resize:16x16" }, + use_texture_alpha = "clip", + groups = { + handy = 1, + axey = 1, + container = 6, + not_in_creative_inventory = 1, + material_wood = 1, + flammable = -1, + double_chest = 2 }, - tiles = {"blank.png^[resize:16x16"}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, - groups = {handy=1,axey=1, container=6,not_in_creative_inventory=1, material_wood=1,flammable=-1,double_chest=2}, drop = drop, is_ground_content = false, sounds = mcl_sounds.node_sound_wood_defaults(), @@ -690,8 +776,8 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile local n = minetest.get_node(pos) local param2 = n.param2 local p = mcl_util.get_double_container_neighbor_pos(pos, param2, "right") - if not p or minetest.get_node(p).name ~= "mcl_chests:"..canonical_basename.."_left" then - n.name = "mcl_chests:"..canonical_basename.."_small" + if not p or minetest.get_node(p).name ~= "mcl_chests:" .. canonical_basename .. "_left" then + n.name = "mcl_chests:" .. canonical_basename .. "_small" minetest.swap_node(pos, n) end end, @@ -708,7 +794,7 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile local param2 = n.param2 local p = mcl_util.get_double_container_neighbor_pos(pos, param2, "right") - if not p or minetest.get_node(p).name ~= "mcl_chests:"..basename.."_left" then + if not p or minetest.get_node(p).name ~= "mcl_chests:" .. basename .. "_left" then return end close_forms(canonical_basename, p) @@ -725,11 +811,11 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile if minetest.is_protected(pos, name) then minetest.record_protection_violation(pos, name) return 0 - -- BEGIN OF LISTRING WORKAROUND + -- BEGIN OF LISTRING WORKAROUND elseif listname == "input" then local other_pos = mcl_util.get_double_container_neighbor_pos(pos, minetest.get_node(pos).param2, "right") - local other_inv = minetest.get_inventory({type="node", pos=other_pos}) - local inv = minetest.get_inventory({type="node", pos=pos}) + local other_inv = minetest.get_inventory({ type = "node", pos = other_pos }) + local inv = minetest.get_inventory({ type = "node", pos = pos }) --[[if other_inv:room_for_item("main", stack) then return -1 else @@ -740,23 +826,23 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile end end--]] return limit_put(stack, other_inv, inv) - -- END OF LISTRING WORKAROUND + -- END OF LISTRING WORKAROUND else return stack:get_count() end end, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().. - " moves stuff in chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff in chest at " .. minetest.pos_to_string(pos)) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " moves stuff to chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " moves stuff to chest at " .. minetest.pos_to_string(pos)) -- BEGIN OF LISTRING WORKAROUND if listname == "input" then local other_pos = mcl_util.get_double_container_neighbor_pos(pos, minetest.get_node(pos).param2, "right") - local other_inv = minetest.get_inventory({type="node", pos=other_pos}) - local inv = minetest.get_inventory({type="node", pos=pos}) + local other_inv = minetest.get_inventory({ type = "node", pos = other_pos }) + local inv = minetest.get_inventory({ type = "node", pos = pos }) inv:set_stack("input", 1, nil) @@ -765,18 +851,20 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile -- END OF LISTRING WORKAROUND end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from chest at "..minetest.pos_to_string(pos)) + minetest.log("action", player:get_player_name() .. + " takes stuff from chest at " .. minetest.pos_to_string(pos)) end, _mcl_blast_resistance = 2.5, _mcl_hardness = 2.5, on_rightclick = function(pos, node, clicker) local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "right") - if minetest.registered_nodes[minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name].groups.opaque == 1 - or minetest.registered_nodes[minetest.get_node({x = pos_other.x, y = pos_other.y + 1, z = pos_other.z}).name].groups.opaque == 1 then - -- won't open if there is no space from the top - return false + if minetest.registered_nodes[minetest.get_node(vector.offset(pos, 0, 1, 0)).name].groups.opaque == 1 + or + minetest.registered_nodes[minetest.get_node(vector.offset(pos_other, 0, 1, 0)).name].groups.opaque + == 1 then + -- won't open if there is no space from the top + return false end local name = minetest.get_meta(pos_other):get_string("name") @@ -788,41 +876,48 @@ local function register_chest(basename, desc, longdesc, usagehelp, tt_help, tile end minetest.show_formspec(clicker:get_player_name(), - "mcl_chests:"..canonical_basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, + sf("mcl_chests:%s_%s_%s_%s", canonical_basename, pos.x, pos.y, pos.z), + table.concat({ + "formspec_version[4]", + "size[11.75,14.15]", - "size[9,11.5]".. - "label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", name)).."]".. - "list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,0.5;9,3;]".. - mcl_formspec.get_itemslot_bg(0,0.5,9,3).. - "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,3.5;9,3;]".. - mcl_formspec.get_itemslot_bg(0,3.5,9,3).. - "label[0,7;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,7.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,7.5,9,3).. - "list[current_player;main;0,10.75;9,1;]".. - mcl_formspec.get_itemslot_bg(0,10.75,9,1).. - -- BEGIN OF LISTRING WORKAROUND - "listring[current_player;main]".. - "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";input]".. - -- END OF LISTRING WORKAROUND - "listring[current_player;main]".. - "listring[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main]".. - "listring[current_player;main]".. - "listring[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main]") + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, name)) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3), + sf("list[nodemeta:%s,%s,%s;main;0.375,0.75;9,3;]", pos_other.x, pos_other.y, pos_other.z), + mcl_formspec.get_itemslot_bg_v4(0.375, 4.5, 9, 3), + sf("list[nodemeta:%s,%s,%s;main;0.375,4.5;9,3;]", pos.x, pos.y, pos.z), + "label[0.375,8.45;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 8.825, 9, 3), + "list[current_player;main;0.375,8.825;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 12.775, 9, 1), + "list[current_player;main;0.375,12.775;9,1;]", + + --BEGIN OF LISTRING WORKAROUND + "listring[current_player;main]", + sf("listring[nodemeta:%s,%s,%s;input]", pos.x, pos.y, pos.z), + --END OF LISTRING WORKAROUND + "listring[current_player;main]" .. + sf("listring[nodemeta:%s,%s,%s;main]", pos_other.x, pos_other.y, pos_other.z), + "listring[current_player;main]", + sf("listring[nodemeta:%s,%s,%s;main]", pos.x, pos.y, pos.z), + }) + ) if on_rightclick_addendum_right then on_rightclick_addendum_right(pos, node, clicker) end - player_chest_open(clicker, pos_other, left_name, left_textures, node.param2, true, "default_chest", "mcl_chests_chest") + player_chest_open(clicker, pos_other, left_name, left_textures, node.param2, true, "default_chest", + "mcl_chests_chest") end, mesecons = mesecons, on_rotate = no_rotate, }) if mod_doc then - doc.add_entry_alias("nodes", small_name, "nodes", "mcl_chests:"..basename.."_left") - doc.add_entry_alias("nodes", small_name, "nodes", "mcl_chests:"..basename.."_right") + doc.add_entry_alias("nodes", small_name, "nodes", "mcl_chests:" .. basename .. "_left") + doc.add_entry_alias("nodes", small_name, "nodes", "mcl_chests:" .. basename .. "_right") end -- END OF register_chest FUNCTION BODY @@ -838,6 +933,15 @@ register_chest("chest", { small = tiles_chest_normal_small, double = tiles_chest_normal_double, + inv = { "default_chest_top.png", "mcl_chests_chest_bottom.png", + "mcl_chests_chest_right.png", "mcl_chests_chest_left.png", + "mcl_chests_chest_back.png", "default_chest_front.png" }, + --[[left = {"default_chest_top_big.png", "default_chest_top_big.png", + "mcl_chests_chest_right.png", "mcl_chests_chest_left.png", + "default_chest_side_big.png^[transformFX", "default_chest_front_big.png"}, + right = {"default_chest_top_big.png^[transformFX", "default_chest_top_big.png^[transformFX", + "mcl_chests_chest_right.png", "mcl_chests_chest_left.png", + "default_chest_side_big.png", "default_chest_front_big.png^[transformFX"},]] -- }, false ) @@ -851,48 +955,57 @@ register_chest("trapped_chest", S("Trapped Chest"), S("A trapped chest is a container which provides 27 inventory slots. When it is opened, it sends a redstone signal to its adjacent blocks as long it stays open. Trapped chests can be turned into large trapped chests with double the capacity by placing two trapped chests next to each other."), chestusage, - S("27 inventory slots") .. "\n" .. S("Can be combined to a large chest") .. "\n" .. S("Emits a redstone signal when opened"), + S("27 inventory slots") .. + "\n" .. S("Can be combined to a large chest") .. "\n" .. S("Emits a redstone signal when opened"), traptiles, nil, - {receptor = { - state = mesecon.state.off, - rules = trapped_chest_mesecons_rules, - }}, + { + receptor = { + state = mesecon.state.off, + rules = trapped_chest_mesecons_rules, + }, + }, function(pos, node, clicker) - minetest.swap_node(pos, {name="mcl_chests:trapped_chest_on_small", param2 = node.param2}) - find_or_create_entity(pos, "mcl_chests:trapped_chest_on_small", {"mcl_chests_trapped.png"}, node.param2, false, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_small") + minetest.swap_node(pos, { name = "mcl_chests:trapped_chest_on_small", param2 = node.param2 }) + find_or_create_entity(pos, "mcl_chests:trapped_chest_on_small", { "mcl_chests_trapped.png" }, node.param2, false, + "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_small") mesecon.receptor_on(pos, trapped_chest_mesecons_rules) end, function(pos, node, clicker) local meta = minetest.get_meta(pos) meta:set_int("players", 1) - minetest.swap_node(pos, {name="mcl_chests:trapped_chest_on_left", param2 = node.param2}) - find_or_create_entity(pos, "mcl_chests:trapped_chest_on_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left") + minetest.swap_node(pos, { name = "mcl_chests:trapped_chest_on_left", param2 = node.param2 }) + find_or_create_entity(pos, "mcl_chests:trapped_chest_on_left", tiles_chest_trapped_double, node.param2, true, + "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left") mesecon.receptor_on(pos, trapped_chest_mesecons_rules) local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "left") - minetest.swap_node(pos_other, {name="mcl_chests:trapped_chest_on_right", param2 = node.param2}) + minetest.swap_node(pos_other, { name = "mcl_chests:trapped_chest_on_right", param2 = node.param2 }) mesecon.receptor_on(pos_other, trapped_chest_mesecons_rules) end, function(pos, node, clicker) local pos_other = mcl_util.get_double_container_neighbor_pos(pos, node.param2, "right") - minetest.swap_node(pos, {name="mcl_chests:trapped_chest_on_right", param2 = node.param2}) + minetest.swap_node(pos, { name = "mcl_chests:trapped_chest_on_right", param2 = node.param2 }) mesecon.receptor_on(pos, trapped_chest_mesecons_rules) - minetest.swap_node(pos_other, {name="mcl_chests:trapped_chest_on_left", param2 = node.param2}) - find_or_create_entity(pos_other, "mcl_chests:trapped_chest_on_left", tiles_chest_trapped_double, node.param2, true, "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left") + minetest.swap_node(pos_other, { name = "mcl_chests:trapped_chest_on_left", param2 = node.param2 }) + find_or_create_entity(pos_other, "mcl_chests:trapped_chest_on_left", tiles_chest_trapped_double, node.param2, + true, + "default_chest", "mcl_chests_chest", "chest"):reinitialize("mcl_chests:trapped_chest_on_left") mesecon.receptor_on(pos_other, trapped_chest_mesecons_rules) end ) register_chest("trapped_chest_on", nil, nil, nil, nil, traptiles, true, - {receptor = { - state = mesecon.state.on, - rules = trapped_chest_mesecons_rules, - }}, + { + receptor = { + state = mesecon.state.on, + rules = trapped_chest_mesecons_rules, + }, + }, nil, nil, nil, "trapped_chest", "trapped_chest" @@ -946,77 +1059,86 @@ end) minetest.register_craft({ output = "mcl_chests:chest", recipe = { - {"group:wood", "group:wood", "group:wood"}, - {"group:wood", "", "group:wood"}, - {"group:wood", "group:wood", "group:wood"}, - } + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "", "group:wood" }, + { "group:wood", "group:wood", "group:wood" }, + }, }) minetest.register_craft({ type = "fuel", recipe = "mcl_chests:chest", - burntime = 15 + burntime = 15, }) minetest.register_craft({ type = "fuel", recipe = "mcl_chests:trapped_chest", - burntime = 15 + burntime = 15, }) minetest.register_node("mcl_chests:ender_chest", { description = S("Ender Chest"), - _tt_help = S("27 interdimensional inventory slots") .. "\n" .. S("Put items inside, retrieve them from any ender chest"), - _doc_items_longdesc = S("Ender chests grant you access to a single personal interdimensional inventory with 27 slots. This inventory is the same no matter from which ender chest you access it from. If you put one item into one ender chest, you will find it in all other ender chests. Each player will only see their own items, but not the items of other players."), + _tt_help = S("27 interdimensional inventory slots") .. + "\n" .. S("Put items inside, retrieve them from any ender chest"), + _doc_items_longdesc = S( + "Ender chests grant you access to a single personal interdimensional inventory with 27 slots. This inventory is the same no matter from which ender chest you access it from. If you put one item into one ender chest, you will find it in all other ender chests. Each player will only see their own items, but not the items of other players."), _doc_items_usagehelp = S("Rightclick the ender chest to access your personal interdimensional inventory."), drawtype = "mesh", mesh = "mcl_chests_chest.b3d", tiles = tiles_chest_ender_small, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + use_texture_alpha = "opaque", paramtype = "light", paramtype2 = "facedir", - stack_max = 64, - groups = {deco_block=1}, + groups = { deco_block = 1 }, sounds = mcl_sounds.node_sound_stone_defaults(), - on_construct = function(pos, node) + on_construct = function(pos) local node = minetest.get_node(pos) node.name = "mcl_chests:ender_chest_small" minetest.set_node(pos, node) end, }) -local formspec_ender_chest = "size[9,8.75]".. - "label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Ender Chest"))).."]".. - "list[current_player;enderchest;0,0.5;9,3;]".. - mcl_formspec.get_itemslot_bg(0,0.5,9,3).. - "label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "listring[current_player;enderchest]".. - "listring[current_player;main]" +local formspec_ender_chest = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Ender Chest"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3), + "list[current_player;enderchest;0.375,0.75;9,3;]", + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + "listring[current_player;enderchest]", + "listring[current_player;main]", +}) minetest.register_node("mcl_chests:ender_chest_small", { description = S("Ender Chest"), - _tt_help = S("27 interdimensional inventory slots") .. "\n" .. S("Put items inside, retrieve them from any ender chest"), - _doc_items_longdesc = S("Ender chests grant you access to a single personal interdimensional inventory with 27 slots. This inventory is the same no matter from which ender chest you access it from. If you put one item into one ender chest, you will find it in all other ender chests. Each player will only see their own items, but not the items of other players."), + _tt_help = S("27 interdimensional inventory slots") .. + "\n" .. S("Put items inside, retrieve them from any ender chest"), + _doc_items_longdesc = S( + "Ender chests grant you access to a single personal interdimensional inventory with 27 slots. This inventory is the same no matter from which ender chest you access it from. If you put one item into one ender chest, you will find it in all other ender chests. Each player will only see their own items, but not the items of other players."), _doc_items_usagehelp = S("Rightclick the ender chest to access your personal interdimensional inventory."), drawtype = "nodebox", node_box = { type = "fixed", - fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375}, + fixed = { -0.4375, -0.5, -0.4375, 0.4375, 0.375, 0.4375 }, }, _chest_entity_textures = ender_chest_texture, _chest_entity_sound = "mcl_chests_enderchest", _chest_entity_mesh = "mcl_chests_chest", _chest_entity_animation_type = "chest", - tiles = {"blank.png^[resize:16x16"}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, + tiles = { "blank.png^[resize:16x16" }, + use_texture_alpha = "clip", -- Note: The “container” group is missing here because the ender chest does not -- have an inventory on its own - groups = {pickaxey=1, deco_block=1, material_stone=1, chest_entity=1, not_in_creative_inventory=1}, + groups = { pickaxey = 1, deco_block = 1, material_stone = 1, chest_entity = 1, not_in_creative_inventory = 1 }, is_ground_content = false, paramtype = "light", light_source = 7, @@ -1024,15 +1146,18 @@ minetest.register_node("mcl_chests:ender_chest_small", { sounds = mcl_sounds.node_sound_stone_defaults(), drop = "mcl_core:obsidian 8", on_construct = function(pos) - create_entity(pos, "mcl_chests:ender_chest_small", ender_chest_texture, minetest.get_node(pos).param2, false, "mcl_chests_enderchest", "mcl_chests_chest", "chest") + create_entity(pos, "mcl_chests:ender_chest_small", ender_chest_texture, minetest.get_node(pos).param2, false, + "mcl_chests_enderchest", "mcl_chests_chest", "chest") end, on_rightclick = function(pos, node, clicker) - if minetest.registered_nodes[minetest.get_node({x = pos.x, y = pos.y + 1, z = pos.z}).name].groups.opaque == 1 then - -- won't open if there is no space from the top - return false + if minetest.registered_nodes[minetest.get_node(vector.offset(pos, 0, 1, 0)).name].groups.opaque == 1 then + -- won't open if there is no space from the top + return false end - minetest.show_formspec(clicker:get_player_name(), "mcl_chests:ender_chest_"..clicker:get_player_name(), formspec_ender_chest) - player_chest_open(clicker, pos, "mcl_chests:ender_chest_small", ender_chest_texture, node.param2, false, "mcl_chests_enderchest", "mcl_chests_chest") + minetest.show_formspec(clicker:get_player_name(), "mcl_chests:ender_chest_" .. clicker:get_player_name(), + formspec_ender_chest) + player_chest_open(clicker, pos, "mcl_chests:ender_chest_small", ender_chest_texture, node.param2, false, + "mcl_chests_enderchest", "mcl_chests_chest") end, on_receive_fields = function(pos, formname, fields, sender) if fields.quit then @@ -1041,21 +1166,21 @@ minetest.register_node("mcl_chests:ender_chest_small", { end, _mcl_blast_resistance = 3000, _mcl_hardness = 22.5, - _mcl_silk_touch_drop = {"mcl_chests:ender_chest"}, + _mcl_silk_touch_drop = { "mcl_chests:ender_chest" }, on_rotate = simple_rotate, }) minetest.register_on_joinplayer(function(player) local inv = player:get_inventory() - inv:set_size("enderchest", 9*3) + inv:set_size("enderchest", 9 * 3) end) minetest.register_allow_player_inventory_action(function(player, action, inv, info) if inv:get_location().type == "player" and ( - action == "move" and (info.from_list == "enderchest" or info.to_list == "enderchest") - or action == "put" and info.listname == "enderchest" - or action == "take" and info.listname == "enderchest" - ) then + action == "move" and (info.from_list == "enderchest" or info.to_list == "enderchest") + or action == "put" and info.listname == "enderchest" + or action == "take" and info.listname == "enderchest" + ) then local def = player:get_wielded_item():get_definition() local range = (def and def.range or player:get_inventory():get_stack("hand", 1):get_definition().range) + 1 if not minetest.find_node_near(player:get_pos(), range, "mcl_chests:ender_chest_small", true) then @@ -1067,10 +1192,10 @@ end) minetest.register_craft({ output = "mcl_chests:ender_chest", recipe = { - {"mcl_core:obsidian", "mcl_core:obsidian", "mcl_core:obsidian"}, - {"mcl_core:obsidian", "mcl_end:ender_eye", "mcl_core:obsidian"}, - {"mcl_core:obsidian", "mcl_core:obsidian", "mcl_core:obsidian"}, - } + { "mcl_core:obsidian", "mcl_core:obsidian", "mcl_core:obsidian" }, + { "mcl_core:obsidian", "mcl_end:ender_eye", "mcl_core:obsidian" }, + { "mcl_core:obsidian", "mcl_core:obsidian", "mcl_core:obsidian" }, + }, }) -- Shulker boxes @@ -1113,21 +1238,29 @@ local shulker_mob_textures = { } local canonical_shulker_color = "violet" +--WARNING: after formspec v4 update, old shulker boxes will need to be placed again to get the new formspec local function formspec_shulker_box(name) - if name == "" then + if not name or name == "" then name = S("Shulker Box") end - return "size[9,8.75]".. - "label[0,0;"..minetest.formspec_escape(minetest.colorize("#313131", name)).."]".. - "list[context;main;0,0.5;9,3;]".. - mcl_formspec.get_itemslot_bg(0,0.5,9,3).. - "label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "listring[context;main]".. - "listring[current_player;main]" + + return table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, name)) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 0.75, 9, 3), + "list[context;main;0.375,0.75;9,3;]", + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + "listring[context;main]", + "listring[current_player;main]", + }) end local function set_shulkerbox_meta(nmeta, imeta) @@ -1143,28 +1276,38 @@ for color, desc in pairs(boxtypes) do local longdesc, usagehelp, create_entry, entry_name if mod_doc then if is_canonical then - longdesc = S("A shulker box is a portable container which provides 27 inventory slots for any item except shulker boxes. Shulker boxes keep their inventory when broken, so shulker boxes as well as their contents can be taken as a single item. Shulker boxes come in many different colors.") - usagehelp = S("To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out. Place the shulker box again to be able to retrieve its contents.") + longdesc = S( + "A shulker box is a portable container which provides 27 inventory slots for any item except shulker boxes. Shulker boxes keep their inventory when broken, so shulker boxes as well as their contents can be taken as a single item. Shulker boxes come in many different colors.") + usagehelp = S( + "To access the inventory of a shulker box, place and right-click it. To take a shulker box and its contents with you, just break and collect it, the items will not fall out. Place the shulker box again to be able to retrieve its contents.") entry_name = S("Shulker Box") else create_entry = false end end - local small_name = "mcl_chests:"..color.."_shulker_box_small" + local small_name = "mcl_chests:" .. color .. "_shulker_box_small" - minetest.register_node("mcl_chests:"..color.."_shulker_box", { + minetest.register_node("mcl_chests:" .. color .. "_shulker_box", { description = desc, _tt_help = S("27 inventory slots") .. "\n" .. S("Can be carried around with its contents"), _doc_items_create_entry = create_entry, _doc_items_entry_name = entry_name, _doc_items_longdesc = longdesc, _doc_items_usagehelp = usagehelp, - tiles = {mob_texture}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + tiles = { mob_texture }, + use_texture_alpha = "opaque", drawtype = "mesh", mesh = "mcl_chests_shulker.b3d", - groups = {handy=1,pickaxey=1, container=3, deco_block=1, dig_by_piston=1, shulker_box=1, old_shulker_box_node=1}, + groups = { + handy = 1, + pickaxey = 1, + container = 3, + deco_block = 1, + dig_by_piston = 1, + shulker_box = 1, + old_shulker_box_node = 1 + }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), stack_max = 1, @@ -1182,7 +1325,7 @@ for color, desc in pairs(boxtypes) do local iinv_main = minetest.deserialize(imetadata) local ninv = nmeta:get_inventory() ninv:set_list("main", iinv_main) - ninv:set_size("main", 9*3) + ninv:set_size("main", 9 * 3) set_shulkerbox_meta(nmeta, itemstack:get_meta()) if minetest.is_creative_enabled(placer:get_player_name()) then @@ -1198,12 +1341,12 @@ for color, desc in pairs(boxtypes) do _on_dispense = function(stack, pos, droppos, dropnode, dropdir) -- Place shulker box as node if minetest.registered_nodes[dropnode.name].buildable_to then - minetest.set_node(droppos, {name = small_name, param2 = minetest.dir_to_facedir(dropdir)}) - local ninv = minetest.get_inventory({type="node", pos=droppos}) + minetest.set_node(droppos, { name = small_name, param2 = minetest.dir_to_facedir(dropdir) }) + local ninv = minetest.get_inventory({ type = "node", pos = droppos }) local imetadata = stack:get_metadata() local iinv_main = minetest.deserialize(imetadata) ninv:set_list("main", iinv_main) - ninv:set_size("main", 9*3) + ninv:set_size("main", 9 * 3) set_shulkerbox_meta(minetest.get_meta(droppos), stack:get_meta()) stack:take_item() end @@ -1221,30 +1364,40 @@ for color, desc in pairs(boxtypes) do drawtype = "nodebox", node_box = { type = "fixed", - fixed = {-0.48, -0.5, -0.48, 0.48, 0.489, 0.48}, + fixed = { -0.48, -0.5, -0.48, 0.48, 0.489, 0.48 }, }, - tiles = {"blank.png^[resize:16x16"}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, - _chest_entity_textures = {mob_texture}, + tiles = { "blank.png^[resize:16x16" }, + use_texture_alpha = "clip", + _chest_entity_textures = { mob_texture }, _chest_entity_sound = "mcl_chests_shulker", _chest_entity_mesh = "mcl_chests_shulker", _chest_entity_animation_type = "shulker", - groups = {handy=1,pickaxey=1, container=3, deco_block=1, dig_by_piston=1, shulker_box=1, chest_entity=1, not_in_creative_inventory=1}, + groups = { + handy = 1, + pickaxey = 1, + container = 3, + deco_block = 1, + dig_by_piston = 1, + shulker_box = 1, + chest_entity = 1, + not_in_creative_inventory = 1 + }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), stack_max = 1, drop = "", paramtype = "light", paramtype2 = "facedir", --- TODO: Make shulker boxes rotatable --- This doesn't work, it just destroys the inventory: --- on_place = minetest.rotate_node, + -- TODO: Make shulker boxes rotatable + -- This doesn't work, it just destroys the inventory: + -- on_place = minetest.rotate_node, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", formspec_shulker_box(nil)) local inv = meta:get_inventory() - inv:set_size("main", 9*3) - create_entity(pos, small_name, {mob_texture}, minetest.get_node(pos).param2, false, "mcl_chests_shulker", "mcl_chests_shulker", "shulker") + inv:set_size("main", 9 * 3) + create_entity(pos, small_name, { mob_texture }, minetest.get_node(pos).param2, false, "mcl_chests_shulker", + "mcl_chests_shulker", "shulker") end, after_place_node = function(pos, placer, itemstack, pointed_thing) local nmeta = minetest.get_meta(pos) @@ -1252,7 +1405,7 @@ for color, desc in pairs(boxtypes) do local iinv_main = minetest.deserialize(imetadata) local ninv = nmeta:get_inventory() ninv:set_list("main", iinv_main) - ninv:set_size("main", 9*3) + ninv:set_size("main", 9 * 3) set_shulkerbox_meta(nmeta, itemstack:get_meta()) if minetest.is_creative_enabled(placer:get_player_name()) then @@ -1266,7 +1419,8 @@ for color, desc in pairs(boxtypes) do end end, on_rightclick = function(pos, node, clicker) - player_chest_open(clicker, pos, small_name, {mob_texture}, node.param2, false, "mcl_chests_shulker", "mcl_chests_shulker", true) + player_chest_open(clicker, pos, small_name, { mob_texture }, node.param2, false, "mcl_chests_shulker", + "mcl_chests_shulker", true) end, on_receive_fields = function(pos, formname, fields, sender) if fields.quit then @@ -1277,12 +1431,12 @@ for color, desc in pairs(boxtypes) do local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local items = {} - for i=1, inv:get_size("main") do + for i = 1, inv:get_size("main") do local stack = inv:get_stack("main", i) items[i] = stack:to_string() end local data = minetest.serialize(items) - local boxitem = ItemStack("mcl_chests:"..color.."_shulker_box") + local boxitem = ItemStack("mcl_chests:" .. color .. "_shulker_box") local boxitem_meta = boxitem:get_meta() boxitem_meta:set_string("description", meta:get_string("description")) boxitem_meta:set_string("name", meta:get_string("name")) @@ -1317,24 +1471,26 @@ for color, desc in pairs(boxtypes) do }) if mod_doc and not is_canonical then - doc.add_entry_alias("nodes", "mcl_chests:"..canonical_shulker_color.."_shulker_box", "nodes", "mcl_chests:"..color.."_shulker_box") - doc.add_entry_alias("nodes", "mcl_chests:"..canonical_shulker_color.."_shulker_box_small", "nodes", "mcl_chests:"..color.."_shulker_box_small") + doc.add_entry_alias("nodes", "mcl_chests:" .. canonical_shulker_color .. "_shulker_box", "nodes", + "mcl_chests:" .. color .. "_shulker_box") + doc.add_entry_alias("nodes", "mcl_chests:" .. canonical_shulker_color .. "_shulker_box_small", "nodes", + "mcl_chests:" .. color .. "_shulker_box_small") end minetest.register_craft({ type = "shapeless", - output = "mcl_chests:"..color.."_shulker_box", - recipe = { "group:shulker_box", "mcl_dye:"..color } + output = "mcl_chests:" .. color .. "_shulker_box", + recipe = { "group:shulker_box", "mcl_dye:" .. color }, }) end minetest.register_craft({ output = "mcl_chests:violet_shulker_box", recipe = { - {"mcl_mobitems:shulker_shell"}, - {"mcl_chests:chest"}, - {"mcl_mobitems:shulker_shell"}, - } + { "mcl_mobitems:shulker_shell" }, + { "mcl_chests:chest" }, + { "mcl_mobitems:shulker_shell" }, + }, }) -- Save metadata of shulker box when used in crafting @@ -1362,13 +1518,14 @@ local function select_and_spawn_entity(pos, node) local node_name = node.name local node_def = minetest.registered_nodes[node_name] local double_chest = minetest.get_item_group(node_name, "double_chest") > 0 - find_or_create_entity(pos, node_name, node_def._chest_entity_textures, node.param2, double_chest, node_def._chest_entity_sound, node_def._chest_entity_mesh, node_def._chest_entity_animation_type) + find_or_create_entity(pos, node_name, node_def._chest_entity_textures, node.param2, double_chest, + node_def._chest_entity_sound, node_def._chest_entity_mesh, node_def._chest_entity_animation_type) end minetest.register_lbm({ label = "Spawn Chest entities", name = "mcl_chests:spawn_chest_entities", - nodenames = {"group:chest_entity"}, + nodenames = { "group:chest_entity" }, run_at_every_load = true, action = select_and_spawn_entity, }) @@ -1376,7 +1533,9 @@ minetest.register_lbm({ minetest.register_lbm({ label = "Replace old chest nodes", name = "mcl_chests:replace_old", - nodenames = {"mcl_chests:chest", "mcl_chests:trapped_chest", "mcl_chests:trapped_chest_on", "mcl_chests:ender_chest", "group:old_shulker_box_node"}, + nodenames = { "mcl_chests:chest", "mcl_chests:trapped_chest", "mcl_chests:trapped_chest_on", + "mcl_chests:ender_chest", + "group:old_shulker_box_node" }, run_at_every_load = true, action = function(pos, node) local node_name = node.name @@ -1384,7 +1543,7 @@ minetest.register_lbm({ minetest.swap_node(pos, node) select_and_spawn_entity(pos, node) if node_name == "mcl_chests:trapped_chest_on" then - minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " ..minetest.pos_to_string(pos)) + minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " .. minetest.pos_to_string(pos)) chest_update_after_close(pos) elseif node_name == "mcl_chests:ender_chest" then local meta = minetest.get_meta(pos) @@ -1399,29 +1558,30 @@ minetest.register_lbm({ -- Fixes redstone weirdness. label = "Disable active trapped chests", name = "mcl_chests:reset_trapped_chests", - nodenames = { "mcl_chests:trapped_chest_on_small", "mcl_chests:trapped_chest_on_left", "mcl_chests:trapped_chest_on_right" }, + nodenames = { "mcl_chests:trapped_chest_on_small", "mcl_chests:trapped_chest_on_left", + "mcl_chests:trapped_chest_on_right" }, run_at_every_load = true, action = function(pos, node) - minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " ..minetest.pos_to_string(pos)) + minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " .. minetest.pos_to_string(pos)) chest_update_after_close(pos) end, }) minetest.register_lbm({ - label = "Update shulker box formspecs (0.60.0)", - name = "mcl_chests:update_shulker_box_formspecs_0_60_0", + label = "Update shulker box formspecs (0.72.0)", + name = "mcl_chests:update_shulker_box_formspecs_0_72_0", nodenames = { "group:shulker_box" }, run_at_every_load = false, action = function(pos, node) local meta = minetest.get_meta(pos) - meta:set_string("formspec", formspec_shulker_box) + meta:set_string("formspec", formspec_shulker_box(meta:get_string("name"))) end, }) minetest.register_lbm({ label = "Upgrade old ender chest formspec", name = "mcl_chests:replace_old_ender_form", - nodenames = {"mcl_chests:ender_chest_small"}, + nodenames = { "mcl_chests:ender_chest_small" }, run_at_every_load = false, action = function(pos, node) minetest.get_meta(pos):set_string("formspec", "") diff --git a/mods/ITEMS/mcl_clock/locale/mcl_clock.es.tr b/mods/ITEMS/mcl_clock/locale/mcl_clock.es.tr index c8841fc6e..6f8581fcc 100644 --- a/mods/ITEMS/mcl_clock/locale/mcl_clock.es.tr +++ b/mods/ITEMS/mcl_clock/locale/mcl_clock.es.tr @@ -1,4 +1,5 @@ # textdomain: mcl_clock Clocks are tools which shows the current time of day in the Overworld.=Los relojes son herramientas que muestran la hora del día en el mundo. The clock contains a rotating disc with a sun symbol (yellow disc) and moon symbol and a little “pointer” which shows the current time of day by estimating the real position of the sun and the moon in the sky. Noon is represented by the sun symbol and midnight is represented by the moon symbol.=El reloj contiene un disco giratorio con un símbolo del sol (disco amarillo) y un símbolo de la luna y un pequeño "puntero" que muestra la hora actual del día al estimar la posición real del sol y la luna en el cielo. El mediodía está representado por el símbolo del sol y la medianoche está representado por el símbolo de la luna. -Clock=Reloj \ No newline at end of file +Clock=Reloj +Displays the time of day in the Overworld=Muestra la hora del día en el mundo. diff --git a/mods/ITEMS/mcl_composters/locale/mcl_composters.ru.tr b/mods/ITEMS/mcl_composters/locale/mcl_composters.ru.tr new file mode 100644 index 000000000..db472dad4 --- /dev/null +++ b/mods/ITEMS/mcl_composters/locale/mcl_composters.ru.tr @@ -0,0 +1,7 @@ +# textdomain: mcl_composters +Composter=Перегнойница +Composters can convert various organic items into bonemeal.=Перегнойницы могут превращать многочисленные растительные предметы в костную муку. +Use organic items on the composter to fill it with layers of compost. Every time an item is put in the composter, there is a chance that the composter adds another layer of compost. Some items have a bigger chance of adding an extra layer than other items. After filling up with 7 layers of compost, the composter is full. After a delay of approximately one second the composter becomes ready and bone meal can be retrieved from it. Right-clicking the composter takes out the bone meal empties the composter."=Используйте растительные предметы на перегнойнице, чтобы заполнить её слоями перегноя. Каждый раз, когда какой-либо предмет помещается в перегнойницу, существует вероятность возникновения добавочного слоя перегноя. Некоторые предметы могут чаще, чем другие приводит к появлению добавочного слоя перегноя. После заполнения на семь слоёв перегноя, перегнойница будет полна. После задержки примерно в одну секунду из перегнойницы можно будет извлечь костную муку. Нажатие правой кнопки мыши по перегнойнице извлекает костную муку и опорожняет её. +filled=заполнена +ready for harvest=готов к жатве +Converts organic items into bonemeal=Превращает растительные предметы в костную муку \ No newline at end of file diff --git a/mods/ITEMS/mcl_core/locale/mcl_core.pt_BR.tr b/mods/ITEMS/mcl_core/locale/mcl_core.pt_BR.tr index e9091287d..c8ed5b8c3 100644 --- a/mods/ITEMS/mcl_core/locale/mcl_core.pt_BR.tr +++ b/mods/ITEMS/mcl_core/locale/mcl_core.pt_BR.tr @@ -217,8 +217,7 @@ Stripped Spruce Wood=Madeira de Pinheiro Descascada Stone Bricks=Tijolo de Rocha Sugar=Açúcar Sugar Canes=Cana de Açúcar -Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.= -Canas de açúcar são plantas que possui alguns usos em fabricações. Canas de açúcar crescerão lentamente até 3 blocos quando estão próximas da água e são colocadas em blocos de grama, terra, areia, areia vermelha, podzol ou terra infértil. +Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well.=Canas de açúcar são plantas que possui alguns usos em fabricações. Canas de açúcar crescerão lentamente até 3 blocos quando estão próximas da água e são colocadas em blocos de grama, terra, areia, areia vermelha, podzol ou terra infértil. Quando uma cana de açúcar é quebrada, todas as canas de açúcar conectadas acima também se quebrarão. Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow.=Canas de açúcar só podem ser colocados emcima de outras canas de açúcar ou sobre blocos em qual elas podem crescer. Sugar comes from sugar canes and is used to make sweet foods.=Açúcar vem de canas de açúcar e é utilizado para fazer doces comidas. The stripped trunk of an acacia tree.=O tronco descascado de uma acácia. diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index 6da9d8357..79cd37d8e 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/mods/ITEMS/mcl_core/nodes_base.lua @@ -370,7 +370,7 @@ minetest.register_node("mcl_core:dirt_with_grass", { _doc_items_hidden = false, paramtype2 = "color", tiles = {"mcl_core_grass_block_top.png", { name="default_dirt.png", color="white" }, { name="default_dirt.png^mcl_dirt_grass_shadow.png", color="white" }}, - overlay_tiles = {"mcl_core_grass_block_top.png", "", {name="mcl_core_grass_block_side_overlay.png", tileable_vertical=false}}, + overlay_tiles = {"mcl_core_grass_block_top.png", "blank.png", {name="mcl_core_grass_block_side_overlay.png", tileable_vertical=false}}, palette = "mcl_core_palette_grass.png", palette_index = 0, color = "#7CBD6B", diff --git a/mods/ITEMS/mcl_core/nodes_misc.lua b/mods/ITEMS/mcl_core/nodes_misc.lua index 47949057c..d830cc310 100644 --- a/mods/ITEMS/mcl_core/nodes_misc.lua +++ b/mods/ITEMS/mcl_core/nodes_misc.lua @@ -71,7 +71,7 @@ minetest.register_node("mcl_core:slimeblock", { neighbor_node = minetest.get_node(neighbor_pos) end local name = neighbor_node.name - if name ~= "air" and name ~= "ignore" and not mesecon.mvps_unsticky[name] then + if name ~= "air" and name ~= "ignore" and name ~= "mcl_honey:honey_block" and not mesecon.mvps_unsticky[name] then local piston, piston_side, piston_up, piston_down = false, false, false, false if name == "mesecons_pistons:piston_sticky_off" or name == "mesecons_pistons:piston_normal_off" then piston, piston_side = true, true diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua index bdbbd0273..beead761d 100644 --- a/mods/ITEMS/mcl_core/nodes_trees.lua +++ b/mods/ITEMS/mcl_core/nodes_trees.lua @@ -51,8 +51,9 @@ function mcl_core.make_player_leaves(pos) end -- Register tree trunk (wood) and bark -local function register_tree_trunk(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark, stripped_variant) - minetest.register_node("mcl_core:"..subname, { +function mcl_core.register_tree_trunk(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark, stripped_variant) + local mod = minetest.get_current_modname() + minetest.register_node(mod..":"..subname, { description = description_trunk, _doc_items_longdesc = longdesc, _doc_items_hidden = false, @@ -69,7 +70,7 @@ local function register_tree_trunk(subname, description_trunk, description_bark, _mcl_stripped_variant = stripped_variant, }) - minetest.register_node("mcl_core:"..subname.."_bark", { + minetest.register_node(mod..":"..subname.."_bark", { description = description_bark, _doc_items_longdesc = S("This is a decorative block surrounded by the bark of a tree trunk."), tiles = {tile_bark}, @@ -86,17 +87,18 @@ local function register_tree_trunk(subname, description_trunk, description_bark, }) minetest.register_craft({ - output = "mcl_core:"..subname.."_bark 3", + output = mod..":"..subname.."_bark 3", recipe = { - { "mcl_core:"..subname, "mcl_core:"..subname }, - { "mcl_core:"..subname, "mcl_core:"..subname }, + { mod..":"..subname, mod..":"..subname }, + { mod..":"..subname, mod..":"..subname }, } }) end -- Register stripped trunk and stripped wood -local function register_stripped_trunk(subname, description_stripped_trunk, description_stripped_bark, longdesc, longdesc_wood, tile_stripped_inner, tile_stripped_bark) - minetest.register_node("mcl_core:"..subname, { +function mcl_core.register_stripped_trunk(subname, description_stripped_trunk, description_stripped_bark, longdesc, longdesc_wood, tile_stripped_inner, tile_stripped_bark) + local mod = minetest.get_current_modname() + minetest.register_node(mod..":"..subname, { description = description_stripped_trunk, _doc_items_longdesc = longdesc, _doc_items_hidden = false, @@ -111,7 +113,7 @@ local function register_stripped_trunk(subname, description_stripped_trunk, desc _mcl_hardness = 2, }) - minetest.register_node("mcl_core:"..subname.."_bark", { + minetest.register_node(mod..":"..subname.."_bark", { description = description_stripped_bark, _doc_items_longdesc = longdesc_wood, tiles = {tile_stripped_bark}, @@ -127,16 +129,17 @@ local function register_stripped_trunk(subname, description_stripped_trunk, desc }) minetest.register_craft({ - output = "mcl_core:"..subname.."_bark 3", + output = mod..":"..subname.."_bark 3", recipe = { - { "mcl_core:"..subname, "mcl_core:"..subname }, - { "mcl_core:"..subname, "mcl_core:"..subname }, + { mod..":"..subname, mod..":"..subname }, + { mod..":"..subname, mod..":"..subname }, } }) end -local function register_wooden_planks(subname, description, tiles) - minetest.register_node("mcl_core:"..subname, { +function mcl_core.register_wooden_planks(subname, description, tiles) + local mod = minetest.get_current_modname() + minetest.register_node(mod..":"..subname, { description = description, _doc_items_longdesc = doc.sub.items.temp.build, _doc_items_hidden = false, @@ -150,7 +153,8 @@ local function register_wooden_planks(subname, description, tiles) }) end -local function register_leaves(subname, description, longdesc, tiles, color, paramtype2, palette, sapling, drop_apples, sapling_chances, foliage_palette) +function mcl_core.register_leaves(subname, description, longdesc, tiles, color, paramtype2, palette, sapling, drop_apples, sapling_chances, foliage_palette) + local mod = minetest.get_current_modname() local apple_chances = {200, 180, 160, 120, 40} local stick_chances = {50, 45, 30, 35, 10} @@ -219,20 +223,27 @@ local function register_leaves(subname, description, longdesc, tiles, color, par end, } - minetest.register_node("mcl_core:" .. subname, l_def) + minetest.register_node(mod .. ":" .. subname, l_def) local o_def = table.copy(l_def) o_def._doc_items_create_entry = false o_def.groups.not_in_creative_inventory = 1 o_def.groups.orphan_leaves = 1 - o_def._mcl_shears_drop = {"mcl_core:" .. subname} - o_def._mcl_silk_touch_drop = {"mcl_core:" .. subname} + o_def._mcl_shears_drop = {mod .. ":" .. subname} + o_def._mcl_silk_touch_drop = {mod .. ":" .. subname} - minetest.register_node("mcl_core:" .. subname .. "_orphan", o_def) + minetest.register_node(mod .. ":" .. subname .. "_orphan", o_def) end -local function register_sapling(subname, description, longdesc, tt_help, texture, selbox) - minetest.register_node("mcl_core:"..subname, { +function mcl_core.register_sapling(subname, description, longdesc, tt_help, texture, selbox) + + local mod = minetest.get_current_modname() + + if not tt_help then + tt_help = S("Needs soil and light to grow") + end + + minetest.register_node(mod..":"..subname, { description = description, _tt_help = tt_help, _doc_items_longdesc = longdesc, @@ -277,59 +288,55 @@ end --------------------- -register_tree_trunk("tree", S("Oak Wood"), S("Oak Bark"), S("The trunk of an oak tree."), "default_tree_top.png", "default_tree.png", "mcl_core:stripped_oak") -register_tree_trunk("darktree", S("Dark Oak Wood"), S("Dark Oak Bark"), S("The trunk of a dark oak tree."), "mcl_core_log_big_oak_top.png", "mcl_core_log_big_oak.png", "mcl_core:stripped_dark_oak") -register_tree_trunk("acaciatree", S("Acacia Wood"), S("Acacia Bark"), S("The trunk of an acacia."), "default_acacia_tree_top.png", "default_acacia_tree.png", "mcl_core:stripped_acacia") -register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The trunk of a spruce tree."), "mcl_core_log_spruce_top.png", "mcl_core_log_spruce.png", "mcl_core:stripped_spruce") -register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png", "mcl_core:stripped_birch") -register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png", "mcl_core:stripped_jungle") +mcl_core.register_tree_trunk("tree", S("Oak Wood"), S("Oak Bark"), S("The trunk of an oak tree."), "default_tree_top.png", "default_tree.png", "mcl_core:stripped_oak") +mcl_core.register_tree_trunk("darktree", S("Dark Oak Wood"), S("Dark Oak Bark"), S("The trunk of a dark oak tree."), "mcl_core_log_big_oak_top.png", "mcl_core_log_big_oak.png", "mcl_core:stripped_dark_oak") +mcl_core.register_tree_trunk("acaciatree", S("Acacia Wood"), S("Acacia Bark"), S("The trunk of an acacia."), "default_acacia_tree_top.png", "default_acacia_tree.png", "mcl_core:stripped_acacia") +mcl_core.register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The trunk of a spruce tree."), "mcl_core_log_spruce_top.png", "mcl_core_log_spruce.png", "mcl_core:stripped_spruce") +mcl_core.register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png", "mcl_core:stripped_birch") +mcl_core.register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png", "mcl_core:stripped_jungle") -register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), S("The stripped wood of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png") -register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), S("The stripped wood of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png") -register_stripped_trunk("stripped_dark_oak", S("Stripped Dark Oak Log"), S("Stripped Dark Oak Wood"), S("The stripped trunk of a dark oak tree."), S("The stripped wood of a dark oak tree."), "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png") -register_stripped_trunk("stripped_birch", S("Stripped Birch Log"), S("Stripped Birch Wood"), S("The stripped trunk of a birch tree."), S("The stripped wood of a birch tree."), "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png") -register_stripped_trunk("stripped_spruce", S("Stripped Spruce Log"), S("Stripped Spruce Wood"), S("The stripped trunk of a spruce tree."), S("The stripped wood of a spruce tree."), "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png") -register_stripped_trunk("stripped_jungle", S("Stripped Jungle Log"), S("Stripped Jungle Wood"), S("The stripped trunk of a jungle tree."), S("The stripped wood of a jungle tree."),"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png") -register_wooden_planks("wood", S("Oak Wood Planks"), {"default_wood.png"}) -register_wooden_planks("darkwood", S("Dark Oak Wood Planks"), {"mcl_core_planks_big_oak.png"}) -register_wooden_planks("junglewood", S("Jungle Wood Planks"), {"default_junglewood.png"}) -register_wooden_planks("sprucewood", S("Spruce Wood Planks"), {"mcl_core_planks_spruce.png"}) -register_wooden_planks("acaciawood", S("Acacia Wood Planks"), {"default_acacia_wood.png"}) -register_wooden_planks("birchwood", S("Birch Wood Planks"), {"mcl_core_planks_birch.png"}) +mcl_core.register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), S("The stripped wood of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png") +mcl_core.register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), S("The stripped wood of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png") +mcl_core.register_stripped_trunk("stripped_dark_oak", S("Stripped Dark Oak Log"), S("Stripped Dark Oak Wood"), S("The stripped trunk of a dark oak tree."), S("The stripped wood of a dark oak tree."), "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png") +mcl_core.register_stripped_trunk("stripped_birch", S("Stripped Birch Log"), S("Stripped Birch Wood"), S("The stripped trunk of a birch tree."), S("The stripped wood of a birch tree."), "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png") +mcl_core.register_stripped_trunk("stripped_spruce", S("Stripped Spruce Log"), S("Stripped Spruce Wood"), S("The stripped trunk of a spruce tree."), S("The stripped wood of a spruce tree."), "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png") +mcl_core.register_stripped_trunk("stripped_jungle", S("Stripped Jungle Log"), S("Stripped Jungle Wood"), S("The stripped trunk of a jungle tree."), S("The stripped wood of a jungle tree."),"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png") +mcl_core.register_wooden_planks("wood", S("Oak Wood Planks"), {"default_wood.png"}) +mcl_core.register_wooden_planks("darkwood", S("Dark Oak Wood Planks"), {"mcl_core_planks_big_oak.png"}) +mcl_core.register_wooden_planks("junglewood", S("Jungle Wood Planks"), {"default_junglewood.png"}) +mcl_core.register_wooden_planks("sprucewood", S("Spruce Wood Planks"), {"mcl_core_planks_spruce.png"}) +mcl_core.register_wooden_planks("acaciawood", S("Acacia Wood Planks"), {"default_acacia_wood.png"}) +mcl_core.register_wooden_planks("birchwood", S("Birch Wood Planks"), {"mcl_core_planks_birch.png"}) +local tt_help_sapling_large = S("Needs soil and light to grow") .. "\n" .. S("2×2 saplings = large tree") -register_sapling("sapling", S("Oak Sapling"), +mcl_core.register_sapling("sapling", S("Oak Sapling"), S("When placed on soil (such as dirt) and exposed to light, an oak sapling will grow into an oak after some time."), - S("Needs soil and light to grow"), - "default_sapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16}) -register_sapling("darksapling", S("Dark Oak Sapling"), + nil, "default_sapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16}) +mcl_core.register_sapling("darksapling", S("Dark Oak Sapling"), S("Dark oak saplings can grow into dark oaks, but only in groups. A lonely dark oak sapling won't grow. A group of four dark oak saplings grows into a dark oak after some time when they are placed on soil (such as dirt) in a 2×2 square and exposed to light."), S("Needs soil and light to grow") .. "\n" .. S("2×2 saplings required"), "mcl_core_sapling_big_oak.png", {-5/16, -0.5, -5/16, 5/16, 7/16, 5/16}) -register_sapling("junglesapling", S("Jungle Sapling"), +mcl_core.register_sapling("junglesapling", S("Jungle Sapling"), S("When placed on soil (such as dirt) and exposed to light, a jungle sapling will grow into a jungle tree after some time. When there are 4 jungle saplings in a 2×2 square, they will grow to a huge jungle tree."), - S("Needs soil and light to grow") .. "\n" .. S("2×2 saplings = large tree"), - "default_junglesapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16}) -register_sapling("acaciasapling", S("Acacia Sapling"), + tt_help_sapling_large, "default_junglesapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16}) +mcl_core.register_sapling("acaciasapling", S("Acacia Sapling"), S("When placed on soil (such as dirt) and exposed to light, an acacia sapling will grow into an acacia after some time."), - S("Needs soil and light to grow"), - "default_acacia_sapling.png", {-5/16, -0.5, -5/16, 5/16, 4/16, 5/16}) -register_sapling("sprucesapling", S("Spruce Sapling"), + nil, "default_acacia_sapling.png", {-5/16, -0.5, -5/16, 5/16, 4/16, 5/16}) +mcl_core.register_sapling("sprucesapling", S("Spruce Sapling"), S("When placed on soil (such as dirt) and exposed to light, a spruce sapling will grow into a spruce after some time. When there are 4 spruce saplings in a 2×2 square, they will grow to a huge spruce."), - S("Needs soil and light to grow") .. "\n" .. S("2×2 saplings = large tree"), - "mcl_core_sapling_spruce.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16}) -register_sapling("birchsapling", S("Birch Sapling"), + tt_help_sapling_large, "mcl_core_sapling_spruce.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16}) +mcl_core.register_sapling("birchsapling", S("Birch Sapling"), S("When placed on soil (such as dirt) and exposed to light, a birch sapling will grow into a birch after some time."), - S("Needs soil and light to grow"), - "mcl_core_sapling_birch.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16}) + nil, "mcl_core_sapling_birch.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16}) -register_leaves("leaves", S("Oak Leaves"), S("Oak leaves are grown from oak trees."), {"default_leaves.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:sapling", true, {20, 16, 12, 10}, 1) -register_leaves("darkleaves", S("Dark Oak Leaves"), S("Dark oak leaves are grown from dark oak trees."), {"mcl_core_leaves_big_oak.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:darksapling", true, {20, 16, 12, 10}, 1) -register_leaves("jungleleaves", S("Jungle Leaves"), S("Jungle leaves are grown from jungle trees."), {"default_jungleleaves.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:junglesapling", false, {40, 26, 32, 24, 10}, 1) -register_leaves("acacialeaves", S("Acacia Leaves"), S("Acacia leaves are grown from acacia trees."), {"default_acacia_leaves.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:acaciasapling", false, {20, 16, 12, 10}, 1) -register_leaves("spruceleaves", S("Spruce Leaves"), S("Spruce leaves are grown from spruce trees."), {"mcl_core_leaves_spruce.png"}, "#619961", "none", nil, "mcl_core:sprucesapling", false, {20, 16, 12, 10}, 0) -register_leaves("birchleaves", S("Birch Leaves"), S("Birch leaves are grown from birch trees."), {"mcl_core_leaves_birch.png"}, "#80A755", "none", nil, "mcl_core:birchsapling", false, {20, 16, 12, 10}, 0) +mcl_core.register_leaves("leaves", S("Oak Leaves"), S("Oak leaves are grown from oak trees."), {"default_leaves.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:sapling", true, {20, 16, 12, 10}, 1) +mcl_core.register_leaves("darkleaves", S("Dark Oak Leaves"), S("Dark oak leaves are grown from dark oak trees."), {"mcl_core_leaves_big_oak.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:darksapling", true, {20, 16, 12, 10}, 1) +mcl_core.register_leaves("jungleleaves", S("Jungle Leaves"), S("Jungle leaves are grown from jungle trees."), {"default_jungleleaves.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:junglesapling", false, {40, 26, 32, 24, 10}, 1) +mcl_core.register_leaves("acacialeaves", S("Acacia Leaves"), S("Acacia leaves are grown from acacia trees."), {"default_acacia_leaves.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_core:acaciasapling", false, {20, 16, 12, 10}, 1) +mcl_core.register_leaves("spruceleaves", S("Spruce Leaves"), S("Spruce leaves are grown from spruce trees."), {"mcl_core_leaves_spruce.png"}, "#619961", "none", nil, "mcl_core:sprucesapling", false, {20, 16, 12, 10}, 0) +mcl_core.register_leaves("birchleaves", S("Birch Leaves"), S("Birch leaves are grown from birch trees."), {"mcl_core_leaves_birch.png"}, "#80A755", "none", nil, "mcl_core:birchsapling", false, {20, 16, 12, 10}, 0) diff --git a/mods/ITEMS/mcl_crafting_table/init.lua b/mods/ITEMS/mcl_crafting_table/init.lua index 7f6b9ccc5..2f114362d 100644 --- a/mods/ITEMS/mcl_crafting_table/init.lua +++ b/mods/ITEMS/mcl_crafting_table/init.lua @@ -1,34 +1,51 @@ +---@diagnostic disable lowercase-global + local S = minetest.get_translator(minetest.get_current_modname()) -local formspec_escape = minetest.formspec_escape -local show_formspec = minetest.show_formspec +local F = minetest.formspec_escape local C = minetest.colorize -local text_color = "#313131" -local itemslot_bg = mcl_formspec.get_itemslot_bg +local show_formspec = minetest.show_formspec mcl_crafting_table = {} -function mcl_crafting_table.show_crafting_form(player) - player:get_inventory():set_width("craft", 3) - player:get_inventory():set_size("craft", 9) +mcl_crafting_table.formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", - show_formspec(player:get_player_name(), "main", - "size[9,8.75]".. - "image[4.7,1.5;1.5,1;gui_crafting_arrow.png]".. - "label[0,4;"..formspec_escape(C(text_color, S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - itemslot_bg(0,7.74,9,1).. - "label[1.75,0;"..formspec_escape(C(text_color, S("Crafting"))).."]".. - "list[current_player;craft;1.75,0.5;3,3;]".. - itemslot_bg(1.75,0.5,3,3).. - "list[current_player;craftpreview;6.1,1.5;1,1;]".. - itemslot_bg(6.1,1.5,1,1).. - "image_button[0.75,1.5;1,1;craftguide_book.png;__mcl_craftguide;]".. - "tooltip[__mcl_craftguide;"..formspec_escape(S("Recipe book")).."]".. - "listring[current_player;main]".. - "listring[current_player;craft]" - ) + "label[2.25,0.375;" .. F(C(mcl_formspec.label_color, S("Crafting"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(2.25, 0.75, 3, 3), + "list[current_player;craft;2.25,0.75;3,3;]", + + "image[6.125,2;1.5,1;gui_crafting_arrow.png]", + + mcl_formspec.get_itemslot_bg_v4(8.2, 2, 1, 1, 0.2), + "list[current_player;craftpreview;8.2,2;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + "listring[current_player;craft]", + "listring[current_player;main]", + + --Crafting guide button + "image_button[0.325,1.95;1.1,1.1;craftguide_book.png;__mcl_craftguide;]", + "tooltip[__mcl_craftguide;" .. F(S("Recipe book")) .. "]", +}) + +---@param player ObjectRef +function mcl_crafting_table.show_crafting_form(player) + local inv = player:get_inventory() + if inv then + inv:set_width("craft", 3) + inv:set_size("craft", 9) + end + + show_formspec(player:get_player_name(), "main", mcl_crafting_table.formspec) end minetest.register_node("mcl_crafting_table:crafting_table", { @@ -38,10 +55,10 @@ minetest.register_node("mcl_crafting_table:crafting_table", { _doc_items_usagehelp = S("Rightclick the crafting table to access the 3×3 crafting grid."), _doc_items_hidden = false, is_ground_content = false, - tiles = {"crafting_workbench_top.png", "default_wood.png", "crafting_workbench_side.png", - "crafting_workbench_side.png", "crafting_workbench_front.png", "crafting_workbench_front.png"}, + tiles = { "crafting_workbench_top.png", "default_wood.png", "crafting_workbench_side.png", + "crafting_workbench_side.png", "crafting_workbench_front.png", "crafting_workbench_front.png" }, paramtype2 = "facedir", - groups = {handy=1,axey=1, deco_block=1, material_wood=1,flammable=-1}, + groups = { handy = 1, axey = 1, deco_block = 1, material_wood = 1, flammable = -1 }, on_rightclick = function(pos, node, player, itemstack) if not player:get_player_control().sneak then mcl_crafting_table.show_crafting_form(player) @@ -55,9 +72,9 @@ minetest.register_node("mcl_crafting_table:crafting_table", { minetest.register_craft({ output = "mcl_crafting_table:crafting_table", recipe = { - {"group:wood", "group:wood"}, - {"group:wood", "group:wood"} - } + { "group:wood", "group:wood" }, + { "group:wood", "group:wood" } + }, }) minetest.register_craft({ diff --git a/mods/ITEMS/mcl_crimson/init.lua b/mods/ITEMS/mcl_crimson/init.lua index 03d0a7caa..3ec6d60e4 100644 --- a/mods/ITEMS/mcl_crimson/init.lua +++ b/mods/ITEMS/mcl_crimson/init.lua @@ -671,8 +671,8 @@ mcl_doors:register_door("mcl_crimson:crimson_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_crimson_crimson_door_bottom.png", "mcl_doors_door_crimson_side_lower.png"}, - tiles_top = {"mcl_crimson_crimson_door_top.png", "mcl_doors_door_crimson_side_upper.png"}, + tiles_bottom = "mcl_crimson_crimson_door_bottom.png", + tiles_top = "mcl_crimson_crimson_door_top.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -681,7 +681,7 @@ mcl_doors:register_trapdoor("mcl_crimson:crimson_trapdoor", { _doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), _doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."), tile_front = "mcl_crimson_crimson_trapdoor.png", - tile_side = "mcl_crimson_crimson_hyphae_wood.png", + tile_side = "mcl_crimson_crimson_trapdoor_side.png", wield_image = "mcl_crimson_crimson_trapdoor.png", groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, @@ -709,8 +709,8 @@ mcl_doors:register_door("mcl_crimson:warped_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_crimson_warped_door_bottom.png", "mcl_doors_door_warped_side_lower.png"}, - tiles_top = {"mcl_crimson_warped_door_top.png", "mcl_doors_door_warped_side_upper.png"}, + tiles_bottom = "mcl_crimson_warped_door_bottom.png", + tiles_top = "mcl_crimson_warped_door_top.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -719,7 +719,7 @@ mcl_doors:register_trapdoor("mcl_crimson:warped_trapdoor", { _doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), _doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."), tile_front = "mcl_crimson_warped_trapdoor.png", - tile_side = "mcl_crimson_warped_hyphae_wood.png", + tile_side = "mcl_crimson_warped_trapdoor_side.png", wield_image = "mcl_crimson_warped_trapdoor.png", groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, diff --git a/mods/ITEMS/mcl_doors/api_doors.lua b/mods/ITEMS/mcl_doors/api_doors.lua index e6eef4e0d..e392bc710 100644 --- a/mods/ITEMS/mcl_doors/api_doors.lua +++ b/mods/ITEMS/mcl_doors/api_doors.lua @@ -54,19 +54,11 @@ function mcl_doors:register_door(name, def) def.sound_close = "doors_door_close" end - local box = {{-8/16, -8/16, -8/16, 8/16, 8/16, -5/16}} - - if not def.node_box_bottom then - def.node_box_bottom = box + if not def.node_box then + def.node_box = {{-8/16, -8/16, -8/16, 8/16, 8/16, -5/16}} end - if not def.node_box_top then - def.node_box_top = box - end - if not def.selection_box_bottom then - def.selection_box_bottom= box - end - if not def.selection_box_top then - def.selection_box_top = box + if not def.selection_box then + def.selection_box = {{-8/16, -8/16, -8/16, 8/16, 8/16, -5/16}} end local longdesc, usagehelp, tt_help @@ -74,9 +66,9 @@ function mcl_doors:register_door(name, def) longdesc = def._doc_items_longdesc if not longdesc then if def.only_redstone_can_open then - longdesc = S("This door is a 2-block high barrier which can be opened or closed by hand or by redstone power.") - else longdesc = S("This door is a 2-block high barrier which can only be opened by redstone power, not by hand.") + else + longdesc = S("This door is a 2-block high barrier which can be opened or closed by hand or by redstone power.") end end usagehelp = def._doc_items_usagehelp @@ -159,7 +151,7 @@ function mcl_doors:register_door(name, def) local door_dir = 1 if left_node.name:sub(1, #name) == name then mirrored = true - door_dir = 2 + door_dir = 3 p2 = left_node.param2 end @@ -202,8 +194,22 @@ function mcl_doors:register_door(name, def) end, }) - local tt = def.tiles_top - local tb = def.tiles_bottom + local top_door_texture = def.tiles_top:match("(.+)%..+$") -- This removes the filename extension from the images. + local bottom_door_texture = def.tiles_bottom:match("(.+)%..+$") -- This removes the filename extension from the images. + + local texture_top = top_door_texture .. ".png" + local texture_bottom = bottom_door_texture .. ".png" + local texture_top_toppart = top_door_texture .. "_toppart.png" -- Special texture to make the top of opened doors not look weird. + local texture_bottom_bottompart = bottom_door_texture .. "_bottompart.png" -- Special texture to make the bottom of opened doors not look weird. + local texture_top_side = top_door_texture .. "_side.png" -- Special texture to make the side of opened doors not look weird. + local texture_bottom_side = bottom_door_texture .. "_side.png" -- Special texture to make the side of opened doors not look weird. + + local texture_top_mirrored = texture_top .. "^[transformFX" + local texture_bottom_mirrored = texture_bottom .. "^[transformFX" + local texture_top_toppart_mirrored = texture_top_toppart .. "^[transformFX" + local texture_bottom_bottompart_mirrored = texture_bottom_bottompart .. "^[transformFX" + local texture_top_side_mirrored = texture_top_side .. "^[transformFX" + local texture_bottom_side_mirrored = texture_bottom_side .. "^[transformFX" local function on_open_close(pos, dir, check_name, replace, replace_dir) local meta1 = minetest_get_meta(pos) @@ -242,16 +248,29 @@ function mcl_doors:register_door(name, def) end local function on_mesecons_signal_open(pos, node) - on_open_close(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2") - end - local function on_mesecons_signal_close(pos, node) - if not mesecon.is_powered({x=pos.x,y=pos.y+1,z=pos.z}) then - on_open_close(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1") + local meta2 = minetest_get_meta(pos) + if meta2:get_int("is_mirrored") ~= 1 then + on_open_close(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2") + else + on_open_close(pos, 1, name.."_t_3", name.."_b_4", name.."_t_4") end end + + local function on_mesecons_signal_close(pos, node) + if not mesecon.is_powered({x=pos.x,y=pos.y+1,z=pos.z}) then + local meta2 = minetest_get_meta(pos) + if meta2:get_int("is_mirrored") ~= 1 then + on_open_close(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1") + else + on_open_close(pos, 1, name.."_t_4", name.."_b_3", name.."_t_3") + end + end + end + local function on_mesecons_signal_open_top(pos, node) on_mesecons_signal_open({x=pos.x, y=pos.y-1, z=pos.z}, node) end + local function on_mesecons_signal_close_top(pos, node) if not mesecon.is_powered({x=pos.x,y=pos.y-1,z=pos.z}) then on_mesecons_signal_close({x=pos.x, y=pos.y-1, z=pos.z}, node) @@ -277,8 +296,8 @@ function mcl_doors:register_door(name, def) end end - minetest.register_node(name.."_b_1", { - tiles = {"blank.png", tt[2].."^[transformFXR90", tb[2], tb[2].."^[transformFX", tb[1], tb[1].."^[transformFX"}, + local template_def = { + tiles = nil, use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, paramtype = "light", paramtype2 = "facedir", @@ -288,56 +307,65 @@ function mcl_doors:register_door(name, def) drawtype = "nodebox", node_box = { type = "fixed", - fixed = def.node_box_bottom + fixed = def.node_box }, selection_box = { type = "fixed", - fixed = def.selection_box_bottom + fixed = def.selection_box }, groups = def.groups, _mcl_hardness = def._mcl_hardness, _mcl_blast_resistance = def._mcl_blast_resistance, sounds = def.sounds, - after_destruct = function(bottom, oldnode) - local meta_bottom = minetest_get_meta(bottom) - if meta_bottom:get_int("rotation") == 1 then - meta_bottom:set_int("rotation", 0) - else - minetest.add_item(bottom, name) - local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z } - if minetest.get_node(bottom).name ~= name.."_b_2" and minetest.get_node(top).name == name.."_t_1" then - minetest.remove_node(top) - end - end - end, + after_destruct = nil, - on_rightclick = on_rightclick, + on_rightclick = nil, - mesecons = { effector = { - action_on = on_mesecons_signal_open, - }}, + mesecons = nil, - on_rotate = function(bottom, node, user, mode, param2) - if mode == screwdriver.ROTATE_FACE then - local meta_bottom = minetest_get_meta(bottom) - meta_bottom:set_int("rotation", 1) - node.param2 = screwdriver.rotate.facedir(bottom, node, mode) - minetest.swap_node(bottom, node) - - local top = {x=bottom.x,y=bottom.y+1,z=bottom.z} - local meta_top = minetest_get_meta(top) - meta_top:set_int("rotation", 1) - node.name = name .."_t_1" - minetest.swap_node(top, node) - - return true - end - return false - end, + on_rotate = nil, can_dig = check_player_priv, - }) + } + + local _b_1_def = table.copy(template_def) + _b_1_def.tiles = {"blank.png", texture_bottom_bottompart .. "^[transformFY", texture_bottom_side, texture_bottom_side_mirrored, texture_bottom_mirrored, texture_bottom} + _b_1_def.after_destruct = function(bottom, oldnode) + local meta_bottom = minetest_get_meta(bottom) + if meta_bottom:get_int("rotation") == 1 then + meta_bottom:set_int("rotation", 0) + else + minetest.add_item(bottom, name) + local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z } + if minetest.get_node(bottom).name ~= name.."_b_2" and minetest.get_node(top).name == name.."_t_1" then + minetest.remove_node(top) + end + end + end + _b_1_def.on_rightclick = on_rightclick + _b_1_def.mesecons = { effector = { + action_on = on_mesecons_signal_open, + }} + _b_1_def.on_rotate = function(bottom, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then + local meta_bottom = minetest_get_meta(bottom) + meta_bottom:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(bottom, node, mode) + minetest.swap_node(bottom, node) + + local top = {x=bottom.x,y=bottom.y+1,z=bottom.z} + local meta_top = minetest_get_meta(top) + meta_top:set_int("rotation", 1) + node.name = name .."_t_1" + minetest.swap_node(top, node) + + return true + end + return false + end + + minetest.register_node(name.."_b_1", _b_1_def) if def.only_redstone_can_open then on_rightclick = nil @@ -349,67 +377,43 @@ function mcl_doors:register_door(name, def) end end - minetest.register_node(name.."_t_1", { - tiles = {tt[2].."^[transformR90", "blank.png", tt[2], tt[2].."^[transformFX", tt[1], tt[1].."^[transformFX"}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - is_ground_content = false, - drop = "", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = def.node_box_top - }, - selection_box = { - type = "fixed", - fixed = def.selection_box_top - }, - groups = def.groups, - _mcl_hardness = def._mcl_hardness, - _mcl_blast_resistance = def._mcl_blast_resistance, - sounds = def.sounds, - - after_destruct = function(top, oldnode) + local _t_1_def = table.copy(template_def) + _t_1_def.tiles = {texture_top_toppart .. "^[transformFY", "blank.png", texture_top_side, texture_top_side_mirrored, texture_top_mirrored, texture_top} + _t_1_def.after_destruct = function(top, oldnode) + local meta_top = minetest_get_meta(top) + if meta_top:get_int("rotation") == 1 then + meta_top:set_int("rotation", 0) + else + local bottom = { x = top.x, y = top.y - 1, z = top.z } + if minetest.get_node(top).name ~= name.."_t_2" and minetest.get_node(bottom).name == name.."_b_1" and oldnode.name == name.."_t_1" then + minetest.dig_node(bottom) + end + end + end + _t_1_def.on_rightclick = on_rightclick + _t_1_def.mesecons = { effector = { + action_on = on_mesecons_signal_open_top, + rules = mesecon.rules.flat, + }} + _t_1_def.on_rotate = function(top, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then local meta_top = minetest_get_meta(top) - if meta_top:get_int("rotation") == 1 then - meta_top:set_int("rotation", 0) - else - local bottom = { x = top.x, y = top.y - 1, z = top.z } - if minetest.get_node(top).name ~= name.."_t_2" and minetest.get_node(bottom).name == name.."_b_1" and oldnode.name == name.."_t_1" then - minetest.dig_node(bottom) - end - end - end, + meta_top:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(top, node, mode) + minetest.swap_node(top, node) - on_rightclick = on_rightclick, + local bottom = {x=top.x,y=top.y-1,z=top.z} + local meta_bottom = minetest_get_meta(bottom) + meta_bottom:set_int("rotation", 1) + node.name = name .."_b_1" + minetest.swap_node(bottom, node) - mesecons = { effector = { - action_on = on_mesecons_signal_open_top, - rules = mesecon.rules.flat, - }}, + return true + end + return false + end - on_rotate = function(top, node, user, mode, param2) - if mode == screwdriver.ROTATE_FACE then - local meta_top = minetest_get_meta(top) - meta_top:set_int("rotation", 1) - node.param2 = screwdriver.rotate.facedir(top, node, mode) - minetest.swap_node(top, node) - - local bottom = {x=top.x,y=top.y-1,z=top.z} - local meta_bottom = minetest_get_meta(bottom) - meta_bottom:set_int("rotation", 1) - node.name = name .."_b_1" - minetest.swap_node(bottom, node) - - return true - end - return false - end, - - can_dig = check_player_priv, - }) + minetest.register_node(name.."_t_1", _t_1_def) if def.only_redstone_can_open then on_rightclick = nil @@ -421,67 +425,43 @@ function mcl_doors:register_door(name, def) end end - minetest.register_node(name.."_b_2", { - tiles = {"blank.png", tt[2].."^[transformFXR90", tb[2].."^[transformI", tb[2].."^[transformFX", tb[1].."^[transformFX", tb[1]}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - is_ground_content = false, - drop = "", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = def.node_box_bottom - }, - selection_box = { - type = "fixed", - fixed = def.selection_box_bottom - }, - groups = def.groups, - _mcl_hardness = def._mcl_hardness, - _mcl_blast_resistance = def._mcl_blast_resistance, - sounds = def.sounds, - - after_destruct = function(bottom, oldnode) + local _b_2_def = table.copy(template_def) + _b_2_def.tiles = {"blank.png", texture_bottom_bottompart_mirrored, texture_bottom_side, texture_bottom_side, texture_bottom, texture_bottom_mirrored} + _b_2_def.after_destruct = function(bottom, oldnode) + local meta_bottom = minetest_get_meta(bottom) + if meta_bottom:get_int("rotation") == 1 then + meta_bottom:set_int("rotation", 0) + else + local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z } + minetest.add_item(bottom, name) + if minetest.get_node(bottom).name ~= name.."_b_1" and minetest.get_node(top).name == name.."_t_2" then + minetest.remove_node(top) + end + end + end + _b_2_def.on_rightclick = on_rightclick + _b_2_def.mesecons = { effector = { + action_off = on_mesecons_signal_close, + }} + _b_2_def.on_rotate = function(bottom, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then local meta_bottom = minetest_get_meta(bottom) - if meta_bottom:get_int("rotation") == 1 then - meta_bottom:set_int("rotation", 0) - else - local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z } - minetest.add_item(bottom, name) - if minetest.get_node(bottom).name ~= name.."_b_1" and minetest.get_node(top).name == name.."_t_2" then - minetest.remove_node(top) - end - end - end, + meta_bottom:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(bottom, node, mode) + minetest.swap_node(bottom, node) - on_rightclick = on_rightclick, + local top = {x=bottom.x,y=bottom.y+1,z=bottom.z} + local meta_top = minetest_get_meta(top) + meta_top:set_int("rotation", 1) + node.name = name .."_t_2" + minetest.swap_node(top, node) - mesecons = { effector = { - action_off = on_mesecons_signal_close, - }}, + return true + end + return false + end - on_rotate = function(bottom, node, user, mode, param2) - if mode == screwdriver.ROTATE_FACE then - local meta_bottom = minetest_get_meta(bottom) - meta_bottom:set_int("rotation", 1) - node.param2 = screwdriver.rotate.facedir(bottom, node, mode) - minetest.swap_node(bottom, node) - - local top = {x=bottom.x,y=bottom.y+1,z=bottom.z} - local meta_top = minetest_get_meta(top) - meta_top:set_int("rotation", 1) - node.name = name .."_t_2" - minetest.swap_node(top, node) - - return true - end - return false - end, - - can_dig = check_player_priv, - }) + minetest.register_node(name.."_b_2", _b_2_def) if def.only_redstone_can_open then on_rightclick = nil @@ -493,74 +473,244 @@ function mcl_doors:register_door(name, def) end end - minetest.register_node(name.."_t_2", { - tiles = {tt[2].."^[transformR90", "blank.png", tt[2].."^[transformI", tt[2].."^[transformFX", tt[1].."^[transformFX", tt[1]}, - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - is_ground_content = false, - drop = "", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = def.node_box_top - }, - selection_box = { - type = "fixed", - fixed = def.selection_box_top - }, - groups = def.groups, - _mcl_hardness = def._mcl_hardness, - _mcl_blast_resistance = def._mcl_blast_resistance, - sounds = def.sounds, - - after_destruct = function(top, oldnode) + local _t_2_def = table.copy(template_def) + _t_2_def.tiles = {texture_top_toppart_mirrored, "blank.png", texture_top_side, texture_top_side, texture_top, texture_top_mirrored} + _t_2_def.after_destruct = function(top, oldnode) + local meta_top = minetest_get_meta(top) + if meta_top:get_int("rotation") == 1 then + meta_top:set_int("rotation", 0) + else + local bottom = { x = top.x, y = top.y - 1, z = top.z } + if minetest.get_node(top).name ~= name.."_t_1" and minetest.get_node(bottom).name == name.."_b_2" and oldnode.name == name.."_t_2" then + minetest.dig_node(bottom) + end + end + end + _t_2_def.on_rightclick = on_rightclick + _t_2_def.mesecons = { effector = { + action_off = on_mesecons_signal_close_top, + rules = mesecon.rules.flat, + }} + _t_2_def.on_rotate = function(top, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then local meta_top = minetest_get_meta(top) - if meta_top:get_int("rotation") == 1 then - meta_top:set_int("rotation", 0) - else - local bottom = { x = top.x, y = top.y - 1, z = top.z } - if minetest.get_node(top).name ~= name.."_t_1" and minetest.get_node(bottom).name == name.."_b_2" and oldnode.name == name.."_t_2" then - minetest.dig_node(bottom) - end + meta_top:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(top, node, mode) + minetest.swap_node(top, node) + + local bottom = {x=top.x,y=top.y-1,z=top.z} + local meta_bottom = minetest_get_meta(bottom) + meta_bottom:set_int("rotation", 1) + node.name = name .."_b_2" + minetest.swap_node(bottom, node) + + return true + end + return false + end + + minetest.register_node(name.."_t_2", _t_2_def) + + if not def.only_redstone_can_open then + on_rightclick = function(pos, node, clicker) + if check_player_priv(pos, clicker) then + on_open_close(pos, 1, name.."_t_3", name.."_b_4", name.."_t_4") end - end, + end + end - on_rightclick = on_rightclick, - - mesecons = { effector = { - action_off = on_mesecons_signal_close_top, - rules = mesecon.rules.flat, - }}, - - on_rotate = function(top, node, user, mode, param2) - if mode == screwdriver.ROTATE_FACE then - local meta_top = minetest_get_meta(top) - meta_top:set_int("rotation", 1) - node.param2 = screwdriver.rotate.facedir(top, node, mode) - minetest.swap_node(top, node) - - local bottom = {x=top.x,y=top.y-1,z=top.z} - local meta_bottom = minetest_get_meta(bottom) - meta_bottom:set_int("rotation", 1) - node.name = name .."_b_2" - minetest.swap_node(bottom, node) - - return true + local _b_3_def = table.copy(template_def) + _b_3_def.tiles = {"blank.png", texture_bottom_mirrored .. "^[transformFY", texture_bottom_side, texture_bottom_side_mirrored, texture_bottom, texture_bottom_mirrored} + _b_3_def.after_destruct = function(bottom, oldnode) + local meta_bottom = minetest_get_meta(bottom) + if meta_bottom:get_int("rotation") == 1 then + meta_bottom:set_int("rotation", 0) + else + minetest.add_item(bottom, name) + local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z } + if minetest.get_node(bottom).name ~= name.."_b_4" and minetest.get_node(top).name == name.."_t_3" then + minetest.remove_node(top) end - return false - end, + end + end + _b_3_def.on_rightclick = on_rightclick + _b_3_def.mesecons = { effector = { + action_on = on_mesecons_signal_open, + }} + _b_3_def.on_rotate = function(bottom, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then + local meta_bottom = minetest_get_meta(bottom) + meta_bottom:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(bottom, node, mode) + minetest.swap_node(bottom, node) + + local top = {x=bottom.x,y=bottom.y+1,z=bottom.z} + local meta_top = minetest_get_meta(top) + meta_top:set_int("rotation", 1) + node.name = name .."_t_3" + minetest.swap_node(top, node) + + return true + end + return false + end + + minetest.register_node(name.."_b_3", _b_3_def) + + if def.only_redstone_can_open then + on_rightclick = nil + else + on_rightclick = function(pos, node, clicker) + if check_player_priv(pos, clicker) then + on_open_close(pos, -1, name.."_b_3", name.."_t_4", name.."_b_4") + end + end + end + + local _t_3_def = table.copy(template_def) + _t_3_def.tiles = {texture_top_toppart_mirrored .. "^[transformFY", "blank.png", texture_top_side, texture_top_side_mirrored, texture_top, texture_top_mirrored} + _t_3_def.after_destruct = function(top, oldnode) + local meta_top = minetest_get_meta(top) + if meta_top:get_int("rotation") == 1 then + meta_top:set_int("rotation", 0) + else + local bottom = { x = top.x, y = top.y - 1, z = top.z } + if minetest.get_node(top).name ~= name.."_t_4" and minetest.get_node(bottom).name == name.."_b_3" and oldnode.name == name.."_t_3" then + minetest.dig_node(bottom) + end + end + end + _t_3_def.on_rightclick = on_rightclick + _t_3_def.mesecons = { effector = { + action_on = on_mesecons_signal_open_top, + rules = mesecon.rules.flat, + }} + _t_3_def.on_rotate = function(top, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then + local meta_top = minetest_get_meta(top) + meta_top:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(top, node, mode) + minetest.swap_node(top, node) + + local bottom = {x=top.x,y=top.y-1,z=top.z} + local meta_bottom = minetest_get_meta(bottom) + meta_bottom:set_int("rotation", 1) + node.name = name .."_b_3" + minetest.swap_node(bottom, node) + + return true + end + return false + end + + minetest.register_node(name.."_t_3", _t_3_def) + + if def.only_redstone_can_open then + on_rightclick = nil + else + on_rightclick = function(pos, node, clicker) + if check_player_priv(pos, clicker) then + on_open_close(pos, 1, name.."_t_4", name.."_b_3", name.."_t_3") + end + end + end + + local _b_4_def = table.copy(template_def) + _b_4_def.tiles = {"blank.png", texture_bottom_bottompart, texture_bottom_side_mirrored, texture_bottom_side_mirrored, texture_bottom_mirrored, texture_bottom} + _b_4_def.after_destruct = function(bottom, oldnode) + local meta_bottom = minetest_get_meta(bottom) + if meta_bottom:get_int("rotation") == 1 then + meta_bottom:set_int("rotation", 0) + else + local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z } + minetest.add_item(bottom, name) + if minetest.get_node(bottom).name ~= name.."_b_3" and minetest.get_node(top).name == name.."_t_4" then + minetest.remove_node(top) + end + end + end + _b_4_def.on_rightclick = on_rightclick + _b_4_def.mesecons = { effector = { + action_off = on_mesecons_signal_close, + }} + _b_4_def.on_rotate = function(bottom, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then + local meta_bottom = minetest_get_meta(bottom) + meta_bottom:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(bottom, node, mode) + minetest.swap_node(bottom, node) + + local top = {x=bottom.x,y=bottom.y+1,z=bottom.z} + local meta_top = minetest_get_meta(top) + meta_top:set_int("rotation", 1) + node.name = name .."_t_4" + minetest.swap_node(top, node) + + return true + end + return false + end + + minetest.register_node(name.."_b_4", _b_4_def) + + if def.only_redstone_can_open then + on_rightclick = nil + else + on_rightclick = function(pos, node, clicker) + if check_player_priv(pos, clicker) then + on_open_close(pos, -1, name.."_b_4", name.."_t_3", name.."_b_3") + end + end + end + + local _t_4_def = table.copy(template_def) + _t_4_def.tiles = {texture_top_toppart, "blank.png", texture_top_side_mirrored, texture_top_side_mirrored, texture_top_mirrored, texture_top} + _t_4_def.after_destruct = function(top, oldnode) + local meta_top = minetest_get_meta(top) + if meta_top:get_int("rotation") == 1 then + meta_top:set_int("rotation", 0) + else + local bottom = { x = top.x, y = top.y - 1, z = top.z } + if minetest.get_node(top).name ~= name.."_t_3" and minetest.get_node(bottom).name == name.."_b_4" and oldnode.name == name.."_t_4" then + minetest.dig_node(bottom) + end + end + end + _t_4_def.on_rightclick = on_rightclick + _t_4_def.mesecons = { effector = { + action_off = on_mesecons_signal_close_top, + rules = mesecon.rules.flat, + }} + _t_4_def.on_rotate = function(top, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then + local meta_top = minetest_get_meta(top) + meta_top:set_int("rotation", 1) + node.param2 = screwdriver.rotate.facedir(top, node, mode) + minetest.swap_node(top, node) + + local bottom = {x=top.x,y=top.y-1,z=top.z} + local meta_bottom = minetest_get_meta(bottom) + meta_bottom:set_int("rotation", 1) + node.name = name .."_b_4" + minetest.swap_node(bottom, node) + + return true + end + return false + end + + minetest.register_node(name.."_t_4", _t_4_def) - can_dig = check_player_priv, - }) -- Add entry aliases for the Help if minetest.get_modpath("doc") then doc.add_entry_alias("craftitems", name, "nodes", name.."_b_1") doc.add_entry_alias("craftitems", name, "nodes", name.."_b_2") + doc.add_entry_alias("craftitems", name, "nodes", name.."_b_3") + doc.add_entry_alias("craftitems", name, "nodes", name.."_b_4") doc.add_entry_alias("craftitems", name, "nodes", name.."_t_1") doc.add_entry_alias("craftitems", name, "nodes", name.."_t_2") + doc.add_entry_alias("craftitems", name, "nodes", name.."_t_3") + doc.add_entry_alias("craftitems", name, "nodes", name.."_t_4") end - end diff --git a/mods/ITEMS/mcl_doors/register.lua b/mods/ITEMS/mcl_doors/register.lua index c998f6538..142bfa52e 100644 --- a/mods/ITEMS/mcl_doors/register.lua +++ b/mods/ITEMS/mcl_doors/register.lua @@ -14,8 +14,8 @@ mcl_doors:register_door("mcl_doors:wooden_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_wood_lower.png", "mcl_doors_door_wood_side_lower.png"}, - tiles_top = {"mcl_doors_door_wood_upper.png", "mcl_doors_door_wood_side_upper.png"}, + tiles_bottom = "mcl_doors_door_wood_lower.png", + tiles_top = "mcl_doors_door_wood_upper.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -37,8 +37,8 @@ mcl_doors:register_door("mcl_doors:acacia_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_acacia_lower.png", "mcl_doors_door_acacia_side_lower.png"}, - tiles_top = {"mcl_doors_door_acacia_upper.png", "mcl_doors_door_acacia_side_upper.png"}, + tiles_bottom = "mcl_doors_door_acacia_lower.png", + tiles_top = "mcl_doors_door_acacia_upper.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -60,8 +60,8 @@ mcl_doors:register_door("mcl_doors:birch_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_birch_lower.png", "mcl_doors_door_birch_side_lower.png"}, - tiles_top = {"mcl_doors_door_birch_upper.png", "mcl_doors_door_birch_side_upper.png"}, + tiles_bottom = "mcl_doors_door_birch_lower.png", + tiles_top = "mcl_doors_door_birch_upper.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -83,8 +83,8 @@ mcl_doors:register_door("mcl_doors:dark_oak_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_dark_oak_lower.png", "mcl_doors_door_dark_oak_side_lower.png"}, - tiles_top = {"mcl_doors_door_dark_oak_upper.png", "mcl_doors_door_dark_oak_side_upper.png"}, + tiles_bottom = "mcl_doors_door_dark_oak_lower.png", + tiles_top = "mcl_doors_door_dark_oak_upper.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -106,8 +106,8 @@ mcl_doors:register_door("mcl_doors:jungle_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_jungle_lower.png", "mcl_doors_door_jungle_side_lower.png"}, - tiles_top = {"mcl_doors_door_jungle_upper.png", "mcl_doors_door_jungle_side_upper.png"}, + tiles_bottom = "mcl_doors_door_jungle_lower.png", + tiles_top = "mcl_doors_door_jungle_upper.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -129,8 +129,8 @@ mcl_doors:register_door("mcl_doors:spruce_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_doors_door_spruce_lower.png", "mcl_doors_door_spruce_side_lower.png"}, - tiles_top = {"mcl_doors_door_spruce_upper.png", "mcl_doors_door_spruce_side_upper.png"}, + tiles_bottom = "mcl_doors_door_spruce_lower.png", + tiles_top = "mcl_doors_door_spruce_upper.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -183,8 +183,8 @@ mcl_doors:register_door("mcl_doors:iron_door", { groups = {pickaxey=1, mesecon_effector_on=1}, _mcl_hardness = 5, _mcl_blast_resistance = 5, - tiles_bottom = {"mcl_doors_door_iron_lower.png^[transformFX", "mcl_doors_door_iron_side_lower.png"}, - tiles_top = {"mcl_doors_door_iron_upper.png^[transformFX", "mcl_doors_door_iron_side_upper.png"}, + tiles_bottom = "mcl_doors_door_iron_lower.png", + tiles_top = "mcl_doors_door_iron_upper.png", sounds = mcl_sounds.node_sound_metal_defaults(), sound_open = "doors_steel_door_open", sound_close = "doors_steel_door_close", diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua index 692cd5e87..abd6ed1d9 100644 --- a/mods/ITEMS/mcl_dye/init.lua +++ b/mods/ITEMS/mcl_dye/init.lua @@ -192,7 +192,11 @@ local function apply_bone_meal(pointed_thing, user) mcl_dye.add_bone_meal_particle(pos) -- Saplings: 45% chance to advance growth stage if math.random(1, 100) <= 45 then - return mcl_core.grow_sapling(pos, n) + if n.name == "mcl_cherry_blossom:cherrysapling" then + return mcl_cherry_blossom.generate_cherry_tree(pos) -- If cherry blossom sapling, run that callback instead. + else + return mcl_core.grow_sapling(pos, n) + end end elseif minetest.get_item_group(n.name, "mushroom") == 1 then mcl_dye.add_bone_meal_particle(pos) diff --git a/mods/ITEMS/mcl_enchanting/engine.lua b/mods/ITEMS/mcl_enchanting/engine.lua index fa6dea353..b5766dd28 100644 --- a/mods/ITEMS/mcl_enchanting/engine.lua +++ b/mods/ITEMS/mcl_enchanting/engine.lua @@ -2,7 +2,8 @@ local S = minetest.get_translator(minetest.get_current_modname()) local F = minetest.formspec_escape function mcl_enchanting.is_book(itemname) - return itemname == "mcl_books:book" or itemname == "mcl_enchanting:book_enchanted" or itemname == "mcl_books:book_enchanted" + return itemname == "mcl_books:book" or itemname == "mcl_enchanting:book_enchanted" or + itemname == "mcl_books:book_enchanted" end function mcl_enchanting.get_enchantments(itemstack) @@ -54,11 +55,13 @@ end function mcl_enchanting.get_enchantment_description(enchantment, level) local enchantment_def = mcl_enchanting.enchantments[enchantment] - return enchantment_def.name .. (enchantment_def.max_level == 1 and "" or " " .. mcl_enchanting.roman_numerals.toRoman(level)) + return enchantment_def.name .. + (enchantment_def.max_level == 1 and "" or " " .. mcl_enchanting.roman_numerals.toRoman(level)) end function mcl_enchanting.get_colorized_enchantment_description(enchantment, level) - return minetest.colorize(mcl_enchanting.enchantments[enchantment].curse and mcl_colors.RED or mcl_colors.GRAY, mcl_enchanting.get_enchantment_description(enchantment, level)) + return minetest.colorize(mcl_enchanting.enchantments[enchantment].curse and mcl_colors.RED or mcl_colors.GRAY, + mcl_enchanting.get_enchantment_description(enchantment, level)) end function mcl_enchanting.get_enchanted_itemstring(itemname) @@ -79,7 +82,8 @@ function mcl_enchanting.not_enchantable_on_enchanting_table(itemname) end function mcl_enchanting.is_enchantable(itemname) - return mcl_enchanting.get_enchantability(itemname) > 0 or mcl_enchanting.not_enchantable_on_enchanting_table(itemname) + return mcl_enchanting.get_enchantability(itemname) > 0 or + mcl_enchanting.not_enchantable_on_enchanting_table(itemname) end function mcl_enchanting.can_enchant_freshly(itemname) @@ -150,7 +154,8 @@ function mcl_enchanting.can_enchant(itemstack, enchantment, level) for incompatible in pairs(enchantment_def.incompatible) do local incompatible_level = item_enchantments[incompatible] if incompatible_level then - return false, "incompatible", mcl_enchanting.get_enchantment_description(incompatible, incompatible_level) + return false, "incompatible", + mcl_enchanting.get_enchantment_description(incompatible, incompatible_level) end end end @@ -169,7 +174,9 @@ function mcl_enchanting.combine(itemstack, combine_with) local itemname = itemstack:get_name() local combine_name = combine_with:get_name() local enchanted_itemname = mcl_enchanting.get_enchanted_itemstring(itemname) - if not enchanted_itemname or enchanted_itemname ~= mcl_enchanting.get_enchanted_itemstring(combine_name) and not mcl_enchanting.is_book(combine_name) then + if not enchanted_itemname or + enchanted_itemname ~= mcl_enchanting.get_enchanted_itemstring(combine_name) and + not mcl_enchanting.is_book(combine_name) then return false end local enchantments = mcl_enchanting.get_enchantments(itemstack) @@ -219,7 +226,7 @@ function mcl_enchanting.enchantments_snippet(_, _, itemstack) local enchantments = mcl_enchanting.get_enchantments(itemstack) local text = "" for enchantment, level in pairs(enchantments) do - text = text .. mcl_enchanting.get_colorized_enchantment_description(enchantment, level) .. "\n" + text = text .. mcl_enchanting.get_colorized_enchantment_description(enchantment, level) .. "\n" end if text ~= "" then if not itemstack:get_definition()._tt_original_description then @@ -267,7 +274,7 @@ function mcl_enchanting.initialize() for itemname, itemdef in pairs(minetest.registered_items) do if mcl_enchanting.can_enchant_freshly(itemname) and not mcl_enchanting.is_book(itemname) then local new_name = itemname .. "_enchanted" - minetest.override_item(itemname, {_mcl_enchanting_enchanted_tool = new_name}) + minetest.override_item(itemname, { _mcl_enchanting_enchanted_tool = new_name }) local new_def = table.copy(itemdef) new_def.inventory_image = itemdef.inventory_image .. mcl_enchanting.overlay if new_def.wield_image then @@ -303,7 +310,7 @@ end function mcl_enchanting.random(pr, ...) local r = pr and pr:next(...) or math.random(...) - if pr and not ({...})[1] then + if pr and not ({ ... })[1] then r = r / 32767 end @@ -328,20 +335,24 @@ function mcl_enchanting.get_random_enchantment(itemstack, treasure, weighted, ex return #possible > 0 and possible[mcl_enchanting.random(pr, 1, #possible)] end -function mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr) +function mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, + ignore_already_enchanted, pr) local itemname = itemstack:get_name() - if (not mcl_enchanting.can_enchant_freshly(itemname) and not ignore_already_enchanted) or mcl_enchanting.not_enchantable_on_enchanting_table(itemname) then + if (not mcl_enchanting.can_enchant_freshly(itemname) and not ignore_already_enchanted) or + mcl_enchanting.not_enchantable_on_enchanting_table(itemname) then return end itemstack = ItemStack(itemstack) local enchantability = minetest.get_item_group(itemname, "enchantability") - enchantability = 1 + mcl_enchanting.random(pr, 0, math.floor(enchantability / 4)) + mcl_enchanting.random(pr, 0, math.floor(enchantability / 4)) + enchantability = 1 + mcl_enchanting.random(pr, 0, math.floor(enchantability / 4)) + + mcl_enchanting.random(pr, 0, math.floor(enchantability / 4)) enchantment_level = enchantment_level + enchantability - enchantment_level = enchantment_level + enchantment_level * (mcl_enchanting.random(pr) + mcl_enchanting.random(pr) - 1) * 0.15 + enchantment_level = enchantment_level + + enchantment_level * (mcl_enchanting.random(pr) + mcl_enchanting.random(pr) - 1) * 0.15 enchantment_level = math.max(math.floor(enchantment_level + 0.5), 1) local enchantments = {} @@ -387,7 +398,6 @@ function mcl_enchanting.generate_random_enchantments(itemstack, enchantment_leve enchantments[selected_enchantment] = enchantment_power mcl_enchanting.enchant(itemstack, selected_enchantment, enchantment_power) end - until not no_reduced_bonus_chance and mcl_enchanting.random(pr) >= (enchantment_level + 1) / 50 return enchantments, description @@ -397,13 +407,15 @@ function mcl_enchanting.generate_random_enchantments_reliable(itemstack, enchant local enchantments repeat - enchantments = mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr) + enchantments = mcl_enchanting.generate_random_enchantments(itemstack, enchantment_level, treasure, + no_reduced_bonus_chance, ignore_already_enchanted, pr) until enchantments return enchantments end -function mcl_enchanting.enchant_randomly(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr) +function mcl_enchanting.enchant_randomly(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, + ignore_already_enchanted, pr) local enchantments = mcl_enchanting.generate_random_enchantments_reliable(itemstack, enchantment_level, treasure, no_reduced_bonus_chance, ignore_already_enchanted, pr) mcl_enchanting.set_enchanted_itemstring(itemstack) @@ -416,7 +428,8 @@ function mcl_enchanting.enchant_uniform_randomly(stack, exclude, pr) local enchantment = mcl_enchanting.get_random_enchantment(stack, true, false, exclude, pr) if enchantment then - mcl_enchanting.enchant(stack, enchantment, mcl_enchanting.random(pr, 1, mcl_enchanting.enchantments[enchantment].max_level)) + mcl_enchanting.enchant(stack, enchantment, + mcl_enchanting.random(pr, 1, mcl_enchanting.enchantments[enchantment].max_level)) end return stack @@ -426,7 +439,8 @@ function mcl_enchanting.get_random_glyph_row() local glyphs = "" local x = 1.3 for i = 1, 9 do - glyphs = glyphs .. "image[".. x .. ",0.1;0.5,0.5;mcl_enchanting_glyph_" .. math.random(18) .. ".png^[colorize:#675D49:255]" + glyphs = glyphs .. + "image[" .. x .. ",0.1;0.5,0.5;mcl_enchanting_glyph_" .. math.random(18) .. ".png^[colorize:#675D49:255]" x = x + 0.6 end return glyphs @@ -459,7 +473,7 @@ end function mcl_enchanting.get_table_slots(player, itemstack, num_bookshelves) local itemname = itemstack:get_name() if (not mcl_enchanting.can_enchant_freshly(itemname)) or mcl_enchanting.not_enchantable_on_enchanting_table(itemname) then - return {false, false, false} + return { false, false, false } end local meta = player:get_meta() local player_slots = minetest.deserialize(meta:get_string("mcl_enchanting:slots")) or {} @@ -475,7 +489,7 @@ function mcl_enchanting.get_table_slots(player, itemstack, num_bookshelves) meta:set_string("mcl_enchanting:slots", minetest.serialize(player_slots)) return player_bookshelves_item_slots else - return {false, false, false} + return { false, false, false } end end end @@ -491,28 +505,33 @@ function mcl_enchanting.show_enchanting_formspec(player) local inv = player:get_inventory() local num_bookshelves = meta:get_int("mcl_enchanting:num_bookshelves") local table_name = meta:get_string("mcl_enchanting:table_name") - local formspec = "" - .. "size[9.07,8.6;]" - .. "formspec_version[3]" - .. "label[0,0;" .. C("#313131") .. F(table_name) .. "]" - .. mcl_formspec.get_itemslot_bg(0.2, 2.4, 1, 1) - .. "list[current_player;enchanting_item;0.2,2.4;1,1]" - .. mcl_formspec.get_itemslot_bg(1.1, 2.4, 1, 1) - .. "image[1.1,2.4;1,1;mcl_enchanting_lapis_background.png]" - .. "list[current_player;enchanting_lapis;1.1,2.4;1,1]" - .. "label[0,4;" .. C("#313131") .. F(S("Inventory")).."]" - .. mcl_formspec.get_itemslot_bg(0, 4.5, 9, 3) - .. mcl_formspec.get_itemslot_bg(0, 7.74, 9, 1) - .. "list[current_player;main;0,4.5;9,3;9]" - .. "listring[current_player;enchanting_item]" - .. "listring[current_player;main]" - .. "listring[current_player;enchanting]" - .. "listring[current_player;main]" - .. "listring[current_player;enchanting_lapis]" - .. "listring[current_player;main]" - .. "list[current_player;main;0,7.74;9,1;]" - .. "real_coordinates[true]" - .. "image[3.15,0.6;7.6,4.1;mcl_enchanting_button_background.png]" + + local formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color) .. table_name) .. "]", + mcl_formspec.get_itemslot_bg_v4(1, 3.25, 1, 1), + "list[current_player;enchanting_item;1,3.25;1,1]", + mcl_formspec.get_itemslot_bg_v4(2.25, 3.25, 1, 1), + "image[2.25,3.25;1,1;mcl_enchanting_lapis_background.png]", + "list[current_player;enchanting_lapis;2.25,3.25;1,1]", + "image[4.125,0.56;7.25,4.1;mcl_enchanting_button_background.png]", + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color) .. S("Inventory")) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + "listring[current_player;enchanting_item]", + "listring[current_player;main]", + "listring[current_player;enchanting]", + "listring[current_player;main]", + "listring[current_player;enchanting_lapis]", + "listring[current_player;main]", + }) + local itemstack = inv:get_stack("enchanting_item", 1) local player_levels = mcl_experience.get_level(player) local y = 0.65 @@ -520,24 +539,50 @@ function mcl_enchanting.show_enchanting_formspec(player) local table_slots = mcl_enchanting.get_table_slots(player, itemstack, num_bookshelves) for i, slot in ipairs(table_slots) do any_enchantment = any_enchantment or slot - local enough_lapis = inv:contains_item("enchanting_lapis", ItemStack({name = "mcl_core:lapis", count = i})) + local enough_lapis = inv:contains_item("enchanting_lapis", ItemStack({ name = "mcl_core:lapis", count = i })) local enough_levels = slot and slot.level_requirement <= player_levels local can_enchant = (slot and enough_lapis and enough_levels) local ending = (can_enchant and "" or "_off") local hover_ending = (can_enchant and "_hovered" or "_off") formspec = formspec - .. "container[3.2," .. y .. "]" - .. (slot and "tooltip[button_" .. i .. ";" .. C("#818181") .. ((slot.description and F(slot.description)) or "") .. " " .. C("#FFFFFF") .. " . . . ?\n\n" .. (enough_levels and C(enough_lapis and "#818181" or "#FC5454") .. F(S("@1 Lapis Lazuli", i)) .. "\n" .. C("#818181") .. F(S("@1 Enchantment Levels", i)) or C("#FC5454") .. F(S("Level requirement: @1", slot.level_requirement))) .. "]" or "") - .. "style[button_" .. i .. ";bgimg=mcl_enchanting_button" .. ending .. ".png;bgimg_hovered=mcl_enchanting_button" .. hover_ending .. ".png;bgimg_pressed=mcl_enchanting_button" .. hover_ending .. ".png]" - .. "button[0,0;7.5,1.3;button_" .. i .. ";]" + .. "container[4.125," .. y .. "]" + .. + ( + slot and + "tooltip[button_" .. + i .. + ";" .. + C("#818181") .. + ((slot.description and F(slot.description)) or "") .. + " " .. + C("#FFFFFF") .. + " . . . ?\n\n" .. + ( + enough_levels and + C(enough_lapis and "#818181" or "#FC5454") .. + F(S("@1 Lapis Lazuli", i)) .. "\n" .. C("#818181") .. F(S("@1 Enchantment Levels", i)) or + C("#FC5454") .. F(S("Level requirement: @1", slot.level_requirement))) .. "]" or "") + .. + "style[button_" .. + i .. + ";bgimg=mcl_enchanting_button" .. + ending .. + ".png;bgimg_hovered=mcl_enchanting_button" .. + hover_ending .. ".png;bgimg_pressed=mcl_enchanting_button" .. hover_ending .. ".png]" + .. "button[0,0;7.25,1.3;button_" .. i .. ";]" .. (slot and "image[0,0;1.3,1.3;mcl_enchanting_number_" .. i .. ending .. ".png]" or "") - .. (slot and "label[7.2,1.1;" .. C(can_enchant and "#80FF20" or "#407F10") .. slot.level_requirement .. "]" or "") + .. (slot and "label[6.8,1;" .. C(can_enchant and "#80FF20" or "#407F10") .. slot.level_requirement .. "]" or "") .. (slot and slot.glyphs or "") .. "container_end[]" - y = y + 1.35 + y = y + 1.3 end formspec = formspec - .. "image[" .. (any_enchantment and 0.58 or 1.15) .. ",1.2;" .. (any_enchantment and 2 or 0.87) .. ",1.43;mcl_enchanting_book_" .. (any_enchantment and "open" or "closed") .. ".png]" + .. + "image[" .. + (any_enchantment and 1.1 or 1.67) .. + ",1.2;" .. + (any_enchantment and 2 or 0.87) .. + ",1.43;mcl_enchanting_book_" .. (any_enchantment and "open" or "closed") .. ".png]" minetest.show_formspec(name, "mcl_enchanting:table", formspec) end @@ -555,7 +600,7 @@ function mcl_enchanting.handle_formspec_fields(player, formname, fields) local meta = player:get_meta() local num_bookshelfes = meta:get_int("mcl_enchanting:num_bookshelves") local itemstack = inv:get_stack("enchanting_item", 1) - local cost = ItemStack({name = "mcl_core:lapis", count = button_pressed}) + local cost = ItemStack({ name = "mcl_core:lapis", count = button_pressed }) if not inv:contains_item("enchanting_lapis", cost) then return end @@ -573,7 +618,7 @@ function mcl_enchanting.handle_formspec_fields(player, formname, fields) mcl_enchanting.set_enchanted_itemstring(itemstack) mcl_enchanting.set_enchantments(itemstack, slot.enchantments) inv:set_stack("enchanting_item", 1, itemstack) - minetest.sound_play("mcl_enchanting_enchant", {to_player = name, gain = 5.0}) + minetest.sound_play("mcl_enchanting_enchant", { to_player = name, gain = 5.0 }) mcl_enchanting.reset_table_slots(player) mcl_enchanting.show_enchanting_formspec(player) awards.unlock(player:get_player_name(), "mcl:enchanter") @@ -603,7 +648,8 @@ function mcl_enchanting.is_enchanting_inventory_action(action, inventory, invent end function mcl_enchanting.allow_inventory_action(player, action, inventory, inventory_info) - local is_enchanting_action, do_limit = mcl_enchanting.is_enchanting_inventory_action(action, inventory, inventory_info) + local is_enchanting_action, do_limit = mcl_enchanting.is_enchanting_inventory_action(action, inventory, + inventory_info) if is_enchanting_action and do_limit then if action == "move" then local listname = inventory_info.to_list @@ -645,13 +691,15 @@ function mcl_enchanting.on_inventory_action(player, action, inventory, inventory end function mcl_enchanting.schedule_book_animation(self, anim) - self.scheduled_anim = {timer = self.anim_length, anim = anim} + self.scheduled_anim = { timer = self.anim_length, anim = anim } end function mcl_enchanting.set_book_animation(self, anim) local anim_index = mcl_enchanting.book_animations[anim] - local start, stop = mcl_enchanting.book_animation_steps[anim_index], mcl_enchanting.book_animation_steps[anim_index + 1] - self.object:set_animation({x = start, y = stop}, mcl_enchanting.book_animation_speed, 0, mcl_enchanting.book_animation_loop[anim] or false) + local start, stop = mcl_enchanting.book_animation_steps[anim_index], + mcl_enchanting.book_animation_steps[anim_index + 1] + self.object:set_animation({ x = start, y = stop }, mcl_enchanting.book_animation_speed, 0, + mcl_enchanting.book_animation_loop[anim] or false) self.scheduled_anim = nil self.anim_length = (stop - start) / 40 end @@ -661,7 +709,7 @@ function mcl_enchanting.check_animation_schedule(self, dtime) if schedanim then schedanim.timer = schedanim.timer - dtime if schedanim.timer <= 0 then - mcl_enchanting.set_book_animation(self, schedanim.anim) + mcl_enchanting.set_book_animation(self, schedanim.anim) end end end @@ -669,7 +717,7 @@ end function mcl_enchanting.look_at(self, pos2) local pos1 = self.object:get_pos() local vec = vector.subtract(pos1, pos2) - local yaw = math.atan(vec.z / vec.x) - math.pi/2 + local yaw = math.atan(vec.z / vec.x) - math.pi / 2 yaw = yaw + (pos1.x >= pos2.x and math.pi or 0) self.object:set_yaw(yaw + math.pi) end diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua index 6bbc507ec..d62288333 100644 --- a/mods/ITEMS/mcl_farming/melon.lua +++ b/mods/ITEMS/mcl_farming/melon.lua @@ -22,7 +22,7 @@ local melon_base_def = { stack_max = 64, tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png"}, groups = { - handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1, + handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1, dig_immediate_piston = 1, enderman_takable = 1, compostability = 65 }, drop = { diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index f235baaf3..7387a78c9 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -100,7 +100,7 @@ local pumpkin_base_def = { paramtype2 = "facedir", tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png"}, groups = { - handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1, + handy = 1, axey = 1, plant = 1, building_block = 1, dig_by_piston = 1, dig_immediate_piston = 1, enderman_takable = 1, compostability = 65 }, sounds = mcl_sounds.node_sound_wood_defaults(), diff --git a/mods/ITEMS/mcl_farming/shared_functions.lua b/mods/ITEMS/mcl_farming/shared_functions.lua index bbb5cdc20..f597e786a 100644 --- a/mods/ITEMS/mcl_farming/shared_functions.lua +++ b/mods/ITEMS/mcl_farming/shared_functions.lua @@ -314,18 +314,18 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s "blank.png", -- right "blank.png", -- left connected_stem_texture, -- back - connected_stem_texture .. "^[transformFX90" --front + connected_stem_texture .. "^[transformFX" --front }, { "blank.png", --top "blank.png", -- bottom "blank.png", -- right "blank.png", -- left - connected_stem_texture .. "^[transformFX90", --back + connected_stem_texture .. "^[transformFX", --back connected_stem_texture, -- front }, { "blank.png", --top "blank.png", -- bottom - connected_stem_texture .. "^[transformFX90", -- right + connected_stem_texture .. "^[transformFX", -- right connected_stem_texture, -- left "blank.png", --back "blank.png", -- front @@ -333,7 +333,7 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s { "blank.png", --top "blank.png", -- bottom connected_stem_texture, -- right - connected_stem_texture .. "^[transformFX90", -- left + connected_stem_texture .. "^[transformFX", -- left "blank.png", --back "blank.png", -- front } diff --git a/mods/ITEMS/mcl_fishing/README.txt b/mods/ITEMS/mcl_fishing/README.txt new file mode 100644 index 000000000..b80d77936 --- /dev/null +++ b/mods/ITEMS/mcl_fishing/README.txt @@ -0,0 +1,15 @@ +License of media (sounds) +-------------------------------------- +CC0 1.0 Universal (CC0 1.0) +https://creativecommons.org/publicdomain/zero/1.0/ + +Authors of media files +----------------------- + +You're Perfect Studio (CC0) +https://opengameart.org/content/fisheefects + reel.wav, bloop.wav + +tran5ient (CC0) +https://freesound.org/people/tran5ient/sounds/190080/ + splash7.wav \ No newline at end of file diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 4e70abce4..893a376f5 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -134,7 +134,7 @@ local fish = function(itemstack, player, pointed_thing) minetest.add_item(pos, item) end if mcl_experience.throw_xp then - mcl_experience.throw_xp(pos, math.random(1,6)) + minetest.after(0.7, mcl_experience.throw_xp, pos, math.random(1,6)) end if not minetest.is_creative_enabled(player:get_player_name()) then @@ -161,6 +161,7 @@ local fish = function(itemstack, player, pointed_thing) end --Destroy bobber. ent.object:remove() + minetest.sound_play("reel", {object=player, gain=0.1, max_hear_distance=16}, true) return itemstack end end @@ -242,6 +243,7 @@ local bobber_on_step = function(self, dtime) if self._oldy == nil then self.object:set_pos({x=self.object:get_pos().x,y=math.floor(self.object:get_pos().y)+.5,z=self.object:get_pos().z}) self._oldy = self.object:get_pos().y + minetest.sound_play("watersplash", {pos=epos, gain=0.25}, true) end -- reset to original position after dive. if self.object:get_pos().y > self._oldy then @@ -280,6 +282,7 @@ local bobber_on_step = function(self, dtime) self._time = self._time + dtime else -- wait time is over time to dive. + minetest.sound_play("bloop", {pos=epos, gain=0.4}, true) self._dive = true self.object:set_velocity({x=0,y=-2,z=0}) self.object:set_acceleration({x=0,y=5,z=0}) diff --git a/mods/ITEMS/mcl_fishing/sounds/bloop.ogg b/mods/ITEMS/mcl_fishing/sounds/bloop.ogg new file mode 100644 index 000000000..c724f5693 Binary files /dev/null and b/mods/ITEMS/mcl_fishing/sounds/bloop.ogg differ diff --git a/mods/ITEMS/mcl_fishing/sounds/reel.ogg b/mods/ITEMS/mcl_fishing/sounds/reel.ogg new file mode 100644 index 000000000..2d4d0d350 Binary files /dev/null and b/mods/ITEMS/mcl_fishing/sounds/reel.ogg differ diff --git a/mods/ITEMS/mcl_fishing/sounds/watersplash.ogg b/mods/ITEMS/mcl_fishing/sounds/watersplash.ogg new file mode 100644 index 000000000..4cb6cb46b Binary files /dev/null and b/mods/ITEMS/mcl_fishing/sounds/watersplash.ogg differ diff --git a/mods/ITEMS/mcl_flowerpots/init.lua b/mods/ITEMS/mcl_flowerpots/init.lua index 14350fac6..6f8c1a54a 100644 --- a/mods/ITEMS/mcl_flowerpots/init.lua +++ b/mods/ITEMS/mcl_flowerpots/init.lua @@ -209,3 +209,9 @@ mcl_flowerpots.register_potted_flower("mcl_core:deadbush", { desc = S("Dead Bush"), image = "default_dry_shrub.png", }) + +mcl_flowerpots.register_potted_flower("mcl_cherry_blossom:cherrysapling", { + name = "cherrysapling", + desc = S("Cherry Sapling"), + image = "mcl_cherry_blossom_sapling.png", +}) diff --git a/mods/ITEMS/mcl_flowerpots/locale/template.txt b/mods/ITEMS/mcl_flowerpots/locale/template.txt index fcdf7d21e..ba543ecf6 100644 --- a/mods/ITEMS/mcl_flowerpots/locale/template.txt +++ b/mods/ITEMS/mcl_flowerpots/locale/template.txt @@ -24,3 +24,4 @@ Flower Pot= Flower pots are decorative blocks in which flowers and other small plants can be placed.= Just place a plant on the flower pot. Flower pots can hold small flowers (not higher than 1 block), saplings, ferns, dead bushes, mushrooms and cacti. Rightclick a potted plant to retrieve the plant.= Can hold a small flower or plant= +Cherry Sapling Flower Pot= diff --git a/mods/ITEMS/mcl_furnaces/init.lua b/mods/ITEMS/mcl_furnaces/init.lua index 8cb8ad5a0..9cb8ffb16 100644 --- a/mods/ITEMS/mcl_furnaces/init.lua +++ b/mods/ITEMS/mcl_furnaces/init.lua @@ -1,5 +1,6 @@ - local S = minetest.get_translator(minetest.get_current_modname()) +local C = minetest.colorize +local F = minetest.formspec_escape local LIGHT_ACTIVE_FURNACE = 13 @@ -8,60 +9,82 @@ local LIGHT_ACTIVE_FURNACE = 13 -- local function active_formspec(fuel_percent, item_percent) - return "size[9,8.75]".. - "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]".. - "list[context;src;2.75,0.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. - "list[context;fuel;2.75,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. - "list[context;dst;5.75,1.5;1,1;]".. - mcl_formspec.get_itemslot_bg(5.75,1.5,1,1).. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. - (100-fuel_percent)..":default_furnace_fire_fg.png]".. - "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[lowpart:".. - (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]".. - -- Craft guide button temporarily removed due to Minetest bug. - -- TODO: Add it back when the Minetest bug is fixed. - --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. - --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. - "listring[context;dst]".. - "listring[current_player;main]".. - "listring[context;src]".. - "listring[current_player;main]".. - "listring[context;fuel]".. - "listring[current_player;main]" + return table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Furnace"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(3.5, 0.75, 1, 1), + "list[context;src;3.5,0.75;1,1;]", + + "image[3.5,2;1,1;default_furnace_fire_bg.png^[lowpart:" .. + (100 - fuel_percent) .. ":default_furnace_fire_fg.png]", + + mcl_formspec.get_itemslot_bg_v4(3.5, 3.25, 1, 1), + "list[context;fuel;3.5,3.25;1,1;]", + + "image[5.25,2;1.5,1;gui_furnace_arrow_bg.png^[lowpart:" .. + (item_percent) .. ":gui_furnace_arrow_fg.png^[transformR270]", + mcl_formspec.get_itemslot_bg_v4(7.875, 2, 1, 1, 0.2), + "list[context;dst;7.875,2;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + -- Craft guide button temporarily removed due to Minetest bug. + -- TODO: Add it back when the Minetest bug is fixed. + --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. + --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. + + "listring[context;dst]", + "listring[current_player;main]", + "listring[context;src]", + "listring[current_player;main]", + "listring[context;fuel]", + "listring[current_player;main]", + }) end -local inactive_formspec = "size[9,8.75]".. - "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]".. - "list[context;src;2.75,0.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. - "list[context;fuel;2.75,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. - "list[context;dst;5.75,1.5;1,1;]".. - mcl_formspec.get_itemslot_bg(5.75,1.5,1,1).. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. - "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[transformR270]".. +local inactive_formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Furnace"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(3.5, 0.75, 1, 1), + "list[context;src;3.5,0.75;1,1;]", + + "image[3.5,2;1,1;default_furnace_fire_bg.png]", + + mcl_formspec.get_itemslot_bg_v4(3.5, 3.25, 1, 1), + "list[context;fuel;3.5,3.25;1,1;]", + + "image[5.25,2;1.5,1;gui_furnace_arrow_bg.png^[transformR270]", + + mcl_formspec.get_itemslot_bg_v4(7.875, 2, 1, 1, 0.2), + "list[context;dst;7.875,2;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + -- Craft guide button temporarily removed due to Minetest bug. -- TODO: Add it back when the Minetest bug is fixed. --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. - "listring[context;dst]".. - "listring[current_player;main]".. - "listring[context;src]".. - "listring[current_player;main]".. - "listring[context;fuel]".. - "listring[current_player;main]" + + "listring[context;dst]", + "listring[current_player;main]", + "listring[context;src]", + "listring[current_player;main]", + "listring[context;fuel]", + "listring[current_player;main]", +}) + local receive_fields = function(pos, formname, fields, sender) if fields.craftguide then @@ -71,7 +94,7 @@ end local function give_xp(pos, player) local meta = minetest.get_meta(pos) - local dir = vector.divide(minetest.facedir_to_dir(minetest.get_node(pos).param2),-1.95) + local dir = vector.divide(minetest.facedir_to_dir(minetest.get_node(pos).param2), -1.95) local xp = meta:get_int("xp") if xp > 0 then if player then @@ -108,7 +131,7 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player) -- Test stack with size 1 because we burn one fuel at a time local teststack = ItemStack(stack) teststack:set_count(1) - local output, decremented_input = minetest.get_craft_result({method="fuel", width=1, items={teststack}}) + local output, decremented_input = minetest.get_craft_result({ method = "fuel", width = 1, items = { teststack } }) if output.time ~= 0 then -- Only allow to place 1 item if fuel get replaced by recipe. -- This is the case for lava buckets. @@ -303,7 +326,7 @@ local function furnace_node_timer(pos, elapsed) -- Check if we have cookable content: cookable local aftercooked - cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) + cooked, aftercooked = minetest.get_craft_result({ method = "cooking", width = 1, items = srclist }) cookable = cooked.time ~= 0 if cookable then -- Successful cooking requires space in dst slot and time @@ -321,7 +344,7 @@ local function furnace_node_timer(pos, elapsed) if cookable and not active then -- We need to get new fuel local afterfuel - fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist}) + fuel, afterfuel = minetest.get_craft_result({ method = "fuel", width = 1, items = fuellist }) if fuel.time == 0 then -- No valid fuel in fuel list -- stop @@ -356,7 +379,7 @@ local function furnace_node_timer(pos, elapsed) if srclist[1]:get_name() == "mcl_sponges:sponge_wet" then inv:set_stack("fuel", 1, "mcl_buckets:bucket_water") fuellist = inv:get_list("fuel") - -- Also for river water + -- Also for river water elseif srclist[1]:get_name() == "mcl_sponges:sponge_wet_river_water" then inv:set_stack("fuel", 1, "mcl_buckets:bucket_river_water") fuellist = inv:get_list("fuel") @@ -366,7 +389,7 @@ local function furnace_node_timer(pos, elapsed) srclist = inv:get_list("src") src_time = 0 - meta:set_int("xp", meta:get_int("xp") + 1) -- ToDo give each recipe an idividial XP count + meta:set_int("xp", meta:get_int("xp") + 1) -- ToDo give each recipe an idividial XP count end end @@ -413,9 +436,9 @@ local function furnace_node_timer(pos, elapsed) meta:set_float("fuel_time", fuel_time) meta:set_float("src_time", src_time) if srclist then - meta:set_string("src_item", src_item) + meta:set_string("src_item", src_item) else - meta:set_string("src_item", "") + meta:set_string("src_item", "") end meta:set_string("formspec", formspec) @@ -440,11 +463,11 @@ minetest.register_node("mcl_furnaces:furnace", { _tt_help = S("Uses fuel to smelt or cook items"), _doc_items_longdesc = S("Furnaces cook or smelt several items, using a furnace fuel, into something else."), _doc_items_usagehelp = - S("Use the furnace to open the furnace menu.").."\n".. - S("Place a furnace fuel in the lower slot and the source material in the upper slot.").."\n".. - S("The furnace will slowly use its fuel to smelt the item.").."\n".. - S("The result will be placed into the output slot at the right side.").."\n".. - S("Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn."), + S("Use the furnace to open the furnace menu.") .. "\n" .. + S("Place a furnace fuel in the lower slot and the source material in the upper slot.") .. "\n" .. + S("The furnace will slowly use its fuel to smelt the item.") .. "\n" .. + S("The result will be placed into the output slot at the right side.") .. "\n" .. + S("Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn."), _doc_items_hidden = false, tiles = { "default_furnace_top.png", "default_furnace_bottom.png", @@ -452,7 +475,7 @@ minetest.register_node("mcl_furnaces:furnace", { "default_furnace_side.png", "default_furnace_front.png" }, paramtype2 = "facedir", - groups = {pickaxey=1, container=4, deco_block=1, material_stone=1}, + groups = { pickaxey = 1, container = 4, deco_block = 1, material_stone = 1 }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), @@ -462,10 +485,11 @@ minetest.register_node("mcl_furnaces:furnace", { local meta2 = meta:to_table() meta:from_table(oldmetadata) local inv = meta:get_inventory() - for _, listname in ipairs({"src", "dst", "fuel"}) do + for _, listname in ipairs({ "src", "dst", "fuel" }) do local stack = inv:get_stack(listname, 1) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} + local p = { x = pos.x + math.random(0, 10) / 10 - 0.5, y = pos.y, + z = pos.z + math.random(0, 10) / 10 - 0.5 } minetest.add_item(p, stack) end end @@ -528,7 +552,7 @@ minetest.register_node("mcl_furnaces:furnace_active", { paramtype = "light", light_source = LIGHT_ACTIVE_FURNACE, drop = "mcl_furnaces:furnace", - groups = {pickaxey=1, container=4, deco_block=1, not_in_creative_inventory=1, material_stone=1}, + groups = { pickaxey = 1, container = 4, deco_block = 1, not_in_creative_inventory = 1, material_stone = 1 }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), on_timer = furnace_node_timer, @@ -538,10 +562,11 @@ minetest.register_node("mcl_furnaces:furnace_active", { local meta2 = meta meta:from_table(oldmetadata) local inv = meta:get_inventory() - for _, listname in ipairs({"src", "dst", "fuel"}) do + for _, listname in ipairs({ "src", "dst", "fuel" }) do local stack = inv:get_stack(listname, 1) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} + local p = { x = pos.x + math.random(0, 10) / 10 - 0.5, y = pos.y, + z = pos.z + math.random(0, 10) / 10 - 0.5 } minetest.add_item(p, stack) end end @@ -573,7 +598,7 @@ minetest.register_craft({ output = "mcl_furnaces:furnace", recipe = { { "group:cobble", "group:cobble", "group:cobble" }, - { "group:cobble", "", "group:cobble" }, + { "group:cobble", "", "group:cobble" }, { "group:cobble", "group:cobble", "group:cobble" }, } }) @@ -586,7 +611,7 @@ end minetest.register_lbm({ label = "Active furnace flame particles", name = "mcl_furnaces:flames", - nodenames = {"mcl_furnaces:furnace_active"}, + nodenames = { "mcl_furnaces:furnace_active" }, run_at_every_load = true, action = function(pos, node) spawn_flames(pos, node.param2) diff --git a/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.es.tr b/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.es.tr index 10378c2da..ee645231e 100644 --- a/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.es.tr +++ b/mods/ITEMS/mcl_furnaces/locale/mcl_furnaces.es.tr @@ -1,8 +1,8 @@ # textdomain: mcl_furnaces Furnace=Horno -Furnaces cook or smelt several items, using a furnace fuel, into something else.=Los hornos cocinan u funden varios elementos, utilizando un combustible de horno, en otra cosa. +Furnaces cook or smelt several items, using a furnace fuel, into something else.=Los hornos cocinan o funden varios elementos, utilizando un combustible de horno, en otra cosa. Use the furnace to open the furnace menu. Place a furnace fuel in the lower slot and the source material in the upper slot. The furnace will slowly use its fuel to smelt the item. The result will be placed into the output slot at the right side.=Use el horno para abrir el menú del horno. Coloque un combustible de horno en la ranura inferior y el material de origen en la ranura superior. El horno usará lentamente su combustible para fundir el artículo. El resultado se colocará en la ranura de salida en el lado derecho. -Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.=Use el libro de recetas para ver qué puede crear, qué puede usar como combustible y durante cuánto tiempo se quemará. +Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.=Use el libro de recetas para ver qué puede crear, qué puede usar como combustible y durante cuánto tiempo arderá. Burning Furnace=Horno ardiente Recipe book=Libro de recetas Inventory=Inventario diff --git a/mods/ITEMS/mcl_grindstone/init.lua b/mods/ITEMS/mcl_grindstone/init.lua index 00c373536..e0137dcd1 100644 --- a/mods/ITEMS/mcl_grindstone/init.lua +++ b/mods/ITEMS/mcl_grindstone/init.lua @@ -1,37 +1,52 @@ -- Code based from mcl_anvils local S = minetest.get_translator(minetest.get_current_modname()) +local F = minetest.formspec_escape +local C = minetest.colorize local MAX_WEAR = 65535 --- formspecs -local function get_grindstone_formspec() - return "size[9,8.75]".. - "image[3,1.5;1.5,1;gui_crafting_arrow.png]".. - "label[0,4.0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "label[1,0.1;"..minetest.formspec_escape(minetest.colorize("#313131", S("Repair & Disenchant"))).."]".. - "list[context;main;0,0;8,4;]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "list[context;input;1,1;1,1;]".. - mcl_formspec.get_itemslot_bg(1,1,1,1).. - "list[context;input;1,2;1,1;1]".. - mcl_formspec.get_itemslot_bg(1,2,1,1).. - "list[context;output;6,1.5;1,1;]".. - mcl_formspec.get_itemslot_bg(6,1.5,1,1).. - "listring[context;output]".. - "listring[current_player;main]".. - "listring[context;input]".. - "listring[current_player;main]" -end +local grindstone_formspec = table.concat({ + "formspec_version[6]", + "size[11.75,10.425]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Repair & Disenchant"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(2.875, 1.25, 1, 1), + "list[context;input;2.875,1.25;1,1;]", + + mcl_formspec.get_itemslot_bg_v4(2.875, 2.625, 1, 1), + "list[context;input;2.875,2.625;1,1;1]", + + "image[2.375,1;2,2.875;grindstone_gui_9.png;2]", + + "image[1.875,1.5;0.5,2.875;grindstone_gui_9.png;2]", + "image[4.375,1.5;0.5,2.875;grindstone_gui_9.png;2]", + + "image[5.5,1.95;1.5,1;gui_crafting_arrow.png]", + + mcl_formspec.get_itemslot_bg_v4(7.875, 1.9375, 1, 1), + "list[context;output;7.875,1.9375;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + "listring[context;output]", + "listring[current_player;main]", + "listring[context;input]", + "listring[current_player;main]", +}) -- Creates a new item with the wear of the items and custom name local function create_new_item(name_item, meta, wear) local new_item = ItemStack(name_item) if wear ~= nil then - new_item:set_wear(wear) + new_item:set_wear(wear) end local new_meta = new_item:get_meta() new_meta:set_string("name", meta:get_string("name")) @@ -86,7 +101,6 @@ local function fix_stack_size(stack) return count end - -- Update the inventory slots of an grindstone node. -- meta: Metadata of grindstone node local function update_grindstone_slots(meta) @@ -122,8 +136,8 @@ local function update_grindstone_slots(meta) else new_output = "" end - -- Check if at least one input has an item - -- Check if the item is's an enchanted book or tool + -- Check if at least one input has an item + -- Check if the item is's an enchanted book or tool elseif (not input1:is_empty() and input2:is_empty()) or (input1:is_empty() and not input2:is_empty()) then if input2:is_empty() then local def1 = input1:get_definition() @@ -168,10 +182,10 @@ end -- Drop any items inside the grindstone if destroyed local function drop_grindstone_items(pos, meta) local inv = meta:get_inventory() - for i=1, inv:get_size("input") do + for i = 1, inv:get_size("input") do local stack = inv:get_stack("input", i) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} + local p = { x = pos.x + math.random(0, 10) / 10 - 0.5, y = pos.y, z = pos.z + math.random(0, 10) / 10 - 0.5 } minetest.add_item(p, stack) end end @@ -181,11 +195,11 @@ local node_box = { type = "fixed", -- created with nodebox editor fixed = { - {-0.25, -0.25, -0.375, 0.25, 0.5, 0.375}, - {-0.375, -0.0625, -0.1875, -0.25, 0.3125, 0.1875}, - {0.25, -0.0625, -0.1875, 0.375, 0.3125, 0.1875}, - {0.25, -0.5, -0.125, 0.375, -0.0625, 0.125}, - {-0.375, -0.5, -0.125, -0.25, -0.0625, 0.125}, + { -0.25, -0.25, -0.375, 0.25, 0.5, 0.375 }, + { -0.375, -0.0625, -0.1875, -0.25, 0.3125, 0.1875 }, + { 0.25, -0.0625, -0.1875, 0.375, 0.3125, 0.1875 }, + { 0.25, -0.5, -0.125, 0.375, -0.0625, 0.125 }, + { -0.375, -0.5, -0.125, -0.25, -0.0625, 0.125 }, } } @@ -193,11 +207,11 @@ minetest.register_node("mcl_grindstone:grindstone", { description = S("Grindstone"), _tt_help = S("Used to disenchant/fix tools"), _doc_items_longdesc = S("Grindstone disenchants tools and armour except for curses, and repairs two items of the same type it is also the weapon smith's work station."), - _doc_items_usagehelp = S("To use the grindstone, rightclick it, Two input slots (on the left) and a single output slot.").."\n".. - S("To disenchant an item place enchanted item in one of the input slots and take the disenchanted item from the output.").."\n".. - S("To repair a tool you need a tool of the same type and material, put both items in the input slot and the output slot will combine two items durabilities with 5% bonus.").."\n".. - S("If both items have enchantments the player will get xp from both items from the disenchant.").."\n".. - S("Curses cannot be removed and will be transfered to the new repaired item, if both items have a different curse the curses will be combined."), + _doc_items_usagehelp = S("To use the grindstone, rightclick it, Two input slots (on the left) and a single output slot.") .. "\n" .. + S("To disenchant an item place enchanted item in one of the input slots and take the disenchanted item from the output.") .. "\n" .. + S("To repair a tool you need a tool of the same type and material, put both items in the input slot and the output slot will combine two items durabilities with 5% bonus.") .. "\n" .. + S("If both items have enchantments the player will get xp from both items from the disenchant.") .. "\n" .. + S("Curses cannot be removed and will be transfered to the new repaired item, if both items have a different curse the curses will be combined."), tiles = { "grindstone_top.png", "grindstone_top.png", @@ -212,7 +226,7 @@ minetest.register_node("mcl_grindstone:grindstone", { selection_box = node_box, collision_box = node_box, sounds = mcl_sounds.node_sound_stone_defaults(), - groups = {pickaxey = 1, deco_block = 1}, + groups = { pickaxey = 1, deco_block = 1 }, after_dig_node = function(pos, oldnode, oldmetadata, digger) local meta = minetest.get_meta(pos) @@ -268,7 +282,7 @@ minetest.register_node("mcl_grindstone:grindstone", { local meta = minetest.get_meta(pos) if from_list == "output" and to_list == "input" then local inv = meta:get_inventory() - for i=1, inv:get_size("input") do + for i = 1, inv:get_size("input") do if i ~= to_index then local istack = inv:get_stack("input", i) istack:set_count(math.max(0, istack:get_count() - count)) @@ -289,8 +303,8 @@ minetest.register_node("mcl_grindstone:grindstone", { if not input1:is_empty() and not input2:is_empty() then -- Get xp earnt from the enchanted items xp_earnt = calculate_xp(input1) + calculate_xp(input1) - input1:take_item() - input2:take_item() + input1:take_item(1) + input2:take_item(1) inv:set_stack("input", 1, input1) inv:set_stack("input", 2, input2) else @@ -320,14 +334,13 @@ minetest.register_node("mcl_grindstone:grindstone", { local inv = meta:get_inventory() inv:set_size("input", 2) inv:set_size("output", 1) - local form = get_grindstone_formspec() - meta:set_string("formspec", form) + meta:set_string("formspec", grindstone_formspec) end, on_rightclick = function(pos, node, player, itemstack) if not player:get_player_control().sneak then local meta = minetest.get_meta(pos) update_grindstone_slots(meta) - meta:set_string("formspec", get_grindstone_formspec()) + meta:set_string("formspec", grindstone_formspec) end end, _mcl_blast_resistance = 6, @@ -337,7 +350,7 @@ minetest.register_node("mcl_grindstone:grindstone", { minetest.register_craft({ output = "mcl_grindstone:grindstone", recipe = { - { "mcl_core:stick", "mcl_stairs:slab_stone_rough", "mcl_core:stick"}, - { "group:wood", "", "group:wood"}, + { "mcl_core:stick", "mcl_stairs:slab_stone_rough", "mcl_core:stick" }, + { "group:wood", "", "group:wood" }, } }) diff --git a/mods/ITEMS/mcl_honey/init.lua b/mods/ITEMS/mcl_honey/init.lua index ad507439e..a870e7c08 100644 --- a/mods/ITEMS/mcl_honey/init.lua +++ b/mods/ITEMS/mcl_honey/init.lua @@ -116,7 +116,7 @@ minetest.register_node("mcl_honey:honey_block", { neighbor_node = minetest.get_node(neighbor_pos) end local name = neighbor_node.name - if name ~= "air" and name ~= "ignore" and not mesecon.mvps_unsticky[name] then + if name ~= "air" and name ~= "ignore" and name ~= "mcl_core:slimeblock" and not mesecon.mvps_unsticky[name] then local piston, piston_side, piston_up, piston_down = false, false, false, false if name == "mesecons_pistons:piston_sticky_off" or name == "mesecons_pistons:piston_normal_off" then piston, piston_side = true, true diff --git a/mods/ITEMS/mcl_hoppers/init.lua b/mods/ITEMS/mcl_hoppers/init.lua index 15bc922ff..b4378b21b 100644 --- a/mods/ITEMS/mcl_hoppers/init.lua +++ b/mods/ITEMS/mcl_hoppers/init.lua @@ -12,15 +12,22 @@ end --[[ BEGIN OF NODE DEFINITIONS ]] local mcl_hoppers_formspec = table.concat({ - "size[9,7]", - "label[2,0;" .. F(C("#313131", S("Hopper"))) .. "]", - "list[context;main;2,0.5;5,1;]", - mcl_formspec.get_itemslot_bg(2, 0.5, 5, 1), - "label[0,2;" .. F(C("#313131", S("Inventory"))) .. "]", - "list[current_player;main;0,2.5;9,3;9]", - mcl_formspec.get_itemslot_bg(0, 2.5, 9, 3), - "list[current_player;main;0,5.74;9,1;]", - mcl_formspec.get_itemslot_bg(0, 5.74, 9, 1), + "formspec_version[4]", + "size[11.75,8.175]", + + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Hopper"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(2.875, 0.75, 5, 1), + "list[context;main;2.875,0.75;5,1;]", + + "label[0.375,2.45;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 2.85, 9, 3), + "list[current_player;main;0.375,2.85;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 6.8, 9, 1), + "list[current_player;main;0.375,6.8;9,1;]", + "listring[context;main]", "listring[current_player;main]", }) @@ -31,7 +38,7 @@ local mcl_hoppers_formspec = table.concat({ local def_hopper = { inventory_image = "mcl_hoppers_item.png", wield_image = "mcl_hoppers_item.png", - groups = {pickaxey = 1, container = 2, deco_block = 1, hopper = 1}, + groups = { pickaxey = 1, container = 2, deco_block = 1, hopper = 1 }, drawtype = "nodebox", paramtype = "light", -- FIXME: mcl_hoppers_hopper_inside.png is unused by hoppers. @@ -47,25 +54,25 @@ local def_hopper = { type = "fixed", fixed = { --funnel walls - {-0.5, 0.0, 0.4, 0.5, 0.5, 0.5}, - {0.4, 0.0, -0.5, 0.5, 0.5, 0.5}, - {-0.5, 0.0, -0.5, -0.4, 0.5, 0.5}, - {-0.5, 0.0, -0.5, 0.5, 0.5, -0.4}, + { -0.5, 0.0, 0.4, 0.5, 0.5, 0.5 }, + { 0.4, 0.0, -0.5, 0.5, 0.5, 0.5 }, + { -0.5, 0.0, -0.5, -0.4, 0.5, 0.5 }, + { -0.5, 0.0, -0.5, 0.5, 0.5, -0.4 }, --funnel base - {-0.5, 0.0, -0.5, 0.5, 0.1, 0.5}, + { -0.5, 0.0, -0.5, 0.5, 0.1, 0.5 }, --spout - {-0.3, -0.3, -0.3, 0.3, 0.0, 0.3}, - {-0.1, -0.3, -0.1, 0.1, -0.5, 0.1}, + { -0.3, -0.3, -0.3, 0.3, 0.0, 0.3 }, + { -0.1, -0.3, -0.1, 0.1, -0.5, 0.1 }, }, }, selection_box = { type = "fixed", fixed = { --funnel - {-0.5, 0.0, -0.5, 0.5, 0.5, 0.5}, + { -0.5, 0.0, -0.5, 0.5, 0.5, 0.5 }, --spout - {-0.3, -0.3, -0.3, 0.3, 0.0, 0.3}, - {-0.1, -0.3, -0.1, 0.1, -0.5, 0.1}, + { -0.3, -0.3, -0.3, 0.3, 0.0, 0.3 }, + { -0.1, -0.3, -0.1, 0.1, -0.5, 0.1 }, }, }, is_ground_content = false, @@ -248,25 +255,25 @@ local def_hopper_side = { type = "fixed", fixed = { --funnel walls - {-0.5, 0.0, 0.4, 0.5, 0.5, 0.5}, - {0.4, 0.0, -0.5, 0.5, 0.5, 0.5}, - {-0.5, 0.0, -0.5, -0.4, 0.5, 0.5}, - {-0.5, 0.0, -0.5, 0.5, 0.5, -0.4}, + { -0.5, 0.0, 0.4, 0.5, 0.5, 0.5 }, + { 0.4, 0.0, -0.5, 0.5, 0.5, 0.5 }, + { -0.5, 0.0, -0.5, -0.4, 0.5, 0.5 }, + { -0.5, 0.0, -0.5, 0.5, 0.5, -0.4 }, --funnel base - {-0.5, 0.0, -0.5, 0.5, 0.1, 0.5}, + { -0.5, 0.0, -0.5, 0.5, 0.1, 0.5 }, --spout - {-0.3, -0.3, -0.3, 0.3, 0.0, 0.3}, - {-0.5, -0.3, -0.1, 0.1, -0.1, 0.1}, + { -0.3, -0.3, -0.3, 0.3, 0.0, 0.3 }, + { -0.5, -0.3, -0.1, 0.1, -0.1, 0.1 }, }, }, selection_box = { type = "fixed", fixed = { --funnel - {-0.5, 0.0, -0.5, 0.5, 0.5, 0.5}, + { -0.5, 0.0, -0.5, 0.5, 0.5, 0.5 }, --spout - {-0.3, -0.3, -0.3, 0.3, 0.0, 0.3}, - {-0.5, -0.3, -0.1, 0.1, -0.1, 0.1}, + { -0.3, -0.3, -0.3, 0.3, 0.0, 0.3 }, + { -0.5, -0.3, -0.1, 0.1, -0.1, 0.1 }, }, }, is_ground_content = false, @@ -559,8 +566,8 @@ end minetest.register_abm({ label = "Hopper/container item exchange", - nodenames = {"mcl_hoppers:hopper"}, - neighbors = {"group:container"}, + nodenames = { "mcl_hoppers:hopper" }, + neighbors = { "group:container" }, interval = 1.0, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) @@ -591,8 +598,8 @@ minetest.register_abm({ minetest.register_abm({ label = "Side-hopper/container item exchange", - nodenames = {"mcl_hoppers:hopper_side"}, - neighbors = {"group:container"}, + nodenames = { "mcl_hoppers:hopper_side" }, + neighbors = { "group:container" }, interval = 1.0, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) diff --git a/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr b/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr index bf9076815..73320ce14 100644 --- a/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr +++ b/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr @@ -1,12 +1,10 @@ # textdomain: mcl_itemframes Item Frame=Рамка -Item frames are decorative blocks in which items can be placed.=Рамки это декоративные блоки, в которые можно помещать предметы. -Just place any item on the item frame. Use the item frame again to retrieve the item.=Просто поместите в рамку любой предмет. Используйте рамку вновь, чтобы заполучить из неё предмет обратно. -Can hold an item=Может хранить предмет -Item Frame=Рамка предмета -Item frames are decorative blocks in which items can be placed.=Рамки предметов — это декоративные блоки, в которые можно помещать предметы. -Just place any item on the item frame. Use the item frame again to retrieve the item.=Просто поместите любой предмет на рамку предмета. Используйте рамку предмета снова, чтобы получить предмет. -Can hold an item.=Может держать предмет. +Item frames are decorative blocks in which items can be placed.=Рамки — это отделочные блоки, в которых можно хранить предметы. +Just place any item on the item frame. Use the item frame again to retrieve the item.=Просто вставьте в рамку любой предмет. Нажмите правой кнопкой мыши на рамку, чтобы взять предмет обратно. +Can hold an item.=Может хранить предмет. Glowing Item Frame=Светящаяся рамка предмета -Glowing item frames are decorative blocks in which items can be placed and made to glow.=Светящиеся рамки предметов — это декоративные блоки, в которые можно помещать предметы и заставлять их светиться. -Can hold an item and glows.=Может держать предмет и светится. +Glowing item frames are decorative blocks in which items can be placed.=Светящиеся рамки предметов — это отделочные блоки, в которых можно хранить предметы и заставлять их светиться. +Can hold an item and glows.=Может хранить предмет и светится. +Glow and Behold!=Сияй и созерцай! +Craft a glow item frame.=Создание светящейся рамки. \ No newline at end of file diff --git a/mods/ITEMS/mcl_mangrove/init.lua b/mods/ITEMS/mcl_mangrove/init.lua index dd2b653c4..6e7767541 100644 --- a/mods/ITEMS/mcl_mangrove/init.lua +++ b/mods/ITEMS/mcl_mangrove/init.lua @@ -18,148 +18,20 @@ local propagule_allowed_nodes = { local propagule_water_nodes = {"mcl_mud:mud","mcl_core:dirt","mcl_core:coarse_dirt","mcl_core:clay"} --"mcl_lush_caves:moss","mcl_lush_caves:rooted_dirt -local function get_drops(fortune_level) - local apple_chances = {200, 180, 160, 120, 40} - local stick_chances = {50, 45, 30, 35, 10} - local sapling_chances = {20, 16, 12, 10} - return { - max_items = 1, - items = { - { - items = {"mcl_mangrove:propagule"}, - rarity = sapling_chances[fortune_level + 1] or sapling_chances[fortune_level] - }, - { - items = {"mcl_core:stick 1"}, - rarity = stick_chances[fortune_level + 1] - }, - { - items = {"mcl_core:stick 2"}, - rarity = stick_chances[fortune_level + 1] - }, - { - items = {"mcl_core:apple"}, - rarity = apple_chances[fortune_level + 1] - } - } - } -end +mcl_core.register_tree_trunk("mangrove_tree", S("Mangrove Wood"), S("Mangrove Bark"), + S("The trunk of a Mangrove tree."), + "mcl_mangrove_log_top.png", "mcl_mangrove_log.png", "mcl_mangrove:mangrove_stripped") -minetest.register_node("mcl_mangrove:mangrove_tree", { - description = S("Mangrove Wood"), - _doc_items_longdesc = S("The trunk of a Mangrove tree."), - _doc_items_hidden = false, - tiles = {"mcl_mangrove_log_top.png", "mcl_mangrove_log_top.png", "mcl_mangrove_log.png"}, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - after_destruct = mcl_core.update_leaves, - groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 2, - _mcl_hardness = 2, - _mcl_stripped_variant = "mcl_mangrove:mangrove_stripped_trunk", -}) -minetest.register_node("mcl_mangrove:mangrove_tree_bark", { - description = S("Mangrove Bark"), - _doc_items_longdesc = S("The bark of a Mangrove tree."), - _doc_items_hidden = false, - tiles = {"mcl_mangrove_log.png", "mcl_mangrove_log.png", "mcl_mangrove_log.png"}, - paramtype2 = "facedir", - groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - on_place = mcl_util.rotate_axis, - _mcl_blast_resistance = 2, - _mcl_hardness = 2, - _mcl_stripped_variant = "mcl_mangrove:mangrove_stripped_bark", -}) +mcl_core.register_wooden_planks("mangrove_wood", S("Mangrove Wood Planks"), {"mcl_mangrove_planks.png"}) -minetest.register_node("mcl_mangrove:mangrove_wood", { - description = S("Mangrove Wood Planks"), - _doc_items_longdesc = doc.sub.items.temp.build, - _doc_items_hidden = false, - tiles = {"mcl_mangrove_planks.png"}, +mcl_core.register_leaves("mangroveleaves", S("Mangrove Leaves"), S("Mangrove leaves are grown from mangrove trees."), + {"mcl_mangrove_leaves.png"}, "#48B518", "color", "mcl_core_palette_foliage.png", "mcl_mangrove:propagule", true, {20, 16, 12, 10}, 1) - is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 3, - _mcl_hardness = 2, -}) +mcl_core.register_stripped_trunk("mangrove_stripped", S("Stripped Mangrove Log"), S("Stripped Mangrove Wood"), + S("The stripped wood of a Mangrove tree"), S("The stripped bark of a Mangrove tree"), + "mcl_stripped_mangrove_log_top.png", "mcl_stripped_mangrove_log_side.png") -local l_def = { - description = S("Mangrove Leaves"), - _doc_items_longdesc = S("mangrove leaves are grown from mangrove trees."), - _doc_items_hidden = false, - drawtype = "allfaces_optional", - waving = 2, - tiles = {"mcl_mangrove_leaves.png"}, - color = "#48B518", - paramtype = "light", - paramtype2 = "color", - palette = "mcl_core_palette_foliage.png", - groups = { - handy = 1, hoey = 1, shearsy = 1, swordy = 1, dig_by_piston = 1, - flammable = 2, fire_encouragement = 30, fire_flammability = 60, - leaves = 1, deco_block = 1, compostability = 30, foliage_palette = 1 - }, - drop = get_drops(0), - _mcl_shears_drop = true, - sounds = mcl_sounds.node_sound_leaves_defaults(), - _mcl_blast_resistance = 0.2, - _mcl_hardness = 0.2, - _mcl_silk_touch_drop = true, - _mcl_fortune_drop = { get_drops(1), get_drops(2), get_drops(3), get_drops(4) }, - on_construct = function(pos) - local node = minetest.get_node(pos) - if node.param2 == 0 or node.param2 == 1 then -- Check if param2 is 1 as well, since the schematics accidentally have the param2 of mangrove leaves be 1. - local new_node = mcl_core.get_foliage_block_type(pos) - if new_node.param2 ~= 0 then - minetest.swap_node(pos, new_node) - end - end - end, - after_place_node = function(pos) - mcl_core.make_player_leaves(pos) -- Leaves placed by the player should always be player leaves. - end, -} - -minetest.register_node("mcl_mangrove:mangroveleaves", l_def) - -local o_def = table.copy(l_def) -o_def._doc_items_create_entry = false -o_def.groups.not_in_creative_inventory = 1 -o_def.groups.orphan_leaves = 1 -o_def._mcl_shears_drop = {"mcl_mangrove:mangroveleaves"} -o_def._mcl_silk_touch_drop = {"mcl_mangrove:mangroveleaves"} - -minetest.register_node("mcl_mangrove:mangroveleaves_orphan", o_def) - -minetest.register_node("mcl_mangrove:mangrove_stripped_trunk", { - description = S("Stripped Mangrove Wood"), - _doc_items_longdesc = S("The stripped wood of a Mangrove tree"), - _doc_items_hidden = false, - tiles ={"mcl_stripped_mangrove_log_top.png","mcl_stripped_mangrove_log_side.png",}, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - on_rotate = mcl_util.rotate_axis_and_place, - _mcl_blast_resistance = 2, - _mcl_hardness = 2, -}) -minetest.register_node("mcl_mangrove:mangrove_stripped_bark", { - description = S("Stripped Mangrove Bark"), - _doc_items_longdesc = S("The stripped bark of a Mangrove tree"), - _doc_items_hidden = false, - tiles ={"mcl_stripped_mangrove_log_side.png","mcl_stripped_mangrove_log_side.png",}, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1, axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - on_rotate = mcl_util.rotate_axis_and_place, - _mcl_blast_resistance = 2, - _mcl_hardness = 2, -}) +minetest.register_alias("mcl_mangrove:mangrove_stripped_trunk", "mcl_mangrove:mangrove_stripped") minetest.register_node("mcl_mangrove:mangrove_roots", { description = S("Mangrove Roots"), @@ -416,8 +288,8 @@ mcl_doors:register_door("mcl_mangrove:mangrove_door", { groups = {handy=1,axey=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, _mcl_blast_resistance = 3, - tiles_bottom = {"mcl_mangrove_door_bottom.png", "mcl_doors_door_mangrove_side_lower.png"}, - tiles_top = {"mcl_mangrove_door_top.png", "mcl_doors_door_mangrove_side_upper.png"}, + tiles_bottom = "mcl_mangrove_door_bottom.png", + tiles_top = "mcl_mangrove_door_top.png", sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -426,7 +298,7 @@ mcl_doors:register_trapdoor("mcl_mangrove:mangrove_trapdoor", { _doc_items_longdesc = S("Wooden trapdoors are horizontal barriers which can be opened and closed by hand or a redstone signal. They occupy the upper or lower part of a block, depending on how they have been placed. When open, they can be climbed like a ladder."), _doc_items_usagehelp = S("To open or close the trapdoor, rightclick it or send a redstone signal to it."), tile_front = "mcl_mangrove_trapdoor.png", - tile_side = "mcl_mangrove_planks.png", + tile_side = "mcl_mangrove_trapdoor_side.png", wield_image = "mcl_mangrove_trapdoor.png", groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1}, _mcl_hardness = 3, diff --git a/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.fr.tr b/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.fr.tr index f898a58a7..4d1590dbd 100644 --- a/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.fr.tr +++ b/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.fr.tr @@ -5,7 +5,7 @@ Mangrove Bark=Bois de palétuvier The bark of a Mangrove tree.=L'écorce d'un palétuvier. Mangrove Wood Planks=Planches de palétuvier Mangrove Leaves=Feuilles de palétuvier -mangrove leaves are grown from mangrove trees.=les feuilles de palétuvier poussent sur les palétuviers. +Mangrove leaves are grown from mangrove trees.=les feuilles de palétuvier poussent sur les palétuviers. Stripped Mangrove Wood=Bûche de palétuvier écorcée The stripped wood of a Mangrove tree=La bûche écorcée d'un palétuvier Stripped Mangrove Bark=Bois de palétuvier écorcé diff --git a/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.ja.tr b/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.ja.tr index 142495e92..6df59f6fb 100644 --- a/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.ja.tr +++ b/mods/ITEMS/mcl_mangrove/locale/mcl_mangrove.ja.tr @@ -5,7 +5,7 @@ Mangrove Bark=マングローブの樹皮 The bark of a Mangrove tree.=マングローブの木の樹皮です。 Mangrove Wood Planks=マングローブの板材 Mangrove Leaves=マングローブの葉 -mangrove leaves are grown from mangrove trees.=マングローブの葉は、マングローブの木から育ちます。 +Mangrove leaves are grown from mangrove trees.=マングローブの葉は、マングローブの木から育ちます。 Stripped Mangrove Wood=樹皮を剥いだマングローブの木 The stripped wood of a Mangrove tree=剥き身となったマングローブの木 Stripped Mangrove Bark=剥がされたマングローブの樹皮 diff --git a/mods/ITEMS/mcl_mangrove/locale/template.txt b/mods/ITEMS/mcl_mangrove/locale/template.txt index 7e0a25450..3de2b9ced 100644 --- a/mods/ITEMS/mcl_mangrove/locale/template.txt +++ b/mods/ITEMS/mcl_mangrove/locale/template.txt @@ -5,7 +5,7 @@ Mangrove Bark= The bark of a Mangrove tree.= Mangrove Wood Planks= Mangrove Leaves= -mangrove leaves are grown from mangrove trees.= +Mangrove leaves are grown from mangrove trees.= Stripped Mangrove Wood= The stripped wood of a Mangrove tree= Stripped Mangrove Bark= diff --git a/mods/ITEMS/mcl_maps/colors.json b/mods/ITEMS/mcl_maps/colors.json index 5b18d6d62..4929a2f66 100644 --- a/mods/ITEMS/mcl_maps/colors.json +++ b/mods/ITEMS/mcl_maps/colors.json @@ -9004,7 +9004,7 @@ 55, 47 ], - "bucket_lava.png": [ + "mcl_buckets_lava_bucket.png": [ 166, 127, 113 diff --git a/mods/ITEMS/mcl_maps/locale/mcl_maps.ru.tr b/mods/ITEMS/mcl_maps/locale/mcl_maps.ru.tr index 6c34007a9..3bb7d6a19 100644 --- a/mods/ITEMS/mcl_maps/locale/mcl_maps.ru.tr +++ b/mods/ITEMS/mcl_maps/locale/mcl_maps.ru.tr @@ -1,5 +1,5 @@ # textdomain: mcl_maps Empty Map=Пустая карта Empty maps are not useful as maps, but they can be stacked and turned to maps which can be used.=Пустые карты не могут использоваться в качестве карт, но могут складываться в стопки, а также могут быть превращены в полноценные карты. -Rightclick to start using the map (which can't be stacked anymore).=Кликните правой, чтобы начать использовать карту (её больше нельзя будет уложить в стопку). +Rightclick to start using the map (which can't be stacked anymore).=Нажмите правую кнопку мыши, чтобы начать использовать карту (её больше нельзя будет уложить в стопку). Map=Карта diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index 528b6843d..0c091080f 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -1,11 +1,13 @@ ---[[ -By EliasFleckenstein03 and Code-Sploit -]] +-- By EliasFleckenstein03 and Code-Sploit local S = minetest.get_translator("mcl_smithing_table") +local F = minetest.formspec_escape +local C = minetest.colorize + mcl_smithing_table = {} -- Function to upgrade diamond tool/armor to netherite tool/armor +---@param itemstack ItemStack function mcl_smithing_table.upgrade_item_netherite(itemstack) local def = itemstack:get_definition() @@ -30,29 +32,49 @@ function mcl_smithing_table.upgrade_item_netherite(itemstack) return itemstack end --- Badly copied over from mcl_anvils --- ToDo: Make better formspec +local formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", -local formspec = "size[9,9]" .. - "background[-0.19,-0.25;9.41,9.49;mcl_smithing_table_inventory.png]".. - "label[0,4.0;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Inventory"))) .. "]" .. - "list[current_player;main;0,4.5;9,3;9]" .. - mcl_formspec.get_itemslot_bg(0,4.5,9,3) .. - "list[current_player;main;0,7.74;9,1;]" .. - mcl_formspec.get_itemslot_bg(0,7.74,9,1) .. - "list[context;upgrade_item;1,2.5;1,1;]" .. - mcl_formspec.get_itemslot_bg(1,2.5,1,1) .. - "list[context;mineral;4,2.5;1,1;]" .. - mcl_formspec.get_itemslot_bg(4,2.5,1,1) .. - "list[context;template;5,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(5,2.5,1,1).. - "list[context;upgraded_item;8,2.5;1,1;]" .. - mcl_formspec.get_itemslot_bg(8,2.5,1,1) .. - "label[3,0.1;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Upgrade Gear"))) .. "]" .. - "listring[context;output]".. - "listring[current_player;main]".. - "listring[context;input]".. - "listring[current_player;main]" + "label[4.125,0.375;" .. F(C(mcl_formspec.label_color, S("Upgrade Gear"))) .. "]", + + "image[0.875,0.375;1.75,1.75;mcl_smithing_table_inventory_hammer.png]", + + mcl_formspec.get_itemslot_bg_v4(1.625, 2.6, 1, 1), + "list[context;upgrade_item;1.625,2.6;1,1;]", + + "image[3.125,2.6;1,1;mcl_anvils_inventory_cross.png]", + + mcl_formspec.get_itemslot_bg_v4(4.75, 2.6, 1, 1), + "list[context;mineral;4.75,2.6;1,1;]", + + mcl_formspec.get_itemslot_bg_v4(6,2.6,1,1), + "list[context;template;6,2.6;1,1;]", + + "image[7,2.6;2,1;mcl_anvils_inventory_arrow.png]", + + mcl_formspec.get_itemslot_bg_v4(9.125, 2.6, 1, 1), + "list[context;upgraded_item;9.125,2.6;1,1;]", + + -- Player Inventory + + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + -- Listrings + + "listring[context;upgrade_item]", + "listring[current_player;main]", + "listring[context;mineral]", + "listring[current_player;main]", + "listring[context;upgraded_item]", + "listring[current_player;main]", + "listring[current_player;main]", + "listring[context;upgrade_item]", +}) local smithing_materials = { ["mcl_nether:netherite_ingot"] = "netherite", @@ -86,6 +108,7 @@ function mcl_smithing_table.is_smithing_mineral(itemname) return smithing_materials[itemname] ~= nil end +---@param pos Vector local function reset_upgraded_item(pos) local inv = minetest.get_meta(pos):get_inventory() local upgraded_item @@ -107,8 +130,7 @@ minetest.register_node("mcl_smithing_table:table", { description = S("Smithing table"), -- ToDo: Add _doc_items_longdesc and _doc_items_usagehelp - stack_max = 64, - groups = {pickaxey = 2, deco_block = 1}, + groups = { pickaxey = 2, deco_block = 1 }, tiles = { "mcl_smithing_table_top.png", @@ -172,7 +194,7 @@ minetest.register_node("mcl_smithing_table:table", { take_item("template") -- ToDo: make epic sound - minetest.sound_play("mcl_smithing_table_upgrade", {pos = pos, max_hear_distance = 16}) + minetest.sound_play("mcl_smithing_table_upgrade", { pos = pos, max_hear_distance = 16 }) end if listname == "upgraded_item" then if stack:get_name() == "mcl_farming:hoe_netherite" then @@ -191,13 +213,13 @@ minetest.register_node("mcl_smithing_table:table", { minetest.register_craft({ output = "mcl_smithing_table:table", recipe = { - {"mcl_core:iron_ingot", "mcl_core:iron_ingot", ""}, - {"group:wood", "group:wood", ""}, - {"group:wood", "group:wood", ""} - } + { "mcl_core:iron_ingot", "mcl_core:iron_ingot", "" }, + { "group:wood", "group:wood", "" }, + { "group:wood", "group:wood", "" } + }, }) -- this is the exact same as mcl_smithing_table.upgrade_item_netherite , in case something relies on the old function function mcl_smithing_table.upgrade_item(itemstack) return mcl_smithing_table.upgrade_item_netherite(itemstack) -end \ No newline at end of file +end diff --git a/mods/ITEMS/mcl_smithing_table/mod.conf b/mods/ITEMS/mcl_smithing_table/mod.conf index d947b850e..6a7ea5286 100644 --- a/mods/ITEMS/mcl_smithing_table/mod.conf +++ b/mods/ITEMS/mcl_smithing_table/mod.conf @@ -1,2 +1,2 @@ name = mcl_smithing_table -depends = mcl_colors, mcl_formspec, mcl_armor +depends = mcl_colors, mcl_formspec, mcl_armor, mcl_anvils diff --git a/mods/ITEMS/mcl_smoker/init.lua b/mods/ITEMS/mcl_smoker/init.lua index 4a4cfca15..757f13054 100644 --- a/mods/ITEMS/mcl_smoker/init.lua +++ b/mods/ITEMS/mcl_smoker/init.lua @@ -1,5 +1,6 @@ - local S = minetest.get_translator(minetest.get_current_modname()) +local C = minetest.colorize +local F = minetest.formspec_escape local LIGHT_ACTIVE_FURNACE = 13 @@ -8,60 +9,82 @@ local LIGHT_ACTIVE_FURNACE = 13 -- local function active_formspec(fuel_percent, item_percent) - return "size[9,8.75]".. - "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Smoker"))).."]".. - "list[context;src;2.75,0.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. - "list[context;fuel;2.75,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. - "list[context;dst;5.75,1.5;1,1;]".. - mcl_formspec.get_itemslot_bg(5.75,1.5,1,1).. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. - (100-fuel_percent)..":default_furnace_fire_fg.png]".. - "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[lowpart:".. - (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]".. - -- Craft guide button temporarily removed due to Minetest bug. - -- TODO: Add it back when the Minetest bug is fixed. - --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. - --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. - "listring[context;dst]".. - "listring[current_player;main]".. - "listring[context;src]".. - "listring[current_player;main]".. - "listring[context;fuel]".. - "listring[current_player;main]" + return table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Smoker"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(3.5, 0.75, 1, 1), + "list[context;src;3.5,0.75;1,1;]", + + "image[3.5,2;1,1;default_furnace_fire_bg.png^[lowpart:" .. + (100 - fuel_percent) .. ":default_furnace_fire_fg.png]", + + mcl_formspec.get_itemslot_bg_v4(3.5, 3.25, 1, 1), + "list[context;fuel;3.5,3.25;1,1;]", + + "image[5.25,2;1.5,1;gui_furnace_arrow_bg.png^[lowpart:" .. + (item_percent) .. ":gui_furnace_arrow_fg.png^[transformR270]", + mcl_formspec.get_itemslot_bg_v4(7.875, 2, 1, 1, 0.2), + "list[context;dst;7.875,2;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + + -- Craft guide button temporarily removed due to Minetest bug. + -- TODO: Add it back when the Minetest bug is fixed. + --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. + --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. + + "listring[context;dst]", + "listring[current_player;main]", + "listring[context;src]", + "listring[current_player;main]", + "listring[context;fuel]", + "listring[current_player;main]", + }) end -local inactive_formspec = "size[9,8.75]".. - "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. - "list[current_player;main;0,4.5;9,3;9]".. - mcl_formspec.get_itemslot_bg(0,4.5,9,3).. - "list[current_player;main;0,7.74;9,1;]".. - mcl_formspec.get_itemslot_bg(0,7.74,9,1).. - "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Smoker"))).."]".. - "list[context;src;2.75,0.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. - "list[context;fuel;2.75,2.5;1,1;]".. - mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. - "list[context;dst;5.75,1.5;1,1;]".. - mcl_formspec.get_itemslot_bg(5.75,1.5,1,1).. - "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. - "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[transformR270]".. +local inactive_formspec = table.concat({ + "formspec_version[4]", + "size[11.75,10.425]", + "label[0.375,0.375;" .. F(C(mcl_formspec.label_color, S("Smoker"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(3.5, 0.75, 1, 1), + "list[context;src;3.5,0.75;1,1;]", + + "image[3.5,2;1,1;default_furnace_fire_bg.png]", + + mcl_formspec.get_itemslot_bg_v4(3.5, 3.25, 1, 1), + "list[context;fuel;3.5,3.25;1,1;]", + + "image[5.25,2;1.5,1;gui_furnace_arrow_bg.png^[transformR270]", + + mcl_formspec.get_itemslot_bg_v4(7.875, 2, 1, 1, 0.2), + "list[context;dst;7.875,2;1,1;]", + + "label[0.375,4.7;" .. F(C(mcl_formspec.label_color, S("Inventory"))) .. "]", + mcl_formspec.get_itemslot_bg_v4(0.375, 5.1, 9, 3), + "list[current_player;main;0.375,5.1;9,3;9]", + + mcl_formspec.get_itemslot_bg_v4(0.375, 9.05, 9, 1), + "list[current_player;main;0.375,9.05;9,1;]", + -- Craft guide button temporarily removed due to Minetest bug. -- TODO: Add it back when the Minetest bug is fixed. --"image_button[8,0;1,1;craftguide_book.png;craftguide;]".. --"tooltip[craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. - "listring[context;dst]".. - "listring[current_player;main]".. - "listring[context;src]".. - "listring[current_player;main]".. - "listring[context;fuel]".. - "listring[current_player;main]" + + "listring[context;dst]", + "listring[current_player;main]", + "listring[context;src]", + "listring[current_player;main]", + "listring[context;fuel]", + "listring[current_player;main]", +}) + local receive_fields = function(pos, formname, fields, sender) if fields.craftguide then @@ -71,7 +94,7 @@ end local function give_xp(pos, player) local meta = minetest.get_meta(pos) - local dir = vector.divide(minetest.facedir_to_dir(minetest.get_node(pos).param2),-1.95) + local dir = vector.divide(minetest.facedir_to_dir(minetest.get_node(pos).param2), -1.95) local xp = meta:get_int("xp") if xp > 0 then if player then @@ -98,7 +121,7 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player) -- Test stack with size 1 because we burn one fuel at a time local teststack = ItemStack(stack) teststack:set_count(1) - local output, decremented_input = minetest.get_craft_result({method="fuel", width=1, items={teststack}}) + local output, decremented_input = minetest.get_craft_result({ method = "fuel", width = 1, items = { teststack } }) if output.time ~= 0 then -- Only allow to place 1 item if fuel get replaced by recipe. -- This is the case for lava buckets. @@ -292,7 +315,7 @@ local function smoker_node_timer(pos, elapsed) -- Check if we have cookable content: cookable local aftercooked - cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) + cooked, aftercooked = minetest.get_craft_result({ method = "cooking", width = 1, items = srclist }) cookable = minetest.get_item_group(inv:get_stack("src", 1):get_name(), "smoker_cookable") == 1 if cookable then -- Successful cooking requires space in dst slot and time @@ -310,7 +333,7 @@ local function smoker_node_timer(pos, elapsed) if cookable and not active then -- We need to get new fuel local afterfuel - fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist}) + fuel, afterfuel = minetest.get_craft_result({ method = "fuel", width = 1, items = fuellist }) if fuel.time == 0 then -- No valid fuel in fuel list -- stop @@ -343,7 +366,7 @@ local function smoker_node_timer(pos, elapsed) srclist = inv:get_list("src") src_time = 0 - meta:set_int("xp", meta:get_int("xp") + 1) -- ToDo give each recipe an idividial XP count + meta:set_int("xp", meta:get_int("xp") + 1) -- ToDo give each recipe an idividial XP count end end @@ -390,9 +413,9 @@ local function smoker_node_timer(pos, elapsed) meta:set_float("fuel_time", fuel_time) meta:set_float("src_time", src_time) if srclist then - meta:set_string("src_item", src_item) + meta:set_string("src_item", src_item) else - meta:set_string("src_item", "") + meta:set_string("src_item", "") end meta:set_string("formspec", formspec) @@ -415,13 +438,14 @@ end minetest.register_node("mcl_smoker:smoker", { description = S("Smoker"), _tt_help = S("Cooks food faster than furnace"), - _doc_items_longdesc = S("Smokers cook several items, mainly raw foods, into cooked foods, but twice as fast as a normal furnace."), + _doc_items_longdesc = S( + "Smokers cook several items, mainly raw foods, into cooked foods, but twice as fast as a normal furnace."), _doc_items_usagehelp = - S("Use the smoker to open the furnace menu.").."\n".. - S("Place a furnace fuel in the lower slot and the source material in the upper slot.").."\n".. - S("The smoker will slowly use its fuel to smelt the item.").."\n".. - S("The result will be placed into the output slot at the right side.").."\n".. - S("Use the recipe book to see what foods you can smelt, what you can use as fuel and how long it will burn."), + S("Use the smoker to open the furnace menu.") .. "\n" .. + S("Place a furnace fuel in the lower slot and the source material in the upper slot.") .. "\n" .. + S("The smoker will slowly use its fuel to smelt the item.") .. "\n" .. + S("The result will be placed into the output slot at the right side.") .. "\n" .. + S("Use the recipe book to see what foods you can smelt, what you can use as fuel and how long it will burn."), _doc_items_hidden = false, tiles = { "smoker_top.png", "smoker_bottom.png", @@ -429,7 +453,7 @@ minetest.register_node("mcl_smoker:smoker", { "smoker_side.png", "smoker_front.png" }, paramtype2 = "facedir", - groups = {pickaxey=1, container=4, deco_block=1, material_stone=1}, + groups = { pickaxey = 1, container = 4, deco_block = 1, material_stone = 1 }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), @@ -439,10 +463,14 @@ minetest.register_node("mcl_smoker:smoker", { local meta2 = meta:to_table() meta:from_table(oldmetadata) local inv = meta:get_inventory() - for _, listname in ipairs({"src", "dst", "fuel"}) do + for _, listname in ipairs({ "src", "dst", "fuel" }) do local stack = inv:get_stack(listname, 1) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} + local p = { + x = pos.x + math.random(0, 10) / 10 - 0.5, + y = pos.y, + z = pos.z + math.random(0, 10) / 10 - 0.5 + } minetest.add_item(p, stack) end end @@ -499,14 +527,16 @@ minetest.register_node("mcl_smoker:smoker_active", { tiles = { "smoker_top.png", "smoker_bottom.png", "smoker_side.png", "smoker_side.png", - "smoker_side.png", {name = "smoker_front_on.png", - animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 48}}, + "smoker_side.png", { + name = "smoker_front_on.png", + animation = { type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 48 } + }, }, paramtype2 = "facedir", paramtype = "light", light_source = LIGHT_ACTIVE_FURNACE, drop = "mcl_smoker:smoker", - groups = {pickaxey=1, container=4, deco_block=1, not_in_creative_inventory=1, material_stone=1}, + groups = { pickaxey = 1, container = 4, deco_block = 1, not_in_creative_inventory = 1, material_stone = 1 }, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), on_timer = smoker_node_timer, @@ -516,10 +546,14 @@ minetest.register_node("mcl_smoker:smoker_active", { local meta2 = meta meta:from_table(oldmetadata) local inv = meta:get_inventory() - for _, listname in ipairs({"src", "dst", "fuel"}) do + for _, listname in ipairs({ "src", "dst", "fuel" }) do local stack = inv:get_stack(listname, 1) if not stack:is_empty() then - local p = {x=pos.x+math.random(0, 10)/10-0.5, y=pos.y, z=pos.z+math.random(0, 10)/10-0.5} + local p = { + x = pos.x + math.random(0, 10) / 10 - 0.5, + y = pos.y, + z = pos.z + math.random(0, 10) / 10 - 0.5 + } minetest.add_item(p, stack) end end @@ -550,9 +584,9 @@ minetest.register_node("mcl_smoker:smoker_active", { minetest.register_craft({ output = "mcl_smoker:smoker", recipe = { - { "", "group:tree", "" }, + { "", "group:tree", "" }, { "group:tree", "mcl_furnaces:furnace", "group:tree" }, - { "", "group:tree", "" }, + { "", "group:tree", "" }, } }) @@ -564,7 +598,7 @@ end minetest.register_lbm({ label = "Active smoker flame particles", name = "mcl_smoker:flames", - nodenames = {"mcl_smoker:smoker_active"}, + nodenames = { "mcl_smoker:smoker_active" }, run_at_every_load = true, action = function(pos, node) spawn_flames(pos, node.param2) diff --git a/mods/ITEMS/mcl_smoker/locale/mcl_smoker.es.tr b/mods/ITEMS/mcl_smoker/locale/mcl_smoker.es.tr new file mode 100644 index 000000000..5d91ec0fd --- /dev/null +++ b/mods/ITEMS/mcl_smoker/locale/mcl_smoker.es.tr @@ -0,0 +1,11 @@ +# textdomain: mcl_smoker +Inventory=Inventario +Smoker=Ahumador +Cooks food faster than furnace=Cocina la comida más rápido que el horno +Use the smoker to open the furnace menu.=Usa el ahumador para abrir el menú del horno. +Place a furnace fuel in the lower slot and the source material in the upper slot.=Coloque un combustible de horno en la ranura inferior y el material de origen en la ranura superior. +The smoker will slowly use its fuel to smelt the item.=El ahumador usará lentamente su combustible para cocinar la comida. +The result will be placed into the output slot at the right side.=El resultado se colocará en la ranura de salida en el lado derecho. +Use the recipe book to see what foods you can smelt, what you can use as fuel and how long it will burn.=Use el libro de recetas para para ver qué comidas puede cocinar, qué puede usar como combustible y durante cuánto tiempo se quemará. +Smokers cook several items, mainly raw foods, into cooked foods, but twice as fast as a normal furnace.=Los ahumadores cocinan varios artículos, principalmente alimentos crudos en cocidos, pero el doble de rápido que un horno normal. +Burning Smoker=Ahumador ardiente diff --git a/mods/ITEMS/mcl_smoker/mcl_smoker.ru.tr b/mods/ITEMS/mcl_smoker/mcl_smoker.ru.tr new file mode 100644 index 000000000..3a58b11d7 --- /dev/null +++ b/mods/ITEMS/mcl_smoker/mcl_smoker.ru.tr @@ -0,0 +1,8 @@ +# textdomain: mcl_smoker +Inventory=Инвентарь +Smoker=Коптильня +Cooks food faster than furnace=Приготовление еды быстрее, чем в печи +Use the recipe book to see what you can smelt, what you can use as fuel and how long it will burn.=Используйте книгу рецептов, чтобы узнать, что вы можете выпекать, что можно использовать в качестве топлива и как долго оно будет гореть. +Use the furnace to open the furnace menu.\nPlace a furnace fuel in the lower slot and the source material in the upper slot.\nThe furnace will slowly use its fuel to smelt the item.\nThe result will be placed into the output slot at the right side.=Используйте печь, чтобы открыть окно взаимодействия с печью.\nПоместите топливо в нижнюю ячейку, а исходное сырьё в верхнюю ячейку.\nПечь будет медленно использовать топливо для выплавки изделия.\nВыходник будет помещён в выходную ячейку с правой стороны. +Smokers cook several items, mainly raw foods, into cooked foods, but twice as fast as a normal furnace.=Коптильни готовят несколько предметов, в основном сырых, в виде готовых блюд, но в два раза быстрее, чем в обычной печи. +Burning Smoker=Зажжённая печь \ No newline at end of file diff --git a/mods/ITEMS/mcl_stairs/api.lua b/mods/ITEMS/mcl_stairs/api.lua index 49daad9bf..6167d7e06 100644 --- a/mods/ITEMS/mcl_stairs/api.lua +++ b/mods/ITEMS/mcl_stairs/api.lua @@ -213,7 +213,6 @@ function mcl_stairs.register_slab(subname, recipeitem, groups, images, descripti -- Automatically generate double slab description if not double_description then double_description = S("Double @1", description) - minetest.log("warning", "[stairs] No explicit description for double slab '"..double_slab.."' added. Using auto-generated description.") end groups.slab = 1 diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index 5f96fa3fa..49863268e 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -661,7 +661,7 @@ minetest.register_tool("mcl_tools:shears", { inventory_image = "default_tool_shears.png", wield_image = "default_tool_shears.png", stack_max = 1, - groups = { tool=1, shears=1, dig_speed_class=4, }, + groups = { tool=1, shears=1, dig_speed_class=4, enchantability=-1, }, tool_capabilities = { full_punch_interval = 0.5, max_drop_level=1, diff --git a/mods/MAPGEN/mcl_dungeons/init.lua b/mods/MAPGEN/mcl_dungeons/init.lua index 0997f51fd..c115c35c3 100644 --- a/mods/MAPGEN/mcl_dungeons/init.lua +++ b/mods/MAPGEN/mcl_dungeons/init.lua @@ -89,6 +89,7 @@ local loottable = items = { { itemstring = "mcl_farming:wheat_item", weight = 20, amount_min = 1, amount_max = 4 }, { itemstring = "mcl_farming:bread", weight = 20 }, + { itemstring = "mcl_cherry_blossom:cherrysapling", weight = 15, amount_min = 1, amount_max = 4 }, -- FIXME: Remove when cherry blossom map generation is implemented. { itemstring = "mcl_core:coal_lump", weight = 15, amount_min = 1, amount_max = 4 }, { itemstring = "mesecons:redstone", weight = 15, amount_min = 1, amount_max = 4 }, { itemstring = "mcl_farming:beetroot_seeds", weight = 10, amount_min = 2, amount_max = 4 }, diff --git a/mods/MISC/mcl_commands/locale/mcl_commands.ru.tr b/mods/MISC/mcl_commands/locale/mcl_commands.ru.tr index fb700cfab..77ff7d4f9 100644 --- a/mods/MISC/mcl_commands/locale/mcl_commands.ru.tr +++ b/mods/MISC/mcl_commands/locale/mcl_commands.ru.tr @@ -3,7 +3,7 @@ Players can't be killed right now, damage has been disabled.=Игроки не Player @1 does not exist.=Игрок @1 не существует. You are already dead=Вы уже мертвы @1 is already dead=@1 уже мертв(а) -@1 committed suicide.=@1 совершил(а) роскомнадзор. +@1 committed suicide.=@1 совершил(а) самоубийство. @1 was killed by @2.=@1 был(а) убит(а) @2. []=[<имя>] Kill player or yourself=Убить игрока или себя @@ -12,12 +12,12 @@ Can use /say=Можно использовать /say Send a message to every player=Отправляет сообщение всем игрокам Invalid usage, see /help say.=Недопустимое использование, см. /help say. ,, =,, <ИмяБлока> -Set node at given position=Устанавливает блок в заданной позиции +Set node at given position=Устанавливает блок в заданном месте Invalid node=Неправильный блок @1 spawned.=@1 возродился(ась). Invalid parameters (see /help setblock)=Недопустимые параметры (см. /help setblock) List bans=Список банов Ban list: @1=Бан-лист: @1 Show who is logged on=Показывает, кто подключён -Displays the world seed=Показывает значение зерна мира (seed) -Only peaceful mobs allowed!=Включены только мирные мобы! +Displays the world seed=Показывает значение зерна мира +Only peaceful mobs allowed!=Разрешены только мирные сущности! diff --git a/mods/MISC/mcl_privs/locale/mcl_privs.ru.tr b/mods/MISC/mcl_privs/locale/mcl_privs.ru.tr index a3f37c365..678ebf4e0 100644 --- a/mods/MISC/mcl_privs/locale/mcl_privs.ru.tr +++ b/mods/MISC/mcl_privs/locale/mcl_privs.ru.tr @@ -1,2 +1,2 @@ # textdomain: mcl_privs -Can place and use advanced blocks like mob spawners, command blocks and barriers.=Позволяет размещать и использовать продвинутые блоки, такие как спаунеры мобов, блоки команд и барьеры. \ No newline at end of file +Can place and use advanced blocks like mob spawners, command blocks and barriers.=Позволяет размещать и использовать продвинутые блоки, такие как порождатели существ, блоки команд и барьеры. \ No newline at end of file diff --git a/mods/PLAYER/mcl_gamemode/API.md b/mods/PLAYER/mcl_gamemode/API.md new file mode 100644 index 000000000..24651301e --- /dev/null +++ b/mods/PLAYER/mcl_gamemode/API.md @@ -0,0 +1,27 @@ +# `mcl_gamemode` + +## `mcl_gamemode.gamemodes` + +List of availlable gamemodes. + +Currently `{"survival", "creative"}` + +## `mcl_gamemode.get_gamemode(player)` + +Get the player's gamemode. + +Returns "survival" or "creative". + +## `mcl_gamemode.set_gamemode(player, gamemode)` + +Set the player's gamemode. + +gamemode: "survival" or "creative" + +## `mcl_gamemode.register_on_gamemode_change(function(player, old_gamemode, new_gamemode))` + +Register a function that will be called when `mcl_gamemode.set_gamemode` is called. + +## `mcl_gamemode.registered_on_gamemode_change` + +Map of registered on_gamemode_change. diff --git a/mods/PLAYER/mcl_gamemode/init.lua b/mods/PLAYER/mcl_gamemode/init.lua new file mode 100644 index 000000000..a43a9c1ff --- /dev/null +++ b/mods/PLAYER/mcl_gamemode/init.lua @@ -0,0 +1,84 @@ +local S = minetest.get_translator("mcl_gamemode") + +mcl_gamemode = {} + +mcl_gamemode.gamemodes = { + "survival", + "creative", +} + +---@param n any +---@param h table +---@return boolean +local function in_table(n, h) + for k, v in pairs(h) do + if v == n then return true end + end + return false +end + +---@type fun(player: mt.PlayerObjectRef, old_gamemode: '"survival"'|'"creative"', new_gamemode: '"survival"'|'"creative"')[] +mcl_gamemode.registered_on_gamemode_change = {} + +---@param func fun(player: mt.PlayerObjectRef, old_gamemode: '"survival"'|'"creative"', new_gamemode: '"survival"'|'"creative"') +function mcl_gamemode.register_on_gamemode_change(func) + table.insert(mcl_gamemode.registered_on_gamemode_change, func) +end + +---@param player mt.PlayerObjectRef +---@param gamemode '"survival"'|'"creative"' +function mcl_gamemode.set_gamemode(player, gamemode) + local meta = player:get_meta() + local old_gamemode = meta:get_string("gamemode") + meta:set_string("gamemode", gamemode) + for _, f in ipairs(mcl_gamemode.registered_on_gamemode_change) do + f(player, old_gamemode, gamemode) + end +end + +local mt_is_creative_enabled = minetest.is_creative_enabled + +---@param player mt.PlayerObjectRef +---@return '"survival"'|'"creative"' +function mcl_gamemode.get_gamemode(player) + if mt_is_creative_enabled(player:get_player_name()) then + return "creative" + end + return player:get_meta():get_string("gamemode") +end + +function minetest.is_creative_enabled(name) + if mt_is_creative_enabled(name) then return true end + if not name then return false end + local p = minetest.get_player_by_name(name) + if p then + return p:get_meta():get_string("gamemode") == "creative" + end + return false +end + +minetest.register_chatcommand("gamemode", { + params = S("[] []"), + description = S("Change gamemode (survival/creative) for yourself or player"), + privs = { server = true }, + func = function(n, param) + -- Full input validation ( just for @erlehmann <3 ) + local p = minetest.get_player_by_name(n) + local args = param:split(" ") + if args[2] ~= nil then + p = minetest.get_player_by_name(args[2]) + end + if not p then + return false, S("Player not online") + end + if args[1] ~= nil and not in_table(args[1], mcl_gamemode.gamemodes) then + return false, S("Gamemode " .. args[1] .. " does not exist.") + elseif args[1] ~= nil then + mcl_gamemode.set_gamemode(p, args[1]) + end + --Result message - show effective game mode + local gm = p:get_meta():get_string("gamemode") + if gm == "" then gm = mcl_gamemode.gamemodes[1] end + return true, S("Gamemode for player ") .. n .. S(": " .. gm) + end +}) diff --git a/mods/PLAYER/mcl_gamemode/mod.conf b/mods/PLAYER/mcl_gamemode/mod.conf new file mode 100644 index 000000000..03eade707 --- /dev/null +++ b/mods/PLAYER/mcl_gamemode/mod.conf @@ -0,0 +1 @@ +name = mcl_gamemode \ No newline at end of file diff --git a/mods/PLAYER/mcl_meshhand/init.lua b/mods/PLAYER/mcl_meshhand/init.lua index a28efd502..c42ff8081 100644 --- a/mods/PLAYER/mcl_meshhand/init.lua +++ b/mods/PLAYER/mcl_meshhand/init.lua @@ -85,16 +85,20 @@ function mcl_meshhand.update_player(player) end end +minetest.register_on_joinplayer(function(player) + player:get_inventory():set_size("hand", 1) +end) + +mcl_gamemode.register_on_gamemode_change(function(player) + mcl_meshhand.update_player(player) +end) + if mcl_skins_enabled then mcl_player.register_on_visual_change(mcl_meshhand.update_player) else minetest.register_on_joinplayer(mcl_meshhand.update_player) end -minetest.register_on_joinplayer(function(player) - player:get_inventory():set_size("hand", 1) -end) - -- This is needed to deal damage when punching mobs -- with random items in hand in survival mode minetest.override_item("", { diff --git a/mods/PLAYER/mcl_meshhand/mod.conf b/mods/PLAYER/mcl_meshhand/mod.conf index 687932514..fd10c259c 100644 --- a/mods/PLAYER/mcl_meshhand/mod.conf +++ b/mods/PLAYER/mcl_meshhand/mod.conf @@ -1,5 +1,5 @@ name = mcl_meshhand author = jordan4ibanez description = Applies the player skin texture to the hand. -depends = mcl_tools, mcl_player +depends = mcl_tools, mcl_player, mcl_gamemode optional_depends = mcl_skins, mcl_custom_skins diff --git a/mods/PLAYER/mcl_player/init.lua b/mods/PLAYER/mcl_player/init.lua index 084fe48a1..288b697e1 100644 --- a/mods/PLAYER/mcl_player/init.lua +++ b/mods/PLAYER/mcl_player/init.lua @@ -1,3 +1,4 @@ +local string = string local sf = string.format -- Minetest 0.4 mod: player @@ -11,15 +12,16 @@ local animation_blend = 0 local function get_mouse_button(player) local controls = player:get_player_control() local get_wielded_item_name = player:get_wielded_item():get_name() - if controls.RMB and not string.find(get_wielded_item_name, "mcl_bows:bow") and not string.find(get_wielded_item_name, "mcl_bows:crossbow") and - not mcl_shields.wielding_shield(player, 1) and not mcl_shields.wielding_shield(player, 2) or controls.LMB then + if controls.RMB and not string.find(get_wielded_item_name, "mcl_bows:bow") and + not string.find(get_wielded_item_name, "mcl_bows:crossbow") and + not mcl_shields.wielding_shield(player, 1) and not mcl_shields.wielding_shield(player, 2) or controls.LMB then return true else return false end end -mcl_player.registered_player_models = { } +mcl_player.registered_player_models = {} -- Local for speed. local models = mcl_player.registered_player_models @@ -49,7 +51,7 @@ function mcl_player.player_get_animation(player) model = player_model[name], textures = textures, animation = player_anim[name], - visibility = player_visibility[name] + visibility = player_visible[name] } end @@ -94,7 +96,7 @@ function mcl_player.player_set_model(player, model_name) player:set_properties({ mesh = model_name, visual = "mesh", - visual_size = model.visual_size or {x=1, y=1}, + visual_size = model.visual_size or { x = 1, y = 1 }, damage_texture_modifier = "^[colorize:red:130", }) update_player_textures(player) @@ -133,6 +135,13 @@ function mcl_player.player_set_armor(player, texture) update_player_textures(player) end +---@param player mt.PlayerObjectRef +---@param x number +---@param y number +---@param w number +---@param h number +---@param fsname string +---@return string function mcl_player.get_player_formspec_model(player, x, y, w, h, fsname) local name = player:get_player_name() local model = player_model[name] @@ -165,7 +174,8 @@ minetest.register_on_joinplayer(function(player) local name = player:get_player_name() mcl_player.player_attached[name] = false player_visible[name] = true - player_textures[name] = {"character.png", "blank.png", "blank.png"} + player_textures[name] = { "character.png", "blank.png", "blank.png" } + --player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30) player:set_fov(86.1) -- see >>> end) @@ -221,11 +231,13 @@ minetest.register_globalstep(function(dtime) elseif mcl_playerplus.elytra[player] and mcl_playerplus.elytra[player].active then player_set_animation(player, "stand") elseif walking and velocity.x > 0.35 - or walking and velocity.x < -0.35 - or walking and velocity.z > 0.35 - or walking and velocity.z < -0.35 then + or walking and velocity.x < -0.35 + or walking and velocity.z > 0.35 + or walking and velocity.z < -0.35 then local wielded_itemname = player:get_wielded_item():get_name() - local no_arm_moving = string.find(wielded_itemname, "mcl_bows:bow") or mcl_shields.wielding_shield(player, 1) or mcl_shields.wielding_shield(player, 2) + local no_arm_moving = string.find(wielded_itemname, "mcl_bows:bow") or + mcl_shields.wielding_shield(player, 1) or + mcl_shields.wielding_shield(player, 2) if player_sneak[name] ~= controls.sneak then player_anim[name] = nil player_sneak[name] = controls.sneak @@ -234,7 +246,8 @@ minetest.register_globalstep(function(dtime) player_set_animation(player, "swim_walk_mine", animation_speed_mod) elseif not controls.sneak and head_in_water and is_sprinting == true then player_set_animation(player, "swim_walk", animation_speed_mod) - elseif no_arm_moving and controls.RMB and controls.sneak or string.find(wielded_itemname, "mcl_bows:crossbow_") and controls.sneak then + elseif no_arm_moving and controls.RMB and controls.sneak or + string.find(wielded_itemname, "mcl_bows:crossbow_") and controls.sneak then player_set_animation(player, "bow_sneak", animation_speed_mod) elseif no_arm_moving and controls.RMB or string.find(wielded_itemname, "mcl_bows:crossbow_") then player_set_animation(player, "bow_walk", animation_speed_mod) diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index d4a21508e..69cb00d07 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -239,10 +239,11 @@ minetest.register_globalstep(function(dtime) elytra.speed = 1 - (direction.y/2 + 0.5) end + local fly_node_walkable = minetest.registered_nodes[fly_node] and minetest.registered_nodes[fly_node].walkable elytra.active = minetest.get_item_group(player:get_inventory():get_stack("armor", 3):get_name(), "elytra") ~= 0 and not parent and (elytra.active or (is_just_jumped and player_velocity.y < -0)) - and ((not minetest.registered_nodes[fly_node].walkable) or fly_node == "ignore") + and ((not fly_node_walkable) or fly_node == "ignore") if elytra.active then if is_just_jumped then -- move the player up when they start flying to give some clearance @@ -257,7 +258,8 @@ minetest.register_globalstep(function(dtime) local speed_mult = elytra.speed local block_below = minetest.get_node(vector.offset(fly_pos, 0, -0.9, 0)).name - if (not minetest.registered_nodes[block_below].walkable) and (player_vel.y ~= 0) then + local reg_node_below = minetest.registered_nodes[block_below] + if (reg_node_below and not reg_node_below.walkable) and (player_vel.y ~= 0) then speed_mult = speed_mult + direction_mult * elytra_vars.speedup_mult * dtime end speed_mult = speed_mult - elytra_vars.slowdown_mult * clamp(dtime, 0.09, 0.2) -- slow down but don't overdo it diff --git a/mods/PLAYER/mcl_skins/locale/mcl_skins.ru.tr b/mods/PLAYER/mcl_skins/locale/mcl_skins.ru.tr new file mode 100644 index 000000000..fda9330d6 --- /dev/null +++ b/mods/PLAYER/mcl_skins/locale/mcl_skins.ru.tr @@ -0,0 +1,14 @@ +# textdomain: mcl_skins +Skins=Облики +Templates=Образцы +Arm size=Толщина рук +Bases=Цвета кожи +Footwears=Обувь +Eyes=Глаза +Mouths=Рты +Bottoms=Ноги +Tops=Туловища +Hairs=Причёски +Headwears=Головные уборы +Open skin configuration screen.=Открыть экран настройки облика. +Select=Выбрать diff --git a/mods/PLAYER/mcl_skins/locale/template.txt b/mods/PLAYER/mcl_skins/locale/template.txt index 12ba740d5..c39d4066d 100644 --- a/mods/PLAYER/mcl_skins/locale/template.txt +++ b/mods/PLAYER/mcl_skins/locale/template.txt @@ -10,5 +10,5 @@ Bottoms= Tops= Hairs= Headwears= -Open skin configuration screen.= -Select= +Open skin configuration screen.= +Select= \ No newline at end of file diff --git a/releasenotes/0_84-the_very_nice_release.md b/releasenotes/0_84-the_very_nice_release.md new file mode 100644 index 000000000..ce722bf36 --- /dev/null +++ b/releasenotes/0_84-the_very_nice_release.md @@ -0,0 +1,160 @@ +### 0.84 - The Very Nice release + +### Contributors +#### New contributors + +* appgurueu +* kbundg +* megustanlosfrijoles +* Niterux +* seventeenthShulker +* Temak +* uqers + +#### Returning contributors + +* 3raven +* AncientMariner +* chmodsayshello +* cora +* epCode +* Exhale +* FlamingRCCars +* FossFanatic +* MrRar +* Nicu +* PrairieWind +* rudzik8 +* SmokeyDope +* Wbjitscool + +## Important Info + +### New server commands + +minetest.register_chatcommand("music", { +params = "[on|off|invert []]", +description = S("Turns music for yourself or another player on or off."), + + +### New settings added + +#Maximum amount of hostile mobs (default:300) +mcl_mob_cap_hostile (Global hostile mob cap) int 300 0 2048 + +#Maximum amount of non-hostile mobs (default:300) +mcl_mob_cap_non_hostile (Global non-hostile mob cap) int 300 0 2048 + +#Maximum amount of ambient water mobs that will spawn near a player (default:20) +mcl_mob_cap_water_ambient (Mob cap ambient water) int 20 0 1024 + +#Maximum amount of underground water mobs that will spawn near a player (default:5) +mcl_mob_cap_water_underground (Mob cap underground water) int 5 0 1024 + +#Maximum amount of axolotl mobs that will spawn near a player (default:5) +mcl_mob_cap_axolotl (Mob cap axolotl) int 5 0 1024 + +## Change Log + +### Gameplay Improvements + +* Cherry Blossoms - Saplings added as loot, and trees and craftables added. Initial changes to enable a Wood API. - PrairieWind, SmokeyDope, Wbjitscool +* Fix issue with drops turning black due to clipping into walls and floors and visually demonstrate drops merging - AncientMariner +* Hoglins attack frequency reduced now due to new attack_frequency mob setting - AncientMariner +* Hostile mobs should lose aggro if they cannot see their target - AncientMariner +* Nerf skeleton attack - AncientMariner +* Split global cap for peaceful and hostile. Introduce underground water, ambient water, axolotl cap. Slight peaceful spawn balancing. Mob spawning can have more density in some instances. Slightly less passive mob spawning. Some mobs were not counted in cap calculations. Refreshed cap space after spawning in cycle. - AncientMariner +* Prevent slime blocks from 'connecting' to honey blocks when pushing/pulling, like in Minecraft - seventeenthShulker +* Add support for external custom skins mod - MrRar +* Double doors fixed - FossFanatic +* Make elytra enchantable and the enchanted elytra usable - PrairieWind/FlamingRCCars/MrRar +* Remove slimes from mushroom islands - AncientMariner +* Remove Flower Forest Beaches from Wolf biome spawn list - PrairieWind +* Make Piglin Brutes drop golden axes = PrairieWind +* Make end crystals explode when nearby crystals are punched and explode - PrairieWind +* Improved pig riding - PrairieWind + + +### Visual Improvements + +* Incorporate sheep eating animation. - epCode +* New textures for warped for Crimson Fungus, Crimson Fungus planks, Warped Hyphae planks - Exhale +* New sweet berry textures - SmokeyDope +* Add Piglin and Creeper description names to death message - AncientMariner +* Creeper should not walk to player if it does not have line of sight. Mob shouldn't look at player it does not have line of sight to. - AncientMariner +* Remove one cause of extra jittering in mobs - AncientMariner +* Update dead bush generation - PrairieWind +* Fix a typo in the Acquire Hardware achievement - uqers +* Clean-up mcl_bamboo text - rudzik8 + + +### Sounds + +* Add more fishing sounds! - Niterux +* Add max_hear_distance flag to composter sounds - SmokeyDope +* Add barrel sounds - SmokeyDope + + +### Translations + +* Update russian translation - Temak +* (french) translation enhancements - 3raven +* Add spanish translations - megustanlosfrijoles + + +### Performance + +* Reduce network activity for elytra flying rocket particles - AncientMariner +* Mapgen Performance Improvements - FossFanatic +* Migrate beacons back to abm - chmodsayshello +* Frequent danger checks and movement actions removed from non-moving and out of range mobs - AncientMariner +* Duplicate jump and danger checks removed from mob processing - AncientMariner +* Decreased frequency of processing for some mob actions - AncientMariner +* Only run certain checks if applicable for mob - AncientMariner + + +### Multiplayer + +* Add global cooldown for the bed quick chat feature - chmodsayshello/AncientMariner +* Music toggle for players connecting to servers - chmodsayshello +* Make sure dying sign text respects protection - AncientMariner + + +### Code Quality + +* Oxidation API - PrairieWind +* Fix sign color requirement and translation issue - PrairieWind +* Standardise despawn logic and add asserts. Add persistent flag for mobs that have been interacted with. - AncientMariner +* Replace the zombie pigman with the zombified piglin - AncientMariner +* Clean up crash code and convert to new style vectors - AncientMariner +* Fix png start warning and double slab description warning. - AncientMariner +* OptiPNG a bunch of textures - PrairieWind +* Beds mesecons dependency incorrectly named - AncientMariner +* Rename Bucket Textures - AncientMariner +* Fix global variable references and exit mob_step if missing pos - AncientMariner +* Fix texture modifiers relying on undocumented behavior - appgurueu + + +### Fixes + +* Piglins no longer aggro for enchanted gold armour - AncientMariner +* Drop pumpkins, melons and buttons via piston or dirt next to piston - AncientMariner +* Llamas and other mobs change skin color - AncientMariner +* Mobs more easily jump from stationary up a block - epCode +* Fix waterlogged mangrove roots leaving water in the nether - AncientMariner +* Prevent ALL furnaces from being moved (xp dupe fix) - chmodsayshello +* Fix gilded blackstone fortune dupe - cora +* Lightning rod param2 is now saved upon being struck - AncientMariner +* Adjust hot stuff achievement to use new lava bucket texture name - SmokeyDope +* Fix dropped out bamboo lines from translation work - AncientMariner +* Zombie piglin no longer prevent sleep unless hostile. - AncientMariner + + +### Crashes + +* Fix crash when creeper explodes in minecart - AncientMariner +* Fix crash when using a named spawn egg - cora +* Fix crash when parrot sits on shoulder - AncientMariner +* Fix 2 automated wool farm crash and elytra fly over unknown block crash - AncientMariner +* Change order of numbers passed into random that crash on some Lua versions - AncientMariner +* solar panels: No crash when minetest.get_natural_light() return nil - MrRar \ No newline at end of file diff --git a/textures/_0.png b/textures/_0.png index 7ec1aea7a..9cef8949b 100644 Binary files a/textures/_0.png and b/textures/_0.png differ diff --git a/textures/_1.png b/textures/_1.png index e4bf5c3ac..f14f751c8 100644 Binary files a/textures/_1.png and b/textures/_1.png differ diff --git a/textures/_1_2.png b/textures/_1_2.png index 8bdc3f8cc..1791ed1f2 100644 Binary files a/textures/_1_2.png and b/textures/_1_2.png differ diff --git a/textures/_1_4.png b/textures/_1_4.png index d32aa3027..6cfd6dd65 100644 Binary files a/textures/_1_4.png and b/textures/_1_4.png differ diff --git a/textures/_1_sup.png b/textures/_1_sup.png index 0e20bf3a6..1e1dd18b9 100644 Binary files a/textures/_1_sup.png and b/textures/_1_sup.png differ diff --git a/textures/_2.png b/textures/_2.png index 29583723f..66b7b9557 100644 Binary files a/textures/_2.png and b/textures/_2.png differ diff --git a/textures/_2_sup.png b/textures/_2_sup.png index ddc378772..9e9f12c1b 100644 Binary files a/textures/_2_sup.png and b/textures/_2_sup.png differ diff --git a/textures/_3.png b/textures/_3.png index c58caaa8c..9c06dba5d 100644 Binary files a/textures/_3.png and b/textures/_3.png differ diff --git a/textures/_3_4.png b/textures/_3_4.png index 316909108..4a65a0f73 100644 Binary files a/textures/_3_4.png and b/textures/_3_4.png differ diff --git a/textures/_3_sup.png b/textures/_3_sup.png index eae28867d..29fc9831c 100644 Binary files a/textures/_3_sup.png and b/textures/_3_sup.png differ diff --git a/textures/_4.png b/textures/_4.png index 38048937c..1784c4749 100644 Binary files a/textures/_4.png and b/textures/_4.png differ diff --git a/textures/_5.png b/textures/_5.png index 96da18b50..85e0703b7 100644 Binary files a/textures/_5.png and b/textures/_5.png differ diff --git a/textures/_6.png b/textures/_6.png index e34e190e1..0abc2a4bb 100644 Binary files a/textures/_6.png and b/textures/_6.png differ diff --git a/textures/_7.png b/textures/_7.png index 2b078c134..711076c2f 100644 Binary files a/textures/_7.png and b/textures/_7.png differ diff --git a/textures/_8.png b/textures/_8.png index d4580e83f..136a41414 100644 Binary files a/textures/_8.png and b/textures/_8.png differ diff --git a/textures/_9.png b/textures/_9.png index 3077c7bb3..5a15bfc4e 100644 Binary files a/textures/_9.png and b/textures/_9.png differ diff --git a/textures/_a.png b/textures/_a.png index d57502ddb..60bb5e342 100644 Binary files a/textures/_a.png and b/textures/_a.png differ diff --git a/textures/_a_.png b/textures/_a_.png index 157565774..10262ddac 100644 Binary files a/textures/_a_.png and b/textures/_a_.png differ diff --git a/textures/_a_acute.png b/textures/_a_acute.png index 552988e31..60f8c4dac 100644 Binary files a/textures/_a_acute.png and b/textures/_a_acute.png differ diff --git a/textures/_a_acute_.png b/textures/_a_acute_.png index 2f8736226..c61dd6c4c 100644 Binary files a/textures/_a_acute_.png and b/textures/_a_acute_.png differ diff --git a/textures/_a_circumflex.png b/textures/_a_circumflex.png index 224675375..625997df9 100644 Binary files a/textures/_a_circumflex.png and b/textures/_a_circumflex.png differ diff --git a/textures/_a_circumflex_.png b/textures/_a_circumflex_.png index 146671315..b751738a7 100644 Binary files a/textures/_a_circumflex_.png and b/textures/_a_circumflex_.png differ diff --git a/textures/_a_grave.png b/textures/_a_grave.png index 6ccb2088e..e8d0dcfb6 100644 Binary files a/textures/_a_grave.png and b/textures/_a_grave.png differ diff --git a/textures/_a_grave_.png b/textures/_a_grave_.png index f973dec5d..d61f6654b 100644 Binary files a/textures/_a_grave_.png and b/textures/_a_grave_.png differ diff --git a/textures/_a_ring.png b/textures/_a_ring.png index 4d1b1e896..a74786313 100644 Binary files a/textures/_a_ring.png and b/textures/_a_ring.png differ diff --git a/textures/_a_ring_.png b/textures/_a_ring_.png index 0c28aadcc..73db3807c 100644 Binary files a/textures/_a_ring_.png and b/textures/_a_ring_.png differ diff --git a/textures/_a_sup.png b/textures/_a_sup.png index c2a001016..80e0123ec 100644 Binary files a/textures/_a_sup.png and b/textures/_a_sup.png differ diff --git a/textures/_a_tilde.png b/textures/_a_tilde.png index 0600d53ad..83a429517 100644 Binary files a/textures/_a_tilde.png and b/textures/_a_tilde.png differ diff --git a/textures/_a_tilde_.png b/textures/_a_tilde_.png index baffca08e..88b8cca83 100644 Binary files a/textures/_a_tilde_.png and b/textures/_a_tilde_.png differ diff --git a/textures/_acute.png b/textures/_acute.png index 709cf70fb..509e830cb 100644 Binary files a/textures/_acute.png and b/textures/_acute.png differ diff --git a/textures/_ae.png b/textures/_ae.png index 40bf3cd6b..f46b7e689 100644 Binary files a/textures/_ae.png and b/textures/_ae.png differ diff --git a/textures/_ae_.png b/textures/_ae_.png index 2f6a56d00..d1050341a 100644 Binary files a/textures/_ae_.png and b/textures/_ae_.png differ diff --git a/textures/_ae_lig.png b/textures/_ae_lig.png index 0f721d8e0..b18693e19 100644 Binary files a/textures/_ae_lig.png and b/textures/_ae_lig.png differ diff --git a/textures/_ae_lig_.png b/textures/_ae_lig_.png index 8aba2a4bc..08c1a8976 100644 Binary files a/textures/_ae_lig_.png and b/textures/_ae_lig_.png differ diff --git a/textures/_am.png b/textures/_am.png index 15ad80d73..72d9dd68c 100644 Binary files a/textures/_am.png and b/textures/_am.png differ diff --git a/textures/_ap.png b/textures/_ap.png index e44b77a61..15f8abe05 100644 Binary files a/textures/_ap.png and b/textures/_ap.png differ diff --git a/textures/_as.png b/textures/_as.png index fbf1494d4..f9eec0c6d 100644 Binary files a/textures/_as.png and b/textures/_as.png differ diff --git a/textures/_at.png b/textures/_at.png index b6b1ebe31..f4f36f12c 100644 Binary files a/textures/_at.png and b/textures/_at.png differ diff --git a/textures/_b.png b/textures/_b.png index bb44b3c1a..0947e6618 100644 Binary files a/textures/_b.png and b/textures/_b.png differ diff --git a/textures/_b_.png b/textures/_b_.png index 034f595ce..db47fcac8 100644 Binary files a/textures/_b_.png and b/textures/_b_.png differ diff --git a/textures/_bl.png b/textures/_bl.png index a8e73c1b7..5706ff380 100644 Binary files a/textures/_bl.png and b/textures/_bl.png differ diff --git a/textures/_br.png b/textures/_br.png index aebe3a025..d8cf11980 100644 Binary files a/textures/_br.png and b/textures/_br.png differ diff --git a/textures/_broken_bar.png b/textures/_broken_bar.png index a2ec6ccc8..3461d4d9a 100644 Binary files a/textures/_broken_bar.png and b/textures/_broken_bar.png differ diff --git a/textures/_c.png b/textures/_c.png index 9d61a1c47..12fce7b20 100644 Binary files a/textures/_c.png and b/textures/_c.png differ diff --git a/textures/_c_.png b/textures/_c_.png index bd6d69d71..33b85221b 100644 Binary files a/textures/_c_.png and b/textures/_c_.png differ diff --git a/textures/_c_cedille.png b/textures/_c_cedille.png index a59faa4fb..acc701201 100644 Binary files a/textures/_c_cedille.png and b/textures/_c_cedille.png differ diff --git a/textures/_c_cedille_.png b/textures/_c_cedille_.png index 3dcffc8e4..865a951d6 100644 Binary files a/textures/_c_cedille_.png and b/textures/_c_cedille_.png differ diff --git a/textures/_ca.png b/textures/_ca.png index 799333fcc..73013c6a9 100644 Binary files a/textures/_ca.png and b/textures/_ca.png differ diff --git a/textures/_cedille.png b/textures/_cedille.png index 2fd6e557f..1335b2759 100644 Binary files a/textures/_cedille.png and b/textures/_cedille.png differ diff --git a/textures/_cent.png b/textures/_cent.png index ac2265b05..28180dbf3 100644 Binary files a/textures/_cent.png and b/textures/_cent.png differ diff --git a/textures/_cl.png b/textures/_cl.png index 71a046245..0850d9b8f 100644 Binary files a/textures/_cl.png and b/textures/_cl.png differ diff --git a/textures/_cm.png b/textures/_cm.png index 6a6a8bc5a..5cf8c7dab 100644 Binary files a/textures/_cm.png and b/textures/_cm.png differ diff --git a/textures/_co.png b/textures/_co.png index 73808a7d9..5a606c06a 100644 Binary files a/textures/_co.png and b/textures/_co.png differ diff --git a/textures/_copyright.png b/textures/_copyright.png index 1f0e3c934..17e6c1916 100644 Binary files a/textures/_copyright.png and b/textures/_copyright.png differ diff --git a/textures/_cr.png b/textures/_cr.png index 2fbbf790f..1d7366f4c 100644 Binary files a/textures/_cr.png and b/textures/_cr.png differ diff --git a/textures/_currency.png b/textures/_currency.png index 45806c12b..196ffa0a0 100644 Binary files a/textures/_currency.png and b/textures/_currency.png differ diff --git a/textures/_d.png b/textures/_d.png index f7bd840cb..33a5a3cae 100644 Binary files a/textures/_d.png and b/textures/_d.png differ diff --git a/textures/_d_.png b/textures/_d_.png index da46423c9..d64d854a4 100644 Binary files a/textures/_d_.png and b/textures/_d_.png differ diff --git a/textures/_d_dash.png b/textures/_d_dash.png index 3f9b1e460..275495cb2 100644 Binary files a/textures/_d_dash.png and b/textures/_d_dash.png differ diff --git a/textures/_d_dash_.png b/textures/_d_dash_.png index 57e424f37..0d718e705 100644 Binary files a/textures/_d_dash_.png and b/textures/_d_dash_.png differ diff --git a/textures/_degree.png b/textures/_degree.png index 95b6c0800..d1dfc83c7 100644 Binary files a/textures/_degree.png and b/textures/_degree.png differ diff --git a/textures/_diaresis.png b/textures/_diaresis.png index edbe9649c..13fb9abb9 100644 Binary files a/textures/_diaresis.png and b/textures/_diaresis.png differ diff --git a/textures/_div.png b/textures/_div.png index ab6888146..c5399cd19 100644 Binary files a/textures/_div.png and b/textures/_div.png differ diff --git a/textures/_dl.png b/textures/_dl.png index c1706295a..8da436340 100644 Binary files a/textures/_dl.png and b/textures/_dl.png differ diff --git a/textures/_dt.png b/textures/_dt.png index b9a53650d..349c18334 100644 Binary files a/textures/_dt.png and b/textures/_dt.png differ diff --git a/textures/_dv.png b/textures/_dv.png index 86d22fea4..dbafa7278 100644 Binary files a/textures/_dv.png and b/textures/_dv.png differ diff --git a/textures/_e.png b/textures/_e.png index 431e2141b..e30d28ebf 100644 Binary files a/textures/_e.png and b/textures/_e.png differ diff --git a/textures/_e_.png b/textures/_e_.png index f9b674b15..ceba83a14 100644 Binary files a/textures/_e_.png and b/textures/_e_.png differ diff --git a/textures/_e_acute.png b/textures/_e_acute.png index 4566f2dbc..abef4fc53 100644 Binary files a/textures/_e_acute.png and b/textures/_e_acute.png differ diff --git a/textures/_e_acute_.png b/textures/_e_acute_.png index 70502e82f..49cddaff0 100644 Binary files a/textures/_e_acute_.png and b/textures/_e_acute_.png differ diff --git a/textures/_e_circumflex.png b/textures/_e_circumflex.png index 0aca71f43..684bd07d4 100644 Binary files a/textures/_e_circumflex.png and b/textures/_e_circumflex.png differ diff --git a/textures/_e_circumflex_.png b/textures/_e_circumflex_.png index 02148554a..79f35a128 100644 Binary files a/textures/_e_circumflex_.png and b/textures/_e_circumflex_.png differ diff --git a/textures/_e_grave.png b/textures/_e_grave.png index c9366cd83..5239e04fc 100644 Binary files a/textures/_e_grave.png and b/textures/_e_grave.png differ diff --git a/textures/_e_grave_.png b/textures/_e_grave_.png index 1006e5fea..9fe0283b7 100644 Binary files a/textures/_e_grave_.png and b/textures/_e_grave_.png differ diff --git a/textures/_ee.png b/textures/_ee.png index 4871c31be..642b6ede3 100644 Binary files a/textures/_ee.png and b/textures/_ee.png differ diff --git a/textures/_ee_.png b/textures/_ee_.png index 3e174052f..23d096195 100644 Binary files a/textures/_ee_.png and b/textures/_ee_.png differ diff --git a/textures/_eq.png b/textures/_eq.png index 9135af0fe..0a9681e09 100644 Binary files a/textures/_eq.png and b/textures/_eq.png differ diff --git a/textures/_ex.png b/textures/_ex.png index e63ed21f2..6bc2b589b 100644 Binary files a/textures/_ex.png and b/textures/_ex.png differ diff --git a/textures/_ex_inv.png b/textures/_ex_inv.png index af591188c..39dfc2b4f 100644 Binary files a/textures/_ex_inv.png and b/textures/_ex_inv.png differ diff --git a/textures/_f.png b/textures/_f.png index 40318ea05..10e49a56e 100644 Binary files a/textures/_f.png and b/textures/_f.png differ diff --git a/textures/_f_.png b/textures/_f_.png index 9c234f7c0..688c327f0 100644 Binary files a/textures/_f_.png and b/textures/_f_.png differ diff --git a/textures/_g.png b/textures/_g.png index 7ddd6e106..cc7a2edea 100644 Binary files a/textures/_g.png and b/textures/_g.png differ diff --git a/textures/_g_.png b/textures/_g_.png index 881d06842..7fddf4857 100644 Binary files a/textures/_g_.png and b/textures/_g_.png differ diff --git a/textures/_gr.png b/textures/_gr.png index 92832f94e..117772d03 100644 Binary files a/textures/_gr.png and b/textures/_gr.png differ diff --git a/textures/_gt.png b/textures/_gt.png index a4ff1b616..115f61e6a 100644 Binary files a/textures/_gt.png and b/textures/_gt.png differ diff --git a/textures/_guill_left.png b/textures/_guill_left.png index a9cf7c724..8eada6edb 100644 Binary files a/textures/_guill_left.png and b/textures/_guill_left.png differ diff --git a/textures/_guill_right.png b/textures/_guill_right.png index f4433eca4..02e2b8597 100644 Binary files a/textures/_guill_right.png and b/textures/_guill_right.png differ diff --git a/textures/_h.png b/textures/_h.png index b4c9cf2cb..6ddb4a845 100644 Binary files a/textures/_h.png and b/textures/_h.png differ diff --git a/textures/_h_.png b/textures/_h_.png index cdea24645..b1379d1ad 100644 Binary files a/textures/_h_.png and b/textures/_h_.png differ diff --git a/textures/_ha.png b/textures/_ha.png index 48323a28f..94622fbcb 100644 Binary files a/textures/_ha.png and b/textures/_ha.png differ diff --git a/textures/_hs.png b/textures/_hs.png index 60bce8e35..f75e24b7b 100644 Binary files a/textures/_hs.png and b/textures/_hs.png differ diff --git a/textures/_i.png b/textures/_i.png index 4abe22825..0677f7b7e 100644 Binary files a/textures/_i.png and b/textures/_i.png differ diff --git a/textures/_i_.png b/textures/_i_.png index e8e5e1b58..9e4ed0241 100644 Binary files a/textures/_i_.png and b/textures/_i_.png differ diff --git a/textures/_i_acute.png b/textures/_i_acute.png index b1ceff343..171248658 100644 Binary files a/textures/_i_acute.png and b/textures/_i_acute.png differ diff --git a/textures/_i_acute_.png b/textures/_i_acute_.png index d59d86398..b916f512d 100644 Binary files a/textures/_i_acute_.png and b/textures/_i_acute_.png differ diff --git a/textures/_i_circumflex.png b/textures/_i_circumflex.png index e7d5ab191..ea7b9667a 100644 Binary files a/textures/_i_circumflex.png and b/textures/_i_circumflex.png differ diff --git a/textures/_i_circumflex_.png b/textures/_i_circumflex_.png index a15c15336..7b75690e6 100644 Binary files a/textures/_i_circumflex_.png and b/textures/_i_circumflex_.png differ diff --git a/textures/_i_grave.png b/textures/_i_grave.png index c0ae05825..a0d98cb3a 100644 Binary files a/textures/_i_grave.png and b/textures/_i_grave.png differ diff --git a/textures/_i_grave_.png b/textures/_i_grave_.png index 7c68cb968..b2dfe3600 100644 Binary files a/textures/_i_grave_.png and b/textures/_i_grave_.png differ diff --git a/textures/_j.png b/textures/_j.png index 118928bfc..17ce331ed 100644 Binary files a/textures/_j.png and b/textures/_j.png differ diff --git a/textures/_j_.png b/textures/_j_.png index 3983cec05..2e1c04d3c 100644 Binary files a/textures/_j_.png and b/textures/_j_.png differ diff --git a/textures/_k.png b/textures/_k.png index 987d0e26a..c636b068d 100644 Binary files a/textures/_k.png and b/textures/_k.png differ diff --git a/textures/_k_.png b/textures/_k_.png index 183c1d27c..51f5b5fe5 100644 Binary files a/textures/_k_.png and b/textures/_k_.png differ diff --git a/textures/_l.png b/textures/_l.png index f70432b50..5dcadd5e4 100644 Binary files a/textures/_l.png and b/textures/_l.png differ diff --git a/textures/_l_.png b/textures/_l_.png index 89a5e1562..4df616eb1 100644 Binary files a/textures/_l_.png and b/textures/_l_.png differ diff --git a/textures/_lt.png b/textures/_lt.png index a1b9d2ff8..3984033c9 100644 Binary files a/textures/_lt.png and b/textures/_lt.png differ diff --git a/textures/_m.png b/textures/_m.png index 9c9c691d8..39c197161 100644 Binary files a/textures/_m.png and b/textures/_m.png differ diff --git a/textures/_m_.png b/textures/_m_.png index c7e9fa044..22c2b29ac 100644 Binary files a/textures/_m_.png and b/textures/_m_.png differ diff --git a/textures/_macron.png b/textures/_macron.png index 738a4374e..5cae02c83 100644 Binary files a/textures/_macron.png and b/textures/_macron.png differ diff --git a/textures/_mn.png b/textures/_mn.png index 63a9e67ba..6eefea63f 100644 Binary files a/textures/_mn.png and b/textures/_mn.png differ diff --git a/textures/_mu.png b/textures/_mu.png index 483936af8..af8bf8564 100644 Binary files a/textures/_mu.png and b/textures/_mu.png differ diff --git a/textures/_n.png b/textures/_n.png index 3f16f50bc..54e554542 100644 Binary files a/textures/_n.png and b/textures/_n.png differ diff --git a/textures/_n_.png b/textures/_n_.png index 430227892..0c1b3ebfa 100644 Binary files a/textures/_n_.png and b/textures/_n_.png differ diff --git a/textures/_n_tilde.png b/textures/_n_tilde.png index cfc1c626c..7c2bc7145 100644 Binary files a/textures/_n_tilde.png and b/textures/_n_tilde.png differ diff --git a/textures/_n_tilde_.png b/textures/_n_tilde_.png index 404221056..330ed22ab 100644 Binary files a/textures/_n_tilde_.png and b/textures/_n_tilde_.png differ diff --git a/textures/_not.png b/textures/_not.png index e7b1b7b66..b37fdf57b 100644 Binary files a/textures/_not.png and b/textures/_not.png differ diff --git a/textures/_o.png b/textures/_o.png index a59eacb8f..d6c786bd5 100644 Binary files a/textures/_o.png and b/textures/_o.png differ diff --git a/textures/_o_.png b/textures/_o_.png index 967c240b2..accf9cafb 100644 Binary files a/textures/_o_.png and b/textures/_o_.png differ diff --git a/textures/_o_acute.png b/textures/_o_acute.png index 9094a80c7..17a7ea383 100644 Binary files a/textures/_o_acute.png and b/textures/_o_acute.png differ diff --git a/textures/_o_acute_.png b/textures/_o_acute_.png index 9279670fa..3f3143532 100644 Binary files a/textures/_o_acute_.png and b/textures/_o_acute_.png differ diff --git a/textures/_o_circumflex.png b/textures/_o_circumflex.png index 1240f1718..4cc23702f 100644 Binary files a/textures/_o_circumflex.png and b/textures/_o_circumflex.png differ diff --git a/textures/_o_circumflex_.png b/textures/_o_circumflex_.png index 8acca66c9..d47a35520 100644 Binary files a/textures/_o_circumflex_.png and b/textures/_o_circumflex_.png differ diff --git a/textures/_o_dash.png b/textures/_o_dash.png index 0f0d638ff..801843df7 100644 Binary files a/textures/_o_dash.png and b/textures/_o_dash.png differ diff --git a/textures/_o_dash_.png b/textures/_o_dash_.png index b6e98f1ee..1be4ca862 100644 Binary files a/textures/_o_dash_.png and b/textures/_o_dash_.png differ diff --git a/textures/_o_grave.png b/textures/_o_grave.png index 861327e27..76c3ac2b5 100644 Binary files a/textures/_o_grave.png and b/textures/_o_grave.png differ diff --git a/textures/_o_grave_.png b/textures/_o_grave_.png index 7ab9e374b..e1c18b3f5 100644 Binary files a/textures/_o_grave_.png and b/textures/_o_grave_.png differ diff --git a/textures/_o_sup.png b/textures/_o_sup.png index bbabcf8c0..b2b95ac37 100644 Binary files a/textures/_o_sup.png and b/textures/_o_sup.png differ diff --git a/textures/_o_tilde.png b/textures/_o_tilde.png index 3c95094bb..9c562e8e3 100644 Binary files a/textures/_o_tilde.png and b/textures/_o_tilde.png differ diff --git a/textures/_o_tilde_.png b/textures/_o_tilde_.png index 8f980dd98..3d43e407e 100644 Binary files a/textures/_o_tilde_.png and b/textures/_o_tilde_.png differ diff --git a/textures/_oe.png b/textures/_oe.png index 693838ce7..4ffbb2fc6 100644 Binary files a/textures/_oe.png and b/textures/_oe.png differ diff --git a/textures/_oe_.png b/textures/_oe_.png index c66b72ba2..b5ea6654f 100644 Binary files a/textures/_oe_.png and b/textures/_oe_.png differ diff --git a/textures/_p.png b/textures/_p.png index 8d0efe264..aa3330b73 100644 Binary files a/textures/_p.png and b/textures/_p.png differ diff --git a/textures/_p_.png b/textures/_p_.png index 964387e64..cf253ed9b 100644 Binary files a/textures/_p_.png and b/textures/_p_.png differ diff --git a/textures/_paragraph.png b/textures/_paragraph.png index cfbf0af51..b8ae4e721 100644 Binary files a/textures/_paragraph.png and b/textures/_paragraph.png differ diff --git a/textures/_pilcrow.png b/textures/_pilcrow.png index cf9bbc778..1cea42388 100644 Binary files a/textures/_pilcrow.png and b/textures/_pilcrow.png differ diff --git a/textures/_plus_minus.png b/textures/_plus_minus.png index b9b79ec32..c001b52a8 100644 Binary files a/textures/_plus_minus.png and b/textures/_plus_minus.png differ diff --git a/textures/_pound.png b/textures/_pound.png index 04a02d462..a9d030d6a 100644 Binary files a/textures/_pound.png and b/textures/_pound.png differ diff --git a/textures/_pr.png b/textures/_pr.png index 21b8fbf80..479641fbe 100644 Binary files a/textures/_pr.png and b/textures/_pr.png differ diff --git a/textures/_ps.png b/textures/_ps.png index 37527155f..7a10f9f86 100644 Binary files a/textures/_ps.png and b/textures/_ps.png differ diff --git a/textures/_q.png b/textures/_q.png index a48222e28..a9d4d7248 100644 Binary files a/textures/_q.png and b/textures/_q.png differ diff --git a/textures/_q_.png b/textures/_q_.png index 50f00af20..0dc1c50cb 100644 Binary files a/textures/_q_.png and b/textures/_q_.png differ diff --git a/textures/_qo.png b/textures/_qo.png index 9eaca2bd7..e649307ec 100644 Binary files a/textures/_qo.png and b/textures/_qo.png differ diff --git a/textures/_qu.png b/textures/_qu.png index 51dff64f3..b41fc936b 100644 Binary files a/textures/_qu.png and b/textures/_qu.png differ diff --git a/textures/_qu_inv.png b/textures/_qu_inv.png index b2fa4275e..abfb3d610 100644 Binary files a/textures/_qu_inv.png and b/textures/_qu_inv.png differ diff --git a/textures/_r.png b/textures/_r.png index 6b80bb254..935ad7d94 100644 Binary files a/textures/_r.png and b/textures/_r.png differ diff --git a/textures/_r_.png b/textures/_r_.png index 3c1bafc58..93b4d9221 100644 Binary files a/textures/_r_.png and b/textures/_r_.png differ diff --git a/textures/_rc.png b/textures/_rc.png index b8ea5b70e..2f52a5c7b 100644 Binary files a/textures/_rc.png and b/textures/_rc.png differ diff --git a/textures/_re.png b/textures/_re.png index 3f7dda14d..6e5dad984 100644 Binary files a/textures/_re.png and b/textures/_re.png differ diff --git a/textures/_registered.png b/textures/_registered.png index 0e510a2a7..24e1119b7 100644 Binary files a/textures/_registered.png and b/textures/_registered.png differ diff --git a/textures/_s.png b/textures/_s.png index 43c314be1..3cf477191 100644 Binary files a/textures/_s.png and b/textures/_s.png differ diff --git a/textures/_s_.png b/textures/_s_.png index 4edf86115..019cf9d61 100644 Binary files a/textures/_s_.png and b/textures/_s_.png differ diff --git a/textures/_sl.png b/textures/_sl.png index 1b4cf0f58..6eaa52234 100644 Binary files a/textures/_sl.png and b/textures/_sl.png differ diff --git a/textures/_sm.png b/textures/_sm.png index 2d7dc7310..ad98a7f04 100644 Binary files a/textures/_sm.png and b/textures/_sm.png differ diff --git a/textures/_sp.png b/textures/_sp.png index 27db127b7..33a32d27e 100644 Binary files a/textures/_sp.png and b/textures/_sp.png differ diff --git a/textures/_sr.png b/textures/_sr.png index b40144656..1e1b2d71d 100644 Binary files a/textures/_sr.png and b/textures/_sr.png differ diff --git a/textures/_sz.png b/textures/_sz.png index 6e323629a..30eda6b56 100644 Binary files a/textures/_sz.png and b/textures/_sz.png differ diff --git a/textures/_t.png b/textures/_t.png index e175268c3..71ca6641c 100644 Binary files a/textures/_t.png and b/textures/_t.png differ diff --git a/textures/_t_.png b/textures/_t_.png index 6fbae7a18..19e54f609 100644 Binary files a/textures/_t_.png and b/textures/_t_.png differ diff --git a/textures/_thorn.png b/textures/_thorn.png index 3d3b4359d..88984e0a1 100644 Binary files a/textures/_thorn.png and b/textures/_thorn.png differ diff --git a/textures/_thorn_.png b/textures/_thorn_.png index 7703ec2c4..72045237b 100644 Binary files a/textures/_thorn_.png and b/textures/_thorn_.png differ diff --git a/textures/_times_cross.png b/textures/_times_cross.png index f6c6cd310..94a510358 100644 Binary files a/textures/_times_cross.png and b/textures/_times_cross.png differ diff --git a/textures/_times_dot.png b/textures/_times_dot.png index 92b5dae14..b6de2d2d6 100644 Binary files a/textures/_times_dot.png and b/textures/_times_dot.png differ diff --git a/textures/_tl.png b/textures/_tl.png index e4eaf45a7..67fe49939 100644 Binary files a/textures/_tl.png and b/textures/_tl.png differ diff --git a/textures/_u.png b/textures/_u.png index 1c81b91cc..226ea15d9 100644 Binary files a/textures/_u.png and b/textures/_u.png differ diff --git a/textures/_u_.png b/textures/_u_.png index 06bac7dd9..acc65373d 100644 Binary files a/textures/_u_.png and b/textures/_u_.png differ diff --git a/textures/_u_acute.png b/textures/_u_acute.png index 04fe159d8..fbbf2b439 100644 Binary files a/textures/_u_acute.png and b/textures/_u_acute.png differ diff --git a/textures/_u_acute_.png b/textures/_u_acute_.png index 266731981..0aec6b5ee 100644 Binary files a/textures/_u_acute_.png and b/textures/_u_acute_.png differ diff --git a/textures/_u_circumflex.png b/textures/_u_circumflex.png index b402d9083..fae539b48 100644 Binary files a/textures/_u_circumflex.png and b/textures/_u_circumflex.png differ diff --git a/textures/_u_circumflex_.png b/textures/_u_circumflex_.png index 6e2bb85d2..62dacca99 100644 Binary files a/textures/_u_circumflex_.png and b/textures/_u_circumflex_.png differ diff --git a/textures/_u_grave.png b/textures/_u_grave.png index 51fff9c2e..c082d50de 100644 Binary files a/textures/_u_grave.png and b/textures/_u_grave.png differ diff --git a/textures/_u_grave_.png b/textures/_u_grave_.png index 2605b3eca..9c3cbb7c0 100644 Binary files a/textures/_u_grave_.png and b/textures/_u_grave_.png differ diff --git a/textures/_ue.png b/textures/_ue.png index d6af6eb7b..6eb803eb4 100644 Binary files a/textures/_ue.png and b/textures/_ue.png differ diff --git a/textures/_ue_.png b/textures/_ue_.png index 52b4c9298..36be264ab 100644 Binary files a/textures/_ue_.png and b/textures/_ue_.png differ diff --git a/textures/_un.png b/textures/_un.png index 5da6b09a7..fba75e8f3 100644 Binary files a/textures/_un.png and b/textures/_un.png differ diff --git a/textures/_v.png b/textures/_v.png index 390e3aae3..0ce495aab 100644 Binary files a/textures/_v.png and b/textures/_v.png differ diff --git a/textures/_v_.png b/textures/_v_.png index 5e27b773e..0c8988900 100644 Binary files a/textures/_v_.png and b/textures/_v_.png differ diff --git a/textures/_vb.png b/textures/_vb.png index d23d3a074..941b2b84a 100644 Binary files a/textures/_vb.png and b/textures/_vb.png differ diff --git a/textures/_w.png b/textures/_w.png index 1b8dc528e..2987f046c 100644 Binary files a/textures/_w.png and b/textures/_w.png differ diff --git a/textures/_w_.png b/textures/_w_.png index 259b599b9..f1db20d3d 100644 Binary files a/textures/_w_.png and b/textures/_w_.png differ diff --git a/textures/_x.png b/textures/_x.png index 746fa1776..899cf15a4 100644 Binary files a/textures/_x.png and b/textures/_x.png differ diff --git a/textures/_x_.png b/textures/_x_.png index 05300eca7..56121585d 100644 Binary files a/textures/_x_.png and b/textures/_x_.png differ diff --git a/textures/_y.png b/textures/_y.png index 87b45d413..458e3bedf 100644 Binary files a/textures/_y.png and b/textures/_y.png differ diff --git a/textures/_y_.png b/textures/_y_.png index de9a88db4..99a96ad49 100644 Binary files a/textures/_y_.png and b/textures/_y_.png differ diff --git a/textures/_y_acute.png b/textures/_y_acute.png index 1fd9679d1..27c478f55 100644 Binary files a/textures/_y_acute.png and b/textures/_y_acute.png differ diff --git a/textures/_y_acute_.png b/textures/_y_acute_.png index 18c5a5528..45d53337e 100644 Binary files a/textures/_y_acute_.png and b/textures/_y_acute_.png differ diff --git a/textures/_y_diaresis.png b/textures/_y_diaresis.png index ecb56c237..74807b40c 100644 Binary files a/textures/_y_diaresis.png and b/textures/_y_diaresis.png differ diff --git a/textures/_yen.png b/textures/_yen.png index 7ea4e0094..f3f915948 100644 Binary files a/textures/_yen.png and b/textures/_yen.png differ diff --git a/textures/_z.png b/textures/_z.png index 62a89e647..9bb1200f3 100644 Binary files a/textures/_z.png and b/textures/_z.png differ diff --git a/textures/_z_.png b/textures/_z_.png index dcdf0ab8d..ba1d79333 100644 Binary files a/textures/_z_.png and b/textures/_z_.png differ diff --git a/textures/awards_bg_default.png b/textures/awards_bg_default.png index b7ba7f429..7fddfce80 100644 Binary files a/textures/awards_bg_default.png and b/textures/awards_bg_default.png differ diff --git a/textures/awards_bg_mining.png b/textures/awards_bg_mining.png index 022e64f2c..fb77b388a 100644 Binary files a/textures/awards_bg_mining.png and b/textures/awards_bg_mining.png differ diff --git a/textures/awards_template.png b/textures/awards_template.png index e918be62c..159a3bc77 100644 Binary files a/textures/awards_template.png and b/textures/awards_template.png differ diff --git a/textures/awards_ui_icon.png b/textures/awards_ui_icon.png index 34bb7c44c..c8163008f 100644 Binary files a/textures/awards_ui_icon.png and b/textures/awards_ui_icon.png differ diff --git a/textures/awards_unknown.png b/textures/awards_unknown.png index e918be62c..159a3bc77 100644 Binary files a/textures/awards_unknown.png and b/textures/awards_unknown.png differ diff --git a/textures/beacon_UV.png b/textures/beacon_UV.png index aed40d1e5..0f309df34 100644 Binary files a/textures/beacon_UV.png and b/textures/beacon_UV.png differ diff --git a/textures/beacon_achievement_icon.png b/textures/beacon_achievement_icon.png index 4f3053b37..384c48cf7 100644 Binary files a/textures/beacon_achievement_icon.png and b/textures/beacon_achievement_icon.png differ diff --git a/textures/beacon_beam_palette.png b/textures/beacon_beam_palette.png index 3cb9ecab6..bae63d622 100644 Binary files a/textures/beacon_beam_palette.png and b/textures/beacon_beam_palette.png differ diff --git a/textures/blast_furnace_front.png b/textures/blast_furnace_front.png index 7b3bc3430..921f58193 100644 Binary files a/textures/blast_furnace_front.png and b/textures/blast_furnace_front.png differ diff --git a/textures/blast_furnace_front_on.png b/textures/blast_furnace_front_on.png index f55aa9802..2b2883517 100644 Binary files a/textures/blast_furnace_front_on.png and b/textures/blast_furnace_front_on.png differ diff --git a/textures/blast_furnace_side.png b/textures/blast_furnace_side.png index 391b9ed19..f7a419823 100644 Binary files a/textures/blast_furnace_side.png and b/textures/blast_furnace_side.png differ diff --git a/textures/blast_furnace_top.png b/textures/blast_furnace_top.png index 78a77c517..42dda0ba4 100644 Binary files a/textures/blast_furnace_top.png and b/textures/blast_furnace_top.png differ diff --git a/textures/character.png b/textures/character.png index 1497f451a..38e8d352b 100644 Binary files a/textures/character.png and b/textures/character.png differ diff --git a/textures/craftguide_zoomin_icon.png b/textures/craftguide_zoomin_icon.png index 2f9f62409..01d1db597 100644 Binary files a/textures/craftguide_zoomin_icon.png and b/textures/craftguide_zoomin_icon.png differ diff --git a/textures/craftguide_zoomout_icon.png b/textures/craftguide_zoomout_icon.png index 2815f939d..35a932734 100644 Binary files a/textures/craftguide_zoomout_icon.png and b/textures/craftguide_zoomout_icon.png differ diff --git a/textures/crafting_creative_next.png b/textures/crafting_creative_next.png index 9a0a3fd68..35a0ad720 100644 Binary files a/textures/crafting_creative_next.png and b/textures/crafting_creative_next.png differ diff --git a/textures/crafting_creative_prev.png b/textures/crafting_creative_prev.png index 5deba802f..309f5c772 100644 Binary files a/textures/crafting_creative_prev.png and b/textures/crafting_creative_prev.png differ diff --git a/textures/crafting_formspec_arrow.png b/textures/crafting_formspec_arrow.png new file mode 100644 index 000000000..12b9c1970 Binary files /dev/null and b/textures/crafting_formspec_arrow.png differ diff --git a/textures/crafting_formspec_bg.png b/textures/crafting_formspec_bg.png index a6a02de23..d88e959e4 100644 Binary files a/textures/crafting_formspec_bg.png and b/textures/crafting_formspec_bg.png differ diff --git a/textures/crafting_inventory_creative.png b/textures/crafting_inventory_creative.png deleted file mode 100644 index 3e575d664..000000000 Binary files a/textures/crafting_inventory_creative.png and /dev/null differ diff --git a/textures/crafting_inventory_creative_survival.png b/textures/crafting_inventory_creative_survival.png deleted file mode 100644 index fe525814f..000000000 Binary files a/textures/crafting_inventory_creative_survival.png and /dev/null differ diff --git a/textures/credits_bg.png b/textures/credits_bg.png index 60deab4fd..280f29def 100644 Binary files a/textures/credits_bg.png and b/textures/credits_bg.png differ diff --git a/textures/crosshair.png b/textures/crosshair.png index a3d7579b0..da9938670 100644 Binary files a/textures/crosshair.png and b/textures/crosshair.png differ diff --git a/textures/custom_beacom_symbol_1.png b/textures/custom_beacom_symbol_1.png index 1f7843f40..7e013873b 100644 Binary files a/textures/custom_beacom_symbol_1.png and b/textures/custom_beacom_symbol_1.png differ diff --git a/textures/custom_beacom_symbol_2.png b/textures/custom_beacom_symbol_2.png index 86ff7bfe2..308636a40 100644 Binary files a/textures/custom_beacom_symbol_2.png and b/textures/custom_beacom_symbol_2.png differ diff --git a/textures/custom_beacom_symbol_3.png b/textures/custom_beacom_symbol_3.png index 61f14876f..395beddb1 100644 Binary files a/textures/custom_beacom_symbol_3.png and b/textures/custom_beacom_symbol_3.png differ diff --git a/textures/custom_beacom_symbol_4.png b/textures/custom_beacom_symbol_4.png index b96423318..1b11f3b3e 100644 Binary files a/textures/custom_beacom_symbol_4.png and b/textures/custom_beacom_symbol_4.png differ diff --git a/textures/default_brick.png b/textures/default_brick.png index ab4f5b78a..af999b9c3 100644 Binary files a/textures/default_brick.png and b/textures/default_brick.png differ diff --git a/textures/default_cobble.png b/textures/default_cobble.png index b1d5fe3c1..4fcae123f 100644 Binary files a/textures/default_cobble.png and b/textures/default_cobble.png differ diff --git a/textures/default_dirt.png b/textures/default_dirt.png index 1a72f2a4d..3c57e2cb8 100644 Binary files a/textures/default_dirt.png and b/textures/default_dirt.png differ diff --git a/textures/default_mossycobble.png b/textures/default_mossycobble.png index 7da561454..c1c3a61e5 100644 Binary files a/textures/default_mossycobble.png and b/textures/default_mossycobble.png differ diff --git a/textures/default_obsidian.png b/textures/default_obsidian.png index dd5f9c816..9dea64f06 100644 Binary files a/textures/default_obsidian.png and b/textures/default_obsidian.png differ diff --git a/textures/default_sand.png b/textures/default_sand.png index e2309a53c..4d6071fd0 100644 Binary files a/textures/default_sand.png and b/textures/default_sand.png differ diff --git a/textures/default_tnt_bottom.png b/textures/default_tnt_bottom.png index 4a0978430..6f1f6ec56 100644 Binary files a/textures/default_tnt_bottom.png and b/textures/default_tnt_bottom.png differ diff --git a/textures/default_tnt_side.png b/textures/default_tnt_side.png index e5aae1411..d5eb0ca9f 100644 Binary files a/textures/default_tnt_side.png and b/textures/default_tnt_side.png differ diff --git a/textures/default_tnt_top.png b/textures/default_tnt_top.png index b55ad3d0b..5dea7c67a 100644 Binary files a/textures/default_tnt_top.png and b/textures/default_tnt_top.png differ diff --git a/textures/default_tool_netheriteaxe.png b/textures/default_tool_netheriteaxe.png index 784956534..19f607e3f 100644 Binary files a/textures/default_tool_netheriteaxe.png and b/textures/default_tool_netheriteaxe.png differ diff --git a/textures/default_tool_netheritepick.png b/textures/default_tool_netheritepick.png index 3f1b7579e..aabafe591 100644 Binary files a/textures/default_tool_netheritepick.png and b/textures/default_tool_netheritepick.png differ diff --git a/textures/default_tool_netheriteshovel.png b/textures/default_tool_netheriteshovel.png index 8aefbff46..7561e1d34 100644 Binary files a/textures/default_tool_netheriteshovel.png and b/textures/default_tool_netheriteshovel.png differ diff --git a/textures/default_tool_netheritesword.png b/textures/default_tool_netheritesword.png index 8cc165b00..baadc8ba9 100644 Binary files a/textures/default_tool_netheritesword.png and b/textures/default_tool_netheritesword.png differ diff --git a/textures/doc_awards_icon_generic.png b/textures/doc_awards_icon_generic.png index 4b8394470..6d1ddfac4 100644 Binary files a/textures/doc_awards_icon_generic.png and b/textures/doc_awards_icon_generic.png differ diff --git a/textures/doc_basics_build.png b/textures/doc_basics_build.png index 0d071ddc7..8394eef19 100644 Binary files a/textures/doc_basics_build.png and b/textures/doc_basics_build.png differ diff --git a/textures/doc_basics_camera_behind.png b/textures/doc_basics_camera_behind.png index 72e05b82c..1bc9cddf1 100644 Binary files a/textures/doc_basics_camera_behind.png and b/textures/doc_basics_camera_behind.png differ diff --git a/textures/doc_basics_camera_ego.png b/textures/doc_basics_camera_ego.png index 5484190d8..7c95c512f 100644 Binary files a/textures/doc_basics_camera_ego.png and b/textures/doc_basics_camera_ego.png differ diff --git a/textures/doc_basics_camera_front.png b/textures/doc_basics_camera_front.png index a6cba11f9..124c19afa 100644 Binary files a/textures/doc_basics_camera_front.png and b/textures/doc_basics_camera_front.png differ diff --git a/textures/doc_basics_craft_grid.png b/textures/doc_basics_craft_grid.png index b504c87c1..d66786511 100644 Binary files a/textures/doc_basics_craft_grid.png and b/textures/doc_basics_craft_grid.png differ diff --git a/textures/doc_basics_craft_groups_1.png b/textures/doc_basics_craft_groups_1.png index 4e95e1c9b..4093c50b1 100644 Binary files a/textures/doc_basics_craft_groups_1.png and b/textures/doc_basics_craft_groups_1.png differ diff --git a/textures/doc_basics_craft_groups_2.png b/textures/doc_basics_craft_groups_2.png index 299a5bac4..a70bdde42 100644 Binary files a/textures/doc_basics_craft_groups_2.png and b/textures/doc_basics_craft_groups_2.png differ diff --git a/textures/doc_basics_craft_groups_3.png b/textures/doc_basics_craft_groups_3.png index c127f51c2..60a568be0 100644 Binary files a/textures/doc_basics_craft_groups_3.png and b/textures/doc_basics_craft_groups_3.png differ diff --git a/textures/doc_basics_craft_repair.png b/textures/doc_basics_craft_repair.png index 7586c19a3..8b5420784 100644 Binary files a/textures/doc_basics_craft_repair.png and b/textures/doc_basics_craft_repair.png differ diff --git a/textures/doc_basics_craft_shaped.png b/textures/doc_basics_craft_shaped.png index cd93754b7..950c55d79 100644 Binary files a/textures/doc_basics_craft_shaped.png and b/textures/doc_basics_craft_shaped.png differ diff --git a/textures/doc_basics_craft_shapeless_1.png b/textures/doc_basics_craft_shapeless_1.png index b206b6cd3..684abfbfb 100644 Binary files a/textures/doc_basics_craft_shapeless_1.png and b/textures/doc_basics_craft_shapeless_1.png differ diff --git a/textures/doc_basics_craft_shapeless_2.png b/textures/doc_basics_craft_shapeless_2.png index f78953805..aa40440da 100644 Binary files a/textures/doc_basics_craft_shapeless_2.png and b/textures/doc_basics_craft_shapeless_2.png differ diff --git a/textures/doc_basics_gameplay_carbone_ng.png b/textures/doc_basics_gameplay_carbone_ng.png index aa4fdec0d..80a38a06b 100644 Binary files a/textures/doc_basics_gameplay_carbone_ng.png and b/textures/doc_basics_gameplay_carbone_ng.png differ diff --git a/textures/doc_basics_gameplay_hades.png b/textures/doc_basics_gameplay_hades.png index 90b5477f9..44b93872d 100644 Binary files a/textures/doc_basics_gameplay_hades.png and b/textures/doc_basics_gameplay_hades.png differ diff --git a/textures/doc_basics_gameplay_lott.png b/textures/doc_basics_gameplay_lott.png index 0ae9c11cd..e8340e6e5 100644 Binary files a/textures/doc_basics_gameplay_lott.png and b/textures/doc_basics_gameplay_lott.png differ diff --git a/textures/doc_basics_gameplay_moontest.png b/textures/doc_basics_gameplay_moontest.png index 6c4728d36..82350d8cc 100644 Binary files a/textures/doc_basics_gameplay_moontest.png and b/textures/doc_basics_gameplay_moontest.png differ diff --git a/textures/doc_basics_gameplay_mtg_1.png b/textures/doc_basics_gameplay_mtg_1.png index 7272de5eb..eaa55fe84 100644 Binary files a/textures/doc_basics_gameplay_mtg_1.png and b/textures/doc_basics_gameplay_mtg_1.png differ diff --git a/textures/doc_basics_gameplay_mtg_2.png b/textures/doc_basics_gameplay_mtg_2.png index c565d1b79..68c8a5063 100644 Binary files a/textures/doc_basics_gameplay_mtg_2.png and b/textures/doc_basics_gameplay_mtg_2.png differ diff --git a/textures/doc_basics_gameplay_outback.png b/textures/doc_basics_gameplay_outback.png index c8c29d316..e2f9f095c 100644 Binary files a/textures/doc_basics_gameplay_outback.png and b/textures/doc_basics_gameplay_outback.png differ diff --git a/textures/doc_basics_gameplay_pixture.png b/textures/doc_basics_gameplay_pixture.png index 3b586b9b0..fe43163f7 100644 Binary files a/textures/doc_basics_gameplay_pixture.png and b/textures/doc_basics_gameplay_pixture.png differ diff --git a/textures/doc_basics_gameplay_xtraores_xtension.png b/textures/doc_basics_gameplay_xtraores_xtension.png index e757dd3da..83a280a65 100644 Binary files a/textures/doc_basics_gameplay_xtraores_xtension.png and b/textures/doc_basics_gameplay_xtraores_xtension.png differ diff --git a/textures/doc_basics_hotbar.png b/textures/doc_basics_hotbar.png index 95863969e..6a8f82ffc 100644 Binary files a/textures/doc_basics_hotbar.png and b/textures/doc_basics_hotbar.png differ diff --git a/textures/doc_basics_hotbar_relations.png b/textures/doc_basics_hotbar_relations.png index dc46cad70..b63943880 100644 Binary files a/textures/doc_basics_hotbar_relations.png and b/textures/doc_basics_hotbar_relations.png differ diff --git a/textures/doc_basics_inventory.png b/textures/doc_basics_inventory.png index 1fca40cb9..3001c0d81 100644 Binary files a/textures/doc_basics_inventory.png and b/textures/doc_basics_inventory.png differ diff --git a/textures/doc_basics_inventory_detail.png b/textures/doc_basics_inventory_detail.png index 95522ef90..da3111030 100644 Binary files a/textures/doc_basics_inventory_detail.png and b/textures/doc_basics_inventory_detail.png differ diff --git a/textures/doc_basics_items_dropped.png b/textures/doc_basics_items_dropped.png index 9ebb142c3..2d4b92450 100644 Binary files a/textures/doc_basics_items_dropped.png and b/textures/doc_basics_items_dropped.png differ diff --git a/textures/doc_basics_light_test.png b/textures/doc_basics_light_test.png index 7e09a4c18..9b4a24f5a 100644 Binary files a/textures/doc_basics_light_test.png and b/textures/doc_basics_light_test.png differ diff --git a/textures/doc_basics_light_torch.png b/textures/doc_basics_light_torch.png index a35ee4d30..0fc840595 100644 Binary files a/textures/doc_basics_light_torch.png and b/textures/doc_basics_light_torch.png differ diff --git a/textures/doc_basics_liquids_nonrenewable.png b/textures/doc_basics_liquids_nonrenewable.png index 5501ce794..f38bbb316 100644 Binary files a/textures/doc_basics_liquids_nonrenewable.png and b/textures/doc_basics_liquids_nonrenewable.png differ diff --git a/textures/doc_basics_liquids_range.png b/textures/doc_basics_liquids_range.png index 92eb9db0b..fef9edf6f 100644 Binary files a/textures/doc_basics_liquids_range.png and b/textures/doc_basics_liquids_range.png differ diff --git a/textures/doc_basics_liquids_renewable_1.png b/textures/doc_basics_liquids_renewable_1.png index bada9c779..67691081e 100644 Binary files a/textures/doc_basics_liquids_renewable_1.png and b/textures/doc_basics_liquids_renewable_1.png differ diff --git a/textures/doc_basics_liquids_renewable_2.png b/textures/doc_basics_liquids_renewable_2.png index 1a0ec43eb..63a5cea1b 100644 Binary files a/textures/doc_basics_liquids_renewable_2.png and b/textures/doc_basics_liquids_renewable_2.png differ diff --git a/textures/doc_basics_liquids_types.png b/textures/doc_basics_liquids_types.png index 196371c37..64484e17f 100644 Binary files a/textures/doc_basics_liquids_types.png and b/textures/doc_basics_liquids_types.png differ diff --git a/textures/doc_basics_minimap_map.png b/textures/doc_basics_minimap_map.png index 3b504f3da..63f4a9bac 100644 Binary files a/textures/doc_basics_minimap_map.png and b/textures/doc_basics_minimap_map.png differ diff --git a/textures/doc_basics_minimap_radar.png b/textures/doc_basics_minimap_radar.png index 0bfda651c..b2368d0a4 100644 Binary files a/textures/doc_basics_minimap_radar.png and b/textures/doc_basics_minimap_radar.png differ diff --git a/textures/doc_basics_minimap_round.png b/textures/doc_basics_minimap_round.png index 65e82a8fb..4f6753dac 100644 Binary files a/textures/doc_basics_minimap_round.png and b/textures/doc_basics_minimap_round.png differ diff --git a/textures/doc_basics_nodes.png b/textures/doc_basics_nodes.png index 0ae1c2f74..0b3b22f64 100644 Binary files a/textures/doc_basics_nodes.png and b/textures/doc_basics_nodes.png differ diff --git a/textures/doc_basics_players_flat.png b/textures/doc_basics_players_flat.png index e4fc875a3..a46fcb658 100644 Binary files a/textures/doc_basics_players_flat.png and b/textures/doc_basics_players_flat.png differ diff --git a/textures/doc_basics_players_lott.png b/textures/doc_basics_players_lott.png index a576d5a40..13419b8e8 100644 Binary files a/textures/doc_basics_players_lott.png and b/textures/doc_basics_players_lott.png differ diff --git a/textures/doc_basics_players_sam.png b/textures/doc_basics_players_sam.png index 93bc6d8bd..4281ca588 100644 Binary files a/textures/doc_basics_players_sam.png and b/textures/doc_basics_players_sam.png differ diff --git a/textures/doc_basics_pointing.png b/textures/doc_basics_pointing.png index 9c1929aee..dda1580f1 100644 Binary files a/textures/doc_basics_pointing.png and b/textures/doc_basics_pointing.png differ diff --git a/textures/doc_basics_sneak.png b/textures/doc_basics_sneak.png index bdebec207..bcde6ce52 100644 Binary files a/textures/doc_basics_sneak.png and b/textures/doc_basics_sneak.png differ diff --git a/textures/doc_basics_tools.png b/textures/doc_basics_tools.png index 1c16628e7..82af52d1a 100644 Binary files a/textures/doc_basics_tools.png and b/textures/doc_basics_tools.png differ diff --git a/textures/doc_basics_tools_mining.png b/textures/doc_basics_tools_mining.png index aa3613f38..1395b890c 100644 Binary files a/textures/doc_basics_tools_mining.png and b/textures/doc_basics_tools_mining.png differ diff --git a/textures/doc_button_icon_hires.png b/textures/doc_button_icon_hires.png index 533d72376..a580f657f 100644 Binary files a/textures/doc_button_icon_hires.png and b/textures/doc_button_icon_hires.png differ diff --git a/textures/doc_button_icon_lores.png b/textures/doc_button_icon_lores.png index 92674b7a7..b3ebe6f4a 100644 Binary files a/textures/doc_button_icon_lores.png and b/textures/doc_button_icon_lores.png differ diff --git a/textures/doc_identifier_identifier.png b/textures/doc_identifier_identifier.png index b37537db3..09480ef07 100644 Binary files a/textures/doc_identifier_identifier.png and b/textures/doc_identifier_identifier.png differ diff --git a/textures/doors_item_steel.png b/textures/doors_item_steel.png index 82a500baf..8235deace 100644 Binary files a/textures/doors_item_steel.png and b/textures/doors_item_steel.png differ diff --git a/textures/doors_item_wood.png b/textures/doors_item_wood.png index ca3a31862..6a074e137 100644 Binary files a/textures/doors_item_wood.png and b/textures/doors_item_wood.png differ diff --git a/textures/doors_trapdoor_side.png b/textures/doors_trapdoor_side.png index 519d9b9e3..acdd1e22f 100644 Binary files a/textures/doors_trapdoor_side.png and b/textures/doors_trapdoor_side.png differ diff --git a/textures/doors_trapdoor_steel_side.png b/textures/doors_trapdoor_steel_side.png index 28a98f2e2..54008f215 100644 Binary files a/textures/doors_trapdoor_steel_side.png and b/textures/doors_trapdoor_steel_side.png differ diff --git a/textures/extra_mobs_hoglin.png b/textures/extra_mobs_hoglin.png index 1a58bef27..43f28d1db 100644 Binary files a/textures/extra_mobs_hoglin.png and b/textures/extra_mobs_hoglin.png differ diff --git a/textures/extra_mobs_piglin.png b/textures/extra_mobs_piglin.png index 917a40f14..3be9eda37 100644 Binary files a/textures/extra_mobs_piglin.png and b/textures/extra_mobs_piglin.png differ diff --git a/textures/extra_mobs_piglin_brute.png b/textures/extra_mobs_piglin_brute.png index 8e9838146..9554d5226 100644 Binary files a/textures/extra_mobs_piglin_brute.png and b/textures/extra_mobs_piglin_brute.png differ diff --git a/textures/extra_mobs_strider.png b/textures/extra_mobs_strider.png index d21429007..a608f5fd0 100644 Binary files a/textures/extra_mobs_strider.png and b/textures/extra_mobs_strider.png differ diff --git a/textures/extra_mobs_strider_cold.png b/textures/extra_mobs_strider_cold.png index 15bc64ba1..c952ed780 100644 Binary files a/textures/extra_mobs_strider_cold.png and b/textures/extra_mobs_strider_cold.png differ diff --git a/textures/extra_mobs_zoglin.png b/textures/extra_mobs_zoglin.png index 18061f48b..122e6f67a 100644 Binary files a/textures/extra_mobs_zoglin.png and b/textures/extra_mobs_zoglin.png differ diff --git a/textures/extra_mobs_zombified_piglin.png b/textures/extra_mobs_zombified_piglin.png index f7f1d40c7..f514c54b8 100644 Binary files a/textures/extra_mobs_zombified_piglin.png and b/textures/extra_mobs_zombified_piglin.png differ diff --git a/textures/farming_mushroom_brown.png b/textures/farming_mushroom_brown.png index 15a35d5f4..ae2d83cd1 100644 Binary files a/textures/farming_mushroom_brown.png and b/textures/farming_mushroom_brown.png differ diff --git a/textures/farming_mushroom_red.png b/textures/farming_mushroom_red.png index aab88ed2b..ac1725b3a 100644 Binary files a/textures/farming_mushroom_red.png and b/textures/farming_mushroom_red.png differ diff --git a/textures/farming_tool_netheritehoe.png b/textures/farming_tool_netheritehoe.png index b5c2dc819..136f65fb9 100644 Binary files a/textures/farming_tool_netheritehoe.png and b/textures/farming_tool_netheritehoe.png differ diff --git a/textures/grindstone_front.png b/textures/grindstone_front.png index 8605c5419..33cf9c262 100644 Binary files a/textures/grindstone_front.png and b/textures/grindstone_front.png differ diff --git a/textures/grindstone_gui_9.png b/textures/grindstone_gui_9.png new file mode 100644 index 000000000..b2fffcb56 Binary files /dev/null and b/textures/grindstone_gui_9.png differ diff --git a/textures/grindstone_side.png b/textures/grindstone_side.png index 635386b6e..b80dd639d 100644 Binary files a/textures/grindstone_side.png and b/textures/grindstone_side.png differ diff --git a/textures/grindstone_top.png b/textures/grindstone_top.png index 0f1a3dcdf..cc91db623 100644 Binary files a/textures/grindstone_top.png and b/textures/grindstone_top.png differ diff --git a/textures/hbarmor_bar.png b/textures/hbarmor_bar.png index ce0aa78ec..74974117c 100644 Binary files a/textures/hbarmor_bar.png and b/textures/hbarmor_bar.png differ diff --git a/textures/hbhunger_bgicon.png b/textures/hbhunger_bgicon.png index d65bf00ec..97f69563c 100644 Binary files a/textures/hbhunger_bgicon.png and b/textures/hbhunger_bgicon.png differ diff --git a/textures/hbhunger_icon.png b/textures/hbhunger_icon.png index 23acb749f..07a5b352a 100644 Binary files a/textures/hbhunger_icon.png and b/textures/hbhunger_icon.png differ diff --git a/textures/hbhunger_icon_regen_poison.png b/textures/hbhunger_icon_regen_poison.png index 128068fbe..ee9339896 100644 Binary files a/textures/hbhunger_icon_regen_poison.png and b/textures/hbhunger_icon_regen_poison.png differ diff --git a/textures/hudbars_bar_breath.png b/textures/hudbars_bar_breath.png index 7d19a5752..f4f259910 100644 Binary files a/textures/hudbars_bar_breath.png and b/textures/hudbars_bar_breath.png differ diff --git a/textures/hudbars_bar_health.png b/textures/hudbars_bar_health.png index 9043e1191..eed95e86f 100644 Binary files a/textures/hudbars_bar_health.png and b/textures/hudbars_bar_health.png differ diff --git a/textures/hudbars_bgicon_breath.png b/textures/hudbars_bgicon_breath.png index 51cb79aa7..0297ededd 100644 Binary files a/textures/hudbars_bgicon_breath.png and b/textures/hudbars_bgicon_breath.png differ diff --git a/textures/hudbars_icon_regenerate.png b/textures/hudbars_icon_regenerate.png index 76ea98aa8..faa6485f5 100644 Binary files a/textures/hudbars_icon_regenerate.png and b/textures/hudbars_icon_regenerate.png differ diff --git a/textures/inventory_plus_doc_inventory_plus.png b/textures/inventory_plus_doc_inventory_plus.png index 92674b7a7..b3ebe6f4a 100644 Binary files a/textures/inventory_plus_doc_inventory_plus.png and b/textures/inventory_plus_doc_inventory_plus.png differ diff --git a/textures/jeija_torches_off.png b/textures/jeija_torches_off.png index 69b830955..51f758cac 100644 Binary files a/textures/jeija_torches_off.png and b/textures/jeija_torches_off.png differ diff --git a/textures/jeija_torches_on.png b/textures/jeija_torches_on.png index 72bbc8ef2..98e833a6d 100644 Binary files a/textures/jeija_torches_on.png and b/textures/jeija_torches_on.png differ diff --git a/textures/lantern.png b/textures/lantern.png index d90e438f6..e39d8a97c 100644 Binary files a/textures/lantern.png and b/textures/lantern.png differ diff --git a/textures/lantern_bottom.png b/textures/lantern_bottom.png index 27dc8fba7..acee8b1c9 100644 Binary files a/textures/lantern_bottom.png and b/textures/lantern_bottom.png differ diff --git a/textures/lantern_top.png b/textures/lantern_top.png index 60e85591a..c7243f4af 100644 Binary files a/textures/lantern_top.png and b/textures/lantern_top.png differ diff --git a/textures/lightning_lightning_1.png b/textures/lightning_lightning_1.png index 5f6c60860..122948b63 100644 Binary files a/textures/lightning_lightning_1.png and b/textures/lightning_lightning_1.png differ diff --git a/textures/lightning_lightning_2.png b/textures/lightning_lightning_2.png index cb6cc8375..2c2f6204b 100644 Binary files a/textures/lightning_lightning_2.png and b/textures/lightning_lightning_2.png differ diff --git a/textures/lightning_lightning_3.png b/textures/lightning_lightning_3.png index 17e1d34ec..c2fa6003a 100644 Binary files a/textures/lightning_lightning_3.png and b/textures/lightning_lightning_3.png differ diff --git a/textures/lodestone_bottom.png b/textures/lodestone_bottom.png index fae5e42f4..8f47d57ed 100644 Binary files a/textures/lodestone_bottom.png and b/textures/lodestone_bottom.png differ diff --git a/textures/lodestone_side1.png b/textures/lodestone_side1.png index fed6db55c..643f636a7 100644 Binary files a/textures/lodestone_side1.png and b/textures/lodestone_side1.png differ diff --git a/textures/lodestone_side2.png b/textures/lodestone_side2.png index 1a939e093..1c649185e 100644 Binary files a/textures/lodestone_side2.png and b/textures/lodestone_side2.png differ diff --git a/textures/lodestone_side3.png b/textures/lodestone_side3.png index 26a028c8c..39054126a 100644 Binary files a/textures/lodestone_side3.png and b/textures/lodestone_side3.png differ diff --git a/textures/lodestone_side4.png b/textures/lodestone_side4.png index 312a85fdf..e700c6158 100644 Binary files a/textures/lodestone_side4.png and b/textures/lodestone_side4.png differ diff --git a/textures/lodestone_top.png b/textures/lodestone_top.png index e0a36f380..a3f1cfc60 100644 Binary files a/textures/lodestone_top.png and b/textures/lodestone_top.png differ diff --git a/textures/mcl_achievements_button.png b/textures/mcl_achievements_button.png index fd9d0bd1a..9dab93575 100644 Binary files a/textures/mcl_achievements_button.png and b/textures/mcl_achievements_button.png differ diff --git a/textures/mcl_amethyst_amethyst_block.png b/textures/mcl_amethyst_amethyst_block.png index 02aba24a4..3b21001fd 100644 Binary files a/textures/mcl_amethyst_amethyst_block.png and b/textures/mcl_amethyst_amethyst_block.png differ diff --git a/textures/mcl_amethyst_amethyst_bud_large.png b/textures/mcl_amethyst_amethyst_bud_large.png index 22197eac9..f528ebf36 100644 Binary files a/textures/mcl_amethyst_amethyst_bud_large.png and b/textures/mcl_amethyst_amethyst_bud_large.png differ diff --git a/textures/mcl_amethyst_amethyst_bud_medium.png b/textures/mcl_amethyst_amethyst_bud_medium.png index 6a1c082d8..e21b950d2 100644 Binary files a/textures/mcl_amethyst_amethyst_bud_medium.png and b/textures/mcl_amethyst_amethyst_bud_medium.png differ diff --git a/textures/mcl_amethyst_amethyst_bud_small.png b/textures/mcl_amethyst_amethyst_bud_small.png index 81a1c04de..29697672a 100644 Binary files a/textures/mcl_amethyst_amethyst_bud_small.png and b/textures/mcl_amethyst_amethyst_bud_small.png differ diff --git a/textures/mcl_amethyst_amethyst_cluster.png b/textures/mcl_amethyst_amethyst_cluster.png index 4fc24fc1b..dd0f05e58 100644 Binary files a/textures/mcl_amethyst_amethyst_cluster.png and b/textures/mcl_amethyst_amethyst_cluster.png differ diff --git a/textures/mcl_amethyst_amethyst_shard.png b/textures/mcl_amethyst_amethyst_shard.png index 28f4859c9..ac7d83447 100644 Binary files a/textures/mcl_amethyst_amethyst_shard.png and b/textures/mcl_amethyst_amethyst_shard.png differ diff --git a/textures/mcl_amethyst_budding_amethyst.png b/textures/mcl_amethyst_budding_amethyst.png index bf5d5cc1d..6f9647350 100644 Binary files a/textures/mcl_amethyst_budding_amethyst.png and b/textures/mcl_amethyst_budding_amethyst.png differ diff --git a/textures/mcl_amethyst_calcite_block.png b/textures/mcl_amethyst_calcite_block.png index cc28046b9..524d56264 100644 Binary files a/textures/mcl_amethyst_calcite_block.png and b/textures/mcl_amethyst_calcite_block.png differ diff --git a/textures/mcl_amethyst_tinted_glass.png b/textures/mcl_amethyst_tinted_glass.png index bf961827f..e0694d74e 100644 Binary files a/textures/mcl_amethyst_tinted_glass.png and b/textures/mcl_amethyst_tinted_glass.png differ diff --git a/textures/mcl_anvils_anvil_top_damaged_0.png b/textures/mcl_anvils_anvil_top_damaged_0.png index bbf187292..bc049e400 100644 Binary files a/textures/mcl_anvils_anvil_top_damaged_0.png and b/textures/mcl_anvils_anvil_top_damaged_0.png differ diff --git a/textures/mcl_anvils_anvil_top_damaged_1.png b/textures/mcl_anvils_anvil_top_damaged_1.png index ccc5a83f1..52ee73485 100644 Binary files a/textures/mcl_anvils_anvil_top_damaged_1.png and b/textures/mcl_anvils_anvil_top_damaged_1.png differ diff --git a/textures/mcl_anvils_anvil_top_damaged_2.png b/textures/mcl_anvils_anvil_top_damaged_2.png index 10e17580e..716b1ba3e 100644 Binary files a/textures/mcl_anvils_anvil_top_damaged_2.png and b/textures/mcl_anvils_anvil_top_damaged_2.png differ diff --git a/textures/mcl_anvils_inventory.png b/textures/mcl_anvils_inventory.png index 7be429623..49421b3db 100644 Binary files a/textures/mcl_anvils_inventory.png and b/textures/mcl_anvils_inventory.png differ diff --git a/textures/mcl_anvils_inventory_arrow.png b/textures/mcl_anvils_inventory_arrow.png new file mode 100644 index 000000000..722d6f636 Binary files /dev/null and b/textures/mcl_anvils_inventory_arrow.png differ diff --git a/textures/mcl_anvils_inventory_cross.png b/textures/mcl_anvils_inventory_cross.png new file mode 100644 index 000000000..ec13632ca Binary files /dev/null and b/textures/mcl_anvils_inventory_cross.png differ diff --git a/textures/mcl_anvils_inventory_hammer.png b/textures/mcl_anvils_inventory_hammer.png new file mode 100644 index 000000000..66c1f5f91 Binary files /dev/null and b/textures/mcl_anvils_inventory_hammer.png differ diff --git a/textures/mcl_armor_boots_netherite.png b/textures/mcl_armor_boots_netherite.png index 91eaa140d..fec25ae97 100644 Binary files a/textures/mcl_armor_boots_netherite.png and b/textures/mcl_armor_boots_netherite.png differ diff --git a/textures/mcl_armor_chestplate_netherite.png b/textures/mcl_armor_chestplate_netherite.png index 96bdef155..b67403b1d 100644 Binary files a/textures/mcl_armor_chestplate_netherite.png and b/textures/mcl_armor_chestplate_netherite.png differ diff --git a/textures/mcl_armor_elytra.png b/textures/mcl_armor_elytra.png index b51f2a564..e2c51810a 100644 Binary files a/textures/mcl_armor_elytra.png and b/textures/mcl_armor_elytra.png differ diff --git a/textures/mcl_armor_helmet_netherite.png b/textures/mcl_armor_helmet_netherite.png index 5bbd2cfa4..44814a907 100644 Binary files a/textures/mcl_armor_helmet_netherite.png and b/textures/mcl_armor_helmet_netherite.png differ diff --git a/textures/mcl_armor_inv_boots_gold.png b/textures/mcl_armor_inv_boots_gold.png index a7ed11bfa..5c6d425b9 100644 Binary files a/textures/mcl_armor_inv_boots_gold.png and b/textures/mcl_armor_inv_boots_gold.png differ diff --git a/textures/mcl_armor_inv_boots_netherite.png b/textures/mcl_armor_inv_boots_netherite.png index afe1a2d0e..5fa1f91f8 100644 Binary files a/textures/mcl_armor_inv_boots_netherite.png and b/textures/mcl_armor_inv_boots_netherite.png differ diff --git a/textures/mcl_armor_inv_chestplate_netherite.png b/textures/mcl_armor_inv_chestplate_netherite.png index 68f866b93..84a057c5c 100644 Binary files a/textures/mcl_armor_inv_chestplate_netherite.png and b/textures/mcl_armor_inv_chestplate_netherite.png differ diff --git a/textures/mcl_armor_inv_elytra.png b/textures/mcl_armor_inv_elytra.png index 54708794e..88ce2818a 100644 Binary files a/textures/mcl_armor_inv_elytra.png and b/textures/mcl_armor_inv_elytra.png differ diff --git a/textures/mcl_armor_inv_helmet_netherite.png b/textures/mcl_armor_inv_helmet_netherite.png index 8407e7ed6..7751f0411 100644 Binary files a/textures/mcl_armor_inv_helmet_netherite.png and b/textures/mcl_armor_inv_helmet_netherite.png differ diff --git a/textures/mcl_armor_inv_leggings_netherite.png b/textures/mcl_armor_inv_leggings_netherite.png index 82be2976c..d6dd76095 100644 Binary files a/textures/mcl_armor_inv_leggings_netherite.png and b/textures/mcl_armor_inv_leggings_netherite.png differ diff --git a/textures/mcl_armor_leggings_netherite.png b/textures/mcl_armor_leggings_netherite.png index b064489f1..c68eb4e9a 100644 Binary files a/textures/mcl_armor_leggings_netherite.png and b/textures/mcl_armor_leggings_netherite.png differ diff --git a/textures/mcl_backstone_quartz_bricks.png b/textures/mcl_backstone_quartz_bricks.png index 162f6559b..94a328989 100644 Binary files a/textures/mcl_backstone_quartz_bricks.png and b/textures/mcl_backstone_quartz_bricks.png differ diff --git a/textures/mcl_bamboo_door_bottom_alt.png b/textures/mcl_bamboo_door_bottom_alt.png deleted file mode 100644 index 2583c18f9..000000000 Binary files a/textures/mcl_bamboo_door_bottom_alt.png and /dev/null differ diff --git a/textures/mcl_bamboo_door_bottom_bottompart.png b/textures/mcl_bamboo_door_bottom_bottompart.png new file mode 100644 index 000000000..beeedfa5e Binary files /dev/null and b/textures/mcl_bamboo_door_bottom_bottompart.png differ diff --git a/textures/mcl_bamboo_door_bottom_side.png b/textures/mcl_bamboo_door_bottom_side.png new file mode 100644 index 000000000..9e1600a99 Binary files /dev/null and b/textures/mcl_bamboo_door_bottom_side.png differ diff --git a/textures/mcl_bamboo_door_top_alt.png b/textures/mcl_bamboo_door_top_alt.png deleted file mode 100644 index e21c2faa2..000000000 Binary files a/textures/mcl_bamboo_door_top_alt.png and /dev/null differ diff --git a/textures/mcl_bamboo_door_top_side.png b/textures/mcl_bamboo_door_top_side.png new file mode 100644 index 000000000..dbeb42b96 Binary files /dev/null and b/textures/mcl_bamboo_door_top_side.png differ diff --git a/textures/mcl_bamboo_door_top_toppart.png b/textures/mcl_bamboo_door_top_toppart.png new file mode 100644 index 000000000..f1977bf83 Binary files /dev/null and b/textures/mcl_bamboo_door_top_toppart.png differ diff --git a/textures/mcl_barrels_barrel_bottom.png b/textures/mcl_barrels_barrel_bottom.png index 0e762df41..59b25ae28 100644 Binary files a/textures/mcl_barrels_barrel_bottom.png and b/textures/mcl_barrels_barrel_bottom.png differ diff --git a/textures/mcl_barrels_barrel_side.png b/textures/mcl_barrels_barrel_side.png index 9ca66d122..b5992a07a 100644 Binary files a/textures/mcl_barrels_barrel_side.png and b/textures/mcl_barrels_barrel_side.png differ diff --git a/textures/mcl_barrels_barrel_top.png b/textures/mcl_barrels_barrel_top.png index bb52958ce..a8ec48f3d 100644 Binary files a/textures/mcl_barrels_barrel_top.png and b/textures/mcl_barrels_barrel_top.png differ diff --git a/textures/mcl_barrels_barrel_top_open.png b/textures/mcl_barrels_barrel_top_open.png index d4df0321a..1559f7943 100644 Binary files a/textures/mcl_barrels_barrel_top_open.png and b/textures/mcl_barrels_barrel_top_open.png differ diff --git a/textures/mcl_beehives_bee_nest_bottom.png b/textures/mcl_beehives_bee_nest_bottom.png index 7f0c178a0..f4fe0add6 100644 Binary files a/textures/mcl_beehives_bee_nest_bottom.png and b/textures/mcl_beehives_bee_nest_bottom.png differ diff --git a/textures/mcl_beehives_bee_nest_front.png b/textures/mcl_beehives_bee_nest_front.png index 6a885fb10..c62ad9d68 100644 Binary files a/textures/mcl_beehives_bee_nest_front.png and b/textures/mcl_beehives_bee_nest_front.png differ diff --git a/textures/mcl_beehives_bee_nest_front_honey.png b/textures/mcl_beehives_bee_nest_front_honey.png index bef035436..692c11418 100644 Binary files a/textures/mcl_beehives_bee_nest_front_honey.png and b/textures/mcl_beehives_bee_nest_front_honey.png differ diff --git a/textures/mcl_beehives_bee_nest_side.png b/textures/mcl_beehives_bee_nest_side.png index 11a25128a..36abc184d 100644 Binary files a/textures/mcl_beehives_bee_nest_side.png and b/textures/mcl_beehives_bee_nest_side.png differ diff --git a/textures/mcl_beehives_bee_nest_top.png b/textures/mcl_beehives_bee_nest_top.png index be167bdd9..33c751d82 100644 Binary files a/textures/mcl_beehives_bee_nest_top.png and b/textures/mcl_beehives_bee_nest_top.png differ diff --git a/textures/mcl_beehives_beehive_end.png b/textures/mcl_beehives_beehive_end.png index a1296c4c0..ffebc1b8f 100644 Binary files a/textures/mcl_beehives_beehive_end.png and b/textures/mcl_beehives_beehive_end.png differ diff --git a/textures/mcl_beehives_beehive_front.png b/textures/mcl_beehives_beehive_front.png index f735fb1e3..718fa2684 100644 Binary files a/textures/mcl_beehives_beehive_front.png and b/textures/mcl_beehives_beehive_front.png differ diff --git a/textures/mcl_beehives_beehive_front_honey.png b/textures/mcl_beehives_beehive_front_honey.png index c7e8abf9e..ba6926ced 100644 Binary files a/textures/mcl_beehives_beehive_front_honey.png and b/textures/mcl_beehives_beehive_front_honey.png differ diff --git a/textures/mcl_beehives_beehive_side.png b/textures/mcl_beehives_beehive_side.png index f744ff616..ac8579faa 100644 Binary files a/textures/mcl_beehives_beehive_side.png and b/textures/mcl_beehives_beehive_side.png differ diff --git a/textures/mcl_bells_bell.png b/textures/mcl_bells_bell.png index eb135f0d4..2dc7c4c9b 100644 Binary files a/textures/mcl_bells_bell.png and b/textures/mcl_bells_bell.png differ diff --git a/textures/mcl_bells_bell_bottom.png b/textures/mcl_bells_bell_bottom.png index ccb89540a..0f510df28 100644 Binary files a/textures/mcl_bells_bell_bottom.png and b/textures/mcl_bells_bell_bottom.png differ diff --git a/textures/mcl_bells_bell_side.png b/textures/mcl_bells_bell_side.png index 98db2bac7..a75720e74 100644 Binary files a/textures/mcl_bells_bell_side.png and b/textures/mcl_bells_bell_side.png differ diff --git a/textures/mcl_bells_bell_top.png b/textures/mcl_bells_bell_top.png index d018844e9..c57ba7332 100644 Binary files a/textures/mcl_bells_bell_top.png and b/textures/mcl_bells_bell_top.png differ diff --git a/textures/mcl_blackstone_basalt_side.png b/textures/mcl_blackstone_basalt_side.png index 54dae1bdf..cfb4dbdd1 100644 Binary files a/textures/mcl_blackstone_basalt_side.png and b/textures/mcl_blackstone_basalt_side.png differ diff --git a/textures/mcl_blackstone_basalt_side_polished.png b/textures/mcl_blackstone_basalt_side_polished.png index b59d0fbb7..3f7175a25 100644 Binary files a/textures/mcl_blackstone_basalt_side_polished.png and b/textures/mcl_blackstone_basalt_side_polished.png differ diff --git a/textures/mcl_blackstone_basalt_smooth.png b/textures/mcl_blackstone_basalt_smooth.png index 3de954c1f..ad04d5700 100644 Binary files a/textures/mcl_blackstone_basalt_smooth.png and b/textures/mcl_blackstone_basalt_smooth.png differ diff --git a/textures/mcl_blackstone_basalt_top.png b/textures/mcl_blackstone_basalt_top.png index 105f5b6b4..c1981dfa4 100644 Binary files a/textures/mcl_blackstone_basalt_top.png and b/textures/mcl_blackstone_basalt_top.png differ diff --git a/textures/mcl_blackstone_basalt_top_polished.png b/textures/mcl_blackstone_basalt_top_polished.png index 6c640592b..7386b20da 100644 Binary files a/textures/mcl_blackstone_basalt_top_polished.png and b/textures/mcl_blackstone_basalt_top_polished.png differ diff --git a/textures/mcl_blackstone_chain.png b/textures/mcl_blackstone_chain.png index a39dea39c..993c44c93 100644 Binary files a/textures/mcl_blackstone_chain.png and b/textures/mcl_blackstone_chain.png differ diff --git a/textures/mcl_blackstone_chiseled_polished.png b/textures/mcl_blackstone_chiseled_polished.png index 51945818b..3fc35d305 100644 Binary files a/textures/mcl_blackstone_chiseled_polished.png and b/textures/mcl_blackstone_chiseled_polished.png differ diff --git a/textures/mcl_blackstone_polished.png b/textures/mcl_blackstone_polished.png index 089ed4713..42d22ad06 100644 Binary files a/textures/mcl_blackstone_polished.png and b/textures/mcl_blackstone_polished.png differ diff --git a/textures/mcl_blackstone_polished_bricks.png b/textures/mcl_blackstone_polished_bricks.png index 2d1fe7442..38440eff1 100644 Binary files a/textures/mcl_blackstone_polished_bricks.png and b/textures/mcl_blackstone_polished_bricks.png differ diff --git a/textures/mcl_blackstone_side.png b/textures/mcl_blackstone_side.png index debb054db..17f007bf1 100644 Binary files a/textures/mcl_blackstone_side.png and b/textures/mcl_blackstone_side.png differ diff --git a/textures/mcl_blackstone_soul_soil.png b/textures/mcl_blackstone_soul_soil.png index 0c48e9948..1cdf41fe2 100644 Binary files a/textures/mcl_blackstone_soul_soil.png and b/textures/mcl_blackstone_soul_soil.png differ diff --git a/textures/mcl_blackstone_top.png b/textures/mcl_blackstone_top.png index debb054db..17f007bf1 100644 Binary files a/textures/mcl_blackstone_top.png and b/textures/mcl_blackstone_top.png differ diff --git a/textures/mcl_boats_acacia_chest_boat.png b/textures/mcl_boats_acacia_chest_boat.png index 35ebe2c2c..7acb4d132 100644 Binary files a/textures/mcl_boats_acacia_chest_boat.png and b/textures/mcl_boats_acacia_chest_boat.png differ diff --git a/textures/mcl_boats_birch_chest_boat.png b/textures/mcl_boats_birch_chest_boat.png index 7d5adfdda..6c743ab4e 100644 Binary files a/textures/mcl_boats_birch_chest_boat.png and b/textures/mcl_boats_birch_chest_boat.png differ diff --git a/textures/mcl_boats_cherry_boat.png b/textures/mcl_boats_cherry_boat.png new file mode 100644 index 000000000..118baddfd Binary files /dev/null and b/textures/mcl_boats_cherry_boat.png differ diff --git a/textures/mcl_boats_cherry_chest_boat.png b/textures/mcl_boats_cherry_chest_boat.png new file mode 100644 index 000000000..8bc3725e6 Binary files /dev/null and b/textures/mcl_boats_cherry_chest_boat.png differ diff --git a/textures/mcl_boats_dark_oak_chest_boat.png b/textures/mcl_boats_dark_oak_chest_boat.png index bc7053a73..7f2a346ec 100644 Binary files a/textures/mcl_boats_dark_oak_chest_boat.png and b/textures/mcl_boats_dark_oak_chest_boat.png differ diff --git a/textures/mcl_boats_jungle_chest_boat.png b/textures/mcl_boats_jungle_chest_boat.png index 878cc9ef3..05e544f4a 100644 Binary files a/textures/mcl_boats_jungle_chest_boat.png and b/textures/mcl_boats_jungle_chest_boat.png differ diff --git a/textures/mcl_boats_mangrove_boat.png b/textures/mcl_boats_mangrove_boat.png index b7ddb616e..6ec7927c9 100644 Binary files a/textures/mcl_boats_mangrove_boat.png and b/textures/mcl_boats_mangrove_boat.png differ diff --git a/textures/mcl_boats_mangrove_chest_boat.png b/textures/mcl_boats_mangrove_chest_boat.png index 681493e9b..85019881f 100644 Binary files a/textures/mcl_boats_mangrove_chest_boat.png and b/textures/mcl_boats_mangrove_chest_boat.png differ diff --git a/textures/mcl_boats_oak_chest_boat.png b/textures/mcl_boats_oak_chest_boat.png index 026851c56..fd4f5a697 100644 Binary files a/textures/mcl_boats_oak_chest_boat.png and b/textures/mcl_boats_oak_chest_boat.png differ diff --git a/textures/mcl_boats_spruce_chest_boat.png b/textures/mcl_boats_spruce_chest_boat.png index 3791804aa..67a7dce19 100644 Binary files a/textures/mcl_boats_spruce_chest_boat.png and b/textures/mcl_boats_spruce_chest_boat.png differ diff --git a/textures/mcl_boats_texture_cherry_boat.png b/textures/mcl_boats_texture_cherry_boat.png new file mode 100644 index 000000000..1c0febd9b Binary files /dev/null and b/textures/mcl_boats_texture_cherry_boat.png differ diff --git a/textures/mcl_boats_texture_mangrove_boat.png b/textures/mcl_boats_texture_mangrove_boat.png index c2c3f3f54..be15f67a5 100644 Binary files a/textures/mcl_boats_texture_mangrove_boat.png and b/textures/mcl_boats_texture_mangrove_boat.png differ diff --git a/textures/mcl_book_book_empty_slot.png b/textures/mcl_book_book_empty_slot.png new file mode 100644 index 000000000..e6a50bd9e Binary files /dev/null and b/textures/mcl_book_book_empty_slot.png differ diff --git a/textures/mcl_bossbars.png b/textures/mcl_bossbars.png index 122579a73..cbb74e0df 100644 Binary files a/textures/mcl_bossbars.png and b/textures/mcl_bossbars.png differ diff --git a/textures/mcl_bossbars_empty.png b/textures/mcl_bossbars_empty.png index 192e2a145..eaa84172b 100644 Binary files a/textures/mcl_bossbars_empty.png and b/textures/mcl_bossbars_empty.png differ diff --git a/textures/mcl_bows_arrow.png b/textures/mcl_bows_arrow.png index 765d90029..65f4111ba 100644 Binary files a/textures/mcl_bows_arrow.png and b/textures/mcl_bows_arrow.png differ diff --git a/textures/mcl_bows_arrow_back.png b/textures/mcl_bows_arrow_back.png index 6620599a6..038cee470 100644 Binary files a/textures/mcl_bows_arrow_back.png and b/textures/mcl_bows_arrow_back.png differ diff --git a/textures/mcl_bows_arrow_inv.png b/textures/mcl_bows_arrow_inv.png index bf324d625..65dfb7f0d 100644 Binary files a/textures/mcl_bows_arrow_inv.png and b/textures/mcl_bows_arrow_inv.png differ diff --git a/textures/mcl_bows_arrow_overlay.png b/textures/mcl_bows_arrow_overlay.png index 8f74772d9..8e33f358f 100644 Binary files a/textures/mcl_bows_arrow_overlay.png and b/textures/mcl_bows_arrow_overlay.png differ diff --git a/textures/mcl_bows_crossbow.png b/textures/mcl_bows_crossbow.png index 8e94f32ae..a3f4f8b36 100644 Binary files a/textures/mcl_bows_crossbow.png and b/textures/mcl_bows_crossbow.png differ diff --git a/textures/mcl_bows_crossbow_0.png b/textures/mcl_bows_crossbow_0.png index cf43279f6..337be27bf 100644 Binary files a/textures/mcl_bows_crossbow_0.png and b/textures/mcl_bows_crossbow_0.png differ diff --git a/textures/mcl_bows_crossbow_1.png b/textures/mcl_bows_crossbow_1.png index 4ffe3fe5a..598a3f1a5 100644 Binary files a/textures/mcl_bows_crossbow_1.png and b/textures/mcl_bows_crossbow_1.png differ diff --git a/textures/mcl_bows_crossbow_2.png b/textures/mcl_bows_crossbow_2.png index f90fcacd2..d9bf8ed86 100644 Binary files a/textures/mcl_bows_crossbow_2.png and b/textures/mcl_bows_crossbow_2.png differ diff --git a/textures/mcl_bows_crossbow_3.png b/textures/mcl_bows_crossbow_3.png index 087189ae8..d1e5a07f4 100644 Binary files a/textures/mcl_bows_crossbow_3.png and b/textures/mcl_bows_crossbow_3.png differ diff --git a/textures/mcl_bows_firework_blue.png b/textures/mcl_bows_firework_blue.png index ad5e1d759..7dab41cc8 100644 Binary files a/textures/mcl_bows_firework_blue.png and b/textures/mcl_bows_firework_blue.png differ diff --git a/textures/mcl_bows_firework_green.png b/textures/mcl_bows_firework_green.png index 6a184442d..302bba5b1 100644 Binary files a/textures/mcl_bows_firework_green.png and b/textures/mcl_bows_firework_green.png differ diff --git a/textures/mcl_bows_firework_red.png b/textures/mcl_bows_firework_red.png index 07d3858ff..bc6889a18 100644 Binary files a/textures/mcl_bows_firework_red.png and b/textures/mcl_bows_firework_red.png differ diff --git a/textures/mcl_bows_firework_white.png b/textures/mcl_bows_firework_white.png index 880c51d85..c0a464389 100644 Binary files a/textures/mcl_bows_firework_white.png and b/textures/mcl_bows_firework_white.png differ diff --git a/textures/mcl_bows_firework_yellow.png b/textures/mcl_bows_firework_yellow.png index 4ac6de4d4..9575566fe 100644 Binary files a/textures/mcl_bows_firework_yellow.png and b/textures/mcl_bows_firework_yellow.png differ diff --git a/textures/mcl_bows_rocket.png b/textures/mcl_bows_rocket.png index a650b2ca6..faf7fb576 100644 Binary files a/textures/mcl_bows_rocket.png and b/textures/mcl_bows_rocket.png differ diff --git a/textures/mcl_bows_rocket_particle.png b/textures/mcl_bows_rocket_particle.png index 3bb378a79..5dd5e2f3f 100644 Binary files a/textures/mcl_bows_rocket_particle.png and b/textures/mcl_bows_rocket_particle.png differ diff --git a/textures/mcl_brewing_bottle_bg.png b/textures/mcl_brewing_bottle_bg.png index 0451b4fa4..e6f9b1d91 100644 Binary files a/textures/mcl_brewing_bottle_bg.png and b/textures/mcl_brewing_bottle_bg.png differ diff --git a/textures/mcl_brewing_bubble_sprite.png b/textures/mcl_brewing_bubble_sprite.png index 74447439e..e945203f2 100644 Binary files a/textures/mcl_brewing_bubble_sprite.png and b/textures/mcl_brewing_bubble_sprite.png differ diff --git a/textures/mcl_brewing_bubbles.png b/textures/mcl_brewing_bubbles.png index 22e6a633c..656252a7b 100644 Binary files a/textures/mcl_brewing_bubbles.png and b/textures/mcl_brewing_bubbles.png differ diff --git a/textures/mcl_brewing_bubbles_active.png b/textures/mcl_brewing_bubbles_active.png index eaf4d30cc..c4f74a2a2 100644 Binary files a/textures/mcl_brewing_bubbles_active.png and b/textures/mcl_brewing_bubbles_active.png differ diff --git a/textures/mcl_brewing_burner.png b/textures/mcl_brewing_burner.png index 8c28e4ddd..8df38ac93 100644 Binary files a/textures/mcl_brewing_burner.png and b/textures/mcl_brewing_burner.png differ diff --git a/textures/mcl_brewing_burner_active.png b/textures/mcl_brewing_burner_active.png index d10fd3a0d..cd3c0105b 100644 Binary files a/textures/mcl_brewing_burner_active.png and b/textures/mcl_brewing_burner_active.png differ diff --git a/textures/mcl_brewing_fuel_bg.png b/textures/mcl_brewing_fuel_bg.png index 359f935bc..3e628e84d 100644 Binary files a/textures/mcl_brewing_fuel_bg.png and b/textures/mcl_brewing_fuel_bg.png differ diff --git a/textures/mcl_brewing_inventory.png b/textures/mcl_brewing_inventory.png index 0d849ca8c..4bd6538d8 100644 Binary files a/textures/mcl_brewing_inventory.png and b/textures/mcl_brewing_inventory.png differ diff --git a/textures/mcl_brewing_potion_bg.png b/textures/mcl_brewing_potion_bg.png index daa52b6ea..05ef058a5 100644 Binary files a/textures/mcl_brewing_potion_bg.png and b/textures/mcl_brewing_potion_bg.png differ diff --git a/textures/mcl_brewing_side.png b/textures/mcl_brewing_side.png index f1db61222..eba693d8b 100644 Binary files a/textures/mcl_brewing_side.png and b/textures/mcl_brewing_side.png differ diff --git a/textures/mcl_brewing_top.png b/textures/mcl_brewing_top.png index 3352b92b8..b21718390 100644 Binary files a/textures/mcl_brewing_top.png and b/textures/mcl_brewing_top.png differ diff --git a/textures/mcl_buckets_cod_bucket.png b/textures/mcl_buckets_cod_bucket.png index deeac5af1..bca265ef3 100644 Binary files a/textures/mcl_buckets_cod_bucket.png and b/textures/mcl_buckets_cod_bucket.png differ diff --git a/textures/mcl_buckets_pufferfish_bucket.png b/textures/mcl_buckets_pufferfish_bucket.png index 90871df11..7461c1786 100644 Binary files a/textures/mcl_buckets_pufferfish_bucket.png and b/textures/mcl_buckets_pufferfish_bucket.png differ diff --git a/textures/mcl_buckets_salmon_bucket.png b/textures/mcl_buckets_salmon_bucket.png index 0afb094be..ab30c26e4 100644 Binary files a/textures/mcl_buckets_salmon_bucket.png and b/textures/mcl_buckets_salmon_bucket.png differ diff --git a/textures/mcl_buckets_tropical_fish_bucket.png b/textures/mcl_buckets_tropical_fish_bucket.png index 7c9050763..d29f539d3 100644 Binary files a/textures/mcl_buckets_tropical_fish_bucket.png and b/textures/mcl_buckets_tropical_fish_bucket.png differ diff --git a/textures/mcl_campfires_campfire_fire.png b/textures/mcl_campfires_campfire_fire.png index 519982043..3894744c6 100644 Binary files a/textures/mcl_campfires_campfire_fire.png and b/textures/mcl_campfires_campfire_fire.png differ diff --git a/textures/mcl_campfires_campfire_inv.png b/textures/mcl_campfires_campfire_inv.png index 3e2f68713..04add6ca3 100644 Binary files a/textures/mcl_campfires_campfire_inv.png and b/textures/mcl_campfires_campfire_inv.png differ diff --git a/textures/mcl_campfires_campfire_log_lit.png b/textures/mcl_campfires_campfire_log_lit.png index d2559d03f..117e78369 100644 Binary files a/textures/mcl_campfires_campfire_log_lit.png and b/textures/mcl_campfires_campfire_log_lit.png differ diff --git a/textures/mcl_campfires_fire1.png b/textures/mcl_campfires_fire1.png index 1b467afb0..2956e2e7c 100644 Binary files a/textures/mcl_campfires_fire1.png and b/textures/mcl_campfires_fire1.png differ diff --git a/textures/mcl_campfires_log.png b/textures/mcl_campfires_log.png index b22603f55..62de149a0 100644 Binary files a/textures/mcl_campfires_log.png and b/textures/mcl_campfires_log.png differ diff --git a/textures/mcl_campfires_soul_campfire_fire.png b/textures/mcl_campfires_soul_campfire_fire.png index b73ae37b5..0f5580e5c 100644 Binary files a/textures/mcl_campfires_soul_campfire_fire.png and b/textures/mcl_campfires_soul_campfire_fire.png differ diff --git a/textures/mcl_campfires_soul_campfire_inv.png b/textures/mcl_campfires_soul_campfire_inv.png index b3c50cd92..6dd17614e 100644 Binary files a/textures/mcl_campfires_soul_campfire_inv.png and b/textures/mcl_campfires_soul_campfire_inv.png differ diff --git a/textures/mcl_campfires_soul_campfire_log_lit.png b/textures/mcl_campfires_soul_campfire_log_lit.png index c261a33d5..aa7459bf5 100644 Binary files a/textures/mcl_campfires_soul_campfire_log_lit.png and b/textures/mcl_campfires_soul_campfire_log_lit.png differ diff --git a/textures/mcl_cartography_table_side1.png b/textures/mcl_cartography_table_side1.png index 8c73ab23a..0f31fb4b2 100644 Binary files a/textures/mcl_cartography_table_side1.png and b/textures/mcl_cartography_table_side1.png differ diff --git a/textures/mcl_cartography_table_side2.png b/textures/mcl_cartography_table_side2.png index 1492c017d..68fc59706 100644 Binary files a/textures/mcl_cartography_table_side2.png and b/textures/mcl_cartography_table_side2.png differ diff --git a/textures/mcl_cartography_table_side3.png b/textures/mcl_cartography_table_side3.png index a905f1fa9..d7b27f04e 100644 Binary files a/textures/mcl_cartography_table_side3.png and b/textures/mcl_cartography_table_side3.png differ diff --git a/textures/mcl_cartography_table_top.png b/textures/mcl_cartography_table_top.png index f2666368c..57c7a32e1 100644 Binary files a/textures/mcl_cartography_table_top.png and b/textures/mcl_cartography_table_top.png differ diff --git a/textures/mcl_cherry_blossom_door_bottom.png b/textures/mcl_cherry_blossom_door_bottom.png new file mode 100644 index 000000000..0a5b3661f Binary files /dev/null and b/textures/mcl_cherry_blossom_door_bottom.png differ diff --git a/textures/mcl_cherry_blossom_door_bottom_bottompart.png b/textures/mcl_cherry_blossom_door_bottom_bottompart.png new file mode 100644 index 000000000..5c65e6f46 Binary files /dev/null and b/textures/mcl_cherry_blossom_door_bottom_bottompart.png differ diff --git a/textures/mcl_cherry_blossom_door_bottom_side.png b/textures/mcl_cherry_blossom_door_bottom_side.png new file mode 100644 index 000000000..5c6109b6f Binary files /dev/null and b/textures/mcl_cherry_blossom_door_bottom_side.png differ diff --git a/textures/mcl_cherry_blossom_door_inv.png b/textures/mcl_cherry_blossom_door_inv.png new file mode 100644 index 000000000..f3a15c090 Binary files /dev/null and b/textures/mcl_cherry_blossom_door_inv.png differ diff --git a/textures/mcl_cherry_blossom_door_top.png b/textures/mcl_cherry_blossom_door_top.png new file mode 100644 index 000000000..b2ac87e14 Binary files /dev/null and b/textures/mcl_cherry_blossom_door_top.png differ diff --git a/textures/mcl_cherry_blossom_door_top_side.png b/textures/mcl_cherry_blossom_door_top_side.png new file mode 100644 index 000000000..5c6109b6f Binary files /dev/null and b/textures/mcl_cherry_blossom_door_top_side.png differ diff --git a/textures/mcl_cherry_blossom_door_top_toppart.png b/textures/mcl_cherry_blossom_door_top_toppart.png new file mode 100644 index 000000000..ed317fa2c Binary files /dev/null and b/textures/mcl_cherry_blossom_door_top_toppart.png differ diff --git a/textures/mcl_cherry_blossom_leaves.png b/textures/mcl_cherry_blossom_leaves.png new file mode 100644 index 000000000..94e223d5b Binary files /dev/null and b/textures/mcl_cherry_blossom_leaves.png differ diff --git a/textures/mcl_cherry_blossom_log.png b/textures/mcl_cherry_blossom_log.png new file mode 100644 index 000000000..05feb9721 Binary files /dev/null and b/textures/mcl_cherry_blossom_log.png differ diff --git a/textures/mcl_cherry_blossom_log_stripped.png b/textures/mcl_cherry_blossom_log_stripped.png new file mode 100644 index 000000000..33e84f7d6 Binary files /dev/null and b/textures/mcl_cherry_blossom_log_stripped.png differ diff --git a/textures/mcl_cherry_blossom_log_top.png b/textures/mcl_cherry_blossom_log_top.png new file mode 100644 index 000000000..48450e458 Binary files /dev/null and b/textures/mcl_cherry_blossom_log_top.png differ diff --git a/textures/mcl_cherry_blossom_log_top_stripped.png b/textures/mcl_cherry_blossom_log_top_stripped.png new file mode 100644 index 000000000..775e2664e Binary files /dev/null and b/textures/mcl_cherry_blossom_log_top_stripped.png differ diff --git a/textures/mcl_cherry_blossom_particle.png b/textures/mcl_cherry_blossom_particle.png new file mode 100644 index 000000000..eabdb097c Binary files /dev/null and b/textures/mcl_cherry_blossom_particle.png differ diff --git a/textures/mcl_cherry_blossom_planks.png b/textures/mcl_cherry_blossom_planks.png new file mode 100644 index 000000000..9d2306eb8 Binary files /dev/null and b/textures/mcl_cherry_blossom_planks.png differ diff --git a/textures/mcl_cherry_blossom_sapling.png b/textures/mcl_cherry_blossom_sapling.png new file mode 100644 index 000000000..9ef0d919c Binary files /dev/null and b/textures/mcl_cherry_blossom_sapling.png differ diff --git a/textures/mcl_cherry_blossom_sign.png b/textures/mcl_cherry_blossom_sign.png new file mode 100644 index 000000000..3ec1958c0 Binary files /dev/null and b/textures/mcl_cherry_blossom_sign.png differ diff --git a/textures/mcl_cherry_blossom_sign_inv.png b/textures/mcl_cherry_blossom_sign_inv.png new file mode 100644 index 000000000..f052d3643 Binary files /dev/null and b/textures/mcl_cherry_blossom_sign_inv.png differ diff --git a/textures/mcl_cherry_blossom_trapdoor.png b/textures/mcl_cherry_blossom_trapdoor.png new file mode 100644 index 000000000..ecf68e629 Binary files /dev/null and b/textures/mcl_cherry_blossom_trapdoor.png differ diff --git a/textures/mcl_cherry_blossom_trapdoor_side.png b/textures/mcl_cherry_blossom_trapdoor_side.png new file mode 100644 index 000000000..7f4a84a4c Binary files /dev/null and b/textures/mcl_cherry_blossom_trapdoor_side.png differ diff --git a/textures/mcl_chests_ender_present.png b/textures/mcl_chests_ender_present.png index 85df1bfba..869e4b909 100644 Binary files a/textures/mcl_chests_ender_present.png and b/textures/mcl_chests_ender_present.png differ diff --git a/textures/mcl_chests_normal_present.png b/textures/mcl_chests_normal_present.png index 23faf46b8..182d7c358 100644 Binary files a/textures/mcl_chests_normal_present.png and b/textures/mcl_chests_normal_present.png differ diff --git a/textures/mcl_chests_trapped_present.png b/textures/mcl_chests_trapped_present.png index 473f24c57..c6e3690d1 100644 Binary files a/textures/mcl_chests_trapped_present.png and b/textures/mcl_chests_trapped_present.png differ diff --git a/textures/mcl_chiseled_deepslate.png b/textures/mcl_chiseled_deepslate.png index c76012d2d..8150e5230 100644 Binary files a/textures/mcl_chiseled_deepslate.png and b/textures/mcl_chiseled_deepslate.png differ diff --git a/textures/mcl_cobbled_deepslate.png b/textures/mcl_cobbled_deepslate.png index 243d118ed..05f03f3e8 100644 Binary files a/textures/mcl_cobbled_deepslate.png and b/textures/mcl_cobbled_deepslate.png differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_orange.png b/textures/mcl_colorblocks_glazed_terracotta_orange.png index 531e1f14c..1892d825f 100644 Binary files a/textures/mcl_colorblocks_glazed_terracotta_orange.png and b/textures/mcl_colorblocks_glazed_terracotta_orange.png differ diff --git a/textures/mcl_comparators_on.png b/textures/mcl_comparators_on.png index d6c2a1201..740a16fa3 100644 Binary files a/textures/mcl_comparators_on.png and b/textures/mcl_comparators_on.png differ diff --git a/textures/mcl_compass_recovery_compass_00.png b/textures/mcl_compass_recovery_compass_00.png index 1f5f2fcbe..9dda90628 100644 Binary files a/textures/mcl_compass_recovery_compass_00.png and b/textures/mcl_compass_recovery_compass_00.png differ diff --git a/textures/mcl_compass_recovery_compass_01.png b/textures/mcl_compass_recovery_compass_01.png index 755ca11c2..ba039cef7 100644 Binary files a/textures/mcl_compass_recovery_compass_01.png and b/textures/mcl_compass_recovery_compass_01.png differ diff --git a/textures/mcl_compass_recovery_compass_02.png b/textures/mcl_compass_recovery_compass_02.png index 2b24f707e..08a4d4e92 100644 Binary files a/textures/mcl_compass_recovery_compass_02.png and b/textures/mcl_compass_recovery_compass_02.png differ diff --git a/textures/mcl_compass_recovery_compass_03.png b/textures/mcl_compass_recovery_compass_03.png index 8db8f016f..a96319988 100644 Binary files a/textures/mcl_compass_recovery_compass_03.png and b/textures/mcl_compass_recovery_compass_03.png differ diff --git a/textures/mcl_compass_recovery_compass_04.png b/textures/mcl_compass_recovery_compass_04.png index d50f6167e..bb6bfa790 100644 Binary files a/textures/mcl_compass_recovery_compass_04.png and b/textures/mcl_compass_recovery_compass_04.png differ diff --git a/textures/mcl_compass_recovery_compass_05.png b/textures/mcl_compass_recovery_compass_05.png index 5dfc87bbb..a8f949154 100644 Binary files a/textures/mcl_compass_recovery_compass_05.png and b/textures/mcl_compass_recovery_compass_05.png differ diff --git a/textures/mcl_compass_recovery_compass_06.png b/textures/mcl_compass_recovery_compass_06.png index 3294694ae..0c1789c3e 100644 Binary files a/textures/mcl_compass_recovery_compass_06.png and b/textures/mcl_compass_recovery_compass_06.png differ diff --git a/textures/mcl_compass_recovery_compass_07.png b/textures/mcl_compass_recovery_compass_07.png index dab9e3324..c381d11a1 100644 Binary files a/textures/mcl_compass_recovery_compass_07.png and b/textures/mcl_compass_recovery_compass_07.png differ diff --git a/textures/mcl_compass_recovery_compass_08.png b/textures/mcl_compass_recovery_compass_08.png index a330d65e5..c381d11a1 100644 Binary files a/textures/mcl_compass_recovery_compass_08.png and b/textures/mcl_compass_recovery_compass_08.png differ diff --git a/textures/mcl_compass_recovery_compass_09.png b/textures/mcl_compass_recovery_compass_09.png index 28634a90d..c381d11a1 100644 Binary files a/textures/mcl_compass_recovery_compass_09.png and b/textures/mcl_compass_recovery_compass_09.png differ diff --git a/textures/mcl_compass_recovery_compass_10.png b/textures/mcl_compass_recovery_compass_10.png index abb1ac62e..effff9282 100644 Binary files a/textures/mcl_compass_recovery_compass_10.png and b/textures/mcl_compass_recovery_compass_10.png differ diff --git a/textures/mcl_compass_recovery_compass_11.png b/textures/mcl_compass_recovery_compass_11.png index 40399fdda..a36646f1d 100644 Binary files a/textures/mcl_compass_recovery_compass_11.png and b/textures/mcl_compass_recovery_compass_11.png differ diff --git a/textures/mcl_compass_recovery_compass_12.png b/textures/mcl_compass_recovery_compass_12.png index 5ffb5cfb2..dedc71610 100644 Binary files a/textures/mcl_compass_recovery_compass_12.png and b/textures/mcl_compass_recovery_compass_12.png differ diff --git a/textures/mcl_compass_recovery_compass_13.png b/textures/mcl_compass_recovery_compass_13.png index e491f4f68..148ae68c3 100644 Binary files a/textures/mcl_compass_recovery_compass_13.png and b/textures/mcl_compass_recovery_compass_13.png differ diff --git a/textures/mcl_compass_recovery_compass_14.png b/textures/mcl_compass_recovery_compass_14.png index 6b97276be..b461e4776 100644 Binary files a/textures/mcl_compass_recovery_compass_14.png and b/textures/mcl_compass_recovery_compass_14.png differ diff --git a/textures/mcl_compass_recovery_compass_15.png b/textures/mcl_compass_recovery_compass_15.png index 205995263..bcb44e6c6 100644 Binary files a/textures/mcl_compass_recovery_compass_15.png and b/textures/mcl_compass_recovery_compass_15.png differ diff --git a/textures/mcl_compass_recovery_compass_16.png b/textures/mcl_compass_recovery_compass_16.png index b05ee74b0..bf3645cc6 100644 Binary files a/textures/mcl_compass_recovery_compass_16.png and b/textures/mcl_compass_recovery_compass_16.png differ diff --git a/textures/mcl_compass_recovery_compass_17.png b/textures/mcl_compass_recovery_compass_17.png index c3e397f50..df432e124 100644 Binary files a/textures/mcl_compass_recovery_compass_17.png and b/textures/mcl_compass_recovery_compass_17.png differ diff --git a/textures/mcl_compass_recovery_compass_18.png b/textures/mcl_compass_recovery_compass_18.png index fa276b85f..50444fdf0 100644 Binary files a/textures/mcl_compass_recovery_compass_18.png and b/textures/mcl_compass_recovery_compass_18.png differ diff --git a/textures/mcl_compass_recovery_compass_19.png b/textures/mcl_compass_recovery_compass_19.png index 98d83685c..6bdd24461 100644 Binary files a/textures/mcl_compass_recovery_compass_19.png and b/textures/mcl_compass_recovery_compass_19.png differ diff --git a/textures/mcl_compass_recovery_compass_20.png b/textures/mcl_compass_recovery_compass_20.png index 03b78851f..c2c2361d6 100644 Binary files a/textures/mcl_compass_recovery_compass_20.png and b/textures/mcl_compass_recovery_compass_20.png differ diff --git a/textures/mcl_compass_recovery_compass_21.png b/textures/mcl_compass_recovery_compass_21.png index a514d0ac9..1d5639777 100644 Binary files a/textures/mcl_compass_recovery_compass_21.png and b/textures/mcl_compass_recovery_compass_21.png differ diff --git a/textures/mcl_compass_recovery_compass_22.png b/textures/mcl_compass_recovery_compass_22.png index b2fbe8c3e..e5e7631fe 100644 Binary files a/textures/mcl_compass_recovery_compass_22.png and b/textures/mcl_compass_recovery_compass_22.png differ diff --git a/textures/mcl_compass_recovery_compass_23.png b/textures/mcl_compass_recovery_compass_23.png index 594231cf2..6f0f59d27 100644 Binary files a/textures/mcl_compass_recovery_compass_23.png and b/textures/mcl_compass_recovery_compass_23.png differ diff --git a/textures/mcl_compass_recovery_compass_24.png b/textures/mcl_compass_recovery_compass_24.png index 91e4984fe..6f0f59d27 100644 Binary files a/textures/mcl_compass_recovery_compass_24.png and b/textures/mcl_compass_recovery_compass_24.png differ diff --git a/textures/mcl_compass_recovery_compass_25.png b/textures/mcl_compass_recovery_compass_25.png index ec69ecffa..6f0f59d27 100644 Binary files a/textures/mcl_compass_recovery_compass_25.png and b/textures/mcl_compass_recovery_compass_25.png differ diff --git a/textures/mcl_compass_recovery_compass_26.png b/textures/mcl_compass_recovery_compass_26.png index f1786ae00..643101d73 100644 Binary files a/textures/mcl_compass_recovery_compass_26.png and b/textures/mcl_compass_recovery_compass_26.png differ diff --git a/textures/mcl_compass_recovery_compass_27.png b/textures/mcl_compass_recovery_compass_27.png index 65a39b69f..6e68a4b0c 100644 Binary files a/textures/mcl_compass_recovery_compass_27.png and b/textures/mcl_compass_recovery_compass_27.png differ diff --git a/textures/mcl_compass_recovery_compass_28.png b/textures/mcl_compass_recovery_compass_28.png index 69f01fe77..7949fcfc4 100644 Binary files a/textures/mcl_compass_recovery_compass_28.png and b/textures/mcl_compass_recovery_compass_28.png differ diff --git a/textures/mcl_compass_recovery_compass_29.png b/textures/mcl_compass_recovery_compass_29.png index 5ba62e90e..816aa18cd 100644 Binary files a/textures/mcl_compass_recovery_compass_29.png and b/textures/mcl_compass_recovery_compass_29.png differ diff --git a/textures/mcl_compass_recovery_compass_30.png b/textures/mcl_compass_recovery_compass_30.png index 06c3ed963..d90e6e4ce 100644 Binary files a/textures/mcl_compass_recovery_compass_30.png and b/textures/mcl_compass_recovery_compass_30.png differ diff --git a/textures/mcl_compass_recovery_compass_31.png b/textures/mcl_compass_recovery_compass_31.png index ee2126bcd..9fb2647ab 100644 Binary files a/textures/mcl_compass_recovery_compass_31.png and b/textures/mcl_compass_recovery_compass_31.png differ diff --git a/textures/mcl_composter_compost.png b/textures/mcl_composter_compost.png index afda87c71..40e7bb423 100644 Binary files a/textures/mcl_composter_compost.png and b/textures/mcl_composter_compost.png differ diff --git a/textures/mcl_copper_anti_oxidation_particle.png b/textures/mcl_copper_anti_oxidation_particle.png index c7192df0e..3d918b0f8 100644 Binary files a/textures/mcl_copper_anti_oxidation_particle.png and b/textures/mcl_copper_anti_oxidation_particle.png differ diff --git a/textures/mcl_copper_block.png b/textures/mcl_copper_block.png index 35dd0ac0b..ae4a33163 100644 Binary files a/textures/mcl_copper_block.png and b/textures/mcl_copper_block.png differ diff --git a/textures/mcl_copper_block_cut.png b/textures/mcl_copper_block_cut.png index c9cf8c30d..c591322b2 100644 Binary files a/textures/mcl_copper_block_cut.png and b/textures/mcl_copper_block_cut.png differ diff --git a/textures/mcl_copper_block_raw.png b/textures/mcl_copper_block_raw.png index 20b33f15d..9ca04bd81 100644 Binary files a/textures/mcl_copper_block_raw.png and b/textures/mcl_copper_block_raw.png differ diff --git a/textures/mcl_copper_exposed.png b/textures/mcl_copper_exposed.png index ef37b77ae..46195b50c 100644 Binary files a/textures/mcl_copper_exposed.png and b/textures/mcl_copper_exposed.png differ diff --git a/textures/mcl_copper_exposed_cut.png b/textures/mcl_copper_exposed_cut.png index 902026fea..728928222 100644 Binary files a/textures/mcl_copper_exposed_cut.png and b/textures/mcl_copper_exposed_cut.png differ diff --git a/textures/mcl_copper_ingot.png b/textures/mcl_copper_ingot.png index c458bebce..ebd6a71c0 100644 Binary files a/textures/mcl_copper_ingot.png and b/textures/mcl_copper_ingot.png differ diff --git a/textures/mcl_copper_ore.png b/textures/mcl_copper_ore.png index e898e8251..2588566e9 100644 Binary files a/textures/mcl_copper_ore.png and b/textures/mcl_copper_ore.png differ diff --git a/textures/mcl_copper_oxidized.png b/textures/mcl_copper_oxidized.png index 234526b31..900ebd181 100644 Binary files a/textures/mcl_copper_oxidized.png and b/textures/mcl_copper_oxidized.png differ diff --git a/textures/mcl_copper_oxidized_cut.png b/textures/mcl_copper_oxidized_cut.png index 5964f5bd0..5e04fce22 100644 Binary files a/textures/mcl_copper_oxidized_cut.png and b/textures/mcl_copper_oxidized_cut.png differ diff --git a/textures/mcl_copper_raw.png b/textures/mcl_copper_raw.png index 1a7d8eaa2..107d00419 100644 Binary files a/textures/mcl_copper_raw.png and b/textures/mcl_copper_raw.png differ diff --git a/textures/mcl_copper_weathered.png b/textures/mcl_copper_weathered.png index bf17b9014..c459d0382 100644 Binary files a/textures/mcl_copper_weathered.png and b/textures/mcl_copper_weathered.png differ diff --git a/textures/mcl_copper_weathered_cut.png b/textures/mcl_copper_weathered_cut.png index 89f6d2d49..8cf8ad78d 100644 Binary files a/textures/mcl_copper_weathered_cut.png and b/textures/mcl_copper_weathered_cut.png differ diff --git a/textures/mcl_core_coarse_dirt.png b/textures/mcl_core_coarse_dirt.png index efe195ef4..5464763bb 100644 Binary files a/textures/mcl_core_coarse_dirt.png and b/textures/mcl_core_coarse_dirt.png differ diff --git a/textures/mcl_core_crying_obsidian.png b/textures/mcl_core_crying_obsidian.png index 1f77335cb..96b230a4d 100644 Binary files a/textures/mcl_core_crying_obsidian.png and b/textures/mcl_core_crying_obsidian.png differ diff --git a/textures/mcl_core_crying_obsidian_tear2.png b/textures/mcl_core_crying_obsidian_tear2.png index 07d1978ba..e0174d8e8 100644 Binary files a/textures/mcl_core_crying_obsidian_tear2.png and b/textures/mcl_core_crying_obsidian_tear2.png differ diff --git a/textures/mcl_core_crying_obsidian_tear3.png b/textures/mcl_core_crying_obsidian_tear3.png index ea0f58393..d75ffe2a5 100644 Binary files a/textures/mcl_core_crying_obsidian_tear3.png and b/textures/mcl_core_crying_obsidian_tear3.png differ diff --git a/textures/mcl_core_dirt_podzol_side.png b/textures/mcl_core_dirt_podzol_side.png index bf31e8673..f129d84b2 100644 Binary files a/textures/mcl_core_dirt_podzol_side.png and b/textures/mcl_core_dirt_podzol_side.png differ diff --git a/textures/mcl_core_grass_block_side_overlay.png b/textures/mcl_core_grass_block_side_overlay.png index 14d4de647..e1aa70bda 100644 Binary files a/textures/mcl_core_grass_block_side_overlay.png and b/textures/mcl_core_grass_block_side_overlay.png differ diff --git a/textures/mcl_core_grass_block_top.png b/textures/mcl_core_grass_block_top.png index 24c802031..26bdfdb70 100644 Binary files a/textures/mcl_core_grass_block_top.png and b/textures/mcl_core_grass_block_top.png differ diff --git a/textures/mcl_core_grass_path_side.png b/textures/mcl_core_grass_path_side.png index ff79d8c4d..900d81e80 100644 Binary files a/textures/mcl_core_grass_path_side.png and b/textures/mcl_core_grass_path_side.png differ diff --git a/textures/mcl_core_grass_path_top.png b/textures/mcl_core_grass_path_top.png index 7537af9a6..e4c6dce82 100644 Binary files a/textures/mcl_core_grass_path_top.png and b/textures/mcl_core_grass_path_top.png differ diff --git a/textures/mcl_core_grass_side_snowed.png b/textures/mcl_core_grass_side_snowed.png index ad0b9cba0..887d0ba19 100644 Binary files a/textures/mcl_core_grass_side_snowed.png and b/textures/mcl_core_grass_side_snowed.png differ diff --git a/textures/mcl_core_iron_nugget.png b/textures/mcl_core_iron_nugget.png index e0ae730b4..4f78bd0b2 100644 Binary files a/textures/mcl_core_iron_nugget.png and b/textures/mcl_core_iron_nugget.png differ diff --git a/textures/mcl_core_light_11.png b/textures/mcl_core_light_11.png index 3d30e5653..f5078cda6 100644 Binary files a/textures/mcl_core_light_11.png and b/textures/mcl_core_light_11.png differ diff --git a/textures/mcl_core_mycelium_particle.png b/textures/mcl_core_mycelium_particle.png index abf43e33a..5494d9cc5 100644 Binary files a/textures/mcl_core_mycelium_particle.png and b/textures/mcl_core_mycelium_particle.png differ diff --git a/textures/mcl_core_mycelium_side.png b/textures/mcl_core_mycelium_side.png index bbc0710b3..cab054adb 100644 Binary files a/textures/mcl_core_mycelium_side.png and b/textures/mcl_core_mycelium_side.png differ diff --git a/textures/mcl_core_mycelium_top.png b/textures/mcl_core_mycelium_top.png index 56193d07b..ed02e33b3 100644 Binary files a/textures/mcl_core_mycelium_top.png and b/textures/mcl_core_mycelium_top.png differ diff --git a/textures/mcl_core_palette_foliage.png b/textures/mcl_core_palette_foliage.png index 76556c578..5e41a7f34 100644 Binary files a/textures/mcl_core_palette_foliage.png and b/textures/mcl_core_palette_foliage.png differ diff --git a/textures/mcl_core_palette_grass.png b/textures/mcl_core_palette_grass.png index 7aee5b33f..8bc4828ef 100644 Binary files a/textures/mcl_core_palette_grass.png and b/textures/mcl_core_palette_grass.png differ diff --git a/textures/mcl_core_palette_water.png b/textures/mcl_core_palette_water.png index f8f767569..c5ec09117 100644 Binary files a/textures/mcl_core_palette_water.png and b/textures/mcl_core_palette_water.png differ diff --git a/textures/mcl_core_papyrus.png b/textures/mcl_core_papyrus.png index e5d90df00..ca1850eaf 100644 Binary files a/textures/mcl_core_papyrus.png and b/textures/mcl_core_papyrus.png differ diff --git a/textures/mcl_core_red_sand.png b/textures/mcl_core_red_sand.png index 1824b7d48..b8e8a7653 100644 Binary files a/textures/mcl_core_red_sand.png and b/textures/mcl_core_red_sand.png differ diff --git a/textures/mcl_core_red_sandstone_bottom.png b/textures/mcl_core_red_sandstone_bottom.png index 93825017f..d7e0e2922 100644 Binary files a/textures/mcl_core_red_sandstone_bottom.png and b/textures/mcl_core_red_sandstone_bottom.png differ diff --git a/textures/mcl_core_red_sandstone_carved.png b/textures/mcl_core_red_sandstone_carved.png index c296256cb..ef65c4af0 100644 Binary files a/textures/mcl_core_red_sandstone_carved.png and b/textures/mcl_core_red_sandstone_carved.png differ diff --git a/textures/mcl_core_red_sandstone_normal.png b/textures/mcl_core_red_sandstone_normal.png index 19124c290..20be1dbc5 100644 Binary files a/textures/mcl_core_red_sandstone_normal.png and b/textures/mcl_core_red_sandstone_normal.png differ diff --git a/textures/mcl_core_red_sandstone_smooth.png b/textures/mcl_core_red_sandstone_smooth.png index 93825017f..d7e0e2922 100644 Binary files a/textures/mcl_core_red_sandstone_smooth.png and b/textures/mcl_core_red_sandstone_smooth.png differ diff --git a/textures/mcl_core_red_sandstone_top.png b/textures/mcl_core_red_sandstone_top.png index dbb8548d4..42412eb8f 100644 Binary files a/textures/mcl_core_red_sandstone_top.png and b/textures/mcl_core_red_sandstone_top.png differ diff --git a/textures/mcl_core_sandstone_bottom.png b/textures/mcl_core_sandstone_bottom.png index 9846dba92..4699e1e3e 100644 Binary files a/textures/mcl_core_sandstone_bottom.png and b/textures/mcl_core_sandstone_bottom.png differ diff --git a/textures/mcl_core_sandstone_carved.png b/textures/mcl_core_sandstone_carved.png index bf535cd20..6c51a27f4 100644 Binary files a/textures/mcl_core_sandstone_carved.png and b/textures/mcl_core_sandstone_carved.png differ diff --git a/textures/mcl_core_sandstone_normal.png b/textures/mcl_core_sandstone_normal.png index b4e33346f..f32bd274e 100644 Binary files a/textures/mcl_core_sandstone_normal.png and b/textures/mcl_core_sandstone_normal.png differ diff --git a/textures/mcl_core_sandstone_smooth.png b/textures/mcl_core_sandstone_smooth.png index 9846dba92..4699e1e3e 100644 Binary files a/textures/mcl_core_sandstone_smooth.png and b/textures/mcl_core_sandstone_smooth.png differ diff --git a/textures/mcl_core_sandstone_top.png b/textures/mcl_core_sandstone_top.png index 388fe08c7..36c292a8b 100644 Binary files a/textures/mcl_core_sandstone_top.png and b/textures/mcl_core_sandstone_top.png differ diff --git a/textures/mcl_core_stripped_acacia_side.png b/textures/mcl_core_stripped_acacia_side.png index e636f8434..2ba79863d 100644 Binary files a/textures/mcl_core_stripped_acacia_side.png and b/textures/mcl_core_stripped_acacia_side.png differ diff --git a/textures/mcl_core_stripped_acacia_top.png b/textures/mcl_core_stripped_acacia_top.png index 95acd3ae0..9dd1f2c97 100644 Binary files a/textures/mcl_core_stripped_acacia_top.png and b/textures/mcl_core_stripped_acacia_top.png differ diff --git a/textures/mcl_core_stripped_birch_side.png b/textures/mcl_core_stripped_birch_side.png index 5eed80b39..7b8288bb2 100644 Binary files a/textures/mcl_core_stripped_birch_side.png and b/textures/mcl_core_stripped_birch_side.png differ diff --git a/textures/mcl_core_stripped_birch_top.png b/textures/mcl_core_stripped_birch_top.png index f1ccd97cd..af3e0b639 100644 Binary files a/textures/mcl_core_stripped_birch_top.png and b/textures/mcl_core_stripped_birch_top.png differ diff --git a/textures/mcl_core_stripped_dark_oak_side.png b/textures/mcl_core_stripped_dark_oak_side.png index 32a8bfebd..cd22ee99e 100644 Binary files a/textures/mcl_core_stripped_dark_oak_side.png and b/textures/mcl_core_stripped_dark_oak_side.png differ diff --git a/textures/mcl_core_stripped_dark_oak_top.png b/textures/mcl_core_stripped_dark_oak_top.png index 51d9744af..0ade88253 100644 Binary files a/textures/mcl_core_stripped_dark_oak_top.png and b/textures/mcl_core_stripped_dark_oak_top.png differ diff --git a/textures/mcl_core_stripped_jungle_side.png b/textures/mcl_core_stripped_jungle_side.png index f46c6c256..7d9f58915 100644 Binary files a/textures/mcl_core_stripped_jungle_side.png and b/textures/mcl_core_stripped_jungle_side.png differ diff --git a/textures/mcl_core_stripped_jungle_top.png b/textures/mcl_core_stripped_jungle_top.png index 4f6ad35e8..21aa8dfee 100644 Binary files a/textures/mcl_core_stripped_jungle_top.png and b/textures/mcl_core_stripped_jungle_top.png differ diff --git a/textures/mcl_core_stripped_oak_side.png b/textures/mcl_core_stripped_oak_side.png index c37220bb6..88666bafd 100644 Binary files a/textures/mcl_core_stripped_oak_side.png and b/textures/mcl_core_stripped_oak_side.png differ diff --git a/textures/mcl_core_stripped_oak_top.png b/textures/mcl_core_stripped_oak_top.png index e4843d715..56ffdb3b2 100644 Binary files a/textures/mcl_core_stripped_oak_top.png and b/textures/mcl_core_stripped_oak_top.png differ diff --git a/textures/mcl_core_stripped_spruce_side.png b/textures/mcl_core_stripped_spruce_side.png index 612e32339..c9acefdf4 100644 Binary files a/textures/mcl_core_stripped_spruce_side.png and b/textures/mcl_core_stripped_spruce_side.png differ diff --git a/textures/mcl_core_stripped_spruce_top.png b/textures/mcl_core_stripped_spruce_top.png index 99a71f88c..db552235a 100644 Binary files a/textures/mcl_core_stripped_spruce_top.png and b/textures/mcl_core_stripped_spruce_top.png differ diff --git a/textures/mcl_cracked_deepslate_bricks.png b/textures/mcl_cracked_deepslate_bricks.png index d67eefe25..f5baf8cff 100644 Binary files a/textures/mcl_cracked_deepslate_bricks.png and b/textures/mcl_cracked_deepslate_bricks.png differ diff --git a/textures/mcl_cracked_deepslate_tiles.png b/textures/mcl_cracked_deepslate_tiles.png index a8763eff0..dbe8719cf 100644 Binary files a/textures/mcl_cracked_deepslate_tiles.png and b/textures/mcl_cracked_deepslate_tiles.png differ diff --git a/textures/mcl_crimson_crimson_door.png b/textures/mcl_crimson_crimson_door.png index dc325a00f..52a123d4c 100644 Binary files a/textures/mcl_crimson_crimson_door.png and b/textures/mcl_crimson_crimson_door.png differ diff --git a/textures/mcl_crimson_crimson_door_bottom.png b/textures/mcl_crimson_crimson_door_bottom.png index 8da6915f2..77da720ff 100644 Binary files a/textures/mcl_crimson_crimson_door_bottom.png and b/textures/mcl_crimson_crimson_door_bottom.png differ diff --git a/textures/mcl_crimson_crimson_door_bottom_bottompart.png b/textures/mcl_crimson_crimson_door_bottom_bottompart.png new file mode 100644 index 000000000..31a1afe29 Binary files /dev/null and b/textures/mcl_crimson_crimson_door_bottom_bottompart.png differ diff --git a/textures/mcl_crimson_crimson_door_bottom_side.png b/textures/mcl_crimson_crimson_door_bottom_side.png new file mode 100644 index 000000000..934abe3c1 Binary files /dev/null and b/textures/mcl_crimson_crimson_door_bottom_side.png differ diff --git a/textures/mcl_crimson_crimson_door_top.png b/textures/mcl_crimson_crimson_door_top.png index c55f28ec7..f6bc75687 100644 Binary files a/textures/mcl_crimson_crimson_door_top.png and b/textures/mcl_crimson_crimson_door_top.png differ diff --git a/textures/mcl_crimson_crimson_door_top_side.png b/textures/mcl_crimson_crimson_door_top_side.png new file mode 100644 index 000000000..e941e8844 Binary files /dev/null and b/textures/mcl_crimson_crimson_door_top_side.png differ diff --git a/textures/mcl_crimson_crimson_door_top_toppart.png b/textures/mcl_crimson_crimson_door_top_toppart.png new file mode 100644 index 000000000..ac3e1dff4 Binary files /dev/null and b/textures/mcl_crimson_crimson_door_top_toppart.png differ diff --git a/textures/mcl_crimson_crimson_fungus.png b/textures/mcl_crimson_crimson_fungus.png index 2c3d3b599..9c4a48901 100644 Binary files a/textures/mcl_crimson_crimson_fungus.png and b/textures/mcl_crimson_crimson_fungus.png differ diff --git a/textures/mcl_crimson_crimson_hyphae_wood.png b/textures/mcl_crimson_crimson_hyphae_wood.png index 0061537f0..b2e131031 100644 Binary files a/textures/mcl_crimson_crimson_hyphae_wood.png and b/textures/mcl_crimson_crimson_hyphae_wood.png differ diff --git a/textures/mcl_crimson_crimson_nylium_side.png b/textures/mcl_crimson_crimson_nylium_side.png index def8c73d4..e4a2ecaa1 100644 Binary files a/textures/mcl_crimson_crimson_nylium_side.png and b/textures/mcl_crimson_crimson_nylium_side.png differ diff --git a/textures/mcl_crimson_crimson_trapdoor_side.png b/textures/mcl_crimson_crimson_trapdoor_side.png new file mode 100644 index 000000000..45abf9111 Binary files /dev/null and b/textures/mcl_crimson_crimson_trapdoor_side.png differ diff --git a/textures/mcl_crimson_nether_sprouts.png b/textures/mcl_crimson_nether_sprouts.png index 469c9db69..7f91d8af6 100644 Binary files a/textures/mcl_crimson_nether_sprouts.png and b/textures/mcl_crimson_nether_sprouts.png differ diff --git a/textures/mcl_crimson_shroomlight.png b/textures/mcl_crimson_shroomlight.png index a7ce84e48..51056110f 100644 Binary files a/textures/mcl_crimson_shroomlight.png and b/textures/mcl_crimson_shroomlight.png differ diff --git a/textures/mcl_crimson_twisting_vines.png b/textures/mcl_crimson_twisting_vines.png index 2837496db..528b62580 100644 Binary files a/textures/mcl_crimson_twisting_vines.png and b/textures/mcl_crimson_twisting_vines.png differ diff --git a/textures/mcl_crimson_twisting_vines_plant.png b/textures/mcl_crimson_twisting_vines_plant.png index 690098adf..7c2afda4e 100644 Binary files a/textures/mcl_crimson_twisting_vines_plant.png and b/textures/mcl_crimson_twisting_vines_plant.png differ diff --git a/textures/mcl_crimson_warped_door.png b/textures/mcl_crimson_warped_door.png index 66639b4c2..2359fc69c 100644 Binary files a/textures/mcl_crimson_warped_door.png and b/textures/mcl_crimson_warped_door.png differ diff --git a/textures/mcl_crimson_warped_door_bottom.png b/textures/mcl_crimson_warped_door_bottom.png index 942eff928..c8715f548 100644 Binary files a/textures/mcl_crimson_warped_door_bottom.png and b/textures/mcl_crimson_warped_door_bottom.png differ diff --git a/textures/mcl_crimson_warped_door_bottom_bottompart.png b/textures/mcl_crimson_warped_door_bottom_bottompart.png new file mode 100644 index 000000000..867cd39e5 Binary files /dev/null and b/textures/mcl_crimson_warped_door_bottom_bottompart.png differ diff --git a/textures/mcl_crimson_warped_door_bottom_side.png b/textures/mcl_crimson_warped_door_bottom_side.png new file mode 100644 index 000000000..30bc9859d Binary files /dev/null and b/textures/mcl_crimson_warped_door_bottom_side.png differ diff --git a/textures/mcl_crimson_warped_door_top.png b/textures/mcl_crimson_warped_door_top.png index 9ad9e2c60..8066ab6b5 100644 Binary files a/textures/mcl_crimson_warped_door_top.png and b/textures/mcl_crimson_warped_door_top.png differ diff --git a/textures/mcl_crimson_warped_door_top_side.png b/textures/mcl_crimson_warped_door_top_side.png new file mode 100644 index 000000000..732afaf8b Binary files /dev/null and b/textures/mcl_crimson_warped_door_top_side.png differ diff --git a/textures/mcl_crimson_warped_door_top_toppart.png b/textures/mcl_crimson_warped_door_top_toppart.png new file mode 100644 index 000000000..35a48ab9a Binary files /dev/null and b/textures/mcl_crimson_warped_door_top_toppart.png differ diff --git a/textures/mcl_crimson_warped_hyphae_wood.png b/textures/mcl_crimson_warped_hyphae_wood.png index 8f5953349..6764e2e83 100644 Binary files a/textures/mcl_crimson_warped_hyphae_wood.png and b/textures/mcl_crimson_warped_hyphae_wood.png differ diff --git a/textures/mcl_crimson_warped_hyphae_wood_2nd.png b/textures/mcl_crimson_warped_hyphae_wood_2nd.png index 8f5953349..6764e2e83 100644 Binary files a/textures/mcl_crimson_warped_hyphae_wood_2nd.png and b/textures/mcl_crimson_warped_hyphae_wood_2nd.png differ diff --git a/textures/mcl_crimson_warped_nylium.png b/textures/mcl_crimson_warped_nylium.png index a9b65768f..d2195d88c 100644 Binary files a/textures/mcl_crimson_warped_nylium.png and b/textures/mcl_crimson_warped_nylium.png differ diff --git a/textures/mcl_crimson_warped_nylium_side.png b/textures/mcl_crimson_warped_nylium_side.png index 26b10cf0f..9ab765b39 100644 Binary files a/textures/mcl_crimson_warped_nylium_side.png and b/textures/mcl_crimson_warped_nylium_side.png differ diff --git a/textures/mcl_crimson_warped_roots.png b/textures/mcl_crimson_warped_roots.png index 97f1e1ec5..96838e6b7 100644 Binary files a/textures/mcl_crimson_warped_roots.png and b/textures/mcl_crimson_warped_roots.png differ diff --git a/textures/mcl_crimson_warped_trapdoor.png b/textures/mcl_crimson_warped_trapdoor.png index efbae0711..05e3f44d6 100644 Binary files a/textures/mcl_crimson_warped_trapdoor.png and b/textures/mcl_crimson_warped_trapdoor.png differ diff --git a/textures/mcl_crimson_warped_trapdoor_side.png b/textures/mcl_crimson_warped_trapdoor_side.png new file mode 100644 index 000000000..b9678049d Binary files /dev/null and b/textures/mcl_crimson_warped_trapdoor_side.png differ diff --git a/textures/mcl_deepslate.png b/textures/mcl_deepslate.png index bfc142907..bf149765b 100644 Binary files a/textures/mcl_deepslate.png and b/textures/mcl_deepslate.png differ diff --git a/textures/mcl_deepslate_bricks.png b/textures/mcl_deepslate_bricks.png index d85e792ab..41d254909 100644 Binary files a/textures/mcl_deepslate_bricks.png and b/textures/mcl_deepslate_bricks.png differ diff --git a/textures/mcl_deepslate_coal_ore.png b/textures/mcl_deepslate_coal_ore.png index c7254836a..1bafca96d 100644 Binary files a/textures/mcl_deepslate_coal_ore.png and b/textures/mcl_deepslate_coal_ore.png differ diff --git a/textures/mcl_deepslate_copper_ore.png b/textures/mcl_deepslate_copper_ore.png index ceffa9ed2..49278476a 100644 Binary files a/textures/mcl_deepslate_copper_ore.png and b/textures/mcl_deepslate_copper_ore.png differ diff --git a/textures/mcl_deepslate_diamond_ore.png b/textures/mcl_deepslate_diamond_ore.png index 6ce9389f9..a0c116145 100644 Binary files a/textures/mcl_deepslate_diamond_ore.png and b/textures/mcl_deepslate_diamond_ore.png differ diff --git a/textures/mcl_deepslate_emerald_ore.png b/textures/mcl_deepslate_emerald_ore.png index 304580c72..21d151607 100644 Binary files a/textures/mcl_deepslate_emerald_ore.png and b/textures/mcl_deepslate_emerald_ore.png differ diff --git a/textures/mcl_deepslate_gold_ore.png b/textures/mcl_deepslate_gold_ore.png index 274b72677..b601afb44 100644 Binary files a/textures/mcl_deepslate_gold_ore.png and b/textures/mcl_deepslate_gold_ore.png differ diff --git a/textures/mcl_deepslate_iron_ore.png b/textures/mcl_deepslate_iron_ore.png index 70399462f..536de8fdf 100644 Binary files a/textures/mcl_deepslate_iron_ore.png and b/textures/mcl_deepslate_iron_ore.png differ diff --git a/textures/mcl_deepslate_lapis_ore.png b/textures/mcl_deepslate_lapis_ore.png index abaad6a8e..0df342755 100644 Binary files a/textures/mcl_deepslate_lapis_ore.png and b/textures/mcl_deepslate_lapis_ore.png differ diff --git a/textures/mcl_deepslate_redstone_ore.png b/textures/mcl_deepslate_redstone_ore.png index cc4a2caba..5ce00fed5 100644 Binary files a/textures/mcl_deepslate_redstone_ore.png and b/textures/mcl_deepslate_redstone_ore.png differ diff --git a/textures/mcl_deepslate_tiles.png b/textures/mcl_deepslate_tiles.png index 60faddeea..4da18d410 100644 Binary files a/textures/mcl_deepslate_tiles.png and b/textures/mcl_deepslate_tiles.png differ diff --git a/textures/mcl_deepslate_top.png b/textures/mcl_deepslate_top.png index e2d99338f..d89feea86 100644 Binary files a/textures/mcl_deepslate_top.png and b/textures/mcl_deepslate_top.png differ diff --git a/textures/mcl_deepslate_tuff.png b/textures/mcl_deepslate_tuff.png index db24d1555..40c0fc9d9 100644 Binary files a/textures/mcl_deepslate_tuff.png and b/textures/mcl_deepslate_tuff.png differ diff --git a/textures/mcl_dirt_grass_shadow.png b/textures/mcl_dirt_grass_shadow.png index 44a9afa23..f0fd97c24 100644 Binary files a/textures/mcl_dirt_grass_shadow.png and b/textures/mcl_dirt_grass_shadow.png differ diff --git a/textures/mcl_doors_door_acacia.png b/textures/mcl_doors_door_acacia.png index 11657784d..f671d9baa 100644 Binary files a/textures/mcl_doors_door_acacia.png and b/textures/mcl_doors_door_acacia.png differ diff --git a/textures/mcl_doors_door_acacia_lower.png b/textures/mcl_doors_door_acacia_lower.png index 510c04728..3bf3bc676 100644 Binary files a/textures/mcl_doors_door_acacia_lower.png and b/textures/mcl_doors_door_acacia_lower.png differ diff --git a/textures/mcl_doors_door_acacia_lower_bottompart.png b/textures/mcl_doors_door_acacia_lower_bottompart.png new file mode 100644 index 000000000..63820d54c Binary files /dev/null and b/textures/mcl_doors_door_acacia_lower_bottompart.png differ diff --git a/textures/mcl_doors_door_acacia_lower_side.png b/textures/mcl_doors_door_acacia_lower_side.png new file mode 100644 index 000000000..65db1e658 Binary files /dev/null and b/textures/mcl_doors_door_acacia_lower_side.png differ diff --git a/textures/mcl_doors_door_acacia_side_lower.png b/textures/mcl_doors_door_acacia_side_lower.png deleted file mode 100644 index 4dbbf38c4..000000000 Binary files a/textures/mcl_doors_door_acacia_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_acacia_side_upper.png b/textures/mcl_doors_door_acacia_side_upper.png deleted file mode 100644 index f1c04b99e..000000000 Binary files a/textures/mcl_doors_door_acacia_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_acacia_upper.png b/textures/mcl_doors_door_acacia_upper.png index 3fa7b30d1..f982c611e 100644 Binary files a/textures/mcl_doors_door_acacia_upper.png and b/textures/mcl_doors_door_acacia_upper.png differ diff --git a/textures/mcl_doors_door_acacia_upper_side.png b/textures/mcl_doors_door_acacia_upper_side.png new file mode 100644 index 000000000..25edc1f1d Binary files /dev/null and b/textures/mcl_doors_door_acacia_upper_side.png differ diff --git a/textures/mcl_doors_door_acacia_upper_toppart.png b/textures/mcl_doors_door_acacia_upper_toppart.png new file mode 100644 index 000000000..ab01973ad Binary files /dev/null and b/textures/mcl_doors_door_acacia_upper_toppart.png differ diff --git a/textures/mcl_doors_door_birch.png b/textures/mcl_doors_door_birch.png index 58af89e58..bcc111422 100644 Binary files a/textures/mcl_doors_door_birch.png and b/textures/mcl_doors_door_birch.png differ diff --git a/textures/mcl_doors_door_birch_lower.png b/textures/mcl_doors_door_birch_lower.png index cb09fef6b..4b189095c 100644 Binary files a/textures/mcl_doors_door_birch_lower.png and b/textures/mcl_doors_door_birch_lower.png differ diff --git a/textures/mcl_doors_door_birch_lower_bottompart.png b/textures/mcl_doors_door_birch_lower_bottompart.png new file mode 100644 index 000000000..b83344bdf Binary files /dev/null and b/textures/mcl_doors_door_birch_lower_bottompart.png differ diff --git a/textures/mcl_doors_door_birch_lower_side.png b/textures/mcl_doors_door_birch_lower_side.png new file mode 100644 index 000000000..e30be5b0b Binary files /dev/null and b/textures/mcl_doors_door_birch_lower_side.png differ diff --git a/textures/mcl_doors_door_birch_side_lower.png b/textures/mcl_doors_door_birch_side_lower.png deleted file mode 100644 index cae115020..000000000 Binary files a/textures/mcl_doors_door_birch_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_birch_side_upper.png b/textures/mcl_doors_door_birch_side_upper.png deleted file mode 100644 index a6805e4f6..000000000 Binary files a/textures/mcl_doors_door_birch_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_birch_upper.png b/textures/mcl_doors_door_birch_upper.png index 3de49d6ab..b04b0336e 100644 Binary files a/textures/mcl_doors_door_birch_upper.png and b/textures/mcl_doors_door_birch_upper.png differ diff --git a/textures/mcl_doors_door_birch_upper_side.png b/textures/mcl_doors_door_birch_upper_side.png new file mode 100644 index 000000000..fd46bdf3f Binary files /dev/null and b/textures/mcl_doors_door_birch_upper_side.png differ diff --git a/textures/mcl_doors_door_birch_upper_toppart.png b/textures/mcl_doors_door_birch_upper_toppart.png new file mode 100644 index 000000000..1555938e6 Binary files /dev/null and b/textures/mcl_doors_door_birch_upper_toppart.png differ diff --git a/textures/mcl_doors_door_crimson_side_lower.png b/textures/mcl_doors_door_crimson_side_lower.png deleted file mode 100644 index b7a6a8777..000000000 Binary files a/textures/mcl_doors_door_crimson_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_crimson_side_upper.png b/textures/mcl_doors_door_crimson_side_upper.png deleted file mode 100644 index bb042109b..000000000 Binary files a/textures/mcl_doors_door_crimson_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_dark_oak.png b/textures/mcl_doors_door_dark_oak.png index 7b827cc46..9fccbd44d 100644 Binary files a/textures/mcl_doors_door_dark_oak.png and b/textures/mcl_doors_door_dark_oak.png differ diff --git a/textures/mcl_doors_door_dark_oak_lower.png b/textures/mcl_doors_door_dark_oak_lower.png index 7c04fd880..56c5c936c 100644 Binary files a/textures/mcl_doors_door_dark_oak_lower.png and b/textures/mcl_doors_door_dark_oak_lower.png differ diff --git a/textures/mcl_doors_door_dark_oak_lower_bottompart.png b/textures/mcl_doors_door_dark_oak_lower_bottompart.png new file mode 100644 index 000000000..3d28d876f Binary files /dev/null and b/textures/mcl_doors_door_dark_oak_lower_bottompart.png differ diff --git a/textures/mcl_doors_door_dark_oak_lower_side.png b/textures/mcl_doors_door_dark_oak_lower_side.png new file mode 100644 index 000000000..74e7dccff Binary files /dev/null and b/textures/mcl_doors_door_dark_oak_lower_side.png differ diff --git a/textures/mcl_doors_door_dark_oak_side_lower.png b/textures/mcl_doors_door_dark_oak_side_lower.png deleted file mode 100644 index 3cf5b4fee..000000000 Binary files a/textures/mcl_doors_door_dark_oak_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_dark_oak_side_upper.png b/textures/mcl_doors_door_dark_oak_side_upper.png deleted file mode 100644 index 528358fe3..000000000 Binary files a/textures/mcl_doors_door_dark_oak_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_dark_oak_upper.png b/textures/mcl_doors_door_dark_oak_upper.png index d3ccecf4f..e826eabdd 100644 Binary files a/textures/mcl_doors_door_dark_oak_upper.png and b/textures/mcl_doors_door_dark_oak_upper.png differ diff --git a/textures/mcl_doors_door_dark_oak_upper_side.png b/textures/mcl_doors_door_dark_oak_upper_side.png new file mode 100644 index 000000000..4dab51cf5 Binary files /dev/null and b/textures/mcl_doors_door_dark_oak_upper_side.png differ diff --git a/textures/mcl_doors_door_dark_oak_upper_toppart.png b/textures/mcl_doors_door_dark_oak_upper_toppart.png new file mode 100644 index 000000000..b06778288 Binary files /dev/null and b/textures/mcl_doors_door_dark_oak_upper_toppart.png differ diff --git a/textures/mcl_doors_door_iron_lower.png b/textures/mcl_doors_door_iron_lower.png index 6d0e36862..5eb6e2e07 100644 Binary files a/textures/mcl_doors_door_iron_lower.png and b/textures/mcl_doors_door_iron_lower.png differ diff --git a/textures/mcl_doors_door_iron_lower_bottompart.png b/textures/mcl_doors_door_iron_lower_bottompart.png new file mode 100644 index 000000000..f029e14fe Binary files /dev/null and b/textures/mcl_doors_door_iron_lower_bottompart.png differ diff --git a/textures/mcl_doors_door_iron_lower_side.png b/textures/mcl_doors_door_iron_lower_side.png new file mode 100644 index 000000000..e005c24b2 Binary files /dev/null and b/textures/mcl_doors_door_iron_lower_side.png differ diff --git a/textures/mcl_doors_door_iron_side_lower.png b/textures/mcl_doors_door_iron_side_lower.png deleted file mode 100644 index 6d0e36862..000000000 Binary files a/textures/mcl_doors_door_iron_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_iron_side_upper.png b/textures/mcl_doors_door_iron_side_upper.png deleted file mode 100644 index a30b93003..000000000 Binary files a/textures/mcl_doors_door_iron_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_iron_upper.png b/textures/mcl_doors_door_iron_upper.png index 093d91ce3..867839641 100644 Binary files a/textures/mcl_doors_door_iron_upper.png and b/textures/mcl_doors_door_iron_upper.png differ diff --git a/textures/mcl_doors_door_iron_upper_side.png b/textures/mcl_doors_door_iron_upper_side.png new file mode 100644 index 000000000..ee43be6ca Binary files /dev/null and b/textures/mcl_doors_door_iron_upper_side.png differ diff --git a/textures/mcl_doors_door_iron_upper_toppart.png b/textures/mcl_doors_door_iron_upper_toppart.png new file mode 100644 index 000000000..045f8c1a1 Binary files /dev/null and b/textures/mcl_doors_door_iron_upper_toppart.png differ diff --git a/textures/mcl_doors_door_jungle.png b/textures/mcl_doors_door_jungle.png index 29032482c..b5672cb1b 100644 Binary files a/textures/mcl_doors_door_jungle.png and b/textures/mcl_doors_door_jungle.png differ diff --git a/textures/mcl_doors_door_jungle_lower.png b/textures/mcl_doors_door_jungle_lower.png index dde5be774..c44e6f8f8 100644 Binary files a/textures/mcl_doors_door_jungle_lower.png and b/textures/mcl_doors_door_jungle_lower.png differ diff --git a/textures/mcl_doors_door_jungle_lower_bottompart.png b/textures/mcl_doors_door_jungle_lower_bottompart.png new file mode 100644 index 000000000..9aadfb31a Binary files /dev/null and b/textures/mcl_doors_door_jungle_lower_bottompart.png differ diff --git a/textures/mcl_doors_door_jungle_lower_side.png b/textures/mcl_doors_door_jungle_lower_side.png new file mode 100644 index 000000000..fdf996ad6 Binary files /dev/null and b/textures/mcl_doors_door_jungle_lower_side.png differ diff --git a/textures/mcl_doors_door_jungle_side_lower.png b/textures/mcl_doors_door_jungle_side_lower.png deleted file mode 100644 index 5ba2aee57..000000000 Binary files a/textures/mcl_doors_door_jungle_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_jungle_side_upper.png b/textures/mcl_doors_door_jungle_side_upper.png deleted file mode 100644 index 9f01843a6..000000000 Binary files a/textures/mcl_doors_door_jungle_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_jungle_upper.png b/textures/mcl_doors_door_jungle_upper.png index c69c15717..401ae3f58 100644 Binary files a/textures/mcl_doors_door_jungle_upper.png and b/textures/mcl_doors_door_jungle_upper.png differ diff --git a/textures/mcl_doors_door_jungle_upper_side.png b/textures/mcl_doors_door_jungle_upper_side.png new file mode 100644 index 000000000..af479d3a4 Binary files /dev/null and b/textures/mcl_doors_door_jungle_upper_side.png differ diff --git a/textures/mcl_doors_door_jungle_upper_toppart.png b/textures/mcl_doors_door_jungle_upper_toppart.png new file mode 100644 index 000000000..d0ab14854 Binary files /dev/null and b/textures/mcl_doors_door_jungle_upper_toppart.png differ diff --git a/textures/mcl_doors_door_mangrove_side_lower.png b/textures/mcl_doors_door_mangrove_side_lower.png deleted file mode 100644 index 9a217e1ae..000000000 Binary files a/textures/mcl_doors_door_mangrove_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_mangrove_side_upper.png b/textures/mcl_doors_door_mangrove_side_upper.png deleted file mode 100644 index 2b27f4aeb..000000000 Binary files a/textures/mcl_doors_door_mangrove_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_spruce.png b/textures/mcl_doors_door_spruce.png index 3806a845f..1b005b9b8 100644 Binary files a/textures/mcl_doors_door_spruce.png and b/textures/mcl_doors_door_spruce.png differ diff --git a/textures/mcl_doors_door_spruce_lower.png b/textures/mcl_doors_door_spruce_lower.png index dc17e2125..fdbca4167 100644 Binary files a/textures/mcl_doors_door_spruce_lower.png and b/textures/mcl_doors_door_spruce_lower.png differ diff --git a/textures/mcl_doors_door_spruce_lower_bottompart.png b/textures/mcl_doors_door_spruce_lower_bottompart.png new file mode 100644 index 000000000..a28a2d69f Binary files /dev/null and b/textures/mcl_doors_door_spruce_lower_bottompart.png differ diff --git a/textures/mcl_doors_door_spruce_lower_side.png b/textures/mcl_doors_door_spruce_lower_side.png new file mode 100644 index 000000000..b65e82b1c Binary files /dev/null and b/textures/mcl_doors_door_spruce_lower_side.png differ diff --git a/textures/mcl_doors_door_spruce_side_lower.png b/textures/mcl_doors_door_spruce_side_lower.png deleted file mode 100644 index df63467a5..000000000 Binary files a/textures/mcl_doors_door_spruce_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_spruce_side_upper.png b/textures/mcl_doors_door_spruce_side_upper.png deleted file mode 100644 index 45b4f664d..000000000 Binary files a/textures/mcl_doors_door_spruce_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_spruce_upper.png b/textures/mcl_doors_door_spruce_upper.png index ee6c4a763..3ef5c4c81 100644 Binary files a/textures/mcl_doors_door_spruce_upper.png and b/textures/mcl_doors_door_spruce_upper.png differ diff --git a/textures/mcl_doors_door_spruce_upper_side.png b/textures/mcl_doors_door_spruce_upper_side.png new file mode 100644 index 000000000..f52beb437 Binary files /dev/null and b/textures/mcl_doors_door_spruce_upper_side.png differ diff --git a/textures/mcl_doors_door_spruce_upper_toppart.png b/textures/mcl_doors_door_spruce_upper_toppart.png new file mode 100644 index 000000000..f1a8bd73e Binary files /dev/null and b/textures/mcl_doors_door_spruce_upper_toppart.png differ diff --git a/textures/mcl_doors_door_warped_side_lower.png b/textures/mcl_doors_door_warped_side_lower.png deleted file mode 100644 index b93dc629e..000000000 Binary files a/textures/mcl_doors_door_warped_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_warped_side_lower_alt.png b/textures/mcl_doors_door_warped_side_lower_alt.png deleted file mode 100644 index 7ba0bcff6..000000000 Binary files a/textures/mcl_doors_door_warped_side_lower_alt.png and /dev/null differ diff --git a/textures/mcl_doors_door_warped_side_upper.png b/textures/mcl_doors_door_warped_side_upper.png deleted file mode 100644 index e0bfa8581..000000000 Binary files a/textures/mcl_doors_door_warped_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_warped_side_upper_alt.png b/textures/mcl_doors_door_warped_side_upper_alt.png deleted file mode 100644 index e70bfb055..000000000 Binary files a/textures/mcl_doors_door_warped_side_upper_alt.png and /dev/null differ diff --git a/textures/mcl_doors_door_wood_lower.png b/textures/mcl_doors_door_wood_lower.png index e69244b56..81cc12056 100644 Binary files a/textures/mcl_doors_door_wood_lower.png and b/textures/mcl_doors_door_wood_lower.png differ diff --git a/textures/mcl_doors_door_wood_lower_bottompart.png b/textures/mcl_doors_door_wood_lower_bottompart.png new file mode 100644 index 000000000..22274cabd Binary files /dev/null and b/textures/mcl_doors_door_wood_lower_bottompart.png differ diff --git a/textures/mcl_doors_door_wood_lower_side.png b/textures/mcl_doors_door_wood_lower_side.png new file mode 100644 index 000000000..f73f7a3e1 Binary files /dev/null and b/textures/mcl_doors_door_wood_lower_side.png differ diff --git a/textures/mcl_doors_door_wood_side_lower.png b/textures/mcl_doors_door_wood_side_lower.png deleted file mode 100644 index 95ef79d81..000000000 Binary files a/textures/mcl_doors_door_wood_side_lower.png and /dev/null differ diff --git a/textures/mcl_doors_door_wood_side_upper.png b/textures/mcl_doors_door_wood_side_upper.png deleted file mode 100644 index bc74c5de3..000000000 Binary files a/textures/mcl_doors_door_wood_side_upper.png and /dev/null differ diff --git a/textures/mcl_doors_door_wood_upper.png b/textures/mcl_doors_door_wood_upper.png index 4e75538c2..8265e48ee 100644 Binary files a/textures/mcl_doors_door_wood_upper.png and b/textures/mcl_doors_door_wood_upper.png differ diff --git a/textures/mcl_doors_door_wood_upper_side.png b/textures/mcl_doors_door_wood_upper_side.png new file mode 100644 index 000000000..efecb1bb4 Binary files /dev/null and b/textures/mcl_doors_door_wood_upper_side.png differ diff --git a/textures/mcl_doors_door_wood_upper_toppart.png b/textures/mcl_doors_door_wood_upper_toppart.png new file mode 100644 index 000000000..7ae6fc712 Binary files /dev/null and b/textures/mcl_doors_door_wood_upper_toppart.png differ diff --git a/textures/mcl_doors_trapdoor_acacia_side.png b/textures/mcl_doors_trapdoor_acacia_side.png index 1cd4f9345..af48599c2 100644 Binary files a/textures/mcl_doors_trapdoor_acacia_side.png and b/textures/mcl_doors_trapdoor_acacia_side.png differ diff --git a/textures/mcl_doors_trapdoor_birch_side.png b/textures/mcl_doors_trapdoor_birch_side.png index 040eaaec6..ea0bc93ef 100644 Binary files a/textures/mcl_doors_trapdoor_birch_side.png and b/textures/mcl_doors_trapdoor_birch_side.png differ diff --git a/textures/mcl_doors_trapdoor_dark_oak_side.png b/textures/mcl_doors_trapdoor_dark_oak_side.png index 6d5e9d6c0..5dbbb4d1b 100644 Binary files a/textures/mcl_doors_trapdoor_dark_oak_side.png and b/textures/mcl_doors_trapdoor_dark_oak_side.png differ diff --git a/textures/mcl_doors_trapdoor_jungle_side.png b/textures/mcl_doors_trapdoor_jungle_side.png index 9f42ba4ff..e62d5b3fd 100644 Binary files a/textures/mcl_doors_trapdoor_jungle_side.png and b/textures/mcl_doors_trapdoor_jungle_side.png differ diff --git a/textures/mcl_doors_trapdoor_spruce_side.png b/textures/mcl_doors_trapdoor_spruce_side.png index 882ef6b26..ae4b947c4 100644 Binary files a/textures/mcl_doors_trapdoor_spruce_side.png and b/textures/mcl_doors_trapdoor_spruce_side.png differ diff --git a/textures/mcl_enchanting_book_closed.png b/textures/mcl_enchanting_book_closed.png index aac64677c..6ff832d3c 100644 Binary files a/textures/mcl_enchanting_book_closed.png and b/textures/mcl_enchanting_book_closed.png differ diff --git a/textures/mcl_enchanting_book_enchanted.png b/textures/mcl_enchanting_book_enchanted.png index 3be680e05..7339e7091 100644 Binary files a/textures/mcl_enchanting_book_enchanted.png and b/textures/mcl_enchanting_book_enchanted.png differ diff --git a/textures/mcl_enchanting_book_entity.png b/textures/mcl_enchanting_book_entity.png index 64e1d7843..9c5ce0277 100644 Binary files a/textures/mcl_enchanting_book_entity.png and b/textures/mcl_enchanting_book_entity.png differ diff --git a/textures/mcl_enchanting_book_open.png b/textures/mcl_enchanting_book_open.png index 29137e0f1..6b4d5a379 100644 Binary files a/textures/mcl_enchanting_book_open.png and b/textures/mcl_enchanting_book_open.png differ diff --git a/textures/mcl_enchanting_button.png b/textures/mcl_enchanting_button.png index 92674cae1..c6765f7ce 100644 Binary files a/textures/mcl_enchanting_button.png and b/textures/mcl_enchanting_button.png differ diff --git a/textures/mcl_enchanting_button_background.png b/textures/mcl_enchanting_button_background.png index 79315ad95..cd05418d4 100644 Binary files a/textures/mcl_enchanting_button_background.png and b/textures/mcl_enchanting_button_background.png differ diff --git a/textures/mcl_enchanting_button_hovered.png b/textures/mcl_enchanting_button_hovered.png index d733e4e5e..c6765f7ce 100644 Binary files a/textures/mcl_enchanting_button_hovered.png and b/textures/mcl_enchanting_button_hovered.png differ diff --git a/textures/mcl_enchanting_button_off.png b/textures/mcl_enchanting_button_off.png index 11b71696c..c6765f7ce 100644 Binary files a/textures/mcl_enchanting_button_off.png and b/textures/mcl_enchanting_button_off.png differ diff --git a/textures/mcl_enchanting_glyph_1.png b/textures/mcl_enchanting_glyph_1.png index a5ac3f553..c449eae08 100644 Binary files a/textures/mcl_enchanting_glyph_1.png and b/textures/mcl_enchanting_glyph_1.png differ diff --git a/textures/mcl_enchanting_glyph_10.png b/textures/mcl_enchanting_glyph_10.png index d002147f5..9feb2a5a2 100644 Binary files a/textures/mcl_enchanting_glyph_10.png and b/textures/mcl_enchanting_glyph_10.png differ diff --git a/textures/mcl_enchanting_glyph_11.png b/textures/mcl_enchanting_glyph_11.png index c9cd9ff5c..adda78dec 100644 Binary files a/textures/mcl_enchanting_glyph_11.png and b/textures/mcl_enchanting_glyph_11.png differ diff --git a/textures/mcl_enchanting_glyph_12.png b/textures/mcl_enchanting_glyph_12.png index dc5dd1d20..5d4c1ee6f 100644 Binary files a/textures/mcl_enchanting_glyph_12.png and b/textures/mcl_enchanting_glyph_12.png differ diff --git a/textures/mcl_enchanting_glyph_13.png b/textures/mcl_enchanting_glyph_13.png index 45c6d5a63..b57fbb71e 100644 Binary files a/textures/mcl_enchanting_glyph_13.png and b/textures/mcl_enchanting_glyph_13.png differ diff --git a/textures/mcl_enchanting_glyph_15.png b/textures/mcl_enchanting_glyph_15.png index 0db3a9ea2..cef995fcf 100644 Binary files a/textures/mcl_enchanting_glyph_15.png and b/textures/mcl_enchanting_glyph_15.png differ diff --git a/textures/mcl_enchanting_glyph_16.png b/textures/mcl_enchanting_glyph_16.png index 52e22b05f..27e180728 100644 Binary files a/textures/mcl_enchanting_glyph_16.png and b/textures/mcl_enchanting_glyph_16.png differ diff --git a/textures/mcl_enchanting_glyph_17.png b/textures/mcl_enchanting_glyph_17.png index 2b374e881..1dc41a021 100644 Binary files a/textures/mcl_enchanting_glyph_17.png and b/textures/mcl_enchanting_glyph_17.png differ diff --git a/textures/mcl_enchanting_glyph_18.png b/textures/mcl_enchanting_glyph_18.png index e762e350b..631973dbb 100644 Binary files a/textures/mcl_enchanting_glyph_18.png and b/textures/mcl_enchanting_glyph_18.png differ diff --git a/textures/mcl_enchanting_glyph_2.png b/textures/mcl_enchanting_glyph_2.png index eb1e74fbc..674fdeaa5 100644 Binary files a/textures/mcl_enchanting_glyph_2.png and b/textures/mcl_enchanting_glyph_2.png differ diff --git a/textures/mcl_enchanting_glyph_3.png b/textures/mcl_enchanting_glyph_3.png index e82145e5c..6f1660580 100644 Binary files a/textures/mcl_enchanting_glyph_3.png and b/textures/mcl_enchanting_glyph_3.png differ diff --git a/textures/mcl_enchanting_glyph_5.png b/textures/mcl_enchanting_glyph_5.png index bf66611e3..1473ea41d 100644 Binary files a/textures/mcl_enchanting_glyph_5.png and b/textures/mcl_enchanting_glyph_5.png differ diff --git a/textures/mcl_enchanting_glyph_6.png b/textures/mcl_enchanting_glyph_6.png index c93976cfb..89de2cf8f 100644 Binary files a/textures/mcl_enchanting_glyph_6.png and b/textures/mcl_enchanting_glyph_6.png differ diff --git a/textures/mcl_enchanting_glyph_7.png b/textures/mcl_enchanting_glyph_7.png index 1e4ff0248..bf632f7f6 100644 Binary files a/textures/mcl_enchanting_glyph_7.png and b/textures/mcl_enchanting_glyph_7.png differ diff --git a/textures/mcl_enchanting_glyph_8.png b/textures/mcl_enchanting_glyph_8.png index 2f2b86c16..acecebc44 100644 Binary files a/textures/mcl_enchanting_glyph_8.png and b/textures/mcl_enchanting_glyph_8.png differ diff --git a/textures/mcl_enchanting_lapis_background.png b/textures/mcl_enchanting_lapis_background.png index 77616e60d..f056899d0 100644 Binary files a/textures/mcl_enchanting_lapis_background.png and b/textures/mcl_enchanting_lapis_background.png differ diff --git a/textures/mcl_enchanting_number_1.png b/textures/mcl_enchanting_number_1.png index ff282f707..8e5fc6485 100644 Binary files a/textures/mcl_enchanting_number_1.png and b/textures/mcl_enchanting_number_1.png differ diff --git a/textures/mcl_enchanting_number_1_off.png b/textures/mcl_enchanting_number_1_off.png index b45337139..c22f319c3 100644 Binary files a/textures/mcl_enchanting_number_1_off.png and b/textures/mcl_enchanting_number_1_off.png differ diff --git a/textures/mcl_enchanting_number_2.png b/textures/mcl_enchanting_number_2.png index 71bce94b4..0a89a9dc6 100644 Binary files a/textures/mcl_enchanting_number_2.png and b/textures/mcl_enchanting_number_2.png differ diff --git a/textures/mcl_enchanting_number_2_off.png b/textures/mcl_enchanting_number_2_off.png index 175915797..c22f319c3 100644 Binary files a/textures/mcl_enchanting_number_2_off.png and b/textures/mcl_enchanting_number_2_off.png differ diff --git a/textures/mcl_enchanting_number_3.png b/textures/mcl_enchanting_number_3.png index 426f79b1a..eee8032a1 100644 Binary files a/textures/mcl_enchanting_number_3.png and b/textures/mcl_enchanting_number_3.png differ diff --git a/textures/mcl_enchanting_number_3_off.png b/textures/mcl_enchanting_number_3_off.png index 8bb8ab950..c22f319c3 100644 Binary files a/textures/mcl_enchanting_number_3_off.png and b/textures/mcl_enchanting_number_3_off.png differ diff --git a/textures/mcl_enchanting_table_bottom.png b/textures/mcl_enchanting_table_bottom.png index 330219b3e..871d96cca 100644 Binary files a/textures/mcl_enchanting_table_bottom.png and b/textures/mcl_enchanting_table_bottom.png differ diff --git a/textures/mcl_enchanting_table_side.png b/textures/mcl_enchanting_table_side.png index a753ec1c8..29eabb902 100644 Binary files a/textures/mcl_enchanting_table_side.png and b/textures/mcl_enchanting_table_side.png differ diff --git a/textures/mcl_enchanting_table_top.png b/textures/mcl_enchanting_table_top.png index fcae44020..d9428503a 100644 Binary files a/textures/mcl_enchanting_table_top.png and b/textures/mcl_enchanting_table_top.png differ diff --git a/textures/mcl_end_crystal.png b/textures/mcl_end_crystal.png index 14f6d95fd..35c3c4b0c 100644 Binary files a/textures/mcl_end_crystal.png and b/textures/mcl_end_crystal.png differ diff --git a/textures/mcl_end_crystal_item.png b/textures/mcl_end_crystal_item.png index aba1e2ad4..54f99b4c2 100644 Binary files a/textures/mcl_end_crystal_item.png and b/textures/mcl_end_crystal_item.png differ diff --git a/textures/mcl_experience_bar.png b/textures/mcl_experience_bar.png index d7bd88f8c..ef6e2f4bb 100644 Binary files a/textures/mcl_experience_bar.png and b/textures/mcl_experience_bar.png differ diff --git a/textures/mcl_experience_bar_background.png b/textures/mcl_experience_bar_background.png index 771064564..afbb9188d 100644 Binary files a/textures/mcl_experience_bar_background.png and b/textures/mcl_experience_bar_background.png differ diff --git a/textures/mcl_experience_bottle.png b/textures/mcl_experience_bottle.png index 5bd7f1831..4aa540802 100644 Binary files a/textures/mcl_experience_bottle.png and b/textures/mcl_experience_bottle.png differ diff --git a/textures/mcl_experience_orb.png b/textures/mcl_experience_orb.png index 35ec06d71..dd99a519c 100644 Binary files a/textures/mcl_experience_orb.png and b/textures/mcl_experience_orb.png differ diff --git a/textures/mcl_farming_pumpkin_hud.png b/textures/mcl_farming_pumpkin_hud.png index 224df0cd9..e2a03671b 100644 Binary files a/textures/mcl_farming_pumpkin_hud.png and b/textures/mcl_farming_pumpkin_hud.png differ diff --git a/textures/mcl_fireworks_rocket.png b/textures/mcl_fireworks_rocket.png index 527d0042b..1c6a580aa 100644 Binary files a/textures/mcl_fireworks_rocket.png and b/textures/mcl_fireworks_rocket.png differ diff --git a/textures/mcl_fishing_bobber.png b/textures/mcl_fishing_bobber.png index 6086ecad7..f7e6a3ac6 100644 Binary files a/textures/mcl_fishing_bobber.png and b/textures/mcl_fishing_bobber.png differ diff --git a/textures/mcl_flowers_cornflower.png b/textures/mcl_flowers_cornflower.png index c7981aac7..d8058c535 100644 Binary files a/textures/mcl_flowers_cornflower.png and b/textures/mcl_flowers_cornflower.png differ diff --git a/textures/mcl_flowers_double_plant_fern_bottom.png b/textures/mcl_flowers_double_plant_fern_bottom.png index 2a2be2260..d4acb4dda 100644 Binary files a/textures/mcl_flowers_double_plant_fern_bottom.png and b/textures/mcl_flowers_double_plant_fern_bottom.png differ diff --git a/textures/mcl_flowers_double_plant_fern_inv.png b/textures/mcl_flowers_double_plant_fern_inv.png index f59bff0b7..2a88a3a17 100644 Binary files a/textures/mcl_flowers_double_plant_fern_inv.png and b/textures/mcl_flowers_double_plant_fern_inv.png differ diff --git a/textures/mcl_flowers_double_plant_fern_top.png b/textures/mcl_flowers_double_plant_fern_top.png index 860b4fee6..9a4d4589b 100644 Binary files a/textures/mcl_flowers_double_plant_fern_top.png and b/textures/mcl_flowers_double_plant_fern_top.png differ diff --git a/textures/mcl_flowers_double_plant_grass_bottom.png b/textures/mcl_flowers_double_plant_grass_bottom.png index a5f25ef63..f7ae3a83c 100644 Binary files a/textures/mcl_flowers_double_plant_grass_bottom.png and b/textures/mcl_flowers_double_plant_grass_bottom.png differ diff --git a/textures/mcl_flowers_double_plant_grass_inv.png b/textures/mcl_flowers_double_plant_grass_inv.png index 974b21a71..251532a27 100644 Binary files a/textures/mcl_flowers_double_plant_grass_inv.png and b/textures/mcl_flowers_double_plant_grass_inv.png differ diff --git a/textures/mcl_flowers_double_plant_grass_top.png b/textures/mcl_flowers_double_plant_grass_top.png index ef60144b2..f6b19d558 100644 Binary files a/textures/mcl_flowers_double_plant_grass_top.png and b/textures/mcl_flowers_double_plant_grass_top.png differ diff --git a/textures/mcl_flowers_fern.png b/textures/mcl_flowers_fern.png index 840d66634..ae54a33fd 100644 Binary files a/textures/mcl_flowers_fern.png and b/textures/mcl_flowers_fern.png differ diff --git a/textures/mcl_flowers_fern_inv.png b/textures/mcl_flowers_fern_inv.png index 1f5980ee3..901332156 100644 Binary files a/textures/mcl_flowers_fern_inv.png and b/textures/mcl_flowers_fern_inv.png differ diff --git a/textures/mcl_flowers_lily_of_the_valley.png b/textures/mcl_flowers_lily_of_the_valley.png index b204c4d97..b4bd537bf 100644 Binary files a/textures/mcl_flowers_lily_of_the_valley.png and b/textures/mcl_flowers_lily_of_the_valley.png differ diff --git a/textures/mcl_flowers_tallgrass.png b/textures/mcl_flowers_tallgrass.png index 1088bd192..ca5579d24 100644 Binary files a/textures/mcl_flowers_tallgrass.png and b/textures/mcl_flowers_tallgrass.png differ diff --git a/textures/mcl_flowers_tallgrass_inv.png b/textures/mcl_flowers_tallgrass_inv.png index 0e075add1..444988810 100644 Binary files a/textures/mcl_flowers_tallgrass_inv.png and b/textures/mcl_flowers_tallgrass_inv.png differ diff --git a/textures/mcl_flowers_wither_rose.png b/textures/mcl_flowers_wither_rose.png index cc655ee74..d69030ec7 100644 Binary files a/textures/mcl_flowers_wither_rose.png and b/textures/mcl_flowers_wither_rose.png differ diff --git a/textures/mcl_formspec_itemslot.png b/textures/mcl_formspec_itemslot.png index 42f265e77..d35e3f163 100644 Binary files a/textures/mcl_formspec_itemslot.png and b/textures/mcl_formspec_itemslot.png differ diff --git a/textures/mcl_hamburger.png b/textures/mcl_hamburger.png index 432d05bba..a4bcc904b 100644 Binary files a/textures/mcl_hamburger.png and b/textures/mcl_hamburger.png differ diff --git a/textures/mcl_hamburger_alt.png b/textures/mcl_hamburger_alt.png index 70fd29448..0c48f42c9 100644 Binary files a/textures/mcl_hamburger_alt.png and b/textures/mcl_hamburger_alt.png differ diff --git a/textures/mcl_honey_block_bottom.png b/textures/mcl_honey_block_bottom.png index a14ddf65e..78de3bcbd 100644 Binary files a/textures/mcl_honey_block_bottom.png and b/textures/mcl_honey_block_bottom.png differ diff --git a/textures/mcl_honey_block_side.png b/textures/mcl_honey_block_side.png index 59f1086b1..8ac2c1290 100644 Binary files a/textures/mcl_honey_block_side.png and b/textures/mcl_honey_block_side.png differ diff --git a/textures/mcl_honey_block_top.png b/textures/mcl_honey_block_top.png index f33addbd5..9e37c9b16 100644 Binary files a/textures/mcl_honey_block_top.png and b/textures/mcl_honey_block_top.png differ diff --git a/textures/mcl_honey_honey_bottle.png b/textures/mcl_honey_honey_bottle.png index ed92ab2ac..d368cd354 100644 Binary files a/textures/mcl_honey_honey_bottle.png and b/textures/mcl_honey_honey_bottle.png differ diff --git a/textures/mcl_honey_honeycomb.png b/textures/mcl_honey_honeycomb.png index 7e7cfecd4..bf0d17c9a 100644 Binary files a/textures/mcl_honey_honeycomb.png and b/textures/mcl_honey_honeycomb.png differ diff --git a/textures/mcl_honey_honeycomb_block.png b/textures/mcl_honey_honeycomb_block.png index d2df1e677..c770c8f5f 100644 Binary files a/textures/mcl_honey_honeycomb_block.png and b/textures/mcl_honey_honeycomb_block.png differ diff --git a/textures/mcl_hunger_icon_foodpoison.png b/textures/mcl_hunger_icon_foodpoison.png index c065fbf15..6d2408497 100644 Binary files a/textures/mcl_hunger_icon_foodpoison.png and b/textures/mcl_hunger_icon_foodpoison.png differ diff --git a/textures/mcl_inventory_background9.png b/textures/mcl_inventory_background9.png new file mode 100644 index 000000000..d774fd319 Binary files /dev/null and b/textures/mcl_inventory_background9.png differ diff --git a/textures/mcl_lanterns_chain.png b/textures/mcl_lanterns_chain.png index 01725114a..6d535148a 100644 Binary files a/textures/mcl_lanterns_chain.png and b/textures/mcl_lanterns_chain.png differ diff --git a/textures/mcl_lanterns_chain_inv.png b/textures/mcl_lanterns_chain_inv.png index a8c89dab4..bed58736e 100644 Binary files a/textures/mcl_lanterns_chain_inv.png and b/textures/mcl_lanterns_chain_inv.png differ diff --git a/textures/mcl_lanterns_lantern.png b/textures/mcl_lanterns_lantern.png index f9936e0fb..172add092 100644 Binary files a/textures/mcl_lanterns_lantern.png and b/textures/mcl_lanterns_lantern.png differ diff --git a/textures/mcl_lanterns_lantern_inv.png b/textures/mcl_lanterns_lantern_inv.png index 8bdc8095f..ac4c41db5 100644 Binary files a/textures/mcl_lanterns_lantern_inv.png and b/textures/mcl_lanterns_lantern_inv.png differ diff --git a/textures/mcl_lanterns_soul_lantern.png b/textures/mcl_lanterns_soul_lantern.png index 6e20058ea..0085d7b28 100644 Binary files a/textures/mcl_lanterns_soul_lantern.png and b/textures/mcl_lanterns_soul_lantern.png differ diff --git a/textures/mcl_lanterns_soul_lantern_inv.png b/textures/mcl_lanterns_soul_lantern_inv.png index 55624c749..a7bb7b901 100644 Binary files a/textures/mcl_lanterns_soul_lantern_inv.png and b/textures/mcl_lanterns_soul_lantern_inv.png differ diff --git a/textures/mcl_mangrove_door_bottom.png b/textures/mcl_mangrove_door_bottom.png index 91c2df8b8..a6b9182d7 100644 Binary files a/textures/mcl_mangrove_door_bottom.png and b/textures/mcl_mangrove_door_bottom.png differ diff --git a/textures/mcl_mangrove_door_bottom_bottompart.png b/textures/mcl_mangrove_door_bottom_bottompart.png new file mode 100644 index 000000000..508be22a8 Binary files /dev/null and b/textures/mcl_mangrove_door_bottom_bottompart.png differ diff --git a/textures/mcl_mangrove_door_bottom_side.png b/textures/mcl_mangrove_door_bottom_side.png new file mode 100644 index 000000000..d5de6fbd1 Binary files /dev/null and b/textures/mcl_mangrove_door_bottom_side.png differ diff --git a/textures/mcl_mangrove_door_top.png b/textures/mcl_mangrove_door_top.png index 8691b0f93..d7068ba18 100644 Binary files a/textures/mcl_mangrove_door_top.png and b/textures/mcl_mangrove_door_top.png differ diff --git a/textures/mcl_mangrove_door_top_side.png b/textures/mcl_mangrove_door_top_side.png new file mode 100644 index 000000000..df586adf6 Binary files /dev/null and b/textures/mcl_mangrove_door_top_side.png differ diff --git a/textures/mcl_mangrove_door_top_toppart.png b/textures/mcl_mangrove_door_top_toppart.png new file mode 100644 index 000000000..95a9d1f0c Binary files /dev/null and b/textures/mcl_mangrove_door_top_toppart.png differ diff --git a/textures/mcl_mangrove_doors.png b/textures/mcl_mangrove_doors.png index 1f495d997..d23a74ab1 100644 Binary files a/textures/mcl_mangrove_doors.png and b/textures/mcl_mangrove_doors.png differ diff --git a/textures/mcl_mangrove_roots_side.png b/textures/mcl_mangrove_roots_side.png index f0409f2dc..3115e6c29 100644 Binary files a/textures/mcl_mangrove_roots_side.png and b/textures/mcl_mangrove_roots_side.png differ diff --git a/textures/mcl_mangrove_trapdoor_side.png b/textures/mcl_mangrove_trapdoor_side.png new file mode 100644 index 000000000..b2b03ce80 Binary files /dev/null and b/textures/mcl_mangrove_trapdoor_side.png differ diff --git a/textures/mcl_maps_map_background.png b/textures/mcl_maps_map_background.png index b5b6aa974..85f97240e 100644 Binary files a/textures/mcl_maps_map_background.png and b/textures/mcl_maps_map_background.png differ diff --git a/textures/mcl_maps_player_arrow.png b/textures/mcl_maps_player_arrow.png index 9856682e2..e13a45b1a 100644 Binary files a/textures/mcl_maps_player_arrow.png and b/textures/mcl_maps_player_arrow.png differ diff --git a/textures/mcl_maps_player_dot.png b/textures/mcl_maps_player_dot.png index c39eacaae..7901d87e4 100644 Binary files a/textures/mcl_maps_player_dot.png and b/textures/mcl_maps_player_dot.png differ diff --git a/textures/mcl_mobitems_glow_ink_sac.png b/textures/mcl_mobitems_glow_ink_sac.png index 989db9673..410984179 100644 Binary files a/textures/mcl_mobitems_glow_ink_sac.png and b/textures/mcl_mobitems_glow_ink_sac.png differ diff --git a/textures/mcl_mobitems_heart_of_the_sea.png b/textures/mcl_mobitems_heart_of_the_sea.png index 21762845c..b550c84ae 100644 Binary files a/textures/mcl_mobitems_heart_of_the_sea.png and b/textures/mcl_mobitems_heart_of_the_sea.png differ diff --git a/textures/mcl_mobitems_heart_of_the_sea_split.png b/textures/mcl_mobitems_heart_of_the_sea_split.png index f4ca2996b..b76bd6a6d 100644 Binary files a/textures/mcl_mobitems_heart_of_the_sea_split.png and b/textures/mcl_mobitems_heart_of_the_sea_split.png differ diff --git a/textures/mcl_mobitems_nautilus_shell.png b/textures/mcl_mobitems_nautilus_shell.png index bd8c96a72..1185fab2e 100644 Binary files a/textures/mcl_mobitems_nautilus_shell.png and b/textures/mcl_mobitems_nautilus_shell.png differ diff --git a/textures/mcl_mobitems_warped_fungus_on_a_stick.png b/textures/mcl_mobitems_warped_fungus_on_a_stick.png index 370cf70fe..ddfa97091 100644 Binary files a/textures/mcl_mobitems_warped_fungus_on_a_stick.png and b/textures/mcl_mobitems_warped_fungus_on_a_stick.png differ diff --git a/textures/mcl_mud.png b/textures/mcl_mud.png index 9d02370a8..827258b38 100644 Binary files a/textures/mcl_mud.png and b/textures/mcl_mud.png differ diff --git a/textures/mcl_mud_bricks.png b/textures/mcl_mud_bricks.png index c5362ca15..38e483852 100644 Binary files a/textures/mcl_mud_bricks.png and b/textures/mcl_mud_bricks.png differ diff --git a/textures/mcl_mud_packed_mud.png b/textures/mcl_mud_packed_mud.png index 28c393ed1..864d6e663 100644 Binary files a/textures/mcl_mud_packed_mud.png and b/textures/mcl_mud_packed_mud.png differ diff --git a/textures/mcl_nether_ancient_debris_side.png b/textures/mcl_nether_ancient_debris_side.png index baf5132b6..fbe84c4de 100644 Binary files a/textures/mcl_nether_ancient_debris_side.png and b/textures/mcl_nether_ancient_debris_side.png differ diff --git a/textures/mcl_nether_ancient_debris_top.png b/textures/mcl_nether_ancient_debris_top.png index 0046acd5d..fbe84c4de 100644 Binary files a/textures/mcl_nether_ancient_debris_top.png and b/textures/mcl_nether_ancient_debris_top.png differ diff --git a/textures/mcl_nether_nether_wart_block_blue.png b/textures/mcl_nether_nether_wart_block_blue.png index 12530a7a1..5974d2c42 100644 Binary files a/textures/mcl_nether_nether_wart_block_blue.png and b/textures/mcl_nether_nether_wart_block_blue.png differ diff --git a/textures/mcl_nether_netherite_ingot.png b/textures/mcl_nether_netherite_ingot.png index 7a8c38d46..f576b16ca 100644 Binary files a/textures/mcl_nether_netherite_ingot.png and b/textures/mcl_nether_netherite_ingot.png differ diff --git a/textures/mcl_nether_netherite_scrap.png b/textures/mcl_nether_netherite_scrap.png index fc451c409..16da8b048 100644 Binary files a/textures/mcl_nether_netherite_scrap.png and b/textures/mcl_nether_netherite_scrap.png differ diff --git a/textures/mcl_nether_netheriteblock.png b/textures/mcl_nether_netheriteblock.png index 1af70e8a1..8f59390fb 100644 Binary files a/textures/mcl_nether_netheriteblock.png and b/textures/mcl_nether_netheriteblock.png differ diff --git a/textures/mcl_nether_quartz_block_side.png b/textures/mcl_nether_quartz_block_side.png index 013c4228f..0d960c567 100644 Binary files a/textures/mcl_nether_quartz_block_side.png and b/textures/mcl_nether_quartz_block_side.png differ diff --git a/textures/mcl_nether_quartz_block_top.png b/textures/mcl_nether_quartz_block_top.png index 013c4228f..0d960c567 100644 Binary files a/textures/mcl_nether_quartz_block_top.png and b/textures/mcl_nether_quartz_block_top.png differ diff --git a/textures/mcl_nether_quartz_chiseled_side.png b/textures/mcl_nether_quartz_chiseled_side.png index e0e86ea87..85c29266e 100644 Binary files a/textures/mcl_nether_quartz_chiseled_side.png and b/textures/mcl_nether_quartz_chiseled_side.png differ diff --git a/textures/mcl_nether_quartz_chiseled_top.png b/textures/mcl_nether_quartz_chiseled_top.png index 40117a884..086a2a66f 100644 Binary files a/textures/mcl_nether_quartz_chiseled_top.png and b/textures/mcl_nether_quartz_chiseled_top.png differ diff --git a/textures/mcl_nether_quartz_pillar_side.png b/textures/mcl_nether_quartz_pillar_side.png index d46d33e89..73478f1fb 100644 Binary files a/textures/mcl_nether_quartz_pillar_side.png and b/textures/mcl_nether_quartz_pillar_side.png differ diff --git a/textures/mcl_nether_quartz_pillar_top.png b/textures/mcl_nether_quartz_pillar_top.png index e91e10682..e85c01228 100644 Binary files a/textures/mcl_nether_quartz_pillar_top.png and b/textures/mcl_nether_quartz_pillar_top.png differ diff --git a/textures/mcl_ocean_brain_coral.png b/textures/mcl_ocean_brain_coral.png index 729032495..4c1363bb4 100644 Binary files a/textures/mcl_ocean_brain_coral.png and b/textures/mcl_ocean_brain_coral.png differ diff --git a/textures/mcl_ocean_brain_coral_block.png b/textures/mcl_ocean_brain_coral_block.png index 02ea5c431..80b5c5381 100644 Binary files a/textures/mcl_ocean_brain_coral_block.png and b/textures/mcl_ocean_brain_coral_block.png differ diff --git a/textures/mcl_ocean_brain_coral_fan.png b/textures/mcl_ocean_brain_coral_fan.png index e15952bb3..eaf5388b5 100644 Binary files a/textures/mcl_ocean_brain_coral_fan.png and b/textures/mcl_ocean_brain_coral_fan.png differ diff --git a/textures/mcl_ocean_bubble_coral.png b/textures/mcl_ocean_bubble_coral.png index 50d0dc29f..4de2e1d73 100644 Binary files a/textures/mcl_ocean_bubble_coral.png and b/textures/mcl_ocean_bubble_coral.png differ diff --git a/textures/mcl_ocean_bubble_coral_block.png b/textures/mcl_ocean_bubble_coral_block.png index d2ff8670f..7ed97df4b 100644 Binary files a/textures/mcl_ocean_bubble_coral_block.png and b/textures/mcl_ocean_bubble_coral_block.png differ diff --git a/textures/mcl_ocean_bubble_coral_fan.png b/textures/mcl_ocean_bubble_coral_fan.png index 007047778..f5284375f 100644 Binary files a/textures/mcl_ocean_bubble_coral_fan.png and b/textures/mcl_ocean_bubble_coral_fan.png differ diff --git a/textures/mcl_ocean_dead_brain_coral.png b/textures/mcl_ocean_dead_brain_coral.png index ae7296346..91003b825 100644 Binary files a/textures/mcl_ocean_dead_brain_coral.png and b/textures/mcl_ocean_dead_brain_coral.png differ diff --git a/textures/mcl_ocean_dead_brain_coral_block.png b/textures/mcl_ocean_dead_brain_coral_block.png index 101d4e573..5f9ef162c 100644 Binary files a/textures/mcl_ocean_dead_brain_coral_block.png and b/textures/mcl_ocean_dead_brain_coral_block.png differ diff --git a/textures/mcl_ocean_dead_brain_coral_fan.png b/textures/mcl_ocean_dead_brain_coral_fan.png index 716f0b9a4..26958f8ad 100644 Binary files a/textures/mcl_ocean_dead_brain_coral_fan.png and b/textures/mcl_ocean_dead_brain_coral_fan.png differ diff --git a/textures/mcl_ocean_dead_bubble_coral.png b/textures/mcl_ocean_dead_bubble_coral.png index 3e259083a..2418b3ac1 100644 Binary files a/textures/mcl_ocean_dead_bubble_coral.png and b/textures/mcl_ocean_dead_bubble_coral.png differ diff --git a/textures/mcl_ocean_dead_bubble_coral_block.png b/textures/mcl_ocean_dead_bubble_coral_block.png index 1fee1648e..853bf1f76 100644 Binary files a/textures/mcl_ocean_dead_bubble_coral_block.png and b/textures/mcl_ocean_dead_bubble_coral_block.png differ diff --git a/textures/mcl_ocean_dead_bubble_coral_fan.png b/textures/mcl_ocean_dead_bubble_coral_fan.png index de1def3e4..78626fd3a 100644 Binary files a/textures/mcl_ocean_dead_bubble_coral_fan.png and b/textures/mcl_ocean_dead_bubble_coral_fan.png differ diff --git a/textures/mcl_ocean_dead_fire_coral.png b/textures/mcl_ocean_dead_fire_coral.png index 48cbcf17c..b5e0dcf14 100644 Binary files a/textures/mcl_ocean_dead_fire_coral.png and b/textures/mcl_ocean_dead_fire_coral.png differ diff --git a/textures/mcl_ocean_dead_fire_coral_block.png b/textures/mcl_ocean_dead_fire_coral_block.png index 9aa1da519..5d0d0b092 100644 Binary files a/textures/mcl_ocean_dead_fire_coral_block.png and b/textures/mcl_ocean_dead_fire_coral_block.png differ diff --git a/textures/mcl_ocean_dead_fire_coral_fan.png b/textures/mcl_ocean_dead_fire_coral_fan.png index 0cea55d8e..edbf7a741 100644 Binary files a/textures/mcl_ocean_dead_fire_coral_fan.png and b/textures/mcl_ocean_dead_fire_coral_fan.png differ diff --git a/textures/mcl_ocean_dead_horn_coral.png b/textures/mcl_ocean_dead_horn_coral.png index 59301d597..14270ea25 100644 Binary files a/textures/mcl_ocean_dead_horn_coral.png and b/textures/mcl_ocean_dead_horn_coral.png differ diff --git a/textures/mcl_ocean_dead_horn_coral_block.png b/textures/mcl_ocean_dead_horn_coral_block.png index 0b2f11d4a..dc897330d 100644 Binary files a/textures/mcl_ocean_dead_horn_coral_block.png and b/textures/mcl_ocean_dead_horn_coral_block.png differ diff --git a/textures/mcl_ocean_dead_horn_coral_fan.png b/textures/mcl_ocean_dead_horn_coral_fan.png index 0900bd778..2bb59125b 100644 Binary files a/textures/mcl_ocean_dead_horn_coral_fan.png and b/textures/mcl_ocean_dead_horn_coral_fan.png differ diff --git a/textures/mcl_ocean_dead_tube_coral.png b/textures/mcl_ocean_dead_tube_coral.png index 1ff0862bc..b99ea16a7 100644 Binary files a/textures/mcl_ocean_dead_tube_coral.png and b/textures/mcl_ocean_dead_tube_coral.png differ diff --git a/textures/mcl_ocean_dead_tube_coral_block.png b/textures/mcl_ocean_dead_tube_coral_block.png index b06cb33d9..0a919313c 100644 Binary files a/textures/mcl_ocean_dead_tube_coral_block.png and b/textures/mcl_ocean_dead_tube_coral_block.png differ diff --git a/textures/mcl_ocean_dead_tube_coral_fan.png b/textures/mcl_ocean_dead_tube_coral_fan.png index 6340c513f..d16c44ed0 100644 Binary files a/textures/mcl_ocean_dead_tube_coral_fan.png and b/textures/mcl_ocean_dead_tube_coral_fan.png differ diff --git a/textures/mcl_ocean_dried_kelp.png b/textures/mcl_ocean_dried_kelp.png index 7358dd29d..683e903f5 100644 Binary files a/textures/mcl_ocean_dried_kelp.png and b/textures/mcl_ocean_dried_kelp.png differ diff --git a/textures/mcl_ocean_dried_kelp_bottom.png b/textures/mcl_ocean_dried_kelp_bottom.png index f3f85134f..aa645462a 100644 Binary files a/textures/mcl_ocean_dried_kelp_bottom.png and b/textures/mcl_ocean_dried_kelp_bottom.png differ diff --git a/textures/mcl_ocean_dried_kelp_side.png b/textures/mcl_ocean_dried_kelp_side.png index 9c3e4237c..6d369bada 100644 Binary files a/textures/mcl_ocean_dried_kelp_side.png and b/textures/mcl_ocean_dried_kelp_side.png differ diff --git a/textures/mcl_ocean_dried_kelp_top.png b/textures/mcl_ocean_dried_kelp_top.png index f3f85134f..aa645462a 100644 Binary files a/textures/mcl_ocean_dried_kelp_top.png and b/textures/mcl_ocean_dried_kelp_top.png differ diff --git a/textures/mcl_ocean_fire_coral.png b/textures/mcl_ocean_fire_coral.png index cf49fca8c..bfb0c7ded 100644 Binary files a/textures/mcl_ocean_fire_coral.png and b/textures/mcl_ocean_fire_coral.png differ diff --git a/textures/mcl_ocean_fire_coral_block.png b/textures/mcl_ocean_fire_coral_block.png index fea7af8c5..512261c78 100644 Binary files a/textures/mcl_ocean_fire_coral_block.png and b/textures/mcl_ocean_fire_coral_block.png differ diff --git a/textures/mcl_ocean_fire_coral_fan.png b/textures/mcl_ocean_fire_coral_fan.png index b88478068..e644dab7d 100644 Binary files a/textures/mcl_ocean_fire_coral_fan.png and b/textures/mcl_ocean_fire_coral_fan.png differ diff --git a/textures/mcl_ocean_horn_coral.png b/textures/mcl_ocean_horn_coral.png index a51711a23..81b26b639 100644 Binary files a/textures/mcl_ocean_horn_coral.png and b/textures/mcl_ocean_horn_coral.png differ diff --git a/textures/mcl_ocean_horn_coral_block.png b/textures/mcl_ocean_horn_coral_block.png index 1192a6e56..127145223 100644 Binary files a/textures/mcl_ocean_horn_coral_block.png and b/textures/mcl_ocean_horn_coral_block.png differ diff --git a/textures/mcl_ocean_horn_coral_fan.png b/textures/mcl_ocean_horn_coral_fan.png index a885ecf11..761f590cd 100644 Binary files a/textures/mcl_ocean_horn_coral_fan.png and b/textures/mcl_ocean_horn_coral_fan.png differ diff --git a/textures/mcl_ocean_kelp_item.png b/textures/mcl_ocean_kelp_item.png index d7a10f5c3..f6c942c3b 100644 Binary files a/textures/mcl_ocean_kelp_item.png and b/textures/mcl_ocean_kelp_item.png differ diff --git a/textures/mcl_ocean_kelp_plant.png b/textures/mcl_ocean_kelp_plant.png index 107fa8a62..2f810e080 100644 Binary files a/textures/mcl_ocean_kelp_plant.png and b/textures/mcl_ocean_kelp_plant.png differ diff --git a/textures/mcl_ocean_sea_pickle_1_anim.png b/textures/mcl_ocean_sea_pickle_1_anim.png index 4af3abfbe..715640baf 100644 Binary files a/textures/mcl_ocean_sea_pickle_1_anim.png and b/textures/mcl_ocean_sea_pickle_1_anim.png differ diff --git a/textures/mcl_ocean_sea_pickle_1_off.png b/textures/mcl_ocean_sea_pickle_1_off.png index 3d8403146..8dc110b8a 100644 Binary files a/textures/mcl_ocean_sea_pickle_1_off.png and b/textures/mcl_ocean_sea_pickle_1_off.png differ diff --git a/textures/mcl_ocean_sea_pickle_2_anim.png b/textures/mcl_ocean_sea_pickle_2_anim.png index c8e917b59..32916257b 100644 Binary files a/textures/mcl_ocean_sea_pickle_2_anim.png and b/textures/mcl_ocean_sea_pickle_2_anim.png differ diff --git a/textures/mcl_ocean_sea_pickle_2_off.png b/textures/mcl_ocean_sea_pickle_2_off.png index 738c570d8..97a292874 100644 Binary files a/textures/mcl_ocean_sea_pickle_2_off.png and b/textures/mcl_ocean_sea_pickle_2_off.png differ diff --git a/textures/mcl_ocean_sea_pickle_3_anim.png b/textures/mcl_ocean_sea_pickle_3_anim.png index 112589883..31fcdb4f5 100644 Binary files a/textures/mcl_ocean_sea_pickle_3_anim.png and b/textures/mcl_ocean_sea_pickle_3_anim.png differ diff --git a/textures/mcl_ocean_sea_pickle_3_off.png b/textures/mcl_ocean_sea_pickle_3_off.png index 958fdac35..0fa6d6587 100644 Binary files a/textures/mcl_ocean_sea_pickle_3_off.png and b/textures/mcl_ocean_sea_pickle_3_off.png differ diff --git a/textures/mcl_ocean_sea_pickle_4_anim.png b/textures/mcl_ocean_sea_pickle_4_anim.png index 194eb47ce..6e36864b0 100644 Binary files a/textures/mcl_ocean_sea_pickle_4_anim.png and b/textures/mcl_ocean_sea_pickle_4_anim.png differ diff --git a/textures/mcl_ocean_sea_pickle_4_off.png b/textures/mcl_ocean_sea_pickle_4_off.png index 4f6b13a51..3c7746881 100644 Binary files a/textures/mcl_ocean_sea_pickle_4_off.png and b/textures/mcl_ocean_sea_pickle_4_off.png differ diff --git a/textures/mcl_ocean_sea_pickle_item.png b/textures/mcl_ocean_sea_pickle_item.png index 0fca2e245..d9ce86739 100644 Binary files a/textures/mcl_ocean_sea_pickle_item.png and b/textures/mcl_ocean_sea_pickle_item.png differ diff --git a/textures/mcl_ocean_seagrass.png b/textures/mcl_ocean_seagrass.png index aab177512..da9c30664 100644 Binary files a/textures/mcl_ocean_seagrass.png and b/textures/mcl_ocean_seagrass.png differ diff --git a/textures/mcl_ocean_tube_coral.png b/textures/mcl_ocean_tube_coral.png index 394157d56..eb63d85b6 100644 Binary files a/textures/mcl_ocean_tube_coral.png and b/textures/mcl_ocean_tube_coral.png differ diff --git a/textures/mcl_ocean_tube_coral_block.png b/textures/mcl_ocean_tube_coral_block.png index 02857340a..dd152b242 100644 Binary files a/textures/mcl_ocean_tube_coral_block.png and b/textures/mcl_ocean_tube_coral_block.png differ diff --git a/textures/mcl_ocean_tube_coral_fan.png b/textures/mcl_ocean_tube_coral_fan.png index c7b2bebe6..b10f365d3 100644 Binary files a/textures/mcl_ocean_tube_coral_fan.png and b/textures/mcl_ocean_tube_coral_fan.png differ diff --git a/textures/mcl_offhand_slot.png b/textures/mcl_offhand_slot.png index 9880712e4..310d2ad58 100644 Binary files a/textures/mcl_offhand_slot.png and b/textures/mcl_offhand_slot.png differ diff --git a/textures/mcl_particles_bonemeal.png b/textures/mcl_particles_bonemeal.png index 684df9865..4f8a966fc 100644 Binary files a/textures/mcl_particles_bonemeal.png and b/textures/mcl_particles_bonemeal.png differ diff --git a/textures/mcl_particles_lava.png b/textures/mcl_particles_lava.png index b4a8fd58f..a0fb99a13 100644 Binary files a/textures/mcl_particles_lava.png and b/textures/mcl_particles_lava.png differ diff --git a/textures/mcl_particles_mob_death.png b/textures/mcl_particles_mob_death.png index 2006dd5d1..eaca237e2 100644 Binary files a/textures/mcl_particles_mob_death.png and b/textures/mcl_particles_mob_death.png differ diff --git a/textures/mcl_particles_sponge1.png b/textures/mcl_particles_sponge1.png index ada90731e..d8d6e55c4 100644 Binary files a/textures/mcl_particles_sponge1.png and b/textures/mcl_particles_sponge1.png differ diff --git a/textures/mcl_particles_sponge2.png b/textures/mcl_particles_sponge2.png index 0004ce4db..95531a5af 100644 Binary files a/textures/mcl_particles_sponge2.png and b/textures/mcl_particles_sponge2.png differ diff --git a/textures/mcl_particles_sponge3.png b/textures/mcl_particles_sponge3.png index 62ae83a86..37f168b71 100644 Binary files a/textures/mcl_particles_sponge3.png and b/textures/mcl_particles_sponge3.png differ diff --git a/textures/mcl_particles_sponge4.png b/textures/mcl_particles_sponge4.png index f1e05ee6a..38c4b71a7 100644 Binary files a/textures/mcl_particles_sponge4.png and b/textures/mcl_particles_sponge4.png differ diff --git a/textures/mcl_particles_sponge5.png b/textures/mcl_particles_sponge5.png index b492718b5..ad4784b3c 100644 Binary files a/textures/mcl_particles_sponge5.png and b/textures/mcl_particles_sponge5.png differ diff --git a/textures/mcl_particles_totem1.png b/textures/mcl_particles_totem1.png index 15fe082e1..b1486ec47 100644 Binary files a/textures/mcl_particles_totem1.png and b/textures/mcl_particles_totem1.png differ diff --git a/textures/mcl_particles_totem2.png b/textures/mcl_particles_totem2.png index 2ab88983d..998f89d4d 100644 Binary files a/textures/mcl_particles_totem2.png and b/textures/mcl_particles_totem2.png differ diff --git a/textures/mcl_particles_totem3.png b/textures/mcl_particles_totem3.png index 55d6f49d3..7e9133817 100644 Binary files a/textures/mcl_particles_totem3.png and b/textures/mcl_particles_totem3.png differ diff --git a/textures/mcl_particles_totem4.png b/textures/mcl_particles_totem4.png index d6e6502b7..81ae7e5ac 100644 Binary files a/textures/mcl_particles_totem4.png and b/textures/mcl_particles_totem4.png differ diff --git a/textures/mcl_playerplus_water.png b/textures/mcl_playerplus_water.png index 1c15685ad..577e24e87 100644 Binary files a/textures/mcl_playerplus_water.png and b/textures/mcl_playerplus_water.png differ diff --git a/textures/mcl_polished_deepslate.png b/textures/mcl_polished_deepslate.png index c567b3048..507b8195e 100644 Binary files a/textures/mcl_polished_deepslate.png and b/textures/mcl_polished_deepslate.png differ diff --git a/textures/mcl_portals_particle1.png b/textures/mcl_portals_particle1.png index 6695291eb..e3b7b55c6 100644 Binary files a/textures/mcl_portals_particle1.png and b/textures/mcl_portals_particle1.png differ diff --git a/textures/mcl_portals_particle2.png b/textures/mcl_portals_particle2.png index 99b3a191a..52ee3b3c7 100644 Binary files a/textures/mcl_portals_particle2.png and b/textures/mcl_portals_particle2.png differ diff --git a/textures/mcl_portals_particle3.png b/textures/mcl_portals_particle3.png index 3000a799c..e07d2492b 100644 Binary files a/textures/mcl_portals_particle3.png and b/textures/mcl_portals_particle3.png differ diff --git a/textures/mcl_portals_particle4.png b/textures/mcl_portals_particle4.png index 28d14cbd6..5a44d9ee1 100644 Binary files a/textures/mcl_portals_particle4.png and b/textures/mcl_portals_particle4.png differ diff --git a/textures/mcl_portals_particle5.png b/textures/mcl_portals_particle5.png index fbd67375a..e2b4da97c 100644 Binary files a/textures/mcl_portals_particle5.png and b/textures/mcl_portals_particle5.png differ diff --git a/textures/mcl_potions_arrow_inv.png b/textures/mcl_potions_arrow_inv.png index 0f84edba1..1f60971ca 100644 Binary files a/textures/mcl_potions_arrow_inv.png and b/textures/mcl_potions_arrow_inv.png differ diff --git a/textures/mcl_potions_effect_bad_omen.png b/textures/mcl_potions_effect_bad_omen.png index d5a259667..4293aed22 100644 Binary files a/textures/mcl_potions_effect_bad_omen.png and b/textures/mcl_potions_effect_bad_omen.png differ diff --git a/textures/mcl_potions_effect_fire_proof.png b/textures/mcl_potions_effect_fire_proof.png index c5acb77a4..effbefaa4 100644 Binary files a/textures/mcl_potions_effect_fire_proof.png and b/textures/mcl_potions_effect_fire_proof.png differ diff --git a/textures/mcl_potions_effect_food_poisoning.png b/textures/mcl_potions_effect_food_poisoning.png index 2c86a72c0..f29be56a5 100644 Binary files a/textures/mcl_potions_effect_food_poisoning.png and b/textures/mcl_potions_effect_food_poisoning.png differ diff --git a/textures/mcl_potions_effect_invisible.png b/textures/mcl_potions_effect_invisible.png index 1d8558754..db0afb575 100644 Binary files a/textures/mcl_potions_effect_invisible.png and b/textures/mcl_potions_effect_invisible.png differ diff --git a/textures/mcl_potions_effect_leaping.png b/textures/mcl_potions_effect_leaping.png index efd631a5d..8fbf25ae8 100644 Binary files a/textures/mcl_potions_effect_leaping.png and b/textures/mcl_potions_effect_leaping.png differ diff --git a/textures/mcl_potions_effect_night_vision.png b/textures/mcl_potions_effect_night_vision.png index 1db9385ef..f4263968a 100644 Binary files a/textures/mcl_potions_effect_night_vision.png and b/textures/mcl_potions_effect_night_vision.png differ diff --git a/textures/mcl_potions_effect_poisoned.png b/textures/mcl_potions_effect_poisoned.png index 63ec12afd..9d8cd5815 100644 Binary files a/textures/mcl_potions_effect_poisoned.png and b/textures/mcl_potions_effect_poisoned.png differ diff --git a/textures/mcl_potions_effect_regenerating.png b/textures/mcl_potions_effect_regenerating.png index 4185e2047..dfb82bba9 100644 Binary files a/textures/mcl_potions_effect_regenerating.png and b/textures/mcl_potions_effect_regenerating.png differ diff --git a/textures/mcl_potions_effect_slow.png b/textures/mcl_potions_effect_slow.png index a8a03be35..464d270a9 100644 Binary files a/textures/mcl_potions_effect_slow.png and b/textures/mcl_potions_effect_slow.png differ diff --git a/textures/mcl_potions_effect_strong.png b/textures/mcl_potions_effect_strong.png index 217c5d647..515b5777a 100644 Binary files a/textures/mcl_potions_effect_strong.png and b/textures/mcl_potions_effect_strong.png differ diff --git a/textures/mcl_potions_effect_swift.png b/textures/mcl_potions_effect_swift.png index ae7dd27d3..cf9e4b95c 100644 Binary files a/textures/mcl_potions_effect_swift.png and b/textures/mcl_potions_effect_swift.png differ diff --git a/textures/mcl_potions_effect_water_breathing.png b/textures/mcl_potions_effect_water_breathing.png index f6c44f23e..3ced75eba 100644 Binary files a/textures/mcl_potions_effect_water_breathing.png and b/textures/mcl_potions_effect_water_breathing.png differ diff --git a/textures/mcl_potions_effect_weak.png b/textures/mcl_potions_effect_weak.png index 61cec03ca..398c161ab 100644 Binary files a/textures/mcl_potions_effect_weak.png and b/textures/mcl_potions_effect_weak.png differ diff --git a/textures/mcl_potions_lingering_bottle.png b/textures/mcl_potions_lingering_bottle.png index 2a887477d..cd5e76564 100644 Binary files a/textures/mcl_potions_lingering_bottle.png and b/textures/mcl_potions_lingering_bottle.png differ diff --git a/textures/mcl_potions_splash_bottle.png b/textures/mcl_potions_splash_bottle.png index 1275627fd..5af0dc373 100644 Binary files a/textures/mcl_potions_splash_bottle.png and b/textures/mcl_potions_splash_bottle.png differ diff --git a/textures/mcl_potions_splash_overlay.png b/textures/mcl_potions_splash_overlay.png index 12402033b..c3b5f317e 100644 Binary files a/textures/mcl_potions_splash_overlay.png and b/textures/mcl_potions_splash_overlay.png differ diff --git a/textures/mcl_raids_hero_of_the_village_icon.png b/textures/mcl_raids_hero_of_the_village_icon.png index 41e0a4e89..d42dfb230 100644 Binary files a/textures/mcl_raids_hero_of_the_village_icon.png and b/textures/mcl_raids_hero_of_the_village_icon.png differ diff --git a/textures/mcl_raw_ores_raw_gold.png b/textures/mcl_raw_ores_raw_gold.png index 4c7c2cd7f..d49405831 100644 Binary files a/textures/mcl_raw_ores_raw_gold.png and b/textures/mcl_raw_ores_raw_gold.png differ diff --git a/textures/mcl_raw_ores_raw_gold_block.png b/textures/mcl_raw_ores_raw_gold_block.png index 197dcfd27..503e3f16e 100644 Binary files a/textures/mcl_raw_ores_raw_gold_block.png and b/textures/mcl_raw_ores_raw_gold_block.png differ diff --git a/textures/mcl_raw_ores_raw_iron.png b/textures/mcl_raw_ores_raw_iron.png index 5903ab00e..36641148b 100644 Binary files a/textures/mcl_raw_ores_raw_iron.png and b/textures/mcl_raw_ores_raw_iron.png differ diff --git a/textures/mcl_raw_ores_raw_iron_block.png b/textures/mcl_raw_ores_raw_iron_block.png index ec00b3ae4..35b29a018 100644 Binary files a/textures/mcl_raw_ores_raw_iron_block.png and b/textures/mcl_raw_ores_raw_iron_block.png differ diff --git a/textures/mcl_sculk_catalyst_bottom.png b/textures/mcl_sculk_catalyst_bottom.png index 16c16b64d..94981fcb9 100644 Binary files a/textures/mcl_sculk_catalyst_bottom.png and b/textures/mcl_sculk_catalyst_bottom.png differ diff --git a/textures/mcl_sculk_catalyst_side.png b/textures/mcl_sculk_catalyst_side.png index 417164740..0828267e5 100644 Binary files a/textures/mcl_sculk_catalyst_side.png and b/textures/mcl_sculk_catalyst_side.png differ diff --git a/textures/mcl_sculk_catalyst_top.png b/textures/mcl_sculk_catalyst_top.png index 73f14eda0..eeebcac5d 100644 Binary files a/textures/mcl_sculk_catalyst_top.png and b/textures/mcl_sculk_catalyst_top.png differ diff --git a/textures/mcl_sculk_sculk.png b/textures/mcl_sculk_sculk.png index fb23b83d9..593c63c7e 100644 Binary files a/textures/mcl_sculk_sculk.png and b/textures/mcl_sculk_sculk.png differ diff --git a/textures/mcl_sculk_sensor_bottom.png b/textures/mcl_sculk_sensor_bottom.png index 4d536d8ff..eeebcac5d 100644 Binary files a/textures/mcl_sculk_sensor_bottom.png and b/textures/mcl_sculk_sensor_bottom.png differ diff --git a/textures/mcl_sculk_sensor_side.png b/textures/mcl_sculk_sensor_side.png index cee486ad2..ef22f9af5 100644 Binary files a/textures/mcl_sculk_sensor_side.png and b/textures/mcl_sculk_sensor_side.png differ diff --git a/textures/mcl_sculk_sensor_top.png b/textures/mcl_sculk_sensor_top.png index 896307ba8..4da71770d 100644 Binary files a/textures/mcl_sculk_sensor_top.png and b/textures/mcl_sculk_sensor_top.png differ diff --git a/textures/mcl_sculk_shrieker_bottom.png b/textures/mcl_sculk_shrieker_bottom.png index 4d536d8ff..eeebcac5d 100644 Binary files a/textures/mcl_sculk_shrieker_bottom.png and b/textures/mcl_sculk_shrieker_bottom.png differ diff --git a/textures/mcl_sculk_shrieker_side.png b/textures/mcl_sculk_shrieker_side.png index 9af2f8f0a..83e60da5c 100644 Binary files a/textures/mcl_sculk_shrieker_side.png and b/textures/mcl_sculk_shrieker_side.png differ diff --git a/textures/mcl_sculk_shrieker_top.png b/textures/mcl_sculk_shrieker_top.png index bc4a6c3f0..7c0125663 100644 Binary files a/textures/mcl_sculk_shrieker_top.png and b/textures/mcl_sculk_shrieker_top.png differ diff --git a/textures/mcl_sculk_vein.png b/textures/mcl_sculk_vein.png index 9c61bace5..ebfa49cc8 100644 Binary files a/textures/mcl_sculk_vein.png and b/textures/mcl_sculk_vein.png differ diff --git a/textures/mcl_shield.png b/textures/mcl_shield.png index 2b132ce3e..2fd057d5a 100644 Binary files a/textures/mcl_shield.png and b/textures/mcl_shield.png differ diff --git a/textures/mcl_shield_base_nopattern.png b/textures/mcl_shield_base_nopattern.png index 4fc344791..febfb4b5a 100644 Binary files a/textures/mcl_shield_base_nopattern.png and b/textures/mcl_shield_base_nopattern.png differ diff --git a/textures/mcl_shield_hud.png b/textures/mcl_shield_hud.png index f4d0b080f..f3ec407d0 100644 Binary files a/textures/mcl_shield_hud.png and b/textures/mcl_shield_hud.png differ diff --git a/textures/mcl_shield_item_overlay.png b/textures/mcl_shield_item_overlay.png index 72728886d..a83f574fd 100644 Binary files a/textures/mcl_shield_item_overlay.png and b/textures/mcl_shield_item_overlay.png differ diff --git a/textures/mcl_shield_pattern_base.png b/textures/mcl_shield_pattern_base.png index a154c63d0..d3cfab8c0 100644 Binary files a/textures/mcl_shield_pattern_base.png and b/textures/mcl_shield_pattern_base.png differ diff --git a/textures/mcl_shield_pattern_border.png b/textures/mcl_shield_pattern_border.png index e74d49676..ae382bcdb 100644 Binary files a/textures/mcl_shield_pattern_border.png and b/textures/mcl_shield_pattern_border.png differ diff --git a/textures/mcl_shield_pattern_bricks.png b/textures/mcl_shield_pattern_bricks.png index 2316b6815..3acba57ab 100644 Binary files a/textures/mcl_shield_pattern_bricks.png and b/textures/mcl_shield_pattern_bricks.png differ diff --git a/textures/mcl_shield_pattern_circle.png b/textures/mcl_shield_pattern_circle.png index 333e6ecb7..07a483ae7 100644 Binary files a/textures/mcl_shield_pattern_circle.png and b/textures/mcl_shield_pattern_circle.png differ diff --git a/textures/mcl_shield_pattern_creeper.png b/textures/mcl_shield_pattern_creeper.png index 693afc0f3..7fb573b61 100644 Binary files a/textures/mcl_shield_pattern_creeper.png and b/textures/mcl_shield_pattern_creeper.png differ diff --git a/textures/mcl_shield_pattern_cross.png b/textures/mcl_shield_pattern_cross.png index 52810a001..0aca4dacf 100644 Binary files a/textures/mcl_shield_pattern_cross.png and b/textures/mcl_shield_pattern_cross.png differ diff --git a/textures/mcl_shield_pattern_curly_border.png b/textures/mcl_shield_pattern_curly_border.png index 085442087..4cd9b778b 100644 Binary files a/textures/mcl_shield_pattern_curly_border.png and b/textures/mcl_shield_pattern_curly_border.png differ diff --git a/textures/mcl_shield_pattern_diagonal_left.png b/textures/mcl_shield_pattern_diagonal_left.png index abff49546..f41cfe1bf 100644 Binary files a/textures/mcl_shield_pattern_diagonal_left.png and b/textures/mcl_shield_pattern_diagonal_left.png differ diff --git a/textures/mcl_shield_pattern_diagonal_right.png b/textures/mcl_shield_pattern_diagonal_right.png index 5f6192807..d906a82fe 100644 Binary files a/textures/mcl_shield_pattern_diagonal_right.png and b/textures/mcl_shield_pattern_diagonal_right.png differ diff --git a/textures/mcl_shield_pattern_diagonal_up_left.png b/textures/mcl_shield_pattern_diagonal_up_left.png index 700f6fbd9..0b4830838 100644 Binary files a/textures/mcl_shield_pattern_diagonal_up_left.png and b/textures/mcl_shield_pattern_diagonal_up_left.png differ diff --git a/textures/mcl_shield_pattern_diagonal_up_right.png b/textures/mcl_shield_pattern_diagonal_up_right.png index e17ef5fa4..7883d821c 100644 Binary files a/textures/mcl_shield_pattern_diagonal_up_right.png and b/textures/mcl_shield_pattern_diagonal_up_right.png differ diff --git a/textures/mcl_shield_pattern_flower.png b/textures/mcl_shield_pattern_flower.png index 8d5a4f843..dc6e5db31 100644 Binary files a/textures/mcl_shield_pattern_flower.png and b/textures/mcl_shield_pattern_flower.png differ diff --git a/textures/mcl_shield_pattern_gradient.png b/textures/mcl_shield_pattern_gradient.png index 29a98c704..bf8094ce4 100644 Binary files a/textures/mcl_shield_pattern_gradient.png and b/textures/mcl_shield_pattern_gradient.png differ diff --git a/textures/mcl_shield_pattern_gradient_up.png b/textures/mcl_shield_pattern_gradient_up.png index 09effb26a..c974ad7a1 100644 Binary files a/textures/mcl_shield_pattern_gradient_up.png and b/textures/mcl_shield_pattern_gradient_up.png differ diff --git a/textures/mcl_shield_pattern_half_horizontal.png b/textures/mcl_shield_pattern_half_horizontal.png index b8bfcaa57..adacc8f28 100644 Binary files a/textures/mcl_shield_pattern_half_horizontal.png and b/textures/mcl_shield_pattern_half_horizontal.png differ diff --git a/textures/mcl_shield_pattern_half_horizontal_bottom.png b/textures/mcl_shield_pattern_half_horizontal_bottom.png index a2b3999fa..292b401b1 100644 Binary files a/textures/mcl_shield_pattern_half_horizontal_bottom.png and b/textures/mcl_shield_pattern_half_horizontal_bottom.png differ diff --git a/textures/mcl_shield_pattern_half_vertical.png b/textures/mcl_shield_pattern_half_vertical.png index 6275ede06..f6092d450 100644 Binary files a/textures/mcl_shield_pattern_half_vertical.png and b/textures/mcl_shield_pattern_half_vertical.png differ diff --git a/textures/mcl_shield_pattern_half_vertical_right.png b/textures/mcl_shield_pattern_half_vertical_right.png index 95ee05ca9..111e0a300 100644 Binary files a/textures/mcl_shield_pattern_half_vertical_right.png and b/textures/mcl_shield_pattern_half_vertical_right.png differ diff --git a/textures/mcl_shield_pattern_rhombus.png b/textures/mcl_shield_pattern_rhombus.png index afa059bf3..732eb6ecd 100644 Binary files a/textures/mcl_shield_pattern_rhombus.png and b/textures/mcl_shield_pattern_rhombus.png differ diff --git a/textures/mcl_shield_pattern_skull.png b/textures/mcl_shield_pattern_skull.png index 7d9699fc4..f7f6362e9 100644 Binary files a/textures/mcl_shield_pattern_skull.png and b/textures/mcl_shield_pattern_skull.png differ diff --git a/textures/mcl_shield_pattern_small_stripes.png b/textures/mcl_shield_pattern_small_stripes.png index 3f1d26be2..c7a2a8ab1 100644 Binary files a/textures/mcl_shield_pattern_small_stripes.png and b/textures/mcl_shield_pattern_small_stripes.png differ diff --git a/textures/mcl_shield_pattern_square_bottom_left.png b/textures/mcl_shield_pattern_square_bottom_left.png index c97cc0854..644c991c9 100644 Binary files a/textures/mcl_shield_pattern_square_bottom_left.png and b/textures/mcl_shield_pattern_square_bottom_left.png differ diff --git a/textures/mcl_shield_pattern_square_bottom_right.png b/textures/mcl_shield_pattern_square_bottom_right.png index edbe6cb71..cad96247e 100644 Binary files a/textures/mcl_shield_pattern_square_bottom_right.png and b/textures/mcl_shield_pattern_square_bottom_right.png differ diff --git a/textures/mcl_shield_pattern_square_top_left.png b/textures/mcl_shield_pattern_square_top_left.png index b50c3eec8..dcfcbcc21 100644 Binary files a/textures/mcl_shield_pattern_square_top_left.png and b/textures/mcl_shield_pattern_square_top_left.png differ diff --git a/textures/mcl_shield_pattern_square_top_right.png b/textures/mcl_shield_pattern_square_top_right.png index 404c81d2e..7cfd3470f 100644 Binary files a/textures/mcl_shield_pattern_square_top_right.png and b/textures/mcl_shield_pattern_square_top_right.png differ diff --git a/textures/mcl_shield_pattern_straight_cross.png b/textures/mcl_shield_pattern_straight_cross.png index c202d1711..8cb195c0f 100644 Binary files a/textures/mcl_shield_pattern_straight_cross.png and b/textures/mcl_shield_pattern_straight_cross.png differ diff --git a/textures/mcl_shield_pattern_stripe_bottom.png b/textures/mcl_shield_pattern_stripe_bottom.png index 585b9bd4c..c9dd28d0d 100644 Binary files a/textures/mcl_shield_pattern_stripe_bottom.png and b/textures/mcl_shield_pattern_stripe_bottom.png differ diff --git a/textures/mcl_shield_pattern_stripe_center.png b/textures/mcl_shield_pattern_stripe_center.png index e3b39aee2..f716f3532 100644 Binary files a/textures/mcl_shield_pattern_stripe_center.png and b/textures/mcl_shield_pattern_stripe_center.png differ diff --git a/textures/mcl_shield_pattern_stripe_downleft.png b/textures/mcl_shield_pattern_stripe_downleft.png index 490b3237a..31095bfed 100644 Binary files a/textures/mcl_shield_pattern_stripe_downleft.png and b/textures/mcl_shield_pattern_stripe_downleft.png differ diff --git a/textures/mcl_shield_pattern_stripe_downright.png b/textures/mcl_shield_pattern_stripe_downright.png index 3b0d530cf..cb35cf8c5 100644 Binary files a/textures/mcl_shield_pattern_stripe_downright.png and b/textures/mcl_shield_pattern_stripe_downright.png differ diff --git a/textures/mcl_shield_pattern_stripe_left.png b/textures/mcl_shield_pattern_stripe_left.png index 3a13a4803..7f183effb 100644 Binary files a/textures/mcl_shield_pattern_stripe_left.png and b/textures/mcl_shield_pattern_stripe_left.png differ diff --git a/textures/mcl_shield_pattern_stripe_middle.png b/textures/mcl_shield_pattern_stripe_middle.png index ebe5891c3..3da72340a 100644 Binary files a/textures/mcl_shield_pattern_stripe_middle.png and b/textures/mcl_shield_pattern_stripe_middle.png differ diff --git a/textures/mcl_shield_pattern_stripe_right.png b/textures/mcl_shield_pattern_stripe_right.png index f329ee5bf..19f8c6ea3 100644 Binary files a/textures/mcl_shield_pattern_stripe_right.png and b/textures/mcl_shield_pattern_stripe_right.png differ diff --git a/textures/mcl_shield_pattern_stripe_top.png b/textures/mcl_shield_pattern_stripe_top.png index 10b01e33f..2bef3467f 100644 Binary files a/textures/mcl_shield_pattern_stripe_top.png and b/textures/mcl_shield_pattern_stripe_top.png differ diff --git a/textures/mcl_shield_pattern_thing.png b/textures/mcl_shield_pattern_thing.png index c4f9808fd..5eb26a74d 100644 Binary files a/textures/mcl_shield_pattern_thing.png and b/textures/mcl_shield_pattern_thing.png differ diff --git a/textures/mcl_shield_pattern_triangle_bottom.png b/textures/mcl_shield_pattern_triangle_bottom.png index edae90068..b78139fd1 100644 Binary files a/textures/mcl_shield_pattern_triangle_bottom.png and b/textures/mcl_shield_pattern_triangle_bottom.png differ diff --git a/textures/mcl_shield_pattern_triangle_top.png b/textures/mcl_shield_pattern_triangle_top.png index 94829274b..f6e1cb2ec 100644 Binary files a/textures/mcl_shield_pattern_triangle_top.png and b/textures/mcl_shield_pattern_triangle_top.png differ diff --git a/textures/mcl_shield_pattern_triangles_bottom.png b/textures/mcl_shield_pattern_triangles_bottom.png index 66fa4eaf1..12c432057 100644 Binary files a/textures/mcl_shield_pattern_triangles_bottom.png and b/textures/mcl_shield_pattern_triangles_bottom.png differ diff --git a/textures/mcl_shield_pattern_triangles_top.png b/textures/mcl_shield_pattern_triangles_top.png index 3ca1f773e..4d210007e 100644 Binary files a/textures/mcl_shield_pattern_triangles_top.png and b/textures/mcl_shield_pattern_triangles_top.png differ diff --git a/textures/mcl_signs_default_sign.png b/textures/mcl_signs_default_sign.png index ab631333b..5acd7d10b 100644 Binary files a/textures/mcl_signs_default_sign.png and b/textures/mcl_signs_default_sign.png differ diff --git a/textures/mcl_signs_default_sign_dark.png b/textures/mcl_signs_default_sign_dark.png index 90e5c7efe..b0726f839 100644 Binary files a/textures/mcl_signs_default_sign_dark.png and b/textures/mcl_signs_default_sign_dark.png differ diff --git a/textures/mcl_signs_default_sign_greyscale.png b/textures/mcl_signs_default_sign_greyscale.png index 1cd41d882..e76d6378c 100644 Binary files a/textures/mcl_signs_default_sign_greyscale.png and b/textures/mcl_signs_default_sign_greyscale.png differ diff --git a/textures/mcl_signs_sign_dark.png b/textures/mcl_signs_sign_dark.png index f6fcf77cf..5f835390c 100644 Binary files a/textures/mcl_signs_sign_dark.png and b/textures/mcl_signs_sign_dark.png differ diff --git a/textures/mcl_signs_sign_greyscale.png b/textures/mcl_signs_sign_greyscale.png index 8d6e29e4d..2c902dad6 100644 Binary files a/textures/mcl_signs_sign_greyscale.png and b/textures/mcl_signs_sign_greyscale.png differ diff --git a/textures/mcl_skins_base_1.png b/textures/mcl_skins_base_1.png index 505331181..4cbc682f2 100644 Binary files a/textures/mcl_skins_base_1.png and b/textures/mcl_skins_base_1.png differ diff --git a/textures/mcl_skins_bottom_1.png b/textures/mcl_skins_bottom_1.png index 65ab46ca9..ebe25c356 100644 Binary files a/textures/mcl_skins_bottom_1.png and b/textures/mcl_skins_bottom_1.png differ diff --git a/textures/mcl_skins_bottom_1_mask.png b/textures/mcl_skins_bottom_1_mask.png index ec0f69d2d..b26699db9 100644 Binary files a/textures/mcl_skins_bottom_1_mask.png and b/textures/mcl_skins_bottom_1_mask.png differ diff --git a/textures/mcl_skins_bottom_2.png b/textures/mcl_skins_bottom_2.png index 3053b422b..b9cd79874 100644 Binary files a/textures/mcl_skins_bottom_2.png and b/textures/mcl_skins_bottom_2.png differ diff --git a/textures/mcl_skins_bottom_3_mask.png b/textures/mcl_skins_bottom_3_mask.png index 8e389272b..fa5214ef9 100644 Binary files a/textures/mcl_skins_bottom_3_mask.png and b/textures/mcl_skins_bottom_3_mask.png differ diff --git a/textures/mcl_skins_bottom_4.png b/textures/mcl_skins_bottom_4.png index 2911d2527..ded9f4991 100644 Binary files a/textures/mcl_skins_bottom_4.png and b/textures/mcl_skins_bottom_4.png differ diff --git a/textures/mcl_skins_bottom_4_mask.png b/textures/mcl_skins_bottom_4_mask.png index ec0f69d2d..b26699db9 100644 Binary files a/textures/mcl_skins_bottom_4_mask.png and b/textures/mcl_skins_bottom_4_mask.png differ diff --git a/textures/mcl_skins_bottom_5.png b/textures/mcl_skins_bottom_5.png index 2645d9766..0cb44293f 100644 Binary files a/textures/mcl_skins_bottom_5.png and b/textures/mcl_skins_bottom_5.png differ diff --git a/textures/mcl_skins_bottom_5_mask.png b/textures/mcl_skins_bottom_5_mask.png index 1fdd26ee6..284cdba2c 100644 Binary files a/textures/mcl_skins_bottom_5_mask.png and b/textures/mcl_skins_bottom_5_mask.png differ diff --git a/textures/mcl_skins_character_1.png b/textures/mcl_skins_character_1.png index 598877bbc..4c3d334f4 100644 Binary files a/textures/mcl_skins_character_1.png and b/textures/mcl_skins_character_1.png differ diff --git a/textures/mcl_skins_eye_4.png b/textures/mcl_skins_eye_4.png index 1cd82bd48..42f3f201a 100644 Binary files a/textures/mcl_skins_eye_4.png and b/textures/mcl_skins_eye_4.png differ diff --git a/textures/mcl_skins_eye_5.png b/textures/mcl_skins_eye_5.png index dacc5cb23..dfb7d45e1 100644 Binary files a/textures/mcl_skins_eye_5.png and b/textures/mcl_skins_eye_5.png differ diff --git a/textures/mcl_skins_eye_6.png b/textures/mcl_skins_eye_6.png index 3b8f897cf..318f30772 100644 Binary files a/textures/mcl_skins_eye_6.png and b/textures/mcl_skins_eye_6.png differ diff --git a/textures/mcl_skins_eye_7.png b/textures/mcl_skins_eye_7.png index f800a90b7..d92f57fd5 100644 Binary files a/textures/mcl_skins_eye_7.png and b/textures/mcl_skins_eye_7.png differ diff --git a/textures/mcl_skins_hair_6.png b/textures/mcl_skins_hair_6.png index eea7a69a6..7e2382dbc 100644 Binary files a/textures/mcl_skins_hair_6.png and b/textures/mcl_skins_hair_6.png differ diff --git a/textures/mcl_skins_hair_6_mask.png b/textures/mcl_skins_hair_6_mask.png index 6c6c6b965..cb8bcb735 100644 Binary files a/textures/mcl_skins_hair_6_mask.png and b/textures/mcl_skins_hair_6_mask.png differ diff --git a/textures/mcl_skins_headwear_1.png b/textures/mcl_skins_headwear_1.png index 3a0fcf1a9..7323a6ce6 100644 Binary files a/textures/mcl_skins_headwear_1.png and b/textures/mcl_skins_headwear_1.png differ diff --git a/textures/mcl_skins_headwear_7.png b/textures/mcl_skins_headwear_7.png index 755b82a84..97cdd7360 100644 Binary files a/textures/mcl_skins_headwear_7.png and b/textures/mcl_skins_headwear_7.png differ diff --git a/textures/mcl_skins_icons.png b/textures/mcl_skins_icons.png index 3f2241afe..f0e7e93d8 100644 Binary files a/textures/mcl_skins_icons.png and b/textures/mcl_skins_icons.png differ diff --git a/textures/mcl_skins_mouth_1.png b/textures/mcl_skins_mouth_1.png index 7b48bc770..963955c81 100644 Binary files a/textures/mcl_skins_mouth_1.png and b/textures/mcl_skins_mouth_1.png differ diff --git a/textures/mcl_skins_mouth_2.png b/textures/mcl_skins_mouth_2.png index 2ac147e31..8c6583759 100644 Binary files a/textures/mcl_skins_mouth_2.png and b/textures/mcl_skins_mouth_2.png differ diff --git a/textures/mcl_skins_mouth_3.png b/textures/mcl_skins_mouth_3.png index 2249962b0..98b18c7ec 100644 Binary files a/textures/mcl_skins_mouth_3.png and b/textures/mcl_skins_mouth_3.png differ diff --git a/textures/mcl_skins_mouth_4.png b/textures/mcl_skins_mouth_4.png index a01f7ed05..7c29832d6 100644 Binary files a/textures/mcl_skins_mouth_4.png and b/textures/mcl_skins_mouth_4.png differ diff --git a/textures/mcl_skins_mouth_5.png b/textures/mcl_skins_mouth_5.png index 74a25a93e..9c08cdb6b 100644 Binary files a/textures/mcl_skins_mouth_5.png and b/textures/mcl_skins_mouth_5.png differ diff --git a/textures/mcl_skins_mouth_6.png b/textures/mcl_skins_mouth_6.png index 3b93aaead..9b36d2b96 100644 Binary files a/textures/mcl_skins_mouth_6.png and b/textures/mcl_skins_mouth_6.png differ diff --git a/textures/mcl_skins_mouth_7.png b/textures/mcl_skins_mouth_7.png index 0b1afb994..1c6b5f7e8 100644 Binary files a/textures/mcl_skins_mouth_7.png and b/textures/mcl_skins_mouth_7.png differ diff --git a/textures/mcl_skins_slim_arms.png b/textures/mcl_skins_slim_arms.png index 5e220587e..415de4f34 100644 Binary files a/textures/mcl_skins_slim_arms.png and b/textures/mcl_skins_slim_arms.png differ diff --git a/textures/mcl_skins_thick_arms.png b/textures/mcl_skins_thick_arms.png index 95b189924..b839b3a1f 100644 Binary files a/textures/mcl_skins_thick_arms.png and b/textures/mcl_skins_thick_arms.png differ diff --git a/textures/mcl_skins_top_4.png b/textures/mcl_skins_top_4.png index 693ef3216..042e63bcd 100644 Binary files a/textures/mcl_skins_top_4.png and b/textures/mcl_skins_top_4.png differ diff --git a/textures/mcl_skins_top_5.png b/textures/mcl_skins_top_5.png index 716b0e305..179b2ea2f 100644 Binary files a/textures/mcl_skins_top_5.png and b/textures/mcl_skins_top_5.png differ diff --git a/textures/mcl_skins_top_5_mask.png b/textures/mcl_skins_top_5_mask.png index f0f6397c7..6bf55d061 100644 Binary files a/textures/mcl_skins_top_5_mask.png and b/textures/mcl_skins_top_5_mask.png differ diff --git a/textures/mcl_smithing_table_bottom.png b/textures/mcl_smithing_table_bottom.png index d7e90662e..cca0ebf14 100644 Binary files a/textures/mcl_smithing_table_bottom.png and b/textures/mcl_smithing_table_bottom.png differ diff --git a/textures/mcl_smithing_table_front.png b/textures/mcl_smithing_table_front.png index 40d128bd0..eef16e6aa 100644 Binary files a/textures/mcl_smithing_table_front.png and b/textures/mcl_smithing_table_front.png differ diff --git a/textures/mcl_smithing_table_inventory.png b/textures/mcl_smithing_table_inventory.png index 7be429623..49421b3db 100644 Binary files a/textures/mcl_smithing_table_inventory.png and b/textures/mcl_smithing_table_inventory.png differ diff --git a/textures/mcl_smithing_table_inventory_hammer.png b/textures/mcl_smithing_table_inventory_hammer.png new file mode 100644 index 000000000..48a21e97d Binary files /dev/null and b/textures/mcl_smithing_table_inventory_hammer.png differ diff --git a/textures/mcl_smithing_table_side.png b/textures/mcl_smithing_table_side.png index 9131ad00f..d93a7906c 100644 Binary files a/textures/mcl_smithing_table_side.png and b/textures/mcl_smithing_table_side.png differ diff --git a/textures/mcl_smithing_table_top.png b/textures/mcl_smithing_table_top.png index 6d55a5c02..be7abee62 100644 Binary files a/textures/mcl_smithing_table_top.png and b/textures/mcl_smithing_table_top.png differ diff --git a/textures/mcl_spyglass.png b/textures/mcl_spyglass.png index df4f14bdf..cdbee2de8 100644 Binary files a/textures/mcl_spyglass.png and b/textures/mcl_spyglass.png differ diff --git a/textures/mcl_spyglass_scope.png b/textures/mcl_spyglass_scope.png index 3992d9102..bf03bcedd 100644 Binary files a/textures/mcl_spyglass_scope.png and b/textures/mcl_spyglass_scope.png differ diff --git a/textures/mcl_stonecutter_bottom.png b/textures/mcl_stonecutter_bottom.png index ff2950888..5b15fe3f5 100644 Binary files a/textures/mcl_stonecutter_bottom.png and b/textures/mcl_stonecutter_bottom.png differ diff --git a/textures/mcl_stonecutter_saw.png b/textures/mcl_stonecutter_saw.png index 8bdec63f1..7d9aa48fd 100644 Binary files a/textures/mcl_stonecutter_saw.png and b/textures/mcl_stonecutter_saw.png differ diff --git a/textures/mcl_stonecutter_side.png b/textures/mcl_stonecutter_side.png index 9c7fe79b4..02261e763 100644 Binary files a/textures/mcl_stonecutter_side.png and b/textures/mcl_stonecutter_side.png differ diff --git a/textures/mcl_stonecutter_top.png b/textures/mcl_stonecutter_top.png index 9d57f5ee6..1cb7ee6e1 100644 Binary files a/textures/mcl_stonecutter_top.png and b/textures/mcl_stonecutter_top.png differ diff --git a/textures/mcl_target_target_side.png b/textures/mcl_target_target_side.png index 0d7236259..5a8c0f09a 100644 Binary files a/textures/mcl_target_target_side.png and b/textures/mcl_target_target_side.png differ diff --git a/textures/mcl_target_target_top.png b/textures/mcl_target_target_top.png index 35cba1c98..5a8c0f09a 100644 Binary files a/textures/mcl_target_target_top.png and b/textures/mcl_target_target_top.png differ diff --git a/textures/mcl_tnt_blink.png b/textures/mcl_tnt_blink.png index c0ba3641c..faf0ec13d 100644 Binary files a/textures/mcl_tnt_blink.png and b/textures/mcl_tnt_blink.png differ diff --git a/textures/mcl_totems_totem.png b/textures/mcl_totems_totem.png index 96243d5bc..56f56cbe0 100644 Binary files a/textures/mcl_totems_totem.png and b/textures/mcl_totems_totem.png differ diff --git a/textures/mcl_walls_cobble_mossy_wall_side.png b/textures/mcl_walls_cobble_mossy_wall_side.png index cb10162c5..472d508c6 100644 Binary files a/textures/mcl_walls_cobble_mossy_wall_side.png and b/textures/mcl_walls_cobble_mossy_wall_side.png differ diff --git a/textures/mcl_walls_cobble_mossy_wall_top.png b/textures/mcl_walls_cobble_mossy_wall_top.png index df7ff940e..ef54287c8 100644 Binary files a/textures/mcl_walls_cobble_mossy_wall_top.png and b/textures/mcl_walls_cobble_mossy_wall_top.png differ diff --git a/textures/mcl_walls_cobble_wall_side.png b/textures/mcl_walls_cobble_wall_side.png index a827c3a42..0614efbc0 100644 Binary files a/textures/mcl_walls_cobble_wall_side.png and b/textures/mcl_walls_cobble_wall_side.png differ diff --git a/textures/mcl_walls_cobble_wall_top.png b/textures/mcl_walls_cobble_wall_top.png index ce77d202f..5e88b5761 100644 Binary files a/textures/mcl_walls_cobble_wall_top.png and b/textures/mcl_walls_cobble_wall_top.png differ diff --git a/textures/mcl_wear_bar.png b/textures/mcl_wear_bar.png index 264666bac..2d8d70f28 100644 Binary files a/textures/mcl_wear_bar.png and b/textures/mcl_wear_bar.png differ diff --git a/textures/mesecons_button_wield_mask.png b/textures/mesecons_button_wield_mask.png index 211ac43fb..ae866e986 100644 Binary files a/textures/mesecons_button_wield_mask.png and b/textures/mesecons_button_wield_mask.png differ diff --git a/textures/mesecons_piston_back.png b/textures/mesecons_piston_back.png index dc7874b75..fba234eb9 100644 Binary files a/textures/mesecons_piston_back.png and b/textures/mesecons_piston_back.png differ diff --git a/textures/mineclone2_icon.png b/textures/mineclone2_icon.png index d96731c95..d2a1554a6 100644 Binary files a/textures/mineclone2_icon.png and b/textures/mineclone2_icon.png differ diff --git a/textures/mineclone2_logo.png b/textures/mineclone2_logo.png index c38b24679..d3e01733d 100644 Binary files a/textures/mineclone2_logo.png and b/textures/mineclone2_logo.png differ diff --git a/textures/mobs_mc_donkey.png b/textures/mobs_mc_donkey.png index 549d4d5ce..c26e22004 100644 Binary files a/textures/mobs_mc_donkey.png and b/textures/mobs_mc_donkey.png differ diff --git a/textures/mobs_mc_glow_squid.png b/textures/mobs_mc_glow_squid.png index c44953dfa..342153b19 100644 Binary files a/textures/mobs_mc_glow_squid.png and b/textures/mobs_mc_glow_squid.png differ diff --git a/textures/mobs_mc_glow_squid_glint1.png b/textures/mobs_mc_glow_squid_glint1.png index 2ed9a013c..9fb56ce6e 100644 Binary files a/textures/mobs_mc_glow_squid_glint1.png and b/textures/mobs_mc_glow_squid_glint1.png differ diff --git a/textures/mobs_mc_glow_squid_glint2.png b/textures/mobs_mc_glow_squid_glint2.png index deed54099..b09e640d9 100644 Binary files a/textures/mobs_mc_glow_squid_glint2.png and b/textures/mobs_mc_glow_squid_glint2.png differ diff --git a/textures/mobs_mc_glow_squid_glint3.png b/textures/mobs_mc_glow_squid_glint3.png index e0fe8919a..986373084 100644 Binary files a/textures/mobs_mc_glow_squid_glint3.png and b/textures/mobs_mc_glow_squid_glint3.png differ diff --git a/textures/mobs_mc_glow_squid_glint4.png b/textures/mobs_mc_glow_squid_glint4.png index 966589fa8..e3b0c8984 100644 Binary files a/textures/mobs_mc_glow_squid_glint4.png and b/textures/mobs_mc_glow_squid_glint4.png differ diff --git a/textures/mobs_mc_horse_black.png b/textures/mobs_mc_horse_black.png index 0b2187794..79386694c 100644 Binary files a/textures/mobs_mc_horse_black.png and b/textures/mobs_mc_horse_black.png differ diff --git a/textures/mobs_mc_horse_chestnut.png b/textures/mobs_mc_horse_chestnut.png index e0a2a95e5..89dfb8472 100644 Binary files a/textures/mobs_mc_horse_chestnut.png and b/textures/mobs_mc_horse_chestnut.png differ diff --git a/textures/mobs_mc_horse_gray.png b/textures/mobs_mc_horse_gray.png index 840437678..e2ff0b7da 100644 Binary files a/textures/mobs_mc_horse_gray.png and b/textures/mobs_mc_horse_gray.png differ diff --git a/textures/mobs_mc_horse_white.png b/textures/mobs_mc_horse_white.png index 930f389af..fcf3eee04 100644 Binary files a/textures/mobs_mc_horse_white.png and b/textures/mobs_mc_horse_white.png differ diff --git a/textures/mobs_mc_illusionist.png b/textures/mobs_mc_illusionist.png index f6be747d4..a03a920b5 100644 Binary files a/textures/mobs_mc_illusionist.png and b/textures/mobs_mc_illusionist.png differ diff --git a/textures/mobs_mc_llama_creamy.png b/textures/mobs_mc_llama_creamy.png index fae25c341..b8079da7c 100644 Binary files a/textures/mobs_mc_llama_creamy.png and b/textures/mobs_mc_llama_creamy.png differ diff --git a/textures/mobs_mc_llama_decor_black.png b/textures/mobs_mc_llama_decor_black.png index e41f7e58a..1fdc3746c 100644 Binary files a/textures/mobs_mc_llama_decor_black.png and b/textures/mobs_mc_llama_decor_black.png differ diff --git a/textures/mobs_mc_llama_decor_brown.png b/textures/mobs_mc_llama_decor_brown.png index 68e6f4f31..94442c553 100644 Binary files a/textures/mobs_mc_llama_decor_brown.png and b/textures/mobs_mc_llama_decor_brown.png differ diff --git a/textures/mobs_mc_llama_decor_gray.png b/textures/mobs_mc_llama_decor_gray.png index 1688e2409..aef4d5799 100644 Binary files a/textures/mobs_mc_llama_decor_gray.png and b/textures/mobs_mc_llama_decor_gray.png differ diff --git a/textures/mobs_mc_llama_decor_orange.png b/textures/mobs_mc_llama_decor_orange.png index d2d4ea5fc..6fdeebe38 100644 Binary files a/textures/mobs_mc_llama_decor_orange.png and b/textures/mobs_mc_llama_decor_orange.png differ diff --git a/textures/mobs_mc_llama_gray.png b/textures/mobs_mc_llama_gray.png index 9e43edfe2..a4d2a7685 100644 Binary files a/textures/mobs_mc_llama_gray.png and b/textures/mobs_mc_llama_gray.png differ diff --git a/textures/mobs_mc_llama_spit.png b/textures/mobs_mc_llama_spit.png index 9433d2f86..788919cf3 100644 Binary files a/textures/mobs_mc_llama_spit.png and b/textures/mobs_mc_llama_spit.png differ diff --git a/textures/mobs_mc_llama_white.png b/textures/mobs_mc_llama_white.png index 6306f3252..6eae4b41d 100644 Binary files a/textures/mobs_mc_llama_white.png and b/textures/mobs_mc_llama_white.png differ diff --git a/textures/mobs_mc_mule.png b/textures/mobs_mc_mule.png index 98ab5d45f..e80c13163 100644 Binary files a/textures/mobs_mc_mule.png and b/textures/mobs_mc_mule.png differ diff --git a/textures/mobs_mc_slime.png b/textures/mobs_mc_slime.png index f61000040..2290d16e5 100644 Binary files a/textures/mobs_mc_slime.png and b/textures/mobs_mc_slime.png differ diff --git a/textures/mobs_mc_spawn_icon_cave_spider.png b/textures/mobs_mc_spawn_icon_cave_spider.png index a7f1354de..2d5e06f5c 100644 Binary files a/textures/mobs_mc_spawn_icon_cave_spider.png and b/textures/mobs_mc_spawn_icon_cave_spider.png differ diff --git a/textures/mobs_mc_spawn_icon_enderman.png b/textures/mobs_mc_spawn_icon_enderman.png index 79eaa871d..9ee03b2ab 100644 Binary files a/textures/mobs_mc_spawn_icon_enderman.png and b/textures/mobs_mc_spawn_icon_enderman.png differ diff --git a/textures/mobs_mc_spawn_icon_endermite.png b/textures/mobs_mc_spawn_icon_endermite.png index df5a1b281..9e553db7d 100644 Binary files a/textures/mobs_mc_spawn_icon_endermite.png and b/textures/mobs_mc_spawn_icon_endermite.png differ diff --git a/textures/mobs_mc_spawn_icon_evoker.png b/textures/mobs_mc_spawn_icon_evoker.png index b6a4353f9..f3b3100d9 100644 Binary files a/textures/mobs_mc_spawn_icon_evoker.png and b/textures/mobs_mc_spawn_icon_evoker.png differ diff --git a/textures/mobs_mc_spawn_icon_ghast.png b/textures/mobs_mc_spawn_icon_ghast.png index d139df508..b4d0cb4b3 100644 Binary files a/textures/mobs_mc_spawn_icon_ghast.png and b/textures/mobs_mc_spawn_icon_ghast.png differ diff --git a/textures/mobs_mc_spawn_icon_horse_skeleton.png b/textures/mobs_mc_spawn_icon_horse_skeleton.png index 266c8520e..02176a62b 100644 Binary files a/textures/mobs_mc_spawn_icon_horse_skeleton.png and b/textures/mobs_mc_spawn_icon_horse_skeleton.png differ diff --git a/textures/mobs_mc_spawn_icon_horse_zombie.png b/textures/mobs_mc_spawn_icon_horse_zombie.png index 959a1fb73..de6fe28fc 100644 Binary files a/textures/mobs_mc_spawn_icon_horse_zombie.png and b/textures/mobs_mc_spawn_icon_horse_zombie.png differ diff --git a/textures/mobs_mc_spawn_icon_illusioner.png b/textures/mobs_mc_spawn_icon_illusioner.png index 4e7981214..f219cc28b 100644 Binary files a/textures/mobs_mc_spawn_icon_illusioner.png and b/textures/mobs_mc_spawn_icon_illusioner.png differ diff --git a/textures/mobs_mc_spawn_icon_magmacube.png b/textures/mobs_mc_spawn_icon_magmacube.png index 37d2bb6d4..b7c929566 100644 Binary files a/textures/mobs_mc_spawn_icon_magmacube.png and b/textures/mobs_mc_spawn_icon_magmacube.png differ diff --git a/textures/mobs_mc_spawn_icon_parrot.png b/textures/mobs_mc_spawn_icon_parrot.png index b70b6143e..4962f1917 100644 Binary files a/textures/mobs_mc_spawn_icon_parrot.png and b/textures/mobs_mc_spawn_icon_parrot.png differ diff --git a/textures/mobs_mc_spawn_icon_skeleton.png b/textures/mobs_mc_spawn_icon_skeleton.png index 450737604..4ca867c2f 100644 Binary files a/textures/mobs_mc_spawn_icon_skeleton.png and b/textures/mobs_mc_spawn_icon_skeleton.png differ diff --git a/textures/mobs_mc_spawn_icon_slime.png b/textures/mobs_mc_spawn_icon_slime.png index 2a5a24e86..c50a330d4 100644 Binary files a/textures/mobs_mc_spawn_icon_slime.png and b/textures/mobs_mc_spawn_icon_slime.png differ diff --git a/textures/mobs_mc_spawn_icon_spider.png b/textures/mobs_mc_spawn_icon_spider.png index 9ce57ce9c..a4ba7a8f5 100644 Binary files a/textures/mobs_mc_spawn_icon_spider.png and b/textures/mobs_mc_spawn_icon_spider.png differ diff --git a/textures/mobs_mc_spawn_icon_squid.png b/textures/mobs_mc_spawn_icon_squid.png index 43a1d4e1d..04e8c965d 100644 Binary files a/textures/mobs_mc_spawn_icon_squid.png and b/textures/mobs_mc_spawn_icon_squid.png differ diff --git a/textures/mobs_mc_spawn_icon_vex.png b/textures/mobs_mc_spawn_icon_vex.png index 3d3488eb7..3b131389f 100644 Binary files a/textures/mobs_mc_spawn_icon_vex.png and b/textures/mobs_mc_spawn_icon_vex.png differ diff --git a/textures/mobs_mc_spawn_icon_villager.png b/textures/mobs_mc_spawn_icon_villager.png index 21e7994f2..04e1cfd93 100644 Binary files a/textures/mobs_mc_spawn_icon_villager.png and b/textures/mobs_mc_spawn_icon_villager.png differ diff --git a/textures/mobs_mc_spawn_icon_vindicator.png b/textures/mobs_mc_spawn_icon_vindicator.png index d79267036..9080b48f8 100644 Binary files a/textures/mobs_mc_spawn_icon_vindicator.png and b/textures/mobs_mc_spawn_icon_vindicator.png differ diff --git a/textures/mobs_mc_spawn_icon_zombie.png b/textures/mobs_mc_spawn_icon_zombie.png index 224f898b1..26ee1291f 100644 Binary files a/textures/mobs_mc_spawn_icon_zombie.png and b/textures/mobs_mc_spawn_icon_zombie.png differ diff --git a/textures/mobs_mc_stray_overlay.png b/textures/mobs_mc_stray_overlay.png index 5fed35a20..7605eaa8d 100644 Binary files a/textures/mobs_mc_stray_overlay.png and b/textures/mobs_mc_stray_overlay.png differ diff --git a/textures/mobs_mc_villager_mason.png b/textures/mobs_mc_villager_mason.png index 45b22aa44..9f9f86d4c 100644 Binary files a/textures/mobs_mc_villager_mason.png and b/textures/mobs_mc_villager_mason.png differ diff --git a/textures/object_crosshair.png b/textures/object_crosshair.png index a3d7579b0..da9938670 100644 Binary files a/textures/object_crosshair.png and b/textures/object_crosshair.png differ diff --git a/textures/player.png b/textures/player.png index 863991b34..c738752ee 100644 Binary files a/textures/player.png and b/textures/player.png differ diff --git a/textures/respawn_anchor_bottom.png b/textures/respawn_anchor_bottom.png index 78a3f1a07..b4f1caf73 100644 Binary files a/textures/respawn_anchor_bottom.png and b/textures/respawn_anchor_bottom.png differ diff --git a/textures/respawn_anchor_side0.png b/textures/respawn_anchor_side0.png index 5dcee366b..21070e311 100644 Binary files a/textures/respawn_anchor_side0.png and b/textures/respawn_anchor_side0.png differ diff --git a/textures/respawn_anchor_side1.png b/textures/respawn_anchor_side1.png index 5a309df5a..967b6f11b 100644 Binary files a/textures/respawn_anchor_side1.png and b/textures/respawn_anchor_side1.png differ diff --git a/textures/respawn_anchor_side2.png b/textures/respawn_anchor_side2.png index 7c7aa25d5..555bd4e29 100644 Binary files a/textures/respawn_anchor_side2.png and b/textures/respawn_anchor_side2.png differ diff --git a/textures/respawn_anchor_side3.png b/textures/respawn_anchor_side3.png index 9eff99f12..775d54847 100644 Binary files a/textures/respawn_anchor_side3.png and b/textures/respawn_anchor_side3.png differ diff --git a/textures/respawn_anchor_side4.png b/textures/respawn_anchor_side4.png index 0e1991a52..649ec399a 100644 Binary files a/textures/respawn_anchor_side4.png and b/textures/respawn_anchor_side4.png differ diff --git a/textures/respawn_anchor_top_off.png b/textures/respawn_anchor_top_off.png index f0d40c789..31937ff7b 100644 Binary files a/textures/respawn_anchor_top_off.png and b/textures/respawn_anchor_top_off.png differ diff --git a/textures/screwdriver.png b/textures/screwdriver.png index f6706b970..8e3409752 100644 Binary files a/textures/screwdriver.png and b/textures/screwdriver.png differ diff --git a/textures/smoker_bottom.png b/textures/smoker_bottom.png index cef1f8a08..a0598b34d 100644 Binary files a/textures/smoker_bottom.png and b/textures/smoker_bottom.png differ diff --git a/textures/smoker_front.png b/textures/smoker_front.png index 3cde8c764..8871bf9b1 100644 Binary files a/textures/smoker_front.png and b/textures/smoker_front.png differ diff --git a/textures/smoker_front_on.png b/textures/smoker_front_on.png index 42ecfd7b2..d4ebda2b4 100644 Binary files a/textures/smoker_front_on.png and b/textures/smoker_front_on.png differ diff --git a/textures/smoker_side.png b/textures/smoker_side.png index b25263278..567b895b8 100644 Binary files a/textures/smoker_side.png and b/textures/smoker_side.png differ diff --git a/textures/smoker_top.png b/textures/smoker_top.png index d79980004..fc39d5fe5 100644 Binary files a/textures/smoker_top.png and b/textures/smoker_top.png differ diff --git a/textures/soul_fire_basic_flame.png b/textures/soul_fire_basic_flame.png index f8d3500c8..e1309a952 100644 Binary files a/textures/soul_fire_basic_flame.png and b/textures/soul_fire_basic_flame.png differ diff --git a/textures/soul_fire_basic_flame_animated.png b/textures/soul_fire_basic_flame_animated.png index 9b8cc8060..be6ba773e 100644 Binary files a/textures/soul_fire_basic_flame_animated.png and b/textures/soul_fire_basic_flame_animated.png differ diff --git a/textures/soul_mcl_burning_entity_flame_animated.png b/textures/soul_mcl_burning_entity_flame_animated.png index 44c6fcbfd..be6ba773e 100644 Binary files a/textures/soul_mcl_burning_entity_flame_animated.png and b/textures/soul_mcl_burning_entity_flame_animated.png differ diff --git a/textures/soul_mcl_burning_hud_flame_animated.png b/textures/soul_mcl_burning_hud_flame_animated.png index 32cbdda40..be6ba773e 100644 Binary files a/textures/soul_mcl_burning_hud_flame_animated.png and b/textures/soul_mcl_burning_hud_flame_animated.png differ diff --git a/textures/sus_stew.png b/textures/sus_stew.png index 1cdc8c6c2..5a4910ef0 100644 Binary files a/textures/sus_stew.png and b/textures/sus_stew.png differ diff --git a/textures/weather_pack_rain_raindrop_1.png b/textures/weather_pack_rain_raindrop_1.png index ab18333b7..be92679f4 100644 Binary files a/textures/weather_pack_rain_raindrop_1.png and b/textures/weather_pack_rain_raindrop_1.png differ diff --git a/textures/weather_pack_rain_raindrop_2.png b/textures/weather_pack_rain_raindrop_2.png index fb37100a3..eb0cac5f0 100644 Binary files a/textures/weather_pack_rain_raindrop_2.png and b/textures/weather_pack_rain_raindrop_2.png differ diff --git a/textures/weather_pack_rain_raindrop_3.png b/textures/weather_pack_rain_raindrop_3.png index 4432b355e..79020dcd1 100644 Binary files a/textures/weather_pack_rain_raindrop_3.png and b/textures/weather_pack_rain_raindrop_3.png differ diff --git a/textures/weather_pack_snow_snowflake1.png b/textures/weather_pack_snow_snowflake1.png index 8604f5dce..1c609810f 100644 Binary files a/textures/weather_pack_snow_snowflake1.png and b/textures/weather_pack_snow_snowflake1.png differ diff --git a/textures/weather_pack_snow_snowflake2.png b/textures/weather_pack_snow_snowflake2.png index bea317ee8..949e27662 100644 Binary files a/textures/weather_pack_snow_snowflake2.png and b/textures/weather_pack_snow_snowflake2.png differ diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 07343479d..9dc50dc7a 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -10,7 +10,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/items,bucket_empty.png,/mods/ITEMS/mcl_buckets/textures,bucket.png,,,,,,, /assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,bucket_water.png,,,,,,, /assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,bucket_river_water.png,,,,,,, -/assets/minecraft/textures/items,bucket_lava.png,/mods/ITEMS/mcl_buckets/textures,bucket_lava.png,,,,,,, +/assets/minecraft/textures/items,bucket_lava.png,/mods/ITEMS/mcl_buckets/textures,mcl_buckets_lava_bucket.png,,,,,,, /assets/minecraft/textures/items,item_frame.png,/mods/ITEMS/mcl_itemframes/textures,mcl_itemframes_item_frame.png,,,,,,, /assets/minecraft/textures/blocks,anvil_base.png,/mods/ITEMS/mcl_anvils/textures,mcl_anvils_anvil_base.png,,,,,,, /assets/minecraft/textures/blocks,anvil_top_damaged_0.png,/mods/ITEMS/mcl_anvils/textures,mcl_anvils_anvil_top_damaged_0.png,,,,,,, diff --git a/tools/generate_ingame_credits.lua b/tools/generate_ingame_credits.lua index db124aaf6..a484322c0 100755 --- a/tools/generate_ingame_credits.lua +++ b/tools/generate_ingame_credits.lua @@ -7,8 +7,9 @@ local colors = { ["Creator of MineClone2"] = "0xFBF837", ["Maintainers"] = "0xFF51D5", ["Developers"] = "0xF84355", + ["Past Developers"] = "0xF84355", ["Contributors"] = "0x52FF00", - ["MineClone5"] = "0xA60014", + ["Music"] = "0xA60014", ["Original Mod Authors"] = "0x343434", ["3D Models"] = "0x0019FF", ["Textures"] = "0xFF9705",