diff --git a/README.md b/README.md index 66b978b..901ec97 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,11 @@ 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 diff --git a/api.lua b/api.lua index 7917231..d52e176 100644 --- a/api.lua +++ b/api.lua @@ -1,5 +1,3 @@ -default = minetest.global_exists('default') and default --[[@as MtgDefault]] - local S = minetest.get_translator(minetest.get_current_modname()) ---@type XEnchanting @@ -743,6 +741,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() @@ -754,21 +785,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 @@ -778,17 +817,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[2.75,' .. -0.5 + i .. ';5,1;x_enchanting_image_button.png;slot_' .. i .. ';' .. slot.descriptions.enchantments_desc_masked .. ' ' .. minetest.colorize('#594E47', S('level') .. ': ' .. 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[2.75,' .. -0.5 + i .. ';5,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';' .. slot.descriptions.enchantments_desc_masked .. ' ' .. minetest.colorize('#594E47', S('level') .. ': ' .. 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.75,' .. -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[2.75,' .. -0.5 + i .. ';5,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';]' end end @@ -797,7 +836,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[2.75,' .. -0.5 + i .. ';5,1;x_enchanting_image_button_disabled.png;slot_' .. i .. ';]' end model_scroll_is_open = false diff --git a/assets/x_enchanting_image_button.xcf b/assets/x_enchanting_image_button.xcf index a328646..7ec1a9d 100644 Binary files a/assets/x_enchanting_image_button.xcf and b/assets/x_enchanting_image_button.xcf differ diff --git a/assets/x_enchanting_image_trade.xcf b/assets/x_enchanting_image_trade.xcf index e86f2ef..f028214 100644 Binary files a/assets/x_enchanting_image_trade.xcf and b/assets/x_enchanting_image_trade.xcf differ diff --git a/init.lua b/init.lua index 762c568..b69a714 100644 --- a/init.lua +++ b/init.lua @@ -23,14 +23,14 @@ minetest.register_on_mods_loaded(function() end end - -- Ores override + -- 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 + -- Entities override - Looting for name, def in pairs(minetest.registered_entities) do if starts_with(name, 'mobs_animal:') or starts_with(name, 'mobs_monster:') diff --git a/screenshot.3.png b/screenshot.3.png index ac8523c..018e0b9 100644 Binary files a/screenshot.3.png and b/screenshot.3.png differ diff --git a/textures/x_enchanting_gui_cloth_bg.png b/textures/x_enchanting_gui_cloth_bg.png new file mode 100644 index 0000000..da790e5 Binary files /dev/null and b/textures/x_enchanting_gui_cloth_bg.png differ diff --git a/textures/x_enchanting_gui_cloth_trade_bg.png b/textures/x_enchanting_gui_cloth_trade_bg.png new file mode 100644 index 0000000..497085d Binary files /dev/null and b/textures/x_enchanting_gui_cloth_trade_bg.png differ diff --git a/textures/x_enchanting_gui_formbg.png b/textures/x_enchanting_gui_formbg.png new file mode 100644 index 0000000..8425cdc Binary files /dev/null and b/textures/x_enchanting_gui_formbg.png differ diff --git a/textures/x_enchanting_gui_hb_bg.png b/textures/x_enchanting_gui_hb_bg.png new file mode 100644 index 0000000..fe90da9 Binary files /dev/null and b/textures/x_enchanting_gui_hb_bg.png differ diff --git a/textures/x_enchanting_gui_slot_bg.png b/textures/x_enchanting_gui_slot_bg.png new file mode 100644 index 0000000..7e5ef50 Binary files /dev/null and b/textures/x_enchanting_gui_slot_bg.png differ diff --git a/textures/x_enchanting_image_button.png b/textures/x_enchanting_image_button.png index dcf3d20..d38a382 100644 Binary files a/textures/x_enchanting_image_button.png and b/textures/x_enchanting_image_button.png differ diff --git a/textures/x_enchanting_image_button_disabled.png b/textures/x_enchanting_image_button_disabled.png index 6f6141f..e19c6cd 100644 Binary files a/textures/x_enchanting_image_button_disabled.png and b/textures/x_enchanting_image_button_disabled.png differ diff --git a/textures/x_enchanting_image_trade_1.png b/textures/x_enchanting_image_trade_1.png index 1c5b702..86e9af8 100644 Binary files a/textures/x_enchanting_image_trade_1.png and b/textures/x_enchanting_image_trade_1.png differ diff --git a/textures/x_enchanting_image_trade_2.png b/textures/x_enchanting_image_trade_2.png index e613a47..4dd340f 100644 Binary files a/textures/x_enchanting_image_trade_2.png and b/textures/x_enchanting_image_trade_2.png differ diff --git a/textures/x_enchanting_image_trade_3.png b/textures/x_enchanting_image_trade_3.png index 5aac4c1..9602159 100644 Binary files a/textures/x_enchanting_image_trade_3.png and b/textures/x_enchanting_image_trade_3.png differ diff --git a/textures/x_enchanting_trade_slot.png b/textures/x_enchanting_trade_slot.png deleted file mode 100644 index 5704169..0000000 Binary files a/textures/x_enchanting_trade_slot.png and /dev/null differ diff --git a/types/minetest.type.lua b/types/minetest.type.lua index 85db7dc..567da2a 100644 --- a/types/minetest.type.lua +++ b/types/minetest.type.lua @@ -93,6 +93,7 @@ ---@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 diff --git a/types/xenchanting.type.lua b/types/xenchanting.type.lua index 0e17593..d544062 100644 --- a/types/xenchanting.type.lua +++ b/types/xenchanting.type.lua @@ -15,6 +15,7 @@ ---@field scroll_animations table Parameters for `ObjectRef` `set_animation` method ---@field player_seeds table ---@field registered_ores table Table with registered ores, `key` ore name +---@field settings {["x_enchanting_small_formspec"]: boolean} ---Enchantment definition