e
/
Mineclonia
forked from Mineclonia/Mineclonia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

items/mcl_banners: make previews items compatible with side preview 

The newly-added preview items (#40) didn't play nice with the side
preview image, mostly because the "layers" metadata wasn't generated,
and they didn't record the base color of the actual banner being crafted.

This commit re-adds that (and other) metadata.
This commit is contained in:
E 2021-05-02 00:00:14 -04:00
parent 164b65a2ca
commit 32172676f3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ITEMS/mcl_banners/init.lua
View File

@ -178,7 +178,7 @@ function mcl_banners.get_overlay(istk)
if not layers_raw or layers_raw == "" then if not layers_raw or layers_raw == "" then
return return
end end
local basec = istk:get_definition()._base_color local basec = imeta:get("fake_base") or istk:get_definition()._base_color
if not basec then if not basec then
basec="unicolor_white" basec="unicolor_white"
end end

12
mods/ITEMS/mcl_banners/patterncraft.lua
View File

@ -485,11 +485,12 @@ local banner_pattern_craft = function(itemstack, player, old_craft_grid, craft_i
local imeta = itemstack:get_meta() local imeta = itemstack:get_meta()
imeta:set_string("layers", minetest.serialize(layers)) imeta:set_string("layers", minetest.serialize(layers))
local idef=itemstack:get_definition()
local mname = ometa:get_string("name") local mname = ometa:get_string("name")
-- Only change description if banner does not have a name -- Only change description if banner does not have a name
if mname == "" then if mname == "" then
local odesc = itemstack:get_definition().description local odesc = idef.description
local description = mcl_banners.make_advanced_banner_description(odesc, layers) local description = mcl_banners.make_advanced_banner_description(odesc, layers)
imeta:set_string("description", description) imeta:set_string("description", description)
else else
@ -500,10 +501,13 @@ local banner_pattern_craft = function(itemstack, player, old_craft_grid, craft_i
if craft_predict then if craft_predict then
local itemid_prefix = "mcl_banners:banner_preview" local itemid_prefix = "mcl_banners:banner_preview"
local coloritemid = dye_to_itemid_mapping[dye] local coloritemid = dye_to_itemid_mapping[dye]
return ItemStack(itemid_prefix .. "_" .. matching_pattern .. "_" .. coloritemid) local is=ItemStack(itemid_prefix .. "_" .. matching_pattern .. "_" .. coloritemid)
else local im=is:get_meta()
return itemstack im:from_table(imeta:to_table())
im:set_string("fake_base", idef._base_color)
return is
end end
return itemstack
end end
minetest.register_craft_predict(function(itemstack, player, old_craft_grid, craft_inv) minetest.register_craft_predict(function(itemstack, player, old_craft_grid, craft_inv)