Add tool texture overlay when enchanted

.gitattributes

@@ -0,0 +1,15 @@
+# Creating an archive
+
+.* export-ignore
+assets export-ignore
+scripts export-ignore
+bin export-ignore
+docs export-ignore
+types export-ignore
+*.zip export-ignore
+bitbucket-pipelines.yml export-ignore
+package.json export-ignore
+package-lock.json export-ignore
+screenshot*.png export-ignore
+i18n.py export-ignore
+config.ld export-ignore

LICENSE.txt

@@ -1,8 +1,7 @@
                   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
+ Copyright (C) 2023 SaKeL <juraj.vajda@gmail.com>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -55,7 +54,7 @@ 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
@@ -111,7 +110,7 @@ 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
 
@@ -158,7 +157,7 @@ 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
@@ -216,7 +215,7 @@ 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.
@@ -267,7 +266,7 @@ Library will still fall under Section 6.)
 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
@@ -329,7 +328,7 @@ 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
@@ -370,7 +369,7 @@ 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
@@ -422,7 +421,7 @@ 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
@@ -454,49 +453,3 @@ 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.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

README.md

@@ -6,9 +6,10 @@ Adds Enchanting Mechanics and API.
 
 ## Features
 
+* does not add new tools/items, it's using MT API to change existing items instead
 * adds enchanting table
 * supports all registered tools with known tool groups: pickaxe, shovel, axe, sword, e.g. `groups = {pickaxe = 1}`
-* support all bows with group `{bow = 1}`
+* supports all bows with group `{bow = 1}`
 * supports `default:bookshelf` or anything with `group:bookshelf`
 * enchanting trade is for `default:mese_crystal` or anything with `groups = {enchanting_trade = 1}`
 * adds enchantability for all MT default tools, for custom tools the enchantability can be set in the item group, e.g. `groups = {enchantability = 15}`
@@ -17,8 +18,6 @@ Adds Enchanting Mechanics and API.
 * mesh node model
 * mesh entity model and animations
 
-NOTE: item inventory/wield image will not be adjusted until this feature is supported by MT engine, see: https://github.com/minetest/minetest/issues/5686
-
 ## How To
 
 ### Enchanting Setup
@@ -55,7 +54,9 @@ groups: sword
 
 #### Fortune
 
-Increases the number and/or chances of specific item drops. This value is not used in the engine; it is the responsibility of the game/mod code to implement this.
+Increases the number and/or chances of specific item drops. Works with groups: stone, soil, sand, snowy, slippery, tree, leaves and all registered ores.
+
+Incompatible: Silk Touch
 
 groups: pickaxe, shovel, axe
 
@@ -75,6 +76,8 @@ groups: pickaxe, shovel, axe
 
 Causes certain blocks to drop themselves as items instead of their usual drops when mined. Mods can prevent this behaviour with adding group `{ no_silktouch = 1 }` to the nodes.
 
+Incompatible: Fortune
+
 groups: pickaxe, shovel, axe
 
 #### Curse of Vanishing
@@ -89,6 +92,14 @@ Increases knockback (players only).
 
 groups: sword
 
+#### Looting
+
+Cause mobs to drop more items. This value is not used in the engine; it is the responsibility of the game/mod code to implement this.
+
+Supported: mobs_monster, mobs_animal, animalia
+
+groups: sword
+
 #### Power
 
 Increases arrow damage.
@@ -114,7 +125,7 @@ Only set in item meta, logic for this has to be in the MOD where the bow comes f
 
 groups: bow
 
-### API
+## API
 
 `ItemStackMetaRef`
 
@@ -165,6 +176,7 @@ end
 ## Optional Dependencies
 
 - xdecor (adjusts conflicting recipe)
+- item_drop (make sure fortune will execute before item_drop mod overrides `handle_node_drops`)
 
 ## License:
 
@@ -174,7 +186,7 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file)
 
 ### Textures
 
-**CC BY-SA 4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated
+**CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated
 
 - x_enchanting_symbol_1.png
 - x_enchanting_symbol_2.png
@@ -203,7 +215,7 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file)
 - x_enchanting_symbol_25.png
 - x_enchanting_symbol_26.png
 
-**LGPL-2.1-or-later, by SaKeL**
+**CC-BY-SA-4.0, by SaKeL**
 
 - x_enchanting_image_button_disabled.png
 - x_enchanting_image_button.png
@@ -214,11 +226,15 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file)
 - x_enchanting_scroll_mesh.png -- Derived from a texture TumeniNodes (CC BY-SA 3.0)
 - x_enchanting_scroll_particle.png
 - x_enchanting_table.png
-- x_enchanting_trade_slot.png
+- x_enchanting_gui_slot_bg.png -- Derived from texture Pixel Perfection by XSSheep (CC-BY-SA-4.0)
+- x_enchanting_gui_cloth_bg.png -- Derived from texture Pixel Perfection by XSSheep (CC-BY-SA-4.0)
+- x_enchanting_gui_cloth_trade_bg.png -- Derived from texture Pixel Perfection by XSSheep (CC-BY-SA-4.0)
+- x_enchanting_gui_formbg.png -- Derived from texture Pixel Perfection by XSSheep (CC-BY-SA-4.0)
+- x_enchanting_gui_hb_bg.png -- Derived from texture Pixel Perfection by XSSheep (CC-BY-SA-4.0)
 
 ### Models
 
-**LGPL-2.1-or-later, by SaKeL**
+**CC-BY-SA-4.0, by SaKeL**
 
 - x_enchanting_scroll.b3d
 - x_enchanting_table.obj

api.lua

@@ -1,4 +1,20 @@
-default = minetest.global_exists('default') and default --[[@as MtgDefault]]
+--[[
+    X Enchanting. Adds Enchanting Mechanics and API.
+    Copyright (C) 2023 SaKeL <juraj.vajda@gmail.com>
+
+    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 juraj.vajda@gmail.com
+--]]
 
 local S = minetest.get_translator(minetest.get_current_modname())
 
@@ -67,6 +83,25 @@ XEnchanting = {
                 'sword'
             }
         },
+        looting = {
+            name = S('Looting'),
+            -- what level should be taken, `level = min/max values`
+            final_level_range = {
+                [1] = { 15, 65 },
+                [2] = { 24, 74 },
+                [3] = { 33, 83 }
+            },
+            -- level definition, `level = number to add`
+            level_def = {
+                [1] = 1,
+                [2] = 2,
+                [3] = 3
+            },
+            weight = 2,
+            groups = {
+                'sword'
+            }
+        },
         fortune = {
             name = S('Fortune'),
             -- what level should be taken, `level = min/max values`
@@ -86,7 +121,8 @@ XEnchanting = {
                 'pickaxe',
                 'shovel',
                 'axe'
-            }
+            },
+            incompatible = { 'silk_touch' }
         },
         unbreaking = {
             name = S('Unbreaking'),
@@ -145,7 +181,8 @@ XEnchanting = {
                 'pickaxe',
                 'shovel',
                 'axe'
-            }
+            },
+            incompatible = { 'fortune' }
         },
         curse_of_vanishing = {
             name = S('Curse of Vanishing'),
@@ -244,7 +281,8 @@ XEnchanting = {
         scroll_close = { { x = 45, y = 84 }, 80, 0, false },
         scroll_open_idle = { { x = 41, y = 42 }, 0, 0, false },
         scroll_closed_idle = { { x = 43, y = 44 }, 0, 0, false }
-    }
+    },
+    registered_ores = {}
 }
 
 ---Merge two tables with key/value pair
@@ -268,6 +306,18 @@ local function get_table_length(table)
     return length
 end
 
+---Find element v of t satisfying f(v)
+local function tableFind(t, f)
+    for _, v in ipairs(t) do
+        if f(v) then
+            return v
+        end
+    end
+
+    return nil
+end
+
+---@diagnostic disable-next-line: unused-local
 function XEnchanting.has_tool_group(self, name)
     if minetest.get_item_group(name, 'pickaxe') > 0 then
         return 'pickaxe'
@@ -301,10 +351,12 @@ function XEnchanting.set_tool_enchantability(self, tool_def)
     })
 end
 
+---@diagnostic disable-next-line: unused-local
 function XEnchanting.get_enchanted_tool_capabilities(self, tool_def, enchantments)
     local tool_stack = ItemStack({ name = tool_def.name })
     local tool_capabilities = tool_stack:get_tool_capabilities()
 
+    ---@diagnostic disable-next-line: unused-local
     for i, enchantment in ipairs(enchantments) do
         -- Efficiency
         if enchantment.id == 'efficiency' then
@@ -408,7 +460,7 @@ function XEnchanting.get_enchanted_tool_capabilities(self, tool_def, enchantment
         end
 
         -- Fortune
-        if enchantment.id == 'fortune' and tool_capabilities.max_drop_level then
+        if enchantment.id == 'fortune' or enchantment.id == 'looting' and tool_capabilities.max_drop_level then
             local old_max_drop_level = tool_capabilities.max_drop_level
             local new_max_drop_level = old_max_drop_level + enchantment.value
 
@@ -419,6 +471,7 @@ function XEnchanting.get_enchanted_tool_capabilities(self, tool_def, enchantment
     return tool_capabilities
 end
 
+---@diagnostic disable-next-line: unused-local
 function XEnchanting.get_randomseed(self)
     return tonumber(tostring(os.time()):reverse():sub(1, 9)) --[[@as integer]]
 end
@@ -427,6 +480,7 @@ function XEnchanting.get_enchanted_descriptions(self, enchantments)
     local enchantments_desc = {}
     local enchantments_desc_masked = {}
 
+    ---@diagnostic disable-next-line: unused-local
     for i, enchantment in ipairs(enchantments) do
         local add_roman_numbers = true
 
@@ -453,7 +507,7 @@ function XEnchanting.get_enchanted_descriptions(self, enchantments)
 
     enchantments_desc = '\n' .. minetest.colorize('#AE81FF', S('Enchanted'))
         .. '\n' .. table.concat(enchantments_desc, '\n')
-    enchantments_desc_masked = table.concat(enchantments_desc_masked, '') .. '...?'
+    enchantments_desc_masked = table.concat(enchantments_desc_masked, '') .. '..?'
 
     return {
         enchantments_desc = enchantments_desc,
@@ -483,6 +537,7 @@ function XEnchanting.set_enchanted_tool(self, pos, itemstack, level, player_name
     ---@type table<string, {["value"]: number}>
     local final_enchantments_meta = {}
 
+    ---@diagnostic disable-next-line: unused-local
     for i, enchantment in ipairs(final_enchantments) do
         stack_meta:set_float('is_' .. enchantment.id, enchantment.value)
         -- store only necessary data, keeping the meta optimized
@@ -497,6 +552,23 @@ function XEnchanting.set_enchanted_tool(self, pos, itemstack, level, player_name
     stack_meta:set_int('is_enchanted', 1)
     stack_meta:set_string('x_enchanting', minetest.serialize(final_enchantments_meta))
 
+
+    if tool_def and tool_def.inventory_image and tool_def.inventory_image ~= '' then
+        stack_meta:set_string('inventory_image', tool_def.inventory_image .. '^((' .. tool_def.inventory_image .. '^[contrast:127:127)^[mask:x_enchanting_glint.png^[opacity:80)')
+    end
+
+    if tool_def and tool_def.inventory_overlay and tool_def.inventory_overlay ~= '' then
+        stack_meta:set_string('inventory_overlay', tool_def.inventory_overlay .. '^((' .. tool_def.inventory_overlay .. '^[contrast:127:127)^[mask:x_enchanting_glint.png^[opacity:80)')
+    end
+
+    if tool_def and tool_def.wield_image and tool_def.wield_image ~= '' then
+        stack_meta:set_string('wield_image', tool_def.wield_image .. '^((' .. tool_def.wield_image .. '^[contrast:127:127)^[mask:x_enchanting_glint.png^[opacity:80)')
+    end
+
+    if tool_def and tool_def.wield_overlay and tool_def.wield_overlay ~= '' then
+        stack_meta:set_string('wield_overlay', tool_def.wield_overlay .. '^((' .. tool_def.wield_overlay .. '^[contrast:127:127)^[mask:x_enchanting_glint.png^[opacity:80)')
+    end
+
     inv:set_stack('item', 1, itemstack)
 
     local trade_stack = inv:get_stack('trade', 1)
@@ -514,6 +586,58 @@ function XEnchanting.set_enchanted_tool(self, pos, itemstack, level, player_name
         pos = pos,
         max_hear_distance = 10
     }, true)
+
+    -- particles
+    local particlespawner_def = {
+        amount = 50,
+        time = 0.5,
+        minpos = { x = pos.x - 1, y = pos.y + 1, z = pos.z - 1 },
+        maxpos = { x = pos.x + 1, y = pos.y + 1.5, z = pos.z + 1 },
+        minvel = { x = -0.1, y = -0.5, z = -0.1 },
+        maxvel = { x = 0.1, y = -1.5, z = 0.1 },
+        minacc = { x = -0.1, y = -0.5, z = -0.1 },
+        maxacc = { x = 0.1, y = -1.5, z = 0.1 },
+        minexptime = 0.5,
+        maxexptime = 1,
+        minsize = 0.5,
+        maxsize = 1,
+        texture = 'x_enchanting_scroll_particle.png^[colorize:#A179E9:256',
+        glow = 1
+    }
+
+    if minetest.has_feature({ dynamic_add_media_table = true, particlespawner_tweenable = true }) then
+        -- new syntax, after v5.6.0
+        particlespawner_def = {
+            amount = 50,
+            time = 0.5,
+            size = {
+                min = 0.5,
+                max = 1,
+            },
+            exptime = 2,
+            pos = {
+                min = vector.new({ x = pos.x - 1.5, y = pos.y + 1, z = pos.z - 1.5 }),
+                max = vector.new({ x = pos.x + 1.5, y = pos.y + 1.5, z = pos.z + 1.5 }),
+            },
+            attract = {
+                kind = 'point',
+                strength = 2,
+                origin = vector.new({ x = pos.x, y = pos.y + 0.65, z = pos.z }),
+                die_on_contact = true
+            },
+            texture = {
+                name = 'x_enchanting_scroll_particle.png^[colorize:#A179E9:256',
+                alpha_tween = {
+                    0.5, 1,
+                    style = 'fwd',
+                    reps = 1
+                }
+            },
+            glow = 1
+        }
+    end
+
+    minetest.add_particlespawner(particlespawner_def)
 end
 
 function XEnchanting.get_enchantment_data(self, player, nr_of_bookshelfs, tool_def)
@@ -539,6 +663,7 @@ function XEnchanting.get_enchantment_data(self, player, nr_of_bookshelfs, tool_d
         if not enchantment_def.groups then
             group_enchantments[enchantment_name] = enchantment_def
         else
+            ---@diagnostic disable-next-line: unused-local
             for i, group in ipairs(enchantment_def.groups) do
                 if minetest.get_item_group(tool_def.name, group) > 0 then
                     group_enchantments[enchantment_name] = enchantment_def
@@ -610,7 +735,8 @@ function XEnchanting.get_enchantment_data(self, player, nr_of_bookshelfs, tool_d
                     id = enchantment_name,
                     value = enchantment_def.level_def[level],
                     level = level,
-                    secondary = enchantment_def.secondary
+                    secondary = enchantment_def.secondary,
+                    incompatible = enchantment_def.incompatible
                 })
             end
         end
@@ -624,14 +750,16 @@ function XEnchanting.get_enchantment_data(self, player, nr_of_bookshelfs, tool_d
         local total_weight = 0
 
         -- calculate total weight
+        ---@diagnostic disable-next-line: unused-local
         for j, enchantment in ipairs(possible_enchantments) do
             total_weight = total_weight + self.enchantment_defs[enchantment.id].weight
         end
 
-        -- Pick a random integer in the half range [0; total_weight] as a number `rand_weight`
+        -- Pick a random integer in the half range [0; total_weight / 2] as a number `rand_weight`
         local rand_weight = math.random(0, total_weight / 2)
         -- local probability = (final_level + 1) / 50
         local probability_level = final_level
+        ---@type Enchantment[]
         local possible_enchantments_excl_secodnary = {}
 
         for _, enchantment in pairs(possible_enchantments) do
@@ -648,22 +776,46 @@ function XEnchanting.get_enchantment_data(self, player, nr_of_bookshelfs, tool_d
             local rand_ench = possible_enchantments[rand_ench_idx]
 
             if j == 1 then
+                -- First pick
                 -- Dont add cursed/secondary enchantment as first pick
                 rand_ench_idx = math.random(1, #possible_enchantments_excl_secodnary)
                 rand_ench = possible_enchantments_excl_secodnary[rand_ench_idx]
 
+                table.insert(final_enchantments, rand_ench)
+
                 for idx, value in pairs(possible_enchantments) do
                     if rand_ench.id == value.id then
                         table.remove(possible_enchantments, idx)
                     end
-                end
 
-                table.insert(final_enchantments, rand_ench)
+                    -- remove incomaptible enchantments
+                    if rand_ench.incompatible
+                        and table.indexof(rand_ench.incompatible, value.id) ~= -1
+                    then
+                        table.remove(possible_enchantments, idx)
+                    end
+                end
             else
                 local probability = (probability_level + 1) / 50
 
+                local alreadyInTable = tableFind(final_enchantments, function(value)
+                    return value.id == rand_ench.id
+                end)
+
+                if not alreadyInTable then
+                    table.insert(final_enchantments, rand_ench)
+                end
+
                 table.remove(possible_enchantments, rand_ench_idx)
-                table.insert(final_enchantments, rand_ench)
+
+                for idx, value in pairs(possible_enchantments) do
+                    -- remove incomaptible enchantments
+                    if rand_ench.incompatible
+                        and table.indexof(rand_ench.incompatible, value.id) ~= -1
+                    then
+                        table.remove(possible_enchantments, idx)
+                    end
+                end
 
                 -- With probability (`final_level` + 1) / 50, keep going. Otherwise, stop picking bonus enchantments.
                 local rand_probability = math.random()
@@ -701,6 +853,39 @@ function XEnchanting.get_enchantment_data(self, player, nr_of_bookshelfs, tool_d
     return data
 end
 
+local function get_hotbar_bg(x, y)
+    local out = ''
+
+    for i = 0, 7, 1 do
+        out = out .. 'image[' .. x + i .. ',' .. y .. ';1,1;x_enchanting_gui_hb_bg.png]'
+    end
+
+    return out
+end
+
+local function get_list_bg(x, y)
+    local out = ''
+
+    for row = 0, 2, 1 do
+        for i = 0, 7, 1 do
+            out = out .. 'image[' .. x + i .. ',' .. y + row .. ';1,1;x_enchanting_gui_slot_bg.png]'
+        end
+    end
+
+    return out
+end
+
+local function get_formspec_bg(player_name)
+    local info = minetest.get_player_information(player_name)
+    local bg = 'background[5,5;1,1;x_enchanting_gui_formbg.png;true]'
+
+    if info.formspec_version > 1 then
+        bg = 'background9[5,5;1,1;x_enchanting_gui_formbg.png;true;10]'
+    end
+
+    return bg
+end
+
 function XEnchanting.get_formspec(self, pos, player_name, data)
     local spos = pos.x .. ',' .. pos.y .. ',' .. pos.z
     local inv = minetest.get_meta(pos):get_inventory()
@@ -712,21 +897,29 @@ function XEnchanting.get_formspec(self, pos, player_name, data)
 
     local formspec = {
         'size[8,9]',
+        'bgcolor[#080808BB;true]',
+        'listcolors[#FFFFFF00;#FFFFFF1A;#FFFFFF00;#30434C;#FFF]',
+        get_formspec_bg(player_name),
+        'style_type[label;font=mono,bold]',
+        'style[slot_1,slot_2,slot_3;font=mono,bold;textcolor=#4D413A]',
         'label[0, 0;' .. S('Enchant') .. ']',
+        -- item
         'list[nodemeta:' .. spos .. ';item;0, 2.5;1, 1;]',
-        'image[1,2.5;1,1;x_enchanting_trade_slot.png;]',
+        'image[0, 2.5;1,1;x_enchanting_gui_cloth_bg.png]',
+        -- trade
         'list[nodemeta:' .. spos .. ';trade;1, 2.5;1, 1;]',
+        'image[1, 2.5;1,1;x_enchanting_gui_cloth_trade_bg.png]',
+        -- inventories
         'list[current_player;main;0, 4.85;8, 1;]',
         'list[current_player;main;0, 6.08;8, 3;8]',
         'listring[nodemeta:' .. spos .. ';trade]',
         'listring[current_player;main]',
         'listring[nodemeta:' .. spos .. ';item]',
-        'listring[current_player;main]'
+        'listring[current_player;main]',
     }
 
-    if default then
-        formspec[#formspec + 1] = default.get_hotbar_bg(0, 4.85)
-    end
+    formspec[#formspec + 1] = get_hotbar_bg(0, 4.85)
+    formspec[#formspec + 1] = get_list_bg(0, 6.08)
 
     -- data
     if data then
@@ -736,17 +929,17 @@ function XEnchanting.get_formspec(self, pos, player_name, data)
 
                 if inv:get_stack('trade', 1):get_count() >= i then
                     ---@diagnostic disable-next-line: codestyle-check
-                    formspec[#formspec + 1] = 'image_button[2.5,' .. -0.5 + i .. ';5,1;x_enchanting_image_button.png;slot_' .. i .. ';' .. slot.descriptions.enchantments_desc_masked .. '    ' .. minetest.colorize('#FFFF00', S('level') .. ': ' .. slot.level) .. ']'
+                    formspec[#formspec + 1] = 'image_button[3.125,' .. -0.5 + i .. ';5.125,1;x_enchanting_image_button.png;slot_' .. i .. ';' .. slot.descriptions.enchantments_desc_masked .. minetest.formspec_escape(' [' .. slot.level .. ']') .. ']'
                 else
                     ---@diagnostic disable-next-line: codestyle-check
-                    formspec[#formspec + 1] = 'image_button[2.5,' .. -0.5 + i .. ';5,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';' .. slot.descriptions.enchantments_desc_masked .. '    ' .. minetest.colorize('#FFFF00', S('level') .. ': ' .. slot.level) .. ']'
+                    formspec[#formspec + 1] = 'image_button[3.125,' .. -0.5 + i .. ';5.125,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';' .. slot.descriptions.enchantments_desc_masked .. minetest.formspec_escape(' [' .. slot.level .. ']') .. ']'
                 end
 
-                formspec[#formspec + 1] = 'image[2.5,' .. -0.5 + i .. ';1,1;x_enchanting_image_trade_' .. i .. '.png;]'
+                formspec[#formspec + 1] = 'image[2.3,' .. -0.5 + i .. ';1,1;x_enchanting_image_trade_' .. i .. '.png;]'
             else
                 -- disabled buttons
                 ---@diagnostic disable-next-line: codestyle-check
-                formspec[#formspec + 1] = 'image_button[2.5,' .. -0.5 + i .. ';5,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';]'
+                formspec[#formspec + 1] = 'image_button[3.125,' .. -0.5 + i .. ';5.125,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';]'
             end
         end
 
@@ -755,7 +948,7 @@ function XEnchanting.get_formspec(self, pos, player_name, data)
         for i = 1, 3, 1 do
             -- disabled buttons
             ---@diagnostic disable-next-line: codestyle-check
-            formspec[#formspec + 1] = 'image_button[2.5,' .. -0.5 + i .. ';5,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';]'
+            formspec[#formspec + 1] = 'image_button[3.125,' .. -0.5 + i .. ';5.125,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';]'
         end
 
         model_scroll_is_open = false

bitbucket-pipelines.yml

@@ -31,36 +31,6 @@ pipelines:
                     script:
                         - nvm use v17.2.0
                         - npm run lua-diagnostics
-    branches:
-        master:
-            - step:
-                name: Install Node Dependencies
-                caches:
-                    - node-modules
-                    - npm
-                    - nvm
-                script:
-                    - nvm install v17.2.0
-                    - npm i -g npm@8
-                    - npm ci
-            - parallel:
-                - step:
-                    name: Lua Check
-                    script:
-                        - apt-get update
-                        - apt-get -y install lua5.1
-                        - apt-get -y install luarocks
-                        - luarocks install luacheck
-                        - luacheck .
-                - step:
-                    name: Lua Diagnostics
-                    caches:
-                        - node-modules
-                        - npm
-                        - nvm
-                    script:
-                        - nvm use v17.2.0
-                        - npm run lua-diagnostics
     tags:
         "*":
             - step:
@@ -73,24 +43,24 @@ pipelines:
                     - nvm install v17.2.0
                     - npm i -g npm@8
                     - npm ci
-            - parallel:
-                - step:
-                    name: Lua Check
-                    script:
-                        - apt-get update
-                        - apt-get -y install lua5.1
-                        - apt-get -y install luarocks
-                        - luarocks install luacheck
-                        - luacheck .
-                - step:
-                    name: Lua Diagnostics
-                    caches:
-                        - node-modules
-                        - npm
-                        - nvm
-                    script:
-                        - nvm use v17.2.0
-                        - npm run lua-diagnostics
+            # - parallel:
+            - step:
+                name: Lua Check
+                script:
+                    - apt-get update
+                    - apt-get -y install lua5.1
+                    - apt-get -y install luarocks
+                    - luarocks install luacheck
+                    - luacheck .
+                # - step:
+                #     name: Lua Diagnostics
+                #     caches:
+                #         - node-modules
+                #         - npm
+                #         - nvm
+                #     script:
+                #         - nvm use v17.2.0
+                #         - npm run lua-diagnostics
             - step:
                 name: Deploy to ContentDB
                 caches:

init.lua

@@ -1,5 +1,20 @@
--- X Enchanting
--- by SaKeL
+--[[
+    X Enchanting. Adds Enchanting Mechanics and API.
+    Copyright (C) 2023 SaKeL <juraj.vajda@gmail.com>
+
+    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 juraj.vajda@gmail.com
+--]]
 
 local path = minetest.get_modpath('x_enchanting')
 local mod_start_time = minetest.get_us_time()
@@ -7,14 +22,156 @@ local mod_start_time = minetest.get_us_time()
 dofile(path .. '/api.lua')
 dofile(path .. '/table.lua')
 
+---Check if string X starts with string Y
+---@param str string
+---@param start string
+---@return boolean
+local function starts_with(str, start)
+    return str:sub(1, #start) == start
+end
+
 minetest.register_on_mods_loaded(function()
+    -- Tools override
     for name, tool_def in pairs(minetest.registered_tools) do
         if XEnchanting:has_tool_group(name) then
             XEnchanting:set_tool_enchantability(tool_def)
         end
     end
+
+    -- Ores override - Fortune
+    for _, def in pairs(minetest.registered_ores) do
+        if not XEnchanting.registered_ores[def.ore] then
+            XEnchanting.registered_ores[def.ore] = true
+        end
+    end
+
+    -- Entities override - Looting
+    for name, def in pairs(minetest.registered_entities) do
+        if starts_with(name, 'mobs_animal:')
+            or starts_with(name, 'mobs_monster:')
+        then
+            if def.on_punch and def.drops then
+                local prev_on_punch = def.on_punch
+
+                ---@param self table
+                ---@param puncher ObjectRef|nil
+                ---@param time_from_last_punch number|integer|nil
+                ---@param tool_capabilities ToolCapabilitiesDef|nil
+                ---@param dir Vector
+                ---@param damage number|integer
+                ---@return boolean|nil
+                def.on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+                    if not self
+                        or not self.object
+                        or not self.object:get_luaentity()
+                        or not puncher
+                        or not tool_capabilities
+                    then
+                        return prev_on_punch(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+                    end
+
+                    local wield_stack = puncher:get_wielded_item()
+                    local wield_stack_meta = wield_stack:get_meta()
+                    local looting = wield_stack_meta:get_float('is_looting')
+
+                    if looting == 0 then
+                        return prev_on_punch(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+                    end
+
+                    local pos = self.object:get_pos()
+
+                    prev_on_punch(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+
+                    if self.health and self.health <= 0 then
+                        local death_by_player = self.cause_of_death
+                            and self.cause_of_death.puncher
+                            and self.cause_of_death.puncher:is_player()
+
+                        if death_by_player and pos then
+                            for _, drop in ipairs(def.drops) do
+                                if math.random(10, 100) / 100 < looting / (looting + 1) then
+                                    local drop_min = drop.min or 0
+                                    local drop_max = drop.max or 0
+                                    local count = math.random(drop_min, drop_max)
+                                    local stack = ItemStack({
+                                        name = drop.name,
+                                        count = count
+                                    })
+                                    local chance = math.random(1, tool_capabilities.max_drop_level)
+
+                                    stack:set_count(stack:get_count() * chance)
+
+                                    if stack:get_count() > 0 then
+                                        minetest.item_drop(stack, puncher, pos)
+                                    end
+                                end
+                            end
+                        end
+                    end
+                end
+            end
+        elseif starts_with(name, 'animalia:') then
+            if def.death_func and def.drops then
+                local prev_death_func = def.death_func
+
+                ---@param self table
+                def.death_func = function(self)
+                    local puncher = self._puncher
+
+                    if not self
+                        or not self.object
+                        or not self.object:get_luaentity()
+                        or not puncher
+                        or not puncher:is_player()
+                        or self._looting_dropped
+                    then
+                        return prev_death_func(self)
+                    end
+
+                    local wield_stack = puncher:get_wielded_item()
+                    local wield_stack_meta = wield_stack:get_meta()
+                    local looting = wield_stack_meta:get_float('is_looting')
+
+                    if looting == 0 then
+                        return prev_death_func(self)
+                    end
+
+                    local pos = self.object:get_pos()
+
+                    prev_death_func(self)
+
+                    local death_by_player = puncher and puncher:is_player()
+
+                    if death_by_player and pos then
+                        local tool_capabilities = wield_stack:get_tool_capabilities()
+                        self._looting_dropped = true
+
+                        for _, drop in ipairs(def.drops) do
+                            if math.random(10, 100) / 100 < looting / (looting + 1) then
+                                local drop_min = drop.min or 0
+                                local drop_max = drop.max or 0
+                                local count = math.random(drop_min, drop_max)
+                                local stack = ItemStack({
+                                    name = drop.name,
+                                    count = count
+                                })
+                                local chance = math.random(1, tool_capabilities.max_drop_level)
+
+                                stack:set_count(stack:get_count() * chance)
+
+                                if stack:get_count() > 0 then
+                                    minetest.item_drop(stack, puncher, pos)
+                                end
+                            end
+                        end
+                    end
+                end
+            end
+        end
+    end
 end)
 
+---@diagnostic disable-next-line: unused-local
 minetest.register_on_joinplayer(function(player, last_login)
     XEnchanting.form_context[player:get_player_name()] = nil
 
@@ -23,11 +180,11 @@ minetest.register_on_joinplayer(function(player, last_login)
     end
 end)
 
+---@diagnostic disable-next-line: unused-local
 minetest.register_on_leaveplayer(function(player, timed_out)
     XEnchanting.form_context[player:get_player_name()] = nil
 end)
 
--- Silk Touch
 local old_handle_node_drops = minetest.handle_node_drops
 
 function minetest.handle_node_drops(pos, drops, digger)
@@ -37,29 +194,64 @@ function minetest.handle_node_drops(pos, drops, digger)
         return old_handle_node_drops(pos, drops, digger)
     end
 
+    local node = minetest.get_node(pos)
     local wield_stack = digger:get_wielded_item()
     local wield_stack_meta = wield_stack:get_meta()
 
-    if wield_stack_meta:get_float('is_silk_touch') == 0 then
+    -- Fortune
+    local fortune = wield_stack_meta:get_float('is_fortune')
+
+    if fortune > 0 then
+        local new_drops = {}
+
+        for _, itemstring in ipairs(drops) do
+            if XEnchanting.registered_ores[node.name]
+                or minetest.get_item_group(node.name, 'stone') > 0
+                or minetest.get_item_group(node.name, 'soil') > 0
+                or minetest.get_item_group(node.name, 'sand') > 0
+                or minetest.get_item_group(node.name, 'snowy') > 0
+                or minetest.get_item_group(node.name, 'slippery') > 0
+                or minetest.get_item_group(node.name, 'tree') > 0
+                or minetest.get_item_group(node.name, 'leaves') > 0
+            then
+                local tool_capabilities = wield_stack:get_tool_capabilities()
+                local stack = ItemStack(itemstring)
+                local chance = math.random(1, tool_capabilities.max_drop_level)
+
+                stack:set_count(stack:get_count() * chance)
+
+                if stack:get_count() > 0 then
+                    table.insert(new_drops, stack)
+                end
+            end
+        end
+
+        if #new_drops > 0 then
+            return old_handle_node_drops(pos, new_drops, digger)
+        end
+
         return old_handle_node_drops(pos, drops, digger)
     end
 
-    local node = minetest.get_node(pos)
+    -- Silk Touch
+    local silk_touch = wield_stack_meta:get_float('is_silk_touch')
 
-    if minetest.get_item_group(node.name, 'no_silktouch') == 1 then
-        return old_handle_node_drops(pos, drops, digger)
+    if silk_touch > 0
+        and minetest.get_item_group(node.name, 'no_silktouch') == 0
+    then
+        -- drop raw item/node
+        return old_handle_node_drops(pos, { ItemStack(node.name) }, digger)
     end
 
-    -- drop raw item/node
-    return old_handle_node_drops(pos, { ItemStack(node.name) }, digger)
+    return old_handle_node_drops(pos, drops, digger)
 end
 
+---@diagnostic disable-next-line: unused-local
 minetest.register_on_player_hpchange(function(player, hp_change, reason)
+    -- Curse of Vanishing
     if (player:get_hp() + hp_change) <= 0 then
         -- Going to die
         local player_inv = player:get_inventory() --[[@as InvRef]]
-
-        -- Curse of Vanishing
         local player_inventory_lists = { 'main', 'craft' }
 
         for _, list_name in ipairs(player_inventory_lists) do
@@ -72,8 +264,6 @@ minetest.register_on_player_hpchange(function(player, hp_change, reason)
                         player_inv:set_stack(list_name, i, ItemStack(''))
                     end
                 end
-
-                player_inv:set_list(list_name, {})
             end
         end
     end

locale/template.txt

@@ -1,14 +1,17 @@
 # textdomain: x_enchanting
 Sharpness=
+Looting=
 Fortune=
 Unbreaking=
 Efficiency=
 Silk Touch=
 Curse of Vanishing=
 Knockback=
+Power=
+Punch=
+Infinity=
 Enchanted=
 Enchant=
-level=
 Enchanting Table=
 owned by=
 Scroll of Enchantments=

locale/x_enchanting.sk.tr

@@ -1,14 +1,17 @@
 # textdomain: x_enchanting
 Sharpness=Ostrosť
+Looting=
 Fortune=Šťastie
 Unbreaking=Nelámavosť
 Efficiency=Výkonnosť
 Silk Touch=Hodvábny dotyk
 Curse of Vanishing=Kliatba zmiznutia
 Knockback=Spätný úder
+Power=
+Punch=
+Infinity=
 Enchanted=Očarený
 Enchant=Očarovať
-level=level
 Enchanting Table=Čarovný stôl
 owned by=vlastník
 Scroll of Enchantments=Čarovný Zvitok

mod.conf

@@ -1,6 +1,6 @@
 name = x_enchanting
 description = Adds Enchanting Mechanics and API.
 depends =
-optional_depends = xdecor
+optional_depends = xdecor, item_drop
 supported_games = minetest_game
 min_minetest_version = 5.4

scripts/deploy.js

@@ -1,3 +1,21 @@
+/**
+ * Deploy code to CDB
+ * Copyright (C) 2023 SaKeL <juraj.vajda@gmail.com>
+ *
+ * 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 juraj.vajda@gmail.com
+ */
+
 import fetch from 'node-fetch'
 import yargs from 'yargs/yargs'
 import {hideBin} from 'yargs/helpers'

scripts/lls-check.js

@@ -1,3 +1,21 @@
+/**
+ * Run LUA diagnostics in continuous integration
+ * Copyright (C) 2023 SaKeL <juraj.vajda@gmail.com>
+ *
+ * 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 juraj.vajda@gmail.com
+ */
+
 import * as path from 'node:path'
 import * as fs from 'node:fs'
 import {exec} from 'node:child_process'

table.lua

@@ -1,3 +1,22 @@
+--[[
+    X Enchanting. Adds Enchanting Mechanics and API.
+    Copyright (C) 2023 SaKeL <juraj.vajda@gmail.com>
+
+    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 juraj.vajda@gmail.com
+--]]
+
+---@diagnostic disable-next-line
 screwdriver = minetest.global_exists('screwdriver') and screwdriver --[[@as MtgScrewdriver]]
 
 local S = minetest.get_translator(minetest.get_current_modname())
@@ -12,6 +31,7 @@ minetest.register_node('x_enchanting:table', {
     drawtype = 'mesh',
     mesh = 'x_enchanting_table.obj',
     tiles = { 'x_enchanting_table.png' },
+    use_texture_alpha = 'clip',
     paramtype = 'light',
     paramtype2 = 'facedir',
     walkable = true,
@@ -59,6 +79,7 @@ minetest.register_node('x_enchanting:table', {
     ---@param placer ObjectRef | nil
     ---@param itemstack ItemStack
     ---@param pointed_thing PointedThingDef
+    ---@diagnostic disable-next-line: unused-local
     after_place_node = function(pos, placer, itemstack, pointed_thing)
         local meta = minetest.get_meta(pos)
 
@@ -79,6 +100,7 @@ minetest.register_node('x_enchanting:table', {
     ---@param clicker ObjectRef
     ---@param itemstack ItemStack
     ---@param pointed_thing? PointedThingDef
+    ---@diagnostic disable-next-line: unused-local
     on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
         local meta = minetest.get_meta(pos)
         local p_name = clicker:get_player_name()
@@ -123,6 +145,7 @@ minetest.register_node('x_enchanting:table', {
     ---@param pos Vector
     ---@param intensity? number
     ---@return table | nil
+    ---@diagnostic disable-next-line: unused-local
     on_blast = function(pos, intensity)
         if minetest.is_protected(pos, '') then
             return
@@ -159,11 +182,13 @@ minetest.register_node('x_enchanting:table', {
             and inv:is_empty('trade')
             and not minetest.is_protected(pos, player:get_player_name())
     end,
+    ---@diagnostic disable-next-line: unused-local
     on_rotate = function(pos, node, user, mode, new_param2)
         return false
     end,
     ---@param pos Vector
     ---@param elapsed number
+    ---@diagnostic disable-next-line: unused-local
     on_timer = function(pos, elapsed)
         -- entity
         local table_scroll = minetest.get_objects_inside_radius(pos, 0.9)
@@ -234,6 +259,7 @@ minetest.register_node('x_enchanting:table', {
         end
 
         -- symbol particles
+        ---@diagnostic disable-next-line: unused-local
         for i = 1, 10, 1 do
             local pos_random = bookshelfs[math.random(1, #bookshelfs)]
             local x = pos.x - pos_random.x
@@ -275,6 +301,7 @@ minetest.register_node('x_enchanting:table', {
     ---@param index number
     ---@param stack ItemStack
     ---@param player ObjectRef
+    ---@diagnostic disable-next-line: unused-local
     allow_metadata_inventory_put = function(pos, listname, index, stack, player)
         local st_meta = stack:get_meta()
         local st_name = stack:get_name()
@@ -302,6 +329,7 @@ minetest.register_node('x_enchanting:table', {
     ---@param index number
     ---@param stack ItemStack
     ---@param player ObjectRef
+    ---@diagnostic disable-next-line: unused-local
     allow_metadata_inventory_take = function(pos, listname, index, stack, player)
         local st_name = stack:get_name()
 
@@ -325,6 +353,7 @@ minetest.register_node('x_enchanting:table', {
     ---@param to_index number
     ---@param count number
     ---@param player ObjectRef
+    ---@diagnostic disable-next-line: unused-local
     allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
         return 0
     end,
@@ -333,12 +362,16 @@ minetest.register_node('x_enchanting:table', {
     ---@param index number
     ---@param stack ItemStack
     ---@param player ObjectRef
+    ---@diagnostic disable-next-line: unused-local
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
         local meta = minetest.get_meta(pos)
         local p_name = player:get_player_name()
         local inv = meta:get_inventory()
+        local item_stack = inv:get_stack('item', 1)
+        local item_stack_meta = item_stack:get_meta()
+        local is_enchanted = item_stack_meta:get_int('is_enchanted')
 
-        if not inv:is_empty('item') then
+        if not inv:is_empty('item') and is_enchanted == 0 then
             -- bookshelfs
             local bookshelfs = minetest.find_nodes_in_area(
                 { x = pos.x - 2, y = pos.y, z = pos.z - 2 },
@@ -346,7 +379,6 @@ minetest.register_node('x_enchanting:table', {
                 { 'default:bookshelf', 'group:bookshelf' }
             )
 
-            local item_stack = inv:get_stack('item', 1)
             local data = XEnchanting:get_enchantment_data(
                 player,
                 #bookshelfs,
@@ -366,12 +398,16 @@ minetest.register_node('x_enchanting:table', {
     ---@param index number
     ---@param stack ItemStack
     ---@param player ObjectRef
+    ---@diagnostic disable-next-line: unused-local
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
         local meta = minetest.get_meta(pos)
         local p_name = player:get_player_name()
         local inv = meta:get_inventory()
+        local item_stack = inv:get_stack('item', 1)
+        local item_stack_meta = item_stack:get_meta()
+        local is_enchanted = item_stack_meta:get_int('is_enchanted')
 
-        if not inv:is_empty('item') then
+        if not inv:is_empty('item') and is_enchanted == 0 then
             -- bookshelfs
             local bookshelfs = minetest.find_nodes_in_area(
                 { x = pos.x - 2, y = pos.y, z = pos.z - 2 },
@@ -379,7 +415,6 @@ minetest.register_node('x_enchanting:table', {
                 { 'default:bookshelf', 'group:bookshelf' }
             )
 
-            local item_stack = inv:get_stack('item', 1)
             local data = XEnchanting:get_enchantment_data(
                 player,
                 #bookshelfs,
@@ -399,6 +434,7 @@ minetest.register_node('x_enchanting:table', {
     ---@param formname string
     ---@param fields table
     ---@param sender ObjectRef
+    ---@diagnostic disable-next-line: unused-local
     on_receive_fields = function(pos, formname, fields, sender)
         local p_name = sender:get_player_name()
 
@@ -477,12 +513,14 @@ minetest.register_entity('x_enchanting:table_scroll', {
     },
     ---@param self table
     ---@param killer ObjectRef
+    ---@diagnostic disable-next-line: unused-local
     on_death = function(self, killer)
         self.object:remove()
     end,
     ---@param self table
     ---@param staticdata StringAbstract
     ---@param dtime_s number
+    ---@diagnostic disable-next-line: unused-local
     on_activate = function(self, staticdata, dtime_s)
         self._scroll_closed = true
         self._tablechecktimer = 5
@@ -496,6 +534,7 @@ minetest.register_entity('x_enchanting:table_scroll', {
     ---@param self table
     ---@param dtime number
     ---@param moveresult? table
+    ---@diagnostic disable-next-line: unused-local
     on_step = function(self, dtime, moveresult)
         local pos = self.object:get_pos()
 
@@ -524,6 +563,7 @@ minetest.register_entity('x_enchanting:table_scroll', {
             local found_player = false
 
             if #objects > 0 then
+                ---@diagnostic disable-next-line: unused-local
                 for i, obj in ipairs(objects) do
                     if obj:is_player() and obj:get_pos() then
                         -- player
@@ -531,6 +571,7 @@ minetest.register_entity('x_enchanting:table_scroll', {
                         local distance = vector.distance(pos, obj:get_pos())
 
                         if distance < shortest_distance then
+                            shortest_distance = distance
                             self._player = obj
                         end
                     end
@@ -584,6 +625,7 @@ minetest.register_entity('x_enchanting:table_scroll', {
     ---@param dir Vector
     ---@param damage number
     ---@return boolean | nil
+    ---@diagnostic disable-next-line: unused-local
     on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
         return true
     end

types/entity.type.lua

@@ -14,3 +14,4 @@
 ---@field on_detach_child fun(self: table, child: ObjectRef): nil Function receive a "luaentity" table as `self`. `child`: an `ObjectRef` of the child that detaches
 ---@field on_detach fun(self: table, parent: ObjectRef|nil): nil Function receive a "luaentity" table as `self`. `parent`: an `ObjectRef` (can be `nil`) from where it got detached. This happens before the parent object is removed from the world.
 ---@field get_staticdata fun(self: table) Function receive a "luaentity" table as `self`. Should return a string that will be passed to `on_activate` when the object is instantiated the next time.
+---@field drops table Custom for mob drops

types/minetest.type.lua

@@ -15,6 +15,8 @@
 ---@field add_entity fun(pos: Vector, name: string, staticdata?: string): ObjectRef|nil  Spawn Lua-defined entity at position. Returns `ObjectRef`, or `nil` if failed.
 ---@field get_node fun(pos: Vector): NodeDef Returns the node at the given position as table in the format `{name="node_name", param1=0, param2=0}`, returns `{name="ignore", param1=0, param2=0}` for unloaded areas.
 ---@field registered_nodes table<string, NodeDef|ItemDef> Map of registered node definitions, indexed by name
+---@field registered_ores table<string, table> Map of registered ore definitions, indexed by name
+---@field registered_craftitems table<string, table> Map of registered craft items, indexed by name
 ---@field after fun(time: number|integer, func: fun(...), ...): JobTable Call the function `func` after `time` seconds, may be fractional. Optional: Variable number of arguments that are passed to `func`.
 ---@field sound_play fun(spec: SimpleSoundSpec|string, parameters: SoundParamDef, ephemeral?: boolean): any Returns a `handle`. Ephemeral sounds will not return a handle and can't be stopped or faded. It is recommend to use this for short sounds that happen in response to player actions (e.g. door closing).
 ---@field add_particlespawner fun(particlespawner_definition: ParticlespawnerDef): number|integer Add a `ParticleSpawner`, an object that spawns an amount of particles over `time` seconds. Returns an `id`, and -1 if adding didn't succeed.
@@ -87,11 +89,12 @@
 ---@field place_node fun(pos: Vector, node: SetNodeTable): nil Place node with the same effects that a player would cause
 ---@field add_particle fun(def: ParticleDef): nil
 ---@field registered_tools table<string, ItemDef> Map of registered tool definitions, indexed by name
----@field registered_entities table<string, ObjectRef> Map of registered entity definitions, indexed by name
+---@field registered_entities table<string, EntityDef> Map of registered entity definitions, indexed by name
 ---@field has_feature fun(args: table<string, boolean> | string): boolean | table returns `boolean, missing_features`, `arg`: string or table in format `{foo=true, bar=true}`, `missing_features`: `{foo=true, bar=true}`
 ---@field handle_node_drops fun(pos: Vector, drops: string[], digger: ObjectRef) `drops`: list of itemstrings. Handles drops from nodes after digging: Default action is to put them into digger's inventory. Can be overridden to get different functionality (e.g. dropping items on ground)
 ---@field register_on_dieplayer fun(func: fun(player: ObjectRef, reason?: string)): nil Called when a player dies. `reason`: a PlayerHPChangeReason table, see register_on_player_hpchange
 ---@field register_on_player_hpchange fun(func: fun(player, hp_change, reason), modifier): number Called when the player gets damaged or healed. `player`: ObjectRef of the player. `hp_change`: the amount of change. Negative when it is damage.. `reason`: a PlayerHPChangeReason table.. The `type` field will have one of the following values: `set_hp`: A mod or the engine called `set_hp` without giving a type - use this for custom damage types.. `punch`: Was punched. `reason.object` will hold the puncher, or nil if none. `fall`, `node_damage`: `damage_per_second` from a neighbouring node. `reason.node` will hold the node name or nil. `drown` `respawn`. Any of the above types may have additional fields from mods. `reason.from` will be `mod` or `engine`. `modifier`: when true, the function should return the actual `hp_change`. Note: modifiers only get a temporary `hp_change` that can be modified by later modifiers. Modifiers can return true as a second argument to stop the execution of further functions. Non-modifiers receive the final HP change calculated by the modifiers.
+---@field get_player_information fun(player_name: string): table Table containing information about a player
 
 ---Minetest settings
 ---@class MinetestSettings

types/node.type.lua

@@ -27,6 +27,7 @@
 ---@field on_destruct fun(pos: Vector) Node destructor; called before removing node. Not called for bulk node placement. default: nil
 ---@field on_blast fun(pos: Vector, intensity?: number): nil intensity: 1.0 = mid range of regular TNT. If defined, called when an explosion touches the node, instead of removing the node.
 ---@field on_timer fun(pos: Vector, elapsed: number): boolean | nil default: nil, called by NodeTimers, see minetest.get_node_timer and NodeTimerRef. elapsed is the total time passed since the timer was started. return true to run the timer for another cycle with the same timeout value.
+---@field _next_state string Only for x_farming composter
 
 ---Textures of node; +Y, -Y, +X, -X, +Z, -Z. List can be shortened to needed length.
 ---@class NodeTilesDef

types/object.type.lua

@@ -45,6 +45,7 @@
 ---@field get_rotation fun(self: ObjectRef): Vector returns the rotation, a vector (radians)
 ---@field get_attach fun(self: ObjectRef): any Returns parent, bone, position, rotation, forced_visible, or nil if it isn't attached.
 ---@field set_attach fun(self: ObjectRef, parent: ObjectRef, bone?: string, position?: Vector, rotation?: Vector, forced_visible?: boolean): any Returns parent, bone, position, rotation, forced_visible, or nil if it isn't attached.
+---@field drops table Custom for mob drops
 
 ---`ObjectRef` armor groups
 ---@class ObjectRefArmorGroups

types/table.type.lua

@@ -6,3 +6,4 @@
 ---Table helpers
 ---@class TableAbstract
 ---@field copy fun(table: table): table returns a deep copy of `table`
+---@field indexof fun(list: table, value: any): number returns the smallest numerical index containing the value `val` in the table `list`. Non-numerical indices are ignored. If `val` could not be found, `-1` is returned. `list` must not have negative indices.

types/xenchanting.type.lua

@@ -14,6 +14,8 @@
 ---@field form_context table<string, FormContextDef> Additional form data for player.
 ---@field scroll_animations table<string, table> Parameters for `ObjectRef` `set_animation` method
 ---@field player_seeds table<string, number | integer>
+---@field registered_ores table<string, boolean> Table with registered ores, `key` ore name
+---@field settings {["x_enchanting_small_formspec"]: boolean}
 
 
 ---Enchantment definition
@@ -24,6 +26,7 @@
 ---@field weight number Enchantment weight
 ---@field secondary boolean Will not appear in masked description and can be applied only as additional enchantment by probability chance.
 ---@field groups string[] | nil List of groups for items what are compatible with this enchantment. If `nil` then all groups are compatible.
+---@field incompatible string[] | nil List of incompatible enchantments
 
 
 ---Form context
@@ -41,10 +44,11 @@
 ---@field value number Value of the enchantment based on level
 ---@field level number Level of the enchantment
 ---@field secondary boolean | nil Will not appear in masked description and can be applied only as additional enchantment by probability chance.
+---@field incompatible string[] | nil List of incompatible enchantments
 
 
 ---@class EnchantmentDataSlot
 ---@field level number
 ---@field final_enchantments Enchantment[]
----@field tool_cap_data ToolCapabilitiesDef
+---@field tool_cap_data ToolCapabilitiesDef | nil
 ---@field descriptions {["enchantments_desc"]: string, ["enchantments_desc_masked"]: string }