forked from MineClone5/MineClone5
Fixes problem where pillar like nodes could not be placed on
nodes that had the "on_rightclick" attribute. Merge remote-tracking branch 'mcl2/rotate_fix' into rotate-fix
This commit is contained in:
commit
49201116e8
Binary file not shown.
BIN
menu/icon.png
BIN
menu/icon.png
Binary file not shown.
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 547 KiB |
Binary file not shown.
After Width: | Height: | Size: 419 KiB |
|
@ -22,100 +22,14 @@ function table.update_nil(t, ...)
|
||||||
return t
|
return t
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Based on minetest.rotate_and_place
|
-- Creates a function that calls to the minetest
|
||||||
|
-- function minetest_rotate_and_place. It rotates
|
||||||
|
-- a block based on where it thinks the player is facing
|
||||||
|
-- at the moment. This is typically called by pillar-like nodes.
|
||||||
|
|
||||||
--[[
|
|
||||||
Attempt to predict the desired orientation of the pillar-like node
|
|
||||||
defined by `itemstack`, and place it accordingly in one of 3 possible
|
|
||||||
orientations (X, Y or Z).
|
|
||||||
|
|
||||||
Stacks are handled normally if the `infinitestacks`
|
|
||||||
field is false or omitted (else, the itemstack is not changed).
|
|
||||||
* `invert_wall`: if `true`, place wall-orientation on the ground and ground-
|
|
||||||
orientation on wall
|
|
||||||
|
|
||||||
This function is a simplified version of minetest.rotate_and_place.
|
|
||||||
The Minetest function is seen as inappropriate because this includes mirror
|
|
||||||
images of possible orientations, causing problems with pillar shadings.
|
|
||||||
]]
|
|
||||||
function mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing, infinitestacks, invert_wall)
|
|
||||||
local unode = minetest.get_node_or_nil(pointed_thing.under)
|
|
||||||
if not unode then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
local undef = minetest.registered_nodes[unode.name]
|
|
||||||
if undef and undef.on_rightclick then
|
|
||||||
undef.on_rightclick(pointed_thing.under, unode, placer,
|
|
||||||
itemstack, pointed_thing)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
|
||||||
local wield_name = itemstack:get_name()
|
|
||||||
|
|
||||||
local above = pointed_thing.above
|
|
||||||
local under = pointed_thing.under
|
|
||||||
local is_x = (above.x ~= under.x)
|
|
||||||
local is_y = (above.y ~= under.y)
|
|
||||||
local is_z = (above.z ~= under.z)
|
|
||||||
|
|
||||||
local anode = minetest.get_node_or_nil(above)
|
|
||||||
if not anode then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
local pos = pointed_thing.above
|
|
||||||
local node = anode
|
|
||||||
|
|
||||||
if undef and undef.buildable_to then
|
|
||||||
pos = pointed_thing.under
|
|
||||||
node = unode
|
|
||||||
end
|
|
||||||
|
|
||||||
if minetest.is_protected(pos, placer:get_player_name()) then
|
|
||||||
minetest.record_protection_violation(pos, placer:get_player_name())
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local ndef = minetest.registered_nodes[node.name]
|
|
||||||
if not ndef or not ndef.buildable_to then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local p2
|
|
||||||
if is_y then
|
|
||||||
if invert_wall then
|
|
||||||
if fdir == 3 or fdir == 1 then
|
|
||||||
p2 = 12
|
|
||||||
else
|
|
||||||
p2 = 6
|
|
||||||
end
|
|
||||||
end
|
|
||||||
elseif is_x then
|
|
||||||
if invert_wall then
|
|
||||||
p2 = 0
|
|
||||||
else
|
|
||||||
p2 = 12
|
|
||||||
end
|
|
||||||
elseif is_z then
|
|
||||||
if invert_wall then
|
|
||||||
p2 = 0
|
|
||||||
else
|
|
||||||
p2 = 6
|
|
||||||
end
|
|
||||||
end
|
|
||||||
minetest.set_node(pos, {name = wield_name, param2 = p2})
|
|
||||||
|
|
||||||
if not infinitestacks then
|
|
||||||
itemstack:take_item()
|
|
||||||
return itemstack
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Wrapper of above function for use as `on_place` callback (Recommended).
|
|
||||||
-- Similar to minetest.rotate_node.
|
|
||||||
function mcl_util.rotate_axis(itemstack, placer, pointed_thing)
|
function mcl_util.rotate_axis(itemstack, placer, pointed_thing)
|
||||||
mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing,
|
minetest.rotate_and_place(itemstack, placer, pointed_thing,
|
||||||
minetest.is_creative_enabled(placer:get_player_name()),
|
minetest.is_creative_enabled(placer:get_player_name()))
|
||||||
placer:get_player_control().sneak)
|
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ if minetest.get_modpath("mcl_armor") then
|
||||||
pumpkin_blur = player:hud_add({
|
pumpkin_blur = player:hud_add({
|
||||||
hud_elem_type = "image",
|
hud_elem_type = "image",
|
||||||
position = {x = 0.5, y = 0.5},
|
position = {x = 0.5, y = 0.5},
|
||||||
scale = {x = -100, y = -100},
|
scale = {x = -101, y = -101},
|
||||||
text = "mcl_farming_pumpkin_hud.png",
|
text = "mcl_farming_pumpkin_hud.png",
|
||||||
z_index = -200
|
z_index = -200
|
||||||
}),
|
}),
|
||||||
|
|
|
@ -175,12 +175,6 @@ minetest.register_globalstep(function(dtime)
|
||||||
and (fly_node == "air" or fly_node == "ignore")
|
and (fly_node == "air" or fly_node == "ignore")
|
||||||
|
|
||||||
if elytra.active then
|
if elytra.active then
|
||||||
if player_velocity.x < (player_velocity_old.x - 10) or player_velocity.x > (player_velocity_old.x + 10) and fly_node ~= "ignore" then
|
|
||||||
mcl_util.deal_damage(player, math.abs(player_velocity_old.x) * 0.2, {type = "fly_into_wall"})
|
|
||||||
end
|
|
||||||
if player_velocity.z < (player_velocity_old.z - 10) or player_velocity.z > (player_velocity_old.z + 10) and fly_node ~= "ignore" then
|
|
||||||
mcl_util.deal_damage(player, math.abs(player_velocity_old.z) * 0.2, {type = "fly_into_wall"})
|
|
||||||
end
|
|
||||||
mcl_player.player_set_animation(player, "fly")
|
mcl_player.player_set_animation(player, "fly")
|
||||||
if player_velocity.y < -1.5 then
|
if player_velocity.y < -1.5 then
|
||||||
player:add_velocity({x=0, y=0.17, z=0})
|
player:add_velocity({x=0, y=0.17, z=0})
|
||||||
|
|
Loading…
Reference in New Issue