Mirrorlandia_minetest/unifieddyes
1
0
Fork 0
mirror of https://github.com/mt-mods/unifieddyes.git synced 2024-11-22 15:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Revert "workaround for engine bug in crafting, placing, digging items with a palette index of 0"

Browse Source 
This reverts commit eb5610fc104be6774298c48639feff92cb146884.
This commit is contained in:
OgelGames 2022-05-07 16:45:41 +10:00
parent c079888023
commit 2af4f1fb98
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
api.lua
View File

@ -21,11 +21,14 @@ minetest.register_on_placenode(
return false return false
end end
local param2
if not string.find(itemstack:to_string(), "palette_index") then if not string.find(itemstack:to_string(), "palette_index") then
local param2
local color = 0
if def.palette == "unifieddyes_palette_extended.png" if def.palette == "unifieddyes_palette_extended.png"
and def.paramtype2 == "color" then and def.paramtype2 == "color" then
param2 = 240 param2 = 240
color = 240
elseif def.palette == "unifieddyes_palette_colorwallmounted.png" elseif def.palette == "unifieddyes_palette_colorwallmounted.png"
and def.paramtype2 == "colorwallmounted" then and def.paramtype2 == "colorwallmounted" then
param2 = newnode.param2 % 8 param2 = newnode.param2 % 8
@ -36,21 +39,17 @@ minetest.register_on_placenode(
if param2 then if param2 then
minetest.swap_node(pos, {name = newnode.name, param2 = param2}) minetest.swap_node(pos, {name = newnode.name, param2 = param2})
minetest.get_meta(pos):set_int("palette_index", color)
end end
end end
if def.palette ~= "" then
minetest.get_meta(pos):set_int("palette_index", param2 or 240)
end
end end
) )
-- The complementary function: strip-off the color if the node being dug is still white/neutral -- The complementary function: strip-off the color if the node being dug is still white/neutral
local function move_item(item, pos, inv, digger, fix_color) local function move_item(item, pos, inv, digger)
if not (digger and digger:is_player()) then return end if not (digger and digger:is_player()) then return end
local creative = minetest.is_creative_enabled(digger:get_player_name()) local creative = minetest.is_creative_enabled(digger:get_player_name())
item = unifieddyes.fix_bad_color_info(item, fix_color)
if inv:room_for_item("main", item) if inv:room_for_item("main", item)
and (not creative or not inv:contains_item("main", item, true)) then and (not creative or not inv:contains_item("main", item, true)) then
inv:add_item("main", item) inv:add_item("main", item)
@ -70,23 +69,22 @@ function unifieddyes.on_dig(pos, node, digger)
local oldparam2 = minetest.get_node(pos).param2 local oldparam2 = minetest.get_node(pos).param2
local def = minetest.registered_items[node.name] local def = minetest.registered_items[node.name]
local fix_color local del_color
if def.paramtype2 == "color" and oldparam2 == 240 and def.palette == "unifieddyes_palette_extended.png" then if def.paramtype2 == "color" and oldparam2 == 240 and def.palette == "unifieddyes_palette_extended.png" then
fix_color = 240 del_color = true
elseif def.paramtype2 == "color" and oldparam2 == 0 and def.palette == "unifieddyes_palette_extended.png" then
fix_color = 0
elseif def.paramtype2 == "colorwallmounted" and math.floor(oldparam2 / 8) == 0 elseif def.paramtype2 == "colorwallmounted" and math.floor(oldparam2 / 8) == 0
and def.palette == "unifieddyes_palette_colorwallmounted.png" then and def.palette == "unifieddyes_palette_colorwallmounted.png" then
fix_color = 0 del_color = true
elseif def.paramtype2 == "colorfacedir" and math.floor(oldparam2 / 32) == 0 elseif def.paramtype2 == "colorfacedir" and math.floor(oldparam2 / 32) == 0
and string.find(def.palette, "unifieddyes_palette_") then and string.find(def.palette, "unifieddyes_palette_") then
fix_color = 0 del_color = true
end end
local inv = digger:get_inventory() local inv = digger:get_inventory()
if fix_color then
move_item(node.name, pos, inv, digger, fix_color) if del_color then
move_item(node.name, pos, inv, digger)
else else
return minetest.node_dig(pos, node, digger) return minetest.node_dig(pos, node, digger)
end end
@ -132,14 +130,11 @@ end
-- This helper function creates a colored itemstack -- This helper function creates a colored itemstack
function unifieddyes.fix_bad_color_info(item, paletteidx)
local stack=minetest.itemstring_with_color(item, paletteidx)
return string.gsub(stack, "u0001color", "u0001palette_index")
end
function unifieddyes.make_colored_itemstack(item, palette, color) function unifieddyes.make_colored_itemstack(item, palette, color)
local paletteidx = unifieddyes.getpaletteidx(color, palette) local paletteidx = unifieddyes.getpaletteidx(color, palette)
return unifieddyes.fix_bad_color_info(item, paletteidx), paletteidx local stack = ItemStack(item)
stack:get_meta():set_int("palette_index", paletteidx)
return stack:to_string(),paletteidx
end end
-- these helper functions register all of the recipes needed to create colored -- these helper functions register all of the recipes needed to create colored