diff --git a/mods/lzr_laser/blocks.lua b/mods/lzr_laser/blocks.lua index 799a3f2..69ca664 100644 --- a/mods/lzr_laser/blocks.lua +++ b/mods/lzr_laser/blocks.lua @@ -70,6 +70,10 @@ local full_update = function() lzr_laser.full_laser_update(lzr_globals.PLAYFIELD_START, lzr_globals.PLAYFIELD_END) end +local after_rotate = function() + full_update() +end + minetest.register_node("lzr_laser:mirror", { description = S("Mirror"), paramtype2 = "facedir", @@ -84,6 +88,7 @@ minetest.register_node("lzr_laser:mirror", { after_place_node = full_update, after_dig_node = full_update, + after_rotate = after_rotate, sounds = lzr_sounds.node_sound_wood_defaults(), groups = { mirror = 1, laser_block = 1, dig_immediate = 3 }, @@ -103,6 +108,7 @@ minetest.register_node("lzr_laser:mirror_on", { }, after_place_node = full_update, after_dig_node = full_update, + after_rotate = after_rotate, sounds = lzr_sounds.node_sound_wood_defaults(), groups = { mirror = 2, laser_block = 1, dig_immediate = 3, not_in_creative_inventory = 1 }, @@ -123,6 +129,7 @@ minetest.register_node("lzr_laser:emitter", { }, after_place_node = full_update, after_dig_node = full_update, + after_rotate = after_rotate, sounds = lzr_sounds.node_sound_wood_defaults(), groups = { emitter = 1, laser_block = 1, dig_immediate = 3 }, @@ -142,6 +149,7 @@ minetest.register_node("lzr_laser:emitter_on", { }, after_place_node = full_update, after_dig_node = full_update, + after_rotate = after_rotate, sounds = lzr_sounds.node_sound_wood_defaults(), groups = { emitter = 2, laser_block = 1, dig_immediate = 3 }, @@ -161,6 +169,7 @@ minetest.register_node("lzr_laser:detector", { }, after_place_node = full_update, after_dig_node = full_update, + after_rotate = after_rotate, sounds = lzr_sounds.node_sound_wood_defaults(), groups = { detector = 1, laser_block = 1, dig_immediate = 3 }, @@ -180,6 +189,7 @@ minetest.register_node("lzr_laser:detector_on", { }, after_place_node = full_update, after_dig_node = full_update, + after_rotate = after_rotate, sounds = lzr_sounds.node_sound_wood_defaults(), groups = { detector = 2, laser_block = 1, dig_immediate = 3, not_in_creative_inventory = 1 }, diff --git a/mods/screwdriver/README.txt b/mods/screwdriver/README.txt new file mode 100644 index 0000000..1f762ee --- /dev/null +++ b/mods/screwdriver/README.txt @@ -0,0 +1,21 @@ +Minetest Game mod: screwdriver +============================== +See license.txt for license information. + +License of source code +---------------------- +Originally by RealBadAngel, Maciej Kasatkin (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) + +License of media (textures) +--------------------------- +Created by Gambit (CC BY-SA 3.0): + screwdriver.png + +Created by InspectorJ of Freesound.org (CC BY 3.0): + screwdriver_use.1.ogg + screwdriver_use.2.ogg + screwdriver_use.3.ogg + screwdriver_use.4.ogg + + (Original file name: Screwdriver, Ratchet, C.wav) diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua new file mode 100644 index 0000000..74dba3b --- /dev/null +++ b/mods/screwdriver/init.lua @@ -0,0 +1,180 @@ +-- screwdriver/init.lua + +screwdriver = {} + +-- Load support for MT game translation. +local S = minetest.get_translator("screwdriver") + +local USES_DEFAULT = 200 + +screwdriver.ROTATE_FACE = 1 +screwdriver.ROTATE_AXIS = 2 +screwdriver.disallow = function(pos, node, user, mode, new_param2) + return false +end +screwdriver.rotate_simple = function(pos, node, user, mode, new_param2) + if mode ~= screwdriver.ROTATE_FACE then + return false + end +end + +-- For attached wallmounted nodes: returns true if rotation is valid +-- simplified version of minetest:builtin/game/falling.lua#L148. +local function check_attached_node(pos, rotation) + local d = minetest.wallmounted_to_dir(rotation) + local p2 = vector.add(pos, d) + local n = minetest.get_node(p2).name + local def2 = minetest.registered_nodes[n] + if def2 and not def2.walkable then + return false + end + return true +end + +screwdriver.rotate = {} + +local facedir_tbl = { + [screwdriver.ROTATE_FACE] = { + [0] = 1, [1] = 2, [2] = 3, [3] = 0, + [4] = 5, [5] = 6, [6] = 7, [7] = 4, + [8] = 9, [9] = 10, [10] = 11, [11] = 8, + [12] = 13, [13] = 14, [14] = 15, [15] = 12, + [16] = 17, [17] = 18, [18] = 19, [19] = 16, + [20] = 21, [21] = 22, [22] = 23, [23] = 20, + }, + [screwdriver.ROTATE_AXIS] = { + [0] = 4, [1] = 4, [2] = 4, [3] = 4, + [4] = 8, [5] = 8, [6] = 8, [7] = 8, + [8] = 12, [9] = 12, [10] = 12, [11] = 12, + [12] = 16, [13] = 16, [14] = 16, [15] = 16, + [16] = 20, [17] = 20, [18] = 20, [19] = 20, + [20] = 0, [21] = 0, [22] = 0, [23] = 0, + }, +} + +screwdriver.rotate.facedir = function(pos, node, mode) + local rotation = node.param2 % 32 -- get first 5 bits + local other = node.param2 - rotation + rotation = facedir_tbl[mode][rotation] or 0 + return rotation + other +end + +screwdriver.rotate.colorfacedir = screwdriver.rotate.facedir + +local wallmounted_tbl = { + [screwdriver.ROTATE_FACE] = {[2] = 5, [3] = 4, [4] = 2, [5] = 3, [1] = 0, [0] = 1}, + [screwdriver.ROTATE_AXIS] = {[2] = 1, [3] = 0, [4] = 1, [5] = 0, [1] = 3, [0] = 2} +} + +screwdriver.rotate.wallmounted = function(pos, node, mode) + local rotation = node.param2 % 8 -- get first 3 bits + local other = node.param2 - rotation + rotation = wallmounted_tbl[mode][rotation] or 0 + if minetest.get_item_group(node.name, "attached_node") ~= 0 then + -- find an acceptable orientation + for i = 1, 5 do + if not check_attached_node(pos, rotation) then + rotation = wallmounted_tbl[mode][rotation] or 0 + else + break + end + end + end + return rotation + other +end + +screwdriver.rotate.colorwallmounted = screwdriver.rotate.wallmounted + +-- Handles rotation +screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) + if pointed_thing.type ~= "node" then + return + end + + local pos = pointed_thing.under + local player_name = user and user:get_player_name() or "" + + if minetest.is_protected(pos, player_name) and not minetest.check_player_privs(player_name, "protection_bypass") then + minetest.record_protection_violation(pos, player_name) + return + end + + local node = minetest.get_node(pos) + local ndef = minetest.registered_nodes[node.name] + if not ndef then + return itemstack + end + if mode == screwdriver.ROTATE_AXIS and ndef and ndef.on_rightclick and + ((not user) or (user and not user:get_player_control().sneak)) then + return ndef.on_rightclick(pos, node, user, itemstack, + pointed_thing) or itemstack + end + + -- can we rotate this paramtype2? + local fn = screwdriver.rotate[ndef.paramtype2] + if not fn and not ndef.on_rotate then + return itemstack + end + + local should_rotate = true + local new_param2 + if fn then + new_param2 = fn(pos, node, mode) + else + new_param2 = node.param2 + end + + -- Node provides a handler, so let the handler decide instead if the node can be rotated + if ndef.on_rotate == false then + return + elseif ndef.on_rotate == "simple" then + if mode ~= screwdriver.ROTATE_FACE then + return + end + elseif ndef.on_rotate then + -- Copy pos and node because callback can modify it + local result = ndef.on_rotate(vector.new(pos), + {name = node.name, param1 = node.param1, param2 = node.param2}, + user, mode, new_param2) + minetest.sound_play({name="screwdriver_use", gain=0.5}, {pos=pos, max_hear_distance=16}, true) + if result == false then -- Disallow rotation + return itemstack + elseif result == true then + should_rotate = false + end + elseif ndef.on_rotate == false then + return itemstack + elseif ndef.can_dig and not ndef.can_dig(pos, user) then + return itemstack + end + + if should_rotate and new_param2 ~= node.param2 then + node.param2 = new_param2 + minetest.swap_node(pos, node) + minetest.check_for_falling(pos) + minetest.sound_play({name="screwdriver_use", gain=0.5}, {pos=pos, max_hear_distance=16}, true) + if ndef.after_rotate then + ndef.after_rotate(vector.new(pos)) + end + end + + return itemstack +end + +-- Screwdriver +minetest.register_tool("screwdriver:screwdriver", { + description = S("Screwdriver") .. "\n" .. S("Punch to rotate face, place to rotates axis"), + short_description = S("Screwdriver"), + inventory_image = "screwdriver.png", + groups = {tool = 1}, + on_use = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, USES_DEFAULT) + return itemstack + end, + on_place = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_AXIS, USES_DEFAULT) + return itemstack + end, +}) + + diff --git a/mods/screwdriver/license.txt b/mods/screwdriver/license.txt new file mode 100644 index 0000000..d9b721b --- /dev/null +++ b/mods/screwdriver/license.txt @@ -0,0 +1,50 @@ +License of source code +---------------------- + +GNU Lesser General Public License, version 2.1 +Copyright (C) 2013-2016 RealBadAngel, Maciej Kasatkin +Copyright (C) 2013-2016 Various Minetest developers and contributors + +This program is free software; you can redistribute it and/or modify it under the terms +of the GNU Lesser General Public License as published by the Free Software Foundation; +either version 2.1 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU Lesser General Public License for more details: +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + + +Licenses of media (textures) +---------------------------- + +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Copyright (C) 2013-2016 Gambit + +You are free to: +Share — copy and redistribute the material in any medium or format. +Adapt — remix, transform, and build upon the material for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the license terms. + +Under the following terms: + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +ShareAlike — If you remix, transform, or build upon the material, you must distribute +your contributions under the same license as the original. + +No additional restrictions — You may not apply legal terms or technological measures that +legally restrict others from doing anything the license permits. + +Notices: + +You do not have to comply with the license for elements of the material in the public +domain or where your use is permitted by an applicable exception or limitation. +No warranties are given. The license may not give you all of the permissions necessary +for your intended use. For example, other rights such as publicity, privacy, or moral +rights may limit how you use the material. + +For more details: +http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/mods/screwdriver/mod.conf b/mods/screwdriver/mod.conf new file mode 100644 index 0000000..38051ef --- /dev/null +++ b/mods/screwdriver/mod.conf @@ -0,0 +1,2 @@ +name = screwdriver +description = A screwdriver allows rotating blocks diff --git a/mods/screwdriver/sounds/screwdriver_use.1.ogg b/mods/screwdriver/sounds/screwdriver_use.1.ogg new file mode 100644 index 0000000..ca25d92 Binary files /dev/null and b/mods/screwdriver/sounds/screwdriver_use.1.ogg differ diff --git a/mods/screwdriver/sounds/screwdriver_use.2.ogg b/mods/screwdriver/sounds/screwdriver_use.2.ogg new file mode 100644 index 0000000..fff44d9 Binary files /dev/null and b/mods/screwdriver/sounds/screwdriver_use.2.ogg differ diff --git a/mods/screwdriver/sounds/screwdriver_use.3.ogg b/mods/screwdriver/sounds/screwdriver_use.3.ogg new file mode 100644 index 0000000..a11b3e5 Binary files /dev/null and b/mods/screwdriver/sounds/screwdriver_use.3.ogg differ diff --git a/mods/screwdriver/sounds/screwdriver_use.4.ogg b/mods/screwdriver/sounds/screwdriver_use.4.ogg new file mode 100644 index 0000000..32e700f Binary files /dev/null and b/mods/screwdriver/sounds/screwdriver_use.4.ogg differ diff --git a/mods/screwdriver/textures/screwdriver.png b/mods/screwdriver/textures/screwdriver.png new file mode 100644 index 0000000..e20f063 Binary files /dev/null and b/mods/screwdriver/textures/screwdriver.png differ