jadedctrl/ minetest-i4
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

Add legacy_inventory setting (disabled by default)

This commit is contained in:
Jean-Patrick Guerrero 2021-12-06 15:16:19 +01:00
parent 382ff397a5
commit cacb9a29fd
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init.lua
View File

@ -9,8 +9,6 @@ end
i3 = { i3 = {
modules = {}, modules = {},
MAX_FAVS = 6, MAX_FAVS = 6,
INV_SIZE = 4*9,
HOTBAR_LEN = 9,
ITEM_BTN_SIZE = 1.1, ITEM_BTN_SIZE = 1.1,
DROP_BAG_ON_DIE = true, DROP_BAG_ON_DIE = true,
MIN_FORMSPEC_VERSION = 4, MIN_FORMSPEC_VERSION = 4,
@ -75,9 +73,13 @@ i3 = {
}, },
progressive_mode = core.settings:get_bool"i3_progressive_mode", progressive_mode = core.settings:get_bool"i3_progressive_mode",
legacy_inventory = core.settings:get_bool"i3_legacy_inventory",
item_compression = core.settings:get_bool("i3_item_compression", true), item_compression = core.settings:get_bool("i3_item_compression", true),
} }
i3.HOTBAR_LEN = i3.legacy_inventory and 8 or 9
i3.INV_SIZE = 4 * i3.HOTBAR_LEN
i3.files.common() i3.files.common()
i3.files.api(http) i3.files.api(http)
i3.files.compress() i3.files.compress()

5
settingtypes.txt
View File

@ -2,4 +2,7 @@
i3_progressive_mode (Learn crafting recipes progressively) bool false i3_progressive_mode (Learn crafting recipes progressively) bool false
# Regroup the items of the same type in the item list. # Regroup the items of the same type in the item list.
i3_item_compression (Regroup items of the same type) bool true i3_item_compression (Regroup items of the same type) bool true
# Set the inventory size to common chests size (8*4).
i3_legacy_inventory (Legacy inventory size) bool false

2
src/common.lua
View File

@ -539,7 +539,7 @@ local function sort_inventory(player, data)
local inv = player:get_inventory() local inv = player:get_inventory()
local list = inv:get_list"main" local list = inv:get_list"main"
local size = inv:get_size"main" local size = inv:get_size"main"
local start_i = data.ignore_hotbar and 10 or 1 local start_i = data.ignore_hotbar and (i3.HOTBAR_LEN + 1) or 1
if true_table(data.drop_items) then if true_table(data.drop_items) then
list = drop_items(player, inv, list, start_i, data.drop_items) list = drop_items(player, inv, list, start_i, data.drop_items)

4
src/gui.lua
View File

@ -122,7 +122,9 @@ local function get_stack_max(inv, data, is_recipe, rcp)
end end
local function get_inv_slots(fs) local function get_inv_slots(fs)
local inv_x, inv_y, size, spacing = 0.22, 6.9, 1, 0.1 local inv_x = i3.legacy_inventory and 0.75 or 0.22
local inv_y = 6.9
local size, spacing = 1, 0.1
fs"style_type[box;colors=#77777710,#77777710,#777,#777]" fs"style_type[box;colors=#77777710,#77777710,#777,#777]"

10
src/hud.lua
View File

@ -34,10 +34,12 @@ local function init_hud(player)
}, },
} }
core.after(0, function() if not i3.legacy_inventory then
player:hud_set_hotbar_itemcount(i3.HOTBAR_LEN) core.after(0, function()
player:hud_set_hotbar_image"i3_hotbar.png" player:hud_set_hotbar_itemcount(i3.HOTBAR_LEN)
end) player:hud_set_hotbar_image"i3_hotbar.png"
end)
end
end end
local function show_hud(player, data) local function show_hud(player, data)