From 5684b5023192c31870ccc4f945dd45334a421698 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 5 Dec 2020 11:46:23 +0100 Subject: [PATCH] updates --- chisel.lua | 36 +++++++++++++----------------------- init.lua | 5 ----- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/chisel.lua b/chisel.lua index 681f60e..d8d8f0e 100644 --- a/chisel.lua +++ b/chisel.lua @@ -6,8 +6,6 @@ chisel.group_style_index = {} chisel.group_style_nodes = {} chisel.player_copied_style = {} - - chisel.register_chiselable = function(node_name, group_name, style) chisel.chiselable[ node_name ] = {} chisel.chiselable[ node_name ].group_name = group_name @@ -20,8 +18,6 @@ chisel.register_chiselable = function(node_name, group_name, style) chisel.group_style_nodes[ group_name ][ style ] = node_name end - - chisel.register_chiselable_stair_and_slab = function(node_subname, group_subname, style) chisel.register_chiselable("stairs:stair_" .. node_subname, "stairs:stair_" .. group_subname, style) chisel.register_chiselable("stairs:stair_inner_" .. node_subname, "stairs:stair_inner_" .. group_subname, style) @@ -29,15 +25,13 @@ chisel.register_chiselable_stair_and_slab = function(node_subname, group_subname chisel.register_chiselable("stairs:slab_" .. node_subname, "stairs:slab_" .. group_subname, style) end - - local function chisel_interact(player, pointed_thing, is_right_click) if pointed_thing.type ~= "node" then return end local pos = pointed_thing.under local is_sneak = player and player:get_player_control().sneak or false local player_name = player and player:get_player_name() - + -- A true player is required if not player_name then return end @@ -56,12 +50,11 @@ local function chisel_interact(player, pointed_thing, is_right_click) minetest.chat_send_player(player_name, "Not chiselable") return end - + local group_name = chisel.chiselable[ node_name ].group_name local style = chisel.chiselable[ node_name ].style local group = chisel.group_style_nodes[ group_name ] local new_style , new_node_name - -- Now branch on the four user-input cases if is_right_click then @@ -77,13 +70,14 @@ local function chisel_interact(player, pointed_thing, is_right_click) minetest.chat_send_player(player_name, "No chisel style copied yet, use sneak + right-click to copy a style") return end - + -- Already the correct style, exit now! if new_style == style then return end - + new_node_name = group[ new_style ] if not new_node_name then - minetest.chat_send_player(player_name, "Chisel style " .. new_style .. " is not supported by this chisel group " .. group_name) + minetest.chat_send_player(player_name, "Chisel style " .. new_style .. + " is not supported by this chisel group " .. group_name) return end end @@ -95,7 +89,7 @@ local function chisel_interact(player, pointed_thing, is_right_click) new_style = k new_node_name = v end - + if new_node_name == nil then -- Not found? Go for the last element for k,v in pairs(group) do @@ -111,16 +105,16 @@ local function chisel_interact(player, pointed_thing, is_right_click) end end end - - + -- Check if rotation could be preserved local nodedef = minetest.registered_nodes[node_name] local new_nodedef = minetest.registered_nodes[new_node_name] local rotation , new_rotation - + if nodedef and new_nodedef then - if ( nodedef.paramtype2 == "facedir" or nodedef.paramtype2 == "colorfacedir" ) and ( new_nodedef.paramtype2 == "facedir" or new_nodedef.paramtype2 == "colorfacedir" ) then - rotation = node.param2 % 32 --rotation are on the last 5 digits + if ( nodedef.paramtype2 == "facedir" or nodedef.paramtype2 == "colorfacedir" ) + and( new_nodedef.paramtype2 == "facedir" or new_nodedef.paramtype2 == "colorfacedir" ) then + rotation = node.param2 % 32 --rotation are on the last 5 digits end end @@ -131,7 +125,7 @@ local function chisel_interact(player, pointed_thing, is_right_click) -- Copy rotation if needed! if rotation ~= nil then new_rotation = new_node.param2 % 32 - + if new_rotation ~= rotation then new_node.param2 = new_node.param2 - new_rotation + rotation minetest.swap_node(pos, new_node) @@ -141,8 +135,6 @@ local function chisel_interact(player, pointed_thing, is_right_click) minetest.sound_play("jonez_carve", {pos = pos, gain = 0.7, max_hear_distance = 5}) end - - --The chisel to carve the marble minetest.register_craftitem("jonez:chisel", { description = S("Chisel for Marble"), @@ -158,8 +150,6 @@ minetest.register_craftitem("jonez:chisel", { end, }) - - minetest.register_craft({ type = "shaped", output = "jonez:chisel", diff --git a/init.lua b/init.lua index 57540be..0566736 100644 --- a/init.lua +++ b/init.lua @@ -132,8 +132,6 @@ local styles = { "corinthian" } - - -- The Crafting of the Greek Set minetest.register_craft({ @@ -176,8 +174,6 @@ minetest.register_craft({ }, }) - - for i = 1, #styles do chisel.register_chiselable("jonez:"..styles[i].."_architrave", "jonez:architrave", styles[i] ) @@ -452,7 +448,6 @@ minetest.register_node("jonez:versailles_pavement", { sounds = default.node_sound_stone_defaults(), }) - minetest.register_craft({ output = 'jonez:versailles_pavement', type = "shaped",