diff --git a/mods/Cars/airboat/init.lua b/mods/Cars/airboat/init.lua index 50a1860..5543027 100644 --- a/mods/Cars/airboat/init.lua +++ b/mods/Cars/airboat/init.lua @@ -242,7 +242,7 @@ minetest.register_entity("airboat:airboat" ..color , airboat) minetest.register_craftitem("airboat:airboat" .. color, { description = "Airboat" .. color, inventory_image = "airboat_airboat_inv.png^[colorize:#"..colour..":70", -wield_image = "none.png", + wield_image = "none.png", wield_scale = {x = 4, y = 4, z = 4}, liquids_pointable = true, diff --git a/mods/Cars/airboat/textures/airboat_airboat_inv.png b/mods/Cars/airboat/textures/airboat_airboat_inv.png deleted file mode 100644 index 87b95e1..0000000 Binary files a/mods/Cars/airboat/textures/airboat_airboat_inv.png and /dev/null differ diff --git a/mods/Cars/carts/textures/cart.png b/mods/Cars/carts/textures/cart.png deleted file mode 100644 index 51e5f6a..0000000 Binary files a/mods/Cars/carts/textures/cart.png and /dev/null differ diff --git a/mods/Cars/carts/textures/carts_rail_straight_pwr.png b/mods/Cars/carts/textures/carts_rail_straight_pwr.png deleted file mode 100644 index 4fb6981..0000000 Binary files a/mods/Cars/carts/textures/carts_rail_straight_pwr.png and /dev/null differ diff --git a/mods/Cars/hotairballoon/textures/hotair_inv.png b/mods/Cars/hotairballoon/textures/hotair_inv.png deleted file mode 100644 index 5b691ea..0000000 Binary files a/mods/Cars/hotairballoon/textures/hotair_inv.png and /dev/null differ diff --git a/mods/Cars/hovercraft/textures/hovercraft_inv.png b/mods/Cars/hovercraft/textures/hovercraft_inv.png deleted file mode 100644 index a2e03c7..0000000 Binary files a/mods/Cars/hovercraft/textures/hovercraft_inv.png and /dev/null differ diff --git a/mods/Cars/spaceship/textures/spaceship_spaceship_inv.png b/mods/Cars/spaceship/textures/spaceship_spaceship_inv.png deleted file mode 100644 index 7588a5d..0000000 Binary files a/mods/Cars/spaceship/textures/spaceship_spaceship_inv.png and /dev/null differ diff --git a/mods/Decorations/castle_shields/init.lua b/mods/Decorations/castle_shields/init.lua index 2c6099a..54676db 100644 --- a/mods/Decorations/castle_shields/init.lua +++ b/mods/Decorations/castle_shields/init.lua @@ -41,9 +41,9 @@ castle_shields.register_shield = function(name, desc, background_color, foregrou minetest.register_node(minetest.get_current_modname()..":"..name, { description = desc, tiles = {tile_side, tile_side, tile_side, tile_side, "color_black.png", tile_front}, - wield_image = "color_hand" .. color .. ".png", - wield_scale = {x=1,y=1,z=0.5}, - inventory_image = "shield"..mask..".png^[colorize:#"..colour..":70", + wield_image = "color_hand" .. color .. ".png", + wield_scale = {x=1,y=1,z=0.5}, + inventory_image = "inv"..mask..".png^[colorize:#"..colour..":70", drawtype="nodebox", paramtype2 = "facedir", paramtype = "light", diff --git a/mods/Decorations/castle_shields/textures/shieldchevron.png b/mods/Decorations/castle_shields/textures/shieldchevron.png index 59ffa37..d969a8a 100644 Binary files a/mods/Decorations/castle_shields/textures/shieldchevron.png and b/mods/Decorations/castle_shields/textures/shieldchevron.png differ diff --git a/mods/Decorations/castle_shields/textures/shieldcross.png b/mods/Decorations/castle_shields/textures/shieldcross.png index a032ef4..67cd40b 100644 Binary files a/mods/Decorations/castle_shields/textures/shieldcross.png and b/mods/Decorations/castle_shields/textures/shieldcross.png differ diff --git a/mods/Decorations/castle_shields/textures/shieldslash.png b/mods/Decorations/castle_shields/textures/shieldslash.png index 1bd1174..9b5a884 100644 Binary files a/mods/Decorations/castle_shields/textures/shieldslash.png and b/mods/Decorations/castle_shields/textures/shieldslash.png differ diff --git a/mods/Decorations/factory_bridges/textures/fbladder.png b/mods/Decorations/factory_bridges/textures/fbladder.png deleted file mode 100644 index d0a5d2e..0000000 Binary files a/mods/Decorations/factory_bridges/textures/fbladder.png and /dev/null differ diff --git a/mods/Decorations/factory_bridges/textures/fbstair.png b/mods/Decorations/factory_bridges/textures/fbstair.png deleted file mode 100644 index 44e061b..0000000 Binary files a/mods/Decorations/factory_bridges/textures/fbstair.png and /dev/null differ diff --git a/mods/Decorations/factory_bridges/textures/fbtrap.png b/mods/Decorations/factory_bridges/textures/fbtrap.png deleted file mode 100644 index f76df02..0000000 Binary files a/mods/Decorations/factory_bridges/textures/fbtrap.png and /dev/null differ diff --git a/mods/Decorations/flags/textures/2018_09_29_034840.png b/mods/Decorations/flags/textures/2018_09_29_034840.png deleted file mode 100644 index 775accf..0000000 Binary files a/mods/Decorations/flags/textures/2018_09_29_034840.png and /dev/null differ diff --git a/mods/Decorations/flags/textures/flag.png b/mods/Decorations/flags/textures/flag.png deleted file mode 100644 index 5a48a8b..0000000 Binary files a/mods/Decorations/flags/textures/flag.png and /dev/null differ diff --git a/mods/Menu/hud/API.txt b/mods/Menu/hud/API.txt new file mode 100644 index 0000000..371cdfd --- /dev/null +++ b/mods/Menu/hud/API.txt @@ -0,0 +1,38 @@ +hud.register(name, def) + -- name: statbar name (health, air, hunger, armor already used by default) + -- def: (see below) + +hud.change_item(player, name, def) + -- player: player object + -- name: statbar name + -- def: table containing new values + -- currently supported: number, text and offset + +hud.swap_statbar(player, name1, name2) -- swaps position and offset of statbar with name1 with statbar with name2 + -- player: player object + -- name1: statbar name + -- name2: statbar name + +hud.remove_item(player, name) + +HUD item definition +{ + hud_elem_type = "statbar", -- currently only supported type (same as in lua-api.txt) + position = {x=, y=}, -- position of statbar (same as in lua-api.txt) + size = {x=24, y=24}, -- statbar texture size (default 24x24), needed to be scaled correctly + text = "hud_heart_fg.png", -- texture name (same as in lua-api.txt) + number = 20, -- number/2 = number of full textures(e.g. hearts) + max = 20, -- used to prevent "overflow" of statbars + alignment = {x=-1,y=-1}, -- alignment on screen (same as in lua-api.txt) + offset = HUD_HEALTH_OFFSET, + background = "hud_heart_bg.png", -- statbar background texture name + autohide_bg = false, -- hide statbar background textures when number = 0 + events = { -- called on events "damage" and "breath_changed" of players + { + type = "damage", + func = function(player) + -- do something here + end + } + }, +} diff --git a/mods/Menu/hud/LICENSE.txt b/mods/Menu/hud/LICENSE.txt new file mode 100644 index 0000000..4362b49 --- /dev/null +++ b/mods/Menu/hud/LICENSE.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/mods/Menu/hud/README.txt b/mods/Menu/hud/README.txt new file mode 100644 index 0000000..93ecfa7 --- /dev/null +++ b/mods/Menu/hud/README.txt @@ -0,0 +1,67 @@ +Minetest mod "Better HUD" +========================= +Version: 2.1.5 + +(c) Copyright BlockMen (2013-2016) + + +About this mod: +~~~~~~~~~~~~~~~ +This mod improves the HUD of Minetest and adds (hidden by default) statbars for Hunger and Armor. +Also it provides an API to add new statbars easily, see API.txt for more informations. + +Changes in builtin HUD items: +- Adds background for Health bar +- Uses better textures for Hotbar +- Uses texture for crosshair +- Positions of builtin statbars can be changed via "hud.conf" file +- Experimental "ItemWheel" that replaces the hotbar (must be enabled by adding "hud_item_wheel = true" in minetest.conf) + +This mod gets provided as Modpack aswell, which includes the hunger mod (https://github.com/BlockMen/hunger) +More information concerning the hunger mechanics can be get there. + +This mod supports the 3d_armor mod by stu (https://github.com/stujones11/minetest-3d_armor) + + + +License: +~~~~~~~~ +(c) Copyright BlockMen (2013-2016) + + +Code: +Licensed under the GNU LGPL version 2.1 or higher. +You can redistribute it and/or modify it under +the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +See LICENSE.txt and http://www.gnu.org/licenses/lgpl-2.1.txt + + +Textures: +hud_heart_fg.png - celeron55 (CC BY-SA 3.0), modified by BlockMen +hud_heart_bg.png - celeron55 (CC BY-SA 3.0), modified by BlockMen +hud_hunger_fg.png - PilzAdam (WTFPL), modified by BlockMen +hud_hunger_bg.png - PilzAdam (WTFPL), modified by BlockMen +wieldhand.png (from character.png) - Jordach (CC BY-SA 3.0), modified by BlockMen +hud_air_fg.png - kaeza (WTFPL), modified by BlockMen +hud_armor_fg.png - Stu (CC BY-SA 3.0), modified by BlockMen +hud_armor_bg.png - Stu (CC BY-SA 3.0), modified by BlockMen + + +Github: +~~~~~~~ +https://github.com/BlockMen/hud + +Forum: +~~~~~~ +https://forum.minetest.net/viewtopic.php?id=6342 + + +Changelog: +~~~~~~~~~~ +see changelog.txt diff --git a/mods/Menu/hud/api.lua b/mods/Menu/hud/api.lua new file mode 100644 index 0000000..21d8c0f --- /dev/null +++ b/mods/Menu/hud/api.lua @@ -0,0 +1,275 @@ + +-- global values +hud.registered_items = {} +hud.damage_events = {} +hud.breath_events = {} + +-- keep id handling internal +local hud_id = {} -- hud item ids +local sb_bg = {} -- statbar background ids + +-- localize often used table +local items = hud.registered_items + +local function throw_error(msg) + minetest.log("error", "Better HUD[error]: " .. msg) +end + + +-- +-- API +-- + +function hud.register(name, def) + if not name or not def then + throw_error("not enough parameters given") + return false + end + + --TODO: allow other elements + if def.hud_elem_type ~= "statbar" then + throw_error("The given HUD element is no statbar") + return false + end + if items[name] ~= nil then + throw_error("A statbar with that name already exists") + return false + end + + -- actually register + -- add background first since draworder is based on id :\ + if def.hud_elem_type == "statbar" and def.background ~= nil then + sb_bg[name] = table.copy(def) + sb_bg[name].text = def.background + if not def.autohide_bg and def.max then + sb_bg[name].number = def.max + end + end + -- add item itself + items[name] = def + + -- register events + if def.events then + for _,v in pairs(def.events) do + if v and v.type and v.func then + if v.type == "damage" then + table.insert(hud.damage_events, v) + end + + if v.type == "breath" then + table.insert(hud.breath_events, v) + end + end + end + end + + -- no error so far, return success + return true +end + +-- swaps stabar positions +function hud.swap_statbar(player, item1, item2) + if not player or not item1 or not item2 then + throw_error("Not enough parameters given to swap statbars") + return false + end + + local def1 = items[item1] or nil + local def2 = items[item2] or nil + + if not def1 or not def2 then + throw_error("Can't swap statbars. Given statbars are not correct") + return false + end + + local pos_swap = false + local p_name = player:get_player_name() + local elem1 = hud_id[p_name.."_"..item1] + local elem2 = hud_id[p_name.."_"..item2] + + if not elem1 or not elem2 or not elem1.id or not elem2.id then + return false + end + + player:hud_change(elem2.id, "offset", def1.offset) + player:hud_change(elem1.id, "offset", def2.offset) + + if def1.position.x ~= def2.position.x or def1.position.y ~= def2.position.y then + player:hud_change(elem2.id, "position", def1.position) + player:hud_change(elem1.id, "position", def2.position) + pos_swap = true + end + + -- do the items have backgrounds? if so, swap them aswell + local bg1 = hud_id[p_name.."_"..item1.."_bg"] or nil + local bg2 = hud_id[p_name.."_"..item2.."_bg"] or nil + if bg1 ~= nil and bg1.id then + player:hud_change(bg1.id, "offset", def2.offset) + if pos_swap == true then + player:hud_change(bg1.id, "position", def2.position) + end + end + if bg2 ~= nil and bg2.id then + player:hud_change(bg2.id, "offset", def1.offset) + if pos_swap == true then + player:hud_change(bg2.id, "position", def1.position) + end + end + + return true + +end + +function hud.change_item(player, name, def) + if not player or not player:is_player() or not name or not def then + throw_error("Not enough parameters given to change HUD item") + return false + end + local i_name = player:get_player_name().."_"..name + local elem = hud_id[i_name] + if not elem then + throw_error("Given HUD element " .. dump(name) .. " does not exist".." hääää") + return false + end + + -- Only update if values supported and value actually changed + -- update supported values (currently number and text only) + if def.number and elem.number then + if def.number ~= elem.number then + if elem.max and def.number > elem.max and not def.max then + def.number = elem.max + end + if def.max then + elem.max = def.max + end + player:hud_change(elem.id, "number", def.number) + elem.number = def.number + -- hide background when set + local bg = hud_id[i_name.."_bg"] + if elem.autohide_bg then + if def.number < 1 then + player:hud_change(bg.id, "number", 0) + else + local num = bg.number + if bg.max then + num = bg.max + end + player:hud_change(bg.id, "number", num) + end + else + if bg and bg.max and bg.max < 1 and def.max and def.max > bg.max then + player:hud_change(bg.id, "number", def.max) + bg.max = def.max + bg.number = def.max + end + end + end + end + if def.text and elem.text then + if def.text ~= elem.text then + player:hud_change(elem.id, "text", def.text) + elem.text = def.text + end + end + + if def.offset and elem.offset then + if def.item_name and def.offset == "item" then + -- for legacy reasons + if def.item_name then + hud.swap_statbar(player, name, def.item_name) + end + else + player:hud_change(elem.id, "offset", def.offset) + elem.offset = def.offset + end + end + + return true +end + +function hud.remove_item(player, name) + if not player or not name then + throw_error("Not enough parameters given") + return false + end + local i_name = player:get_player_name().."_"..name + if hud_id[i_name] == nil then + throw_error("Given HUD element " .. dump(name) .. " does not exist") + return false + end + player:hud_remove(hud_id[i_name].id) + hud_id[i_name] = nil + + return true +end + + +-- +-- Add registered HUD items to joining players +-- + +-- Following code is placed here to keep HUD ids internal +local function add_hud_item(player, name, def) + if not player or not name or not def then + throw_error("not enough parameters given") + return false + end + local i_name = player:get_player_name().."_"..name + hud_id[i_name] = def + hud_id[i_name].id = player:hud_add(def) +end + +minetest.register_on_joinplayer(function(player) + + -- first: hide the default statbars + local hud_flags = player:hud_get_flags() + hud_flags.healthbar = false + hud_flags.breathbar = false + player:hud_set_flags(hud_flags) + + -- now add the backgrounds for statbars + for _,item in pairs(sb_bg) do + add_hud_item(player, _.."_bg", item) + end + -- and finally the actual HUD items + for _,item in pairs(items) do + add_hud_item(player, _, item) + end + + -- fancy hotbar (only when no crafting mod present) + if minetest.get_modpath("crafting") == nil then + minetest.after(0.5, function() + player:hud_set_hotbar_image("hud_hotbar.png") + player:hud_set_hotbar_selected_image("hud_hotbar_selected.png") + end) + end +end) + +function hud.player_event(player, event) + if not player then return end -- ADDED + + --needed for first update called by on_join + minetest.after(0, function(player) -- ADDED (player) + if event == "health_changed" then + for _,v in pairs(hud.damage_events) do + if v.func then + v.func(player) + end + end + end + + if event == "breath_changed" then + for _,v in pairs(hud.breath_events) do + if v.func then + v.func(player) + end + end + end + + if event == "hud_changed" then--called when flags changed + + end + end, player) -- ADDED , player) +end + +core.register_playerevent(hud.player_event) diff --git a/mods/Menu/hud/builtin.lua b/mods/Menu/hud/builtin.lua new file mode 100644 index 0000000..49d34c3 --- /dev/null +++ b/mods/Menu/hud/builtin.lua @@ -0,0 +1,126 @@ + +HUD_IW_MAX = 8 +HUD_IW_TICK = 0.4 +if minetest.is_singleplayer() == true then + HUD_IW_TICK = 0.2 +end + +HUD_SB_SIZE = {x = 24, y = 24} + +HUD_HEALTH_POS = {x = 0.5,y = 1} +HUD_HEALTH_OFFSET = {x = -262, y = -87} +HUD_AIR_POS = {x = 0.5, y = 1} +HUD_AIR_OFFSET = {x = 15, y = -87} +HUD_HUNGER_POS = {x = 0.5, y = 1} +HUD_HUNGER_OFFSET = {x = 15, y = -110} +HUD_ARMOR_POS = {x = 0.5, y = 1} +HUD_ARMOR_OFFSET = {x = -262, y = -110} + +-- Reorder everything when using ItemWeel +hud.item_wheel = minetest.settings:get_bool("hud_item_wheel") +if hud.item_wheel then + HUD_HEALTH_POS = {x = 0.5,y = 1} + HUD_HEALTH_OFFSET = {x = -385, y = -77} + HUD_AIR_POS = {x = 0.5, y = 1} + HUD_AIR_OFFSET = {x = 150, y = -77} + HUD_HUNGER_POS = {x = 0.5, y = 1} + HUD_HUNGER_OFFSET = {x = 180, y = -44} + HUD_ARMOR_POS = {x = 0.5, y = 1} + HUD_ARMOR_OFFSET = {x = -415, y = -44} +end + +-- read hud.conf settings +function hud.read_conf() + local mod_path = minetest.get_modpath("hud") + local set = io.open(mod_path .. "/hud.conf", "r") + if set then + dofile(mod_path .. "/hud.conf") + set:close() + end +end + +hud.read_conf() + +local damage_enabled = minetest.settings:get_bool("enable_damage") + +hud.show_hunger = minetest.get_modpath("hunger") ~= nil +hud.show_armor = minetest.get_modpath("3d_armor") ~= nil + +-- check if some settings are invalid +local enable_hunger = minetest.settings:get_bool("hud_hunger_enable") +if (enable_hunger == true) and not hud.show_hunger then + hud.notify_hunger(5) +end + +if damage_enabled ~= true then + hud.show_armor = false + return +end + +hud.register("health", { + hud_elem_type = "statbar", + position = HUD_HEALTH_POS, + size = HUD_SB_SIZE, + text = "hud_heart_fg.png", + number = 20, + alignment = {x = -1, y = -1}, + offset = HUD_HEALTH_OFFSET, + background = "hud_heart_bg.png", + events = { + { + type = "damage", + func = function(player) + hud.change_item(player, "health", {number = player:get_hp()}) + end + } + }, +}) + +hud.register("air", { + hud_elem_type = "statbar", + position = HUD_AIR_POS, + size = HUD_SB_SIZE, + text = "hud_air_fg.png", + number = 0, + alignment = {x = -1, y = -1}, + offset = HUD_AIR_OFFSET, + background = nil, + events = { + { + type = "breath", + func = function(player) + if not player then return end -- ADDED + local air = player:get_breath() or 11 + if air > 10 then + air = 0 + end + hud.change_item(player, "air", {number = air * 2}) + end + } + }, +}) + +hud.register("armor", { + hud_elem_type = "statbar", + position = HUD_ARMOR_POS, + size = HUD_SB_SIZE, + text = "hud_armor_fg.png", + number = 0, + alignment = {x = -1, y = -1}, + offset = HUD_ARMOR_OFFSET, + background = "hud_armor_bg.png", + autohide_bg = true, + max = 20, +}) + +hud.register("hunger", { + hud_elem_type = "statbar", + position = HUD_HUNGER_POS, + size = HUD_SB_SIZE, + text = "hud_hunger_fg.png", + number = 0, + alignment = {x = -1, y = -1}, + offset = HUD_HUNGER_OFFSET, + background = "hud_hunger_bg.png", + max = 0, +}) diff --git a/mods/Menu/hud/changelog.txt b/mods/Menu/hud/changelog.txt new file mode 100644 index 0000000..d34cb17 --- /dev/null +++ b/mods/Menu/hud/changelog.txt @@ -0,0 +1,140 @@ +2.1.5 +----- +- Fixed armor not being updated correct due armor mod changes + +2.1.4 +----- +- Fixed unhandled exception in hud.swap_statbar() + +2.1.3 +----- +- Added hud.swap_statbar() and fix wrong behavior of previous workaround +- Fixed missing background of some statbars in multiplayer + +2.1.2 +----- +- Fixed crash caused by animated nodes (reported by Krock) +- Fixed "freezing" of empty slots (reported by kilbith) + +2.1.1 +----- +- Added itemcounting/wearout info +- Added support for hud scaling +- Fixed typo causing endless updating +- Fixed image scaling of some textures (like glass) +- Improved ItemWheel image + +2.1 +--- +- Added "ItemWheel" (experimental) +- Fixed disapperaring hunger bar (reported by poet-nohit) + +2.0.1 +----- +- Fix disappearing hotbar (reported by poet-nohit) +- Fix unused global var +- Added one more check to catch probably incorrect players + +2.0 +--- +- Complete rewrite +- Moved hunger into seperate mod +- Added API +- Switched License to LGPL 2.1 + +===== ===== ===== +----- 0-1.x ----- +===== ===== ===== + +1.4.1 +----- +- ### + +1.4 +--- +- New hunger mechanics/added experimental player-action based hunger +- Better crosshair texture, switched to "new" default hand +- Added support for farming redo mod, kpgmobs and jkmod + +1.3.3 +----- +- Prevent crash with armor mod and missing player +- Add support for ethereal mod (by TenPlus1) + +1.3.2 +----- +- Fix dependecies (by Chris Beelby) +- Add support for creatures mod +- Add optional healing for food (by TenPlus1) + +1.3.1 +----- +- Add compatibility for statbar scaling +- Fix typo in depends.txt +- Lower maintimer tick + +1.3 +--- +- New way hunger is saved (all old files in world dirctory can get deleted [e.g. hud_BlockMen_hunger]) +- Fixed healing (not while drowning, fix after death) +- Add support for mods: seaplants[sea] and mobfcooking (by Xanthin) +- Tweaked hand image +- Player can die caus of starving now + +1.2 +--- +- Send statbar values only to client when changed +- Hide armor bar if not wearing armor +- More reliable food overrides (by CiaranG) +- Support for bushes_classic foods (plantlife modpack) (by CiaranG) +- Add support for mushroom mod food/poison (by CiaranG) +- Add support for mods: fruit and mush45 +- New images for hotbar, smaller armor icons + +1.1 +--- +- added support for stu's 3darmor mod +- restructured and cleaned up code +- added support for poisen food (damages player, but does not kill) + +1.0 +--- +- hunger is reset after death +- health and hunger bar is shown correct on all screen resolutions now +- switched to changed native hotbar image support +- fixed revival of player when drown +- hunger bar is not shown anymore if hunger is disabled +- hunger can be disabled by minetest.conf ("hud_hunger_enable = false") + +0.5 Beta +---------- +- removed the fancy borders of hud inventory bar and moved to new native support +- moved crosshair to native support too + +0.4 Beta +---------- +- enabled drowning + +0.3 Beta +---------- +- added fancy borders of hud inventory bar (only for screenheight <= 800) + +0.2.3 Beta +---------- +- added support for food of glooptest and bushes (commit by CheeseKeg) + +0.2.2 Beta +---------- +- added support for food of animalmaterials (mobf modpack),fishing + +0.2.1 Beta +---------- +- tweaked override of food +- added support for food of dwares, moretrees and simple mobs + +0.2 Beta +-------- +- added support of custom config files +- you can eat max. 50% more than before (although it isnt shown in hunger bar) +- you get healed with 8 breads and more (in hunger bar) now +- a bread (from farming) == 2 breads in hunger bar diff --git a/mods/Menu/hud/depends.txt b/mods/Menu/hud/depends.txt new file mode 100644 index 0000000..7be6dbb --- /dev/null +++ b/mods/Menu/hud/depends.txt @@ -0,0 +1 @@ +3d_armor? \ No newline at end of file diff --git a/mods/Menu/hud/hud.conf.example b/mods/Menu/hud/hud.conf.example new file mode 100644 index 0000000..67087fa --- /dev/null +++ b/mods/Menu/hud/hud.conf.example @@ -0,0 +1,35 @@ +--##Better HUD example config file## +------------------------------------ +-- This example moves the statbars in the down left and down right corners. By Echoes91 + +-- NOTICE -- +-- if damage is disabled no statbar is shown at all +-- Make sure that the statbars are shown correct on other screen resolutions aswell + + +HUD_SB_SIZE = {x = 24, y = 24} -- statbar icon size in pixel before (!) scaling + +-- +-- health bar +-- +HUD_HEALTH_POS = {x = 0, y = 1} -- min 0, max 1 +HUD_HEALTH_OFFSET = {x = 10, y = -30} -- offset in pixel + +-- +-- hunger bar +-- +HUD_HUNGER_POS = {x = 1, y = 1} -- min 0, max 1 +HUD_HUNGER_OFFSET = {x = -250, y = -30} -- offset in pixel + +-- +-- breath bar +-- +HUD_AIR_POS = {x = 1, y = 1} -- min 0, max 1 +HUD_AIR_OFFSET = {x = -250, y = -60} -- offset in pixel + +-- +-- armor bar +-- +HUD_ARMOR_POS = {x = 0, y = 1} -- min 0, max 1 +HUD_ARMOR_OFFSET = {x = 10, y = -60} -- offset in pixel + diff --git a/mods/Menu/hud/init.lua b/mods/Menu/hud/init.lua new file mode 100644 index 0000000..22c9b4c --- /dev/null +++ b/mods/Menu/hud/init.lua @@ -0,0 +1,12 @@ + +hud = {} + +local path = minetest.get_modpath("hud") + +dofile(path .. "/api.lua") +dofile(path .. "/builtin.lua") +dofile(path .. "/legacy.lua") + +if hud.item_wheel then + dofile(path .. "/itemwheel.lua") +end diff --git a/mods/Menu/hud/itemwheel.lua b/mods/Menu/hud/itemwheel.lua new file mode 100644 index 0000000..2e04648 --- /dev/null +++ b/mods/Menu/hud/itemwheel.lua @@ -0,0 +1,195 @@ +local hb = {} +local scale = 0.5 + +local function update_wheel(player) + local name = player:get_player_name() + if not player or not name then + return + end + + local i = player:get_wield_index() + local i1 = i - 1 + local i3 = i + 1 + + -- it's a wheel + if i1 < 1 then + i1 = HUD_IW_MAX + end + if i3 > HUD_IW_MAX then + i3 = 1 + end + + -- get the displayed items + local inv = player:get_inventory() + local item = hb[name].item + local index = hb[name].index + local item2 = player:get_wielded_item():get_name() + + -- update all items when wielded has changed + if item and item2 and item ~= item2 or item == "wheel_init" or (index and index ~= i) then + local items = {} + items[1] = inv:get_stack("main", i1):get_name() or nil + items[2] = item2 + items[3] = inv:get_stack("main", i3):get_name() or nil + local num = player:get_wielded_item():get_count() + local wear = player:get_wielded_item():get_wear() + if num < 2 then + num = "" + else + num = tostring(num) + end + if wear > 0 then + num = tostring(100 - math.floor((wear/65535)*100)) .. "%" + end + + for n, m in pairs(items) do + -- some default values + local image = "hud_wielded.png" + local need_scale = false + local s1 = {x = 1*scale, y = 1*scale} + local s2 = {x = 3*scale, y = 3*scale} + if n ~= 2 then + s1 = {x = 0.6*scale, y = 0.6*scale} + s2 = {x = 2*scale, y = 2*scale} + end + + -- get the images + local def = minetest.registered_items[m] + if def then + if def.tiles and (def.tiles[1] and not def.tiles[1].name) then + image = minetest.inventorycube(def.tiles[1], def.tiles[6] or def.tiles[3] or def.tiles[1], def.tiles[3] or def.tiles[1]) + need_scale = true + end + if def.inventory_image and def.inventory_image ~= "" then + image = def.inventory_image + need_scale = true + end + if def.wielded_image and def.wielded_image ~= "" then + image = def.wielded_image + need_scale = false + end + -- needed for nodes with inventory cube inv imges, e.g. glass + if string.find(image, 'inventorycube') then + need_scale = true + end + end + + -- get the id and update hud elements + local id = hb[name].id[n] + if id and image then + if need_scale then + player:hud_change(id, "scale", s1) + else + player:hud_change(id, "scale", s2) + end + -- make previous and next item darker + --if n ~= 2 then + --image = image .. "^[colorize:#0005" + --end + player:hud_change(id, "text", image) + end + end + if hb[name].id[4] then + player:hud_change(hb[name].id[4], "text", num) + end + end + + -- update wielded buffer + if hb[name].id[2] ~= nil then + hb[name].item = item2 + hb[name].index = i + end +end + +minetest.register_on_joinplayer(function(player) + local name = player:get_player_name() + hb[name]= {} + hb[name].id = {} + hb[name].item = "wheel_init" + hb[name].index = 1 + + minetest.after(0.1, function() + + -- hide builtin hotbar + local hud_flags = player:hud_get_flags() + hud_flags.hotbar = false + player:hud_set_flags(hud_flags) + + player:hud_add({ + hud_elem_type = "image", + text = "hud_new.png", + position = {x = 0.5, y = 1}, + scale = {x = 1*scale, y = 1*scale}, + alignment = {x = 0, y = -1}, + offset = {x = 0, y = 0} + }) + + hb[name].id[1] = player:hud_add({ + hud_elem_type = "image", + text = "hud_wielded.png", + position = {x = 0.5, y = 1}, + scale = {x = 0.5, y = 0.5}, + alignment = {x = -3.5, y = -1.5}, + offset = {x = -75*scale, y = -8*scale} + }) + + hb[name].id[2] = player:hud_add({ + hud_elem_type = "image", + text = "hud_wielded.png", + position = {x = 0.5, y = 1}, + scale = {x = 3*scale, y = 3*scale}, + alignment = {x = 0, y = -1.5}, + offset = {x = 0, y = -12*scale} + }) + + hb[name].id[3] = player:hud_add({ + hud_elem_type = "image", + text = "hud_wielded.png", + position = {x = 0.5, y = 1}, + scale = {x = 1*scale, y = 1*scale}, + alignment = {x = 3.5, y = -1.5}, + offset = {x = 75*scale, y = -8*scale} + }) + + hb[name].id[4] = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.5, y = 1}, + offset = {x = 35*scale, y = -55*scale}, + alignment = {x = 0, y = -1}, + number = 0xffffff, + text = "", + }) + + -- init item wheel + minetest.after(0, function() + hb[name].item = "wheel_init" + update_wheel(player) + end) + end) +end) + +local function update_wrapper(a, b, player) + local name = player:get_player_name() + if not name then + return + end + minetest.after(0, function() + hb[name].item = "wheel_init" + update_wheel(player) + end) +end + +minetest.register_on_placenode(update_wrapper) +minetest.register_on_dignode(update_wrapper) + + +local timer = 0 +minetest.register_globalstep(function(dtime) + timer = timer + dtime + if timer >= HUD_IW_TICK then + timer = 0 + for _, player in ipairs(minetest.get_connected_players()) do + update_wheel(player) + end + end--timer +end) diff --git a/mods/Menu/hud/legacy.lua b/mods/Menu/hud/legacy.lua new file mode 100644 index 0000000..9bbc2f6 --- /dev/null +++ b/mods/Menu/hud/legacy.lua @@ -0,0 +1,73 @@ +-- Armor +function hud.set_armor() +end + +if hud.show_armor then + local shields = minetest.get_modpath("shields") ~= nil + local armor_org_func = armor.set_player_armor + + local function get_armor_lvl(def) + -- items/protection based display + local lvl = def.level or 0 + local max = 63 -- full diamond armor + if shields then + max = 84.14 -- full diamond armor + diamond shield + end + -- TODO: is there a sane way to read out max values? + local ret = lvl/max + if ret > 1 then + ret = 1 + end + + return tonumber(20 * ret) + end + + function armor.set_player_armor(self, player) + armor_org_func(self, player) + local name = player:get_player_name() + local def = self.def + local armor_lvl = 0 + if def[name] and def[name].level then + armor_lvl = get_armor_lvl(def[name]) + end + hud.change_item(player, "armor", {number = armor_lvl}) + end +end + +function hud.notify_hunger(delay, use) + local txt_part = "enable" + if use then + txt_part = "use" + end + minetest.after(delay, function() + minetest.chat_send_all("#Better HUD: You can't " .. txt_part .. " hunger without the \"hunger\" mod") + minetest.chat_send_all(" Enable it or download it from \"https://github.com/BlockMen/hunger\"") + end) +end + +-- Hunger related functions +if not hud.show_hunger then + function hud.set_hunger() + hud.notify_hunger(1, true) + end + + function hud.get_hunger() + hud.notify_hunger(1, true) + end + + function hud.item_eat(hp_change, replace_with_item) + return function(itemstack, user, pointed_thing) + hud.notify_hunger(1, true) + local func = minetest.item_eat(hp_change, replace_with_item) + return func(itemstack, user, pointed_thing) + end + end + + function hud.save_hunger() + hud.notify_hunger(1, true) + end + + function hud.load_hunger(player) + hud.notify_hunger(1, true) + end +end diff --git a/mods/Menu/hud/textures/crosshair.png b/mods/Menu/hud/textures/crosshair.png new file mode 100644 index 0000000..a832298 Binary files /dev/null and b/mods/Menu/hud/textures/crosshair.png differ diff --git a/mods/Menu/hud/textures/hud_air_fg.png b/mods/Menu/hud/textures/hud_air_fg.png new file mode 100644 index 0000000..b62c9b0 Binary files /dev/null and b/mods/Menu/hud/textures/hud_air_fg.png differ diff --git a/mods/Menu/hud/textures/hud_armor_bg.png b/mods/Menu/hud/textures/hud_armor_bg.png new file mode 100644 index 0000000..3240100 Binary files /dev/null and b/mods/Menu/hud/textures/hud_armor_bg.png differ diff --git a/mods/Menu/hud/textures/hud_armor_fg.png b/mods/Menu/hud/textures/hud_armor_fg.png new file mode 100644 index 0000000..374f1a9 Binary files /dev/null and b/mods/Menu/hud/textures/hud_armor_fg.png differ diff --git a/mods/Menu/hud/textures/hud_heart_bg.png b/mods/Menu/hud/textures/hud_heart_bg.png new file mode 100644 index 0000000..e2be276 Binary files /dev/null and b/mods/Menu/hud/textures/hud_heart_bg.png differ diff --git a/mods/Menu/hud/textures/hud_heart_fg.png b/mods/Menu/hud/textures/hud_heart_fg.png new file mode 100644 index 0000000..dc213d8 Binary files /dev/null and b/mods/Menu/hud/textures/hud_heart_fg.png differ diff --git a/mods/Menu/hud/textures/hud_hotbar.png b/mods/Menu/hud/textures/hud_hotbar.png new file mode 100644 index 0000000..8c3df7c Binary files /dev/null and b/mods/Menu/hud/textures/hud_hotbar.png differ diff --git a/mods/Menu/hud/textures/hud_hotbar_selected.png b/mods/Menu/hud/textures/hud_hotbar_selected.png new file mode 100644 index 0000000..5334d6b Binary files /dev/null and b/mods/Menu/hud/textures/hud_hotbar_selected.png differ diff --git a/mods/Menu/hud/textures/hud_hunger_bg.png b/mods/Menu/hud/textures/hud_hunger_bg.png new file mode 100644 index 0000000..07e21e7 Binary files /dev/null and b/mods/Menu/hud/textures/hud_hunger_bg.png differ diff --git a/mods/Menu/hud/textures/hud_hunger_fg.png b/mods/Menu/hud/textures/hud_hunger_fg.png new file mode 100644 index 0000000..a5cc2a1 Binary files /dev/null and b/mods/Menu/hud/textures/hud_hunger_fg.png differ diff --git a/mods/Menu/hud/textures/hud_new.png b/mods/Menu/hud/textures/hud_new.png new file mode 100644 index 0000000..cf46e68 Binary files /dev/null and b/mods/Menu/hud/textures/hud_new.png differ diff --git a/mods/Menu/hud/textures/hud_wielded.png b/mods/Menu/hud/textures/hud_wielded.png new file mode 100644 index 0000000..2dc0e3d Binary files /dev/null and b/mods/Menu/hud/textures/hud_wielded.png differ diff --git a/mods/Menu/inventory_plus/menu.lua b/mods/Menu/inventory_plus/menu.lua index 5f9ecb8..e6dc297 100644 --- a/mods/Menu/inventory_plus/menu.lua +++ b/mods/Menu/inventory_plus/menu.lua @@ -200,9 +200,9 @@ if page == "furnitures" then .. "image_button_exit[1,4.5;1,1;gui_hotbar_selected.png^cgdoor.png;cgdoor;]" -- .. "image_button_exit[2,4.5;1,1;gui_hotbar_selected.png^slabs.png;tslabs;]" .. "image_button_exit[2,4.5;1,1;gui_hotbar_selected.png^torch.png;torch;]" -.. "image_button_exit[3,4.5;1,1;gui_hotbar_selected.png^shieldcross.png;shieldcross;]" -.. "image_button_exit[4,4.5;1,1;gui_hotbar_selected.png^shieldslash.png;shieldslash;]" -.. "image_button_exit[5,4.5;1,1;gui_hotbar_selected.png^shieldchevron.png;shieldchevron;]" +.. "image_button_exit[3,4.5;1,1;gui_hotbar_selected.png^invcross.png;shieldcross;]" +.. "image_button_exit[4,4.5;1,1;gui_hotbar_selected.png^invslash.png;shieldslash;]" +.. "image_button_exit[5,4.5;1,1;gui_hotbar_selected.png^invchevron.png;shieldchevron;]" .."image_button_exit[6,4.5;1,1;gui_hotbar_selected.png^trampo.png;trampoline;]" .. "image_button[7,4.5;1,1;gui_hotbar_selected.png^droite.png;furnitures2;]" diff --git a/mods/Menu/inventory_plus/textures/airboat_airboat_inv.png b/mods/Menu/inventory_plus/textures/airboat_airboat_inv.png new file mode 100644 index 0000000..a668fe8 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/airboat_airboat_inv.png differ diff --git a/mods/Menu/inventory_plus/textures/arc.png b/mods/Menu/inventory_plus/textures/arc.png index 77b83a3..b676d53 100644 Binary files a/mods/Menu/inventory_plus/textures/arc.png and b/mods/Menu/inventory_plus/textures/arc.png differ diff --git a/mods/Menu/inventory_plus/textures/arcin.png b/mods/Menu/inventory_plus/textures/arcin.png index a2b1dc3..7683663 100644 Binary files a/mods/Menu/inventory_plus/textures/arcin.png and b/mods/Menu/inventory_plus/textures/arcin.png differ diff --git a/mods/Menu/inventory_plus/textures/arcout.png b/mods/Menu/inventory_plus/textures/arcout.png index c51678e..4bd4104 100644 Binary files a/mods/Menu/inventory_plus/textures/arcout.png and b/mods/Menu/inventory_plus/textures/arcout.png differ diff --git a/mods/Menu/inventory_plus/textures/armoire.png b/mods/Menu/inventory_plus/textures/armoire.png index 2dfb36b..eba292e 100644 Binary files a/mods/Menu/inventory_plus/textures/armoire.png and b/mods/Menu/inventory_plus/textures/armoire.png differ diff --git a/mods/Menu/inventory_plus/textures/beaconoff.png b/mods/Menu/inventory_plus/textures/beaconoff.png index 1178bb2..d9818aa 100644 Binary files a/mods/Menu/inventory_plus/textures/beaconoff.png and b/mods/Menu/inventory_plus/textures/beaconoff.png differ diff --git a/mods/Menu/inventory_plus/textures/beaconon.png b/mods/Menu/inventory_plus/textures/beaconon.png index d82b51e..398dfc3 100644 Binary files a/mods/Menu/inventory_plus/textures/beaconon.png and b/mods/Menu/inventory_plus/textures/beaconon.png differ diff --git a/mods/Menu/inventory_plus/textures/beds.png b/mods/Menu/inventory_plus/textures/beds.png index 81d7bc3..a93d137 100644 Binary files a/mods/Menu/inventory_plus/textures/beds.png and b/mods/Menu/inventory_plus/textures/beds.png differ diff --git a/mods/Menu/inventory_plus/textures/bench.png b/mods/Menu/inventory_plus/textures/bench.png index 3f57dc8..c41056f 100644 Binary files a/mods/Menu/inventory_plus/textures/bench.png and b/mods/Menu/inventory_plus/textures/bench.png differ diff --git a/mods/Menu/inventory_plus/textures/bigtrees.png b/mods/Menu/inventory_plus/textures/bigtrees.png index 36085ad..b7086ff 100644 Binary files a/mods/Menu/inventory_plus/textures/bigtrees.png and b/mods/Menu/inventory_plus/textures/bigtrees.png differ diff --git a/mods/Menu/inventory_plus/textures/blocks.png b/mods/Menu/inventory_plus/textures/blocks.png index f5ba664..ea3d2db 100644 Binary files a/mods/Menu/inventory_plus/textures/blocks.png and b/mods/Menu/inventory_plus/textures/blocks.png differ diff --git a/mods/Menu/inventory_plus/textures/carpets.png b/mods/Menu/inventory_plus/textures/carpets.png index 4b56949..cf8a086 100644 Binary files a/mods/Menu/inventory_plus/textures/carpets.png and b/mods/Menu/inventory_plus/textures/carpets.png differ diff --git a/mods/Menu/inventory_plus/textures/cars.png b/mods/Menu/inventory_plus/textures/cars.png index 2dba0a3..8f53b2a 100644 Binary files a/mods/Menu/inventory_plus/textures/cars.png and b/mods/Menu/inventory_plus/textures/cars.png differ diff --git a/mods/Menu/inventory_plus/textures/cart.png b/mods/Menu/inventory_plus/textures/cart.png new file mode 100644 index 0000000..eabb227 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/cart.png differ diff --git a/mods/Menu/inventory_plus/textures/carts_rail_straight_pwr.png b/mods/Menu/inventory_plus/textures/carts_rail_straight_pwr.png new file mode 100644 index 0000000..9d26b86 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/carts_rail_straight_pwr.png differ diff --git a/mods/Menu/inventory_plus/textures/cgborder.png b/mods/Menu/inventory_plus/textures/cgborder.png index d21d935..fecf634 100644 Binary files a/mods/Menu/inventory_plus/textures/cgborder.png and b/mods/Menu/inventory_plus/textures/cgborder.png differ diff --git a/mods/Menu/inventory_plus/textures/cgdoor.png b/mods/Menu/inventory_plus/textures/cgdoor.png index be96361..a1034aa 100644 Binary files a/mods/Menu/inventory_plus/textures/cgdoor.png and b/mods/Menu/inventory_plus/textures/cgdoor.png differ diff --git a/mods/Menu/inventory_plus/textures/cgherse.png b/mods/Menu/inventory_plus/textures/cgherse.png index 71e431e..6cbc904 100644 Binary files a/mods/Menu/inventory_plus/textures/cgherse.png and b/mods/Menu/inventory_plus/textures/cgherse.png differ diff --git a/mods/Menu/inventory_plus/textures/chair.png b/mods/Menu/inventory_plus/textures/chair.png index b7f9621..0720983 100644 Binary files a/mods/Menu/inventory_plus/textures/chair.png and b/mods/Menu/inventory_plus/textures/chair.png differ diff --git a/mods/Menu/inventory_plus/textures/computer.png b/mods/Menu/inventory_plus/textures/computer.png index 7d516e3..91a1509 100644 Binary files a/mods/Menu/inventory_plus/textures/computer.png and b/mods/Menu/inventory_plus/textures/computer.png differ diff --git a/mods/Menu/inventory_plus/textures/cone.png b/mods/Menu/inventory_plus/textures/cone.png index 794cf92..7147d6f 100644 Binary files a/mods/Menu/inventory_plus/textures/cone.png and b/mods/Menu/inventory_plus/textures/cone.png differ diff --git a/mods/Menu/inventory_plus/textures/cornera.png b/mods/Menu/inventory_plus/textures/cornera.png index cda6430..c53aa8d 100644 Binary files a/mods/Menu/inventory_plus/textures/cornera.png and b/mods/Menu/inventory_plus/textures/cornera.png differ diff --git a/mods/Menu/inventory_plus/textures/cornerb.png b/mods/Menu/inventory_plus/textures/cornerb.png index b0051e9..4f511d0 100644 Binary files a/mods/Menu/inventory_plus/textures/cornerb.png and b/mods/Menu/inventory_plus/textures/cornerb.png differ diff --git a/mods/Menu/inventory_plus/textures/cylinder.png b/mods/Menu/inventory_plus/textures/cylinder.png index 839df94..1a7d7fa 100644 Binary files a/mods/Menu/inventory_plus/textures/cylinder.png and b/mods/Menu/inventory_plus/textures/cylinder.png differ diff --git a/mods/Menu/inventory_plus/textures/desk.png b/mods/Menu/inventory_plus/textures/desk.png index ed920b2..92198d3 100644 Binary files a/mods/Menu/inventory_plus/textures/desk.png and b/mods/Menu/inventory_plus/textures/desk.png differ diff --git a/mods/Menu/inventory_plus/textures/doors.png b/mods/Menu/inventory_plus/textures/doors.png index 3441dbd..cec97e5 100644 Binary files a/mods/Menu/inventory_plus/textures/doors.png and b/mods/Menu/inventory_plus/textures/doors.png differ diff --git a/mods/Menu/inventory_plus/textures/droite.png b/mods/Menu/inventory_plus/textures/droite.png index 8eeda55..d2c870d 100644 Binary files a/mods/Menu/inventory_plus/textures/droite.png and b/mods/Menu/inventory_plus/textures/droite.png differ diff --git a/mods/Menu/inventory_plus/textures/earth.png b/mods/Menu/inventory_plus/textures/earth.png index 4944495..f36049e 100644 Binary files a/mods/Menu/inventory_plus/textures/earth.png and b/mods/Menu/inventory_plus/textures/earth.png differ diff --git a/mods/Menu/inventory_plus/textures/edge.png b/mods/Menu/inventory_plus/textures/edge.png index 3e6a837..878e115 100644 Binary files a/mods/Menu/inventory_plus/textures/edge.png and b/mods/Menu/inventory_plus/textures/edge.png differ diff --git a/mods/Menu/inventory_plus/textures/edgecorner.png b/mods/Menu/inventory_plus/textures/edgecorner.png index 7a249ff..6b68794 100644 Binary files a/mods/Menu/inventory_plus/textures/edgecorner.png and b/mods/Menu/inventory_plus/textures/edgecorner.png differ diff --git a/mods/Menu/inventory_plus/textures/fbladder.png b/mods/Menu/inventory_plus/textures/fbladder.png new file mode 100644 index 0000000..0737876 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/fbladder.png differ diff --git a/mods/Menu/inventory_plus/textures/fbstair.png b/mods/Menu/inventory_plus/textures/fbstair.png new file mode 100644 index 0000000..2198e92 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/fbstair.png differ diff --git a/mods/Menu/inventory_plus/textures/fbtrap.png b/mods/Menu/inventory_plus/textures/fbtrap.png new file mode 100644 index 0000000..692c307 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/fbtrap.png differ diff --git a/mods/Menu/inventory_plus/textures/fence.png b/mods/Menu/inventory_plus/textures/fence.png index 62d36eb..d643567 100644 Binary files a/mods/Menu/inventory_plus/textures/fence.png and b/mods/Menu/inventory_plus/textures/fence.png differ diff --git a/mods/Menu/inventory_plus/textures/flag.png b/mods/Menu/inventory_plus/textures/flag.png new file mode 100644 index 0000000..ac5d24b Binary files /dev/null and b/mods/Menu/inventory_plus/textures/flag.png differ diff --git a/mods/Menu/inventory_plus/textures/flowers.png b/mods/Menu/inventory_plus/textures/flowers.png index 23582c0..32f7c55 100644 Binary files a/mods/Menu/inventory_plus/textures/flowers.png and b/mods/Menu/inventory_plus/textures/flowers.png differ diff --git a/mods/Menu/inventory_plus/textures/frigo.png b/mods/Menu/inventory_plus/textures/frigo.png index 9333eb4..8e1cf96 100644 Binary files a/mods/Menu/inventory_plus/textures/frigo.png and b/mods/Menu/inventory_plus/textures/frigo.png differ diff --git a/mods/Menu/inventory_plus/textures/fullpipe.png b/mods/Menu/inventory_plus/textures/fullpipe.png index cd44bda..1c12c6b 100644 Binary files a/mods/Menu/inventory_plus/textures/fullpipe.png and b/mods/Menu/inventory_plus/textures/fullpipe.png differ diff --git a/mods/Menu/inventory_plus/textures/fullpipeborder.png b/mods/Menu/inventory_plus/textures/fullpipeborder.png index 1b877e2..8b29fae 100644 Binary files a/mods/Menu/inventory_plus/textures/fullpipeborder.png and b/mods/Menu/inventory_plus/textures/fullpipeborder.png differ diff --git a/mods/Menu/inventory_plus/textures/gauche.png b/mods/Menu/inventory_plus/textures/gauche.png index 4ecf2bf..bd6df4a 100644 Binary files a/mods/Menu/inventory_plus/textures/gauche.png and b/mods/Menu/inventory_plus/textures/gauche.png differ diff --git a/mods/Menu/inventory_plus/textures/hotair_inv.png b/mods/Menu/inventory_plus/textures/hotair_inv.png new file mode 100644 index 0000000..003c7a4 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/hotair_inv.png differ diff --git a/mods/Menu/inventory_plus/textures/hovercraft_inv.png b/mods/Menu/inventory_plus/textures/hovercraft_inv.png new file mode 100644 index 0000000..30efacd Binary files /dev/null and b/mods/Menu/inventory_plus/textures/hovercraft_inv.png differ diff --git a/mods/Menu/inventory_plus/textures/invchevron.png b/mods/Menu/inventory_plus/textures/invchevron.png new file mode 100644 index 0000000..4bd89b2 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/invchevron.png differ diff --git a/mods/Menu/inventory_plus/textures/invcross.png b/mods/Menu/inventory_plus/textures/invcross.png new file mode 100644 index 0000000..850e46c Binary files /dev/null and b/mods/Menu/inventory_plus/textures/invcross.png differ diff --git a/mods/Menu/inventory_plus/textures/invslash.png b/mods/Menu/inventory_plus/textures/invslash.png new file mode 100644 index 0000000..2aaaef8 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/invslash.png differ diff --git a/mods/Menu/inventory_plus/textures/lights.png b/mods/Menu/inventory_plus/textures/lights.png index b5facba..85759b9 100644 Binary files a/mods/Menu/inventory_plus/textures/lights.png and b/mods/Menu/inventory_plus/textures/lights.png differ diff --git a/mods/Menu/inventory_plus/textures/long.png b/mods/Menu/inventory_plus/textures/long.png index d6bafd2..30bd38c 100644 Binary files a/mods/Menu/inventory_plus/textures/long.png and b/mods/Menu/inventory_plus/textures/long.png differ diff --git a/mods/Menu/inventory_plus/textures/mmars.png b/mods/Menu/inventory_plus/textures/mmars.png index e4d4e3e..2f08b55 100644 Binary files a/mods/Menu/inventory_plus/textures/mmars.png and b/mods/Menu/inventory_plus/textures/mmars.png differ diff --git a/mods/Menu/inventory_plus/textures/mobs.png b/mods/Menu/inventory_plus/textures/mobs.png index bdd5267..9abbd48 100644 Binary files a/mods/Menu/inventory_plus/textures/mobs.png and b/mods/Menu/inventory_plus/textures/mobs.png differ diff --git a/mods/Menu/inventory_plus/textures/moon.png b/mods/Menu/inventory_plus/textures/moon.png index af82895..197f96b 100644 Binary files a/mods/Menu/inventory_plus/textures/moon.png and b/mods/Menu/inventory_plus/textures/moon.png differ diff --git a/mods/Menu/inventory_plus/textures/noncubic.png b/mods/Menu/inventory_plus/textures/noncubic.png index f9ad7bf..8ccc30e 100644 Binary files a/mods/Menu/inventory_plus/textures/noncubic.png and b/mods/Menu/inventory_plus/textures/noncubic.png differ diff --git a/mods/Menu/inventory_plus/textures/nones.png b/mods/Menu/inventory_plus/textures/nones.png index 52fd316..cdc6577 100644 Binary files a/mods/Menu/inventory_plus/textures/nones.png and b/mods/Menu/inventory_plus/textures/nones.png differ diff --git a/mods/Menu/inventory_plus/textures/normaltrees.png b/mods/Menu/inventory_plus/textures/normaltrees.png index a6bb41d..3b191ed 100644 Binary files a/mods/Menu/inventory_plus/textures/normaltrees.png and b/mods/Menu/inventory_plus/textures/normaltrees.png differ diff --git a/mods/Menu/inventory_plus/textures/protect.png b/mods/Menu/inventory_plus/textures/protect.png index c235a60..31e224a 100644 Binary files a/mods/Menu/inventory_plus/textures/protect.png and b/mods/Menu/inventory_plus/textures/protect.png differ diff --git a/mods/Menu/inventory_plus/textures/rotate.png b/mods/Menu/inventory_plus/textures/rotate.png index 301a7a2..7faaece 100644 Binary files a/mods/Menu/inventory_plus/textures/rotate.png and b/mods/Menu/inventory_plus/textures/rotate.png differ diff --git a/mods/Menu/inventory_plus/textures/rotate2.png b/mods/Menu/inventory_plus/textures/rotate2.png new file mode 100644 index 0000000..56865b7 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/rotate2.png differ diff --git a/mods/Menu/inventory_plus/textures/signs.png b/mods/Menu/inventory_plus/textures/signs.png index c13c4dd..33e3ad2 100644 Binary files a/mods/Menu/inventory_plus/textures/signs.png and b/mods/Menu/inventory_plus/textures/signs.png differ diff --git a/mods/Menu/inventory_plus/textures/slabs.png b/mods/Menu/inventory_plus/textures/slabs.png index b59ed11..5d1e26b 100644 Binary files a/mods/Menu/inventory_plus/textures/slabs.png and b/mods/Menu/inventory_plus/textures/slabs.png differ diff --git a/mods/Menu/inventory_plus/textures/slabtop.png b/mods/Menu/inventory_plus/textures/slabtop.png index 8be7022..d202216 100644 Binary files a/mods/Menu/inventory_plus/textures/slabtop.png and b/mods/Menu/inventory_plus/textures/slabtop.png differ diff --git a/mods/Menu/inventory_plus/textures/smalltrees.png b/mods/Menu/inventory_plus/textures/smalltrees.png index 31de8d7..aef144a 100644 Binary files a/mods/Menu/inventory_plus/textures/smalltrees.png and b/mods/Menu/inventory_plus/textures/smalltrees.png differ diff --git a/mods/Menu/inventory_plus/textures/sofas.png b/mods/Menu/inventory_plus/textures/sofas.png index 2442b77..18f34a0 100644 Binary files a/mods/Menu/inventory_plus/textures/sofas.png and b/mods/Menu/inventory_plus/textures/sofas.png differ diff --git a/mods/Menu/inventory_plus/textures/spaceship_spaceship_inv.png b/mods/Menu/inventory_plus/textures/spaceship_spaceship_inv.png new file mode 100644 index 0000000..ebe1925 Binary files /dev/null and b/mods/Menu/inventory_plus/textures/spaceship_spaceship_inv.png differ diff --git a/mods/Menu/inventory_plus/textures/sphere.png b/mods/Menu/inventory_plus/textures/sphere.png index d1bdc5d..f32535f 100644 Binary files a/mods/Menu/inventory_plus/textures/sphere.png and b/mods/Menu/inventory_plus/textures/sphere.png differ diff --git a/mods/Menu/inventory_plus/textures/stairs.png b/mods/Menu/inventory_plus/textures/stairs.png index 2442b77..079b820 100644 Binary files a/mods/Menu/inventory_plus/textures/stairs.png and b/mods/Menu/inventory_plus/textures/stairs.png differ diff --git a/mods/Menu/inventory_plus/textures/surfboard.png b/mods/Menu/inventory_plus/textures/surfboard.png index 3143546..8dd9766 100644 Binary files a/mods/Menu/inventory_plus/textures/surfboard.png and b/mods/Menu/inventory_plus/textures/surfboard.png differ diff --git a/mods/Menu/inventory_plus/textures/table.png b/mods/Menu/inventory_plus/textures/table.png index e8ffffc..5914260 100644 Binary files a/mods/Menu/inventory_plus/textures/table.png and b/mods/Menu/inventory_plus/textures/table.png differ diff --git a/mods/Menu/inventory_plus/textures/tapestry.png b/mods/Menu/inventory_plus/textures/tapestry.png index 41008f5..430ec46 100644 Binary files a/mods/Menu/inventory_plus/textures/tapestry.png and b/mods/Menu/inventory_plus/textures/tapestry.png differ diff --git a/mods/Menu/inventory_plus/textures/tapestryl.png b/mods/Menu/inventory_plus/textures/tapestryl.png index c43eac7..0875561 100644 Binary files a/mods/Menu/inventory_plus/textures/tapestryl.png and b/mods/Menu/inventory_plus/textures/tapestryl.png differ diff --git a/mods/Menu/inventory_plus/textures/tapestryvl.png b/mods/Menu/inventory_plus/textures/tapestryvl.png index 2c15324..9a7074c 100644 Binary files a/mods/Menu/inventory_plus/textures/tapestryvl.png and b/mods/Menu/inventory_plus/textures/tapestryvl.png differ diff --git a/mods/Menu/inventory_plus/textures/time.png b/mods/Menu/inventory_plus/textures/time.png index 00b59ee..1ec9f4f 100644 Binary files a/mods/Menu/inventory_plus/textures/time.png and b/mods/Menu/inventory_plus/textures/time.png differ diff --git a/mods/Menu/inventory_plus/textures/torch.png b/mods/Menu/inventory_plus/textures/torch.png index 2074d68..b7fc319 100644 Binary files a/mods/Menu/inventory_plus/textures/torch.png and b/mods/Menu/inventory_plus/textures/torch.png differ diff --git a/mods/Menu/inventory_plus/textures/trampo.png b/mods/Menu/inventory_plus/textures/trampo.png index 70eb487..41140ad 100644 Binary files a/mods/Menu/inventory_plus/textures/trampo.png and b/mods/Menu/inventory_plus/textures/trampo.png differ diff --git a/mods/Menu/inventory_plus/textures/trapdoor.png b/mods/Menu/inventory_plus/textures/trapdoor.png index b72e6d8..2806095 100644 Binary files a/mods/Menu/inventory_plus/textures/trapdoor.png and b/mods/Menu/inventory_plus/textures/trapdoor.png differ diff --git a/mods/Menu/inventory_plus/textures/triangle.png b/mods/Menu/inventory_plus/textures/triangle.png index 1b0f1b6..6d6b1dc 100644 Binary files a/mods/Menu/inventory_plus/textures/triangle.png and b/mods/Menu/inventory_plus/textures/triangle.png differ diff --git a/mods/Menu/inventory_plus/textures/waters.png b/mods/Menu/inventory_plus/textures/waters.png index 518c8ae..946c413 100644 Binary files a/mods/Menu/inventory_plus/textures/waters.png and b/mods/Menu/inventory_plus/textures/waters.png differ diff --git a/mods/Menu/inventory_plus/textures/windows.png b/mods/Menu/inventory_plus/textures/windows.png index 4987548..b1a5bec 100644 Binary files a/mods/Menu/inventory_plus/textures/windows.png and b/mods/Menu/inventory_plus/textures/windows.png differ diff --git a/mods/Mobs/mobs/textures/mobs_alien.png b/mods/Mobs/mobs/textures/mobs_alien.png new file mode 100644 index 0000000..e8c183d Binary files /dev/null and b/mods/Mobs/mobs/textures/mobs_alien.png differ diff --git a/mods/Mobs/mobs/textures/mobs_chicken_egg.png b/mods/Mobs/mobs/textures/mobs_chicken_egg.png index be8a4e1..92830cd 100644 Binary files a/mods/Mobs/mobs/textures/mobs_chicken_egg.png and b/mods/Mobs/mobs/textures/mobs_chicken_egg.png differ diff --git a/mods/Mobs/mobs/textures/mobs_chicken_egg_overlay.png b/mods/Mobs/mobs/textures/mobs_chicken_egg_overlay.png index e81716a..b33e7b9 100644 Binary files a/mods/Mobs/mobs/textures/mobs_chicken_egg_overlay.png and b/mods/Mobs/mobs/textures/mobs_chicken_egg_overlay.png differ diff --git a/mods/Mobs/mobs/textures/mobs_magic_lasso.png b/mods/Mobs/mobs/textures/mobs_magic_lasso.png index befdc11..993f2d1 100644 Binary files a/mods/Mobs/mobs/textures/mobs_magic_lasso.png and b/mods/Mobs/mobs/textures/mobs_magic_lasso.png differ diff --git a/mods/Mobs/mobs/textures/mobs_nametag.png b/mods/Mobs/mobs/textures/mobs_nametag.png index 74005b3..ec99ec0 100644 Binary files a/mods/Mobs/mobs/textures/mobs_nametag.png and b/mods/Mobs/mobs/textures/mobs_nametag.png differ diff --git a/mods/Mobs/mobs/textures/mobs_panda.png b/mods/Mobs/mobs/textures/mobs_panda.png new file mode 100644 index 0000000..967815d Binary files /dev/null and b/mods/Mobs/mobs/textures/mobs_panda.png differ diff --git a/mods/Mobs/mobs/textures/mobs_pig.png b/mods/Mobs/mobs/textures/mobs_pig.png new file mode 100644 index 0000000..3bb4e30 Binary files /dev/null and b/mods/Mobs/mobs/textures/mobs_pig.png differ diff --git a/mods/Mobs/mobs_animal/adultalien.lua b/mods/Mobs/mobs_animal/adultalien.lua index db30bed..4563b95 100644 --- a/mods/Mobs/mobs_animal/adultalien.lua +++ b/mods/Mobs/mobs_animal/adultalien.lua @@ -79,4 +79,4 @@ stepheight = 0.6, day_toggle = true, }) -mobs:register_egg("mobs_animal:adultalien", S("AdultAlien"), "color_green.png", 1) +mobs:register_egg("mobs_animal:adultalien", S("AdultAlien"), "mobs_alien.png", 1) diff --git a/mods/Mobs/mobs_animal/adultpanda.lua b/mods/Mobs/mobs_animal/adultpanda.lua index b5cde75..29deb48 100644 --- a/mods/Mobs/mobs_animal/adultpanda.lua +++ b/mods/Mobs/mobs_animal/adultpanda.lua @@ -79,4 +79,4 @@ stepheight = 0.6, day_toggle = true, }) -mobs:register_egg("mobs_animal:adultpanda", S("AdultPanda"), "color_white.png", 1) +mobs:register_egg("mobs_animal:adultpanda", S("AdultPanda"), "mobs_panda.png", 1) diff --git a/mods/Mobs/mobs_animal/adultpig.lua b/mods/Mobs/mobs_animal/adultpig.lua index c2c2085..00b53f6 100644 --- a/mods/Mobs/mobs_animal/adultpig.lua +++ b/mods/Mobs/mobs_animal/adultpig.lua @@ -17,6 +17,7 @@ stepheight = 0.6, hp_max = 0, armor = 0, collisionbox = {-0.9, -0.9, -0.9, 0.9, 0.9, 0.9}, + inventory_image = "mobs_pig.png", visual = "mesh", visual_size = {x=2, y=2, z=2}, mesh = "mobs_adult.b3d", @@ -79,4 +80,4 @@ stepheight = 0.6, day_toggle = true, }) -mobs:register_egg("mobs_animal:adultpig", S("AdultPig"), "color_pink.png", 1) +mobs:register_egg("mobs_animal:adultpig", S("AdultPig"), "mobs_pig.png", 1) diff --git a/mods/Mobs/mobs_animal/babyalien.lua b/mods/Mobs/mobs_animal/babyalien.lua index 53dfb23..f5fe4de 100644 --- a/mods/Mobs/mobs_animal/babyalien.lua +++ b/mods/Mobs/mobs_animal/babyalien.lua @@ -76,4 +76,4 @@ stepheight = 0.6, day_toggle = true, }) -mobs:register_egg("mobs_animal:babyalien", S("BabyAlien"), "color_green.png", 1) +mobs:register_egg("mobs_animal:babyalien", S("BabyAlien"), "mobs_alien.png", 1) diff --git a/mods/Mobs/mobs_animal/babypanda.lua b/mods/Mobs/mobs_animal/babypanda.lua index 2107a0f..0a21578 100644 --- a/mods/Mobs/mobs_animal/babypanda.lua +++ b/mods/Mobs/mobs_animal/babypanda.lua @@ -76,4 +76,4 @@ stepheight = 0.6, day_toggle = true, }) -mobs:register_egg("mobs_animal:babypanda", S("babyPanda"), "color_white.png", 1) +mobs:register_egg("mobs_animal:babypanda", S("babyPanda"), "mobs_panda.png", 1) diff --git a/mods/Mobs/mobs_animal/babypig.lua b/mods/Mobs/mobs_animal/babypig.lua index fb3743d..7f444f6 100644 --- a/mods/Mobs/mobs_animal/babypig.lua +++ b/mods/Mobs/mobs_animal/babypig.lua @@ -76,4 +76,4 @@ stepheight = 0.6, day_toggle = true, }) -mobs:register_egg("mobs_animal:babypig", S("BabyPig"), "color_pink.png", 1) +mobs:register_egg("mobs_animal:babypig", S("BabyPig"), "mobs_pig.png", 1) diff --git a/mods/Other/screwdriver/README.txt b/mods/Other/screwdriver/README.txt new file mode 100644 index 0000000..9d39c58 --- /dev/null +++ b/mods/Other/screwdriver/README.txt @@ -0,0 +1,13 @@ +Minetest Game mod: screwdriver +============================== +See license.txt for license information. + +License of source code +---------------------- +Originally by RealBadAngel, Maciej Kasatkin (LGPL 2.1) +Various Minetest developers and contributors (LGPL 2.1) + +License of media (textures) +--------------------------- +Created by Gambit (CC BY-SA 3.0): + screwdriver.png diff --git a/mods/Other/screwdriver/init.lua b/mods/Other/screwdriver/init.lua new file mode 100644 index 0000000..035af5e --- /dev/null +++ b/mods/Other/screwdriver/init.lua @@ -0,0 +1,171 @@ +screwdriver = {} + +screwdriver.ROTATE_FACE = 1 +screwdriver.ROTATE_AXIS = 2 +screwdriver.disallow = function(pos, node, user, mode, new_param2) + return false +end +screwdriver.rotate_simple = function(pos, node, user, mode, new_param2) + if mode ~= screwdriver.ROTATE_FACE then + return false + end +end + +-- For attached wallmounted nodes: returns true if rotation is valid +-- simplified version of minetest:builtin/game/falling.lua#L148. +local function check_attached_node(pos, rotation) + local d = minetest.wallmounted_to_dir(rotation) + local p2 = vector.add(pos, d) + local n = minetest.get_node(p2).name + local def2 = minetest.registered_nodes[n] + if def2 and not def2.walkable then + return false + end + return true +end + +screwdriver.rotate = {} + +local facedir_tbl = { + [screwdriver.ROTATE_FACE] = { + [0] = 1, [1] = 2, [2] = 3, [3] = 0, + [4] = 5, [5] = 6, [6] = 7, [7] = 4, + [8] = 9, [9] = 10, [10] = 11, [11] = 8, + [12] = 13, [13] = 14, [14] = 15, [15] = 12, + [16] = 17, [17] = 18, [18] = 19, [19] = 16, + [20] = 21, [21] = 22, [22] = 23, [23] = 20, + }, + [screwdriver.ROTATE_AXIS] = { + [0] = 4, [1] = 4, [2] = 4, [3] = 4, + [4] = 8, [5] = 8, [6] = 8, [7] = 8, + [8] = 12, [9] = 12, [10] = 12, [11] = 12, + [12] = 16, [13] = 16, [14] = 16, [15] = 16, + [16] = 20, [17] = 20, [18] = 20, [19] = 20, + [20] = 0, [21] = 0, [22] = 0, [23] = 0, + }, +} + +screwdriver.rotate.facedir = function(pos, node, mode) + local rotation = node.param2 % 32 -- get first 5 bits + local other = node.param2 - rotation + rotation = facedir_tbl[mode][rotation] or 0 + return rotation + other +end + +screwdriver.rotate.colorfacedir = screwdriver.rotate.facedir + +local wallmounted_tbl = { + [screwdriver.ROTATE_FACE] = {[2] = 5, [3] = 4, [4] = 2, [5] = 3, [1] = 0, [0] = 1}, + [screwdriver.ROTATE_AXIS] = {[2] = 5, [3] = 4, [4] = 2, [5] = 1, [1] = 0, [0] = 3} +} + +screwdriver.rotate.wallmounted = function(pos, node, mode) + local rotation = node.param2 % 8 -- get first 3 bits + local other = node.param2 - rotation + rotation = wallmounted_tbl[mode][rotation] or 0 + if minetest.get_item_group(node.name, "attached_node") ~= 0 then + -- find an acceptable orientation + for i = 1, 5 do + if not check_attached_node(pos, rotation) then + rotation = wallmounted_tbl[mode][rotation] or 0 + else + break + end + end + end + return rotation + other +end + +screwdriver.rotate.colorwallmounted = screwdriver.rotate.wallmounted + +-- Handles rotation +screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) + if pointed_thing.type ~= "node" then + return + end + + local pos = pointed_thing.under + + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, user:get_player_name()) + return + end + + local node = minetest.get_node(pos) + local ndef = minetest.registered_nodes[node.name] + if not ndef then + return itemstack + end + -- can we rotate this paramtype2? + local fn = screwdriver.rotate[ndef.paramtype2] + if not fn and not ndef.on_rotate then + return itemstack + end + + local should_rotate = true + local new_param2 + if fn then + new_param2 = fn(pos, node, mode) + else + new_param2 = node.param2 + end + + -- Node provides a handler, so let the handler decide instead if the node can be rotated + if ndef.on_rotate then + -- Copy pos and node because callback can modify it + local result = ndef.on_rotate(vector.new(pos), + {name = node.name, param1 = node.param1, param2 = node.param2}, + user, mode, new_param2) + if result == false then -- Disallow rotation + return itemstack + elseif result == true then + should_rotate = false + end + elseif ndef.on_rotate == false then + return itemstack + elseif ndef.can_dig and not ndef.can_dig(pos, user) then + return itemstack + end + + if should_rotate and new_param2 ~= node.param2 then + node.param2 = new_param2 + minetest.swap_node(pos, node) + minetest.check_for_falling(pos) + end + + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(user:get_player_name())) then + itemstack:add_wear(65535 / ((uses or 200) - 1)) + end + + return itemstack +end + +-- Screwdriver +minetest.register_tool("screwdriver:screwdriver", { + description = "Rotate Tool (left-click rotates face, right-click rotates axis)", + inventory_image = "rotate2.png", + wield_image ="none.png", + on_use = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, 200) + return itemstack + end, + on_place = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_AXIS, 200) + return itemstack + end, +}) + + +minetest.register_craft({ + output = "screwdriver:screwdriver", + recipe = { + {"default:steel_ingot"}, + {"group:stick"} + } +}) + +minetest.register_alias("screwdriver:screwdriver1", "screwdriver:screwdriver") +minetest.register_alias("screwdriver:screwdriver2", "screwdriver:screwdriver") +minetest.register_alias("screwdriver:screwdriver3", "screwdriver:screwdriver") +minetest.register_alias("screwdriver:screwdriver4", "screwdriver:screwdriver") diff --git a/mods/Other/screwdriver/license.txt b/mods/Other/screwdriver/license.txt new file mode 100644 index 0000000..d9b721b --- /dev/null +++ b/mods/Other/screwdriver/license.txt @@ -0,0 +1,50 @@ +License of source code +---------------------- + +GNU Lesser General Public License, version 2.1 +Copyright (C) 2013-2016 RealBadAngel, Maciej Kasatkin +Copyright (C) 2013-2016 Various Minetest developers and contributors + +This program is free software; you can redistribute it and/or modify it under the terms +of the GNU Lesser General Public License as published by the Free Software Foundation; +either version 2.1 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU Lesser General Public License for more details: +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + + +Licenses of media (textures) +---------------------------- + +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Copyright (C) 2013-2016 Gambit + +You are free to: +Share — copy and redistribute the material in any medium or format. +Adapt — remix, transform, and build upon the material for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the license terms. + +Under the following terms: + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +ShareAlike — If you remix, transform, or build upon the material, you must distribute +your contributions under the same license as the original. + +No additional restrictions — You may not apply legal terms or technological measures that +legally restrict others from doing anything the license permits. + +Notices: + +You do not have to comply with the license for elements of the material in the public +domain or where your use is permitted by an applicable exception or limitation. +No warranties are given. The license may not give you all of the permissions necessary +for your intended use. For example, other rights such as publicity, privacy, or moral +rights may limit how you use the material. + +For more details: +http://creativecommons.org/licenses/by-sa/3.0/