Replace fake player code with fakelib (#10)

fixes #8

@corarona

[#L769](https://github.com/minetest-mods/torch_bomb/blob/master/init.lua#L769) this should say wield_scale = {x=1, y=1, z=1} or just be removed since 1 is the default i suppose.

https://github.com/minetest/minetest/blob/master/doc/lua_api.md?plain=1#L8679
https://codeberg.org/mineclonia/mineclonia/issues/955
https://git.minetest.land/MineClone2/MineClone2/issues/3971

.github/workflows/luacheck.yml

@@ -0,0 +1,10 @@
+name: luacheck
+on: [push, pull_request]
+jobs:
+  luacheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+      - name: Luacheck
+        uses: lunarmodules/luacheck@master

.gitignore

@@ -1,41 +0,0 @@
-# Compiled Lua sources
-luac.out
-
-# luarocks build files
-*.src.rock
-*.zip
-*.tar.gz
-
-# Object files
-*.o
-*.os
-*.ko
-*.obj
-*.elf
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-*.def
-*.exp
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
-

.luacheckrc

@@ -0,0 +1,13 @@
+unused_args = false
+max_line_length = 150
+
+read_globals = {
+	"minetest",
+	"vector",
+	"ItemStack",
+	"default",
+	"tnt",
+	"mcl_sounds",
+	"mcl_explosions",
+	"fakelib",
+}

README.md

@@ -14,4 +14,6 @@ If you want to scatter torches from the center of a cavern to reach floor and ce
 
 For precision torch placement a set of torch crossbows are included: wooden, bronze, and steel.
 
-TNT is an optional dependency for this mod, but torch bombs don't have a crafting recipe (and don't produce a damaging blast) without the tnt mod enabled.
+TNT is an optional dependency for this mod, but torch bombs don't have a crafting recipe (and don't produce a damaging blast) without the `tnt` mod enabled.
+
+The `fakelib` mod is a required dependency for simulating the placement of torches.

class_fakeplayer.lua

@@ -1,147 +0,0 @@
--- The purpose of this class is to have something that can be passed into callbacks that
--- demand a "Player" object as a parameter and hopefully prevent the mods that have
--- registered with those callbacks from crashing on a nil dereference or bad function
--- call. This is not supposed to be a remotely functional thing, it's just supposed
--- to provide dummy methods and return values of the correct data type for anything that 
--- might ignore the false "is_player()" return and go ahead and try to use this thing
--- anyway.
-
--- I'm trying to patch holes in bad mod programming, essentially. If a mod is so badly
--- programmed that it crashes anyway there's not a lot else I can do on my end of things.
-
-local FakePlayer = {}
-FakePlayer.__index = FakePlayer
-
-local function return_value(x)
-	return (function() return x end)
-end
-
-local function return_nil()
-	return nil
-end
-
-local function return_empty_string()
-	return ""
-end
-
-local function return_zero()
-	return 0
-end
-
-local function return_empty_table()
-	return {}
-end
-
-function FakePlayer.update(self, pos, player_name)
-	self.is_fake_player = player_name
-	self.get_pos = return_value(pos)
-end
-
-function FakePlayer.create(pos, player_name)
-	local self = {}
-	setmetatable(self, FakePlayer)
-	
-	self.is_fake_player = player_name
-
-	-- ObjectRef	
-	self.get_pos = return_value(pos)
-	self.set_pos = return_nil
-	self.move_to = return_nil
-	self.punch = return_nil
-	self.right_click = return_nil
-	self.get_hp = return_value(10)
-	self.set_hp = return_nil
-	self.get_inventory = return_nil -- returns an `InvRef`
-	self.get_wield_list = return_empty_string
-	self.get_wield_index = return_value(1)
-	self.get_wielded_item = return_value(ItemStack(nil))
-	self.set_wielded_item = return_value(false)
-	self.set_armor_groups = return_nil
-	self.get_armor_groups = return_empty_table
-	self.set_animation = return_nil
-	self.get_animation = return_nil -- a set of values, maybe important?
-	self.set_attach = return_nil
-	self.get_attach = return_nil
-	self.set_detach = return_nil
-	self.set_bone_position = return_nil
-	self.get_bone_position = return_nil
-	self.set_properties = return_nil
-	self.get_properties = return_empty_table
-
-	self.is_player = return_value(false)
-
-	self.get_nametag_attributes = return_empty_table
-	self.set_nametag_attributes = return_nil
-
-	--LuaEntitySAO
-	self.set_velocity = return_nil
-	self.get_velocity = return_value({x=0,y=0,z=0})
-	self.set_acceleration = return_nil
-	self.get_acceleration = return_value({x=0,y=0,z=0})
-	self.set_yaw = return_nil
-	self.get_yaw = return_zero
-	self.set_texture_mod = return_nil
-	self.get_texture_mod = return_nil -- maybe important?
-	self.set_sprite = return_nil
-	--self.get_entity_name` (**Deprecated**: Will be removed in a future version)
-	self.get_luaentity = return_nil
-
-	-- Player object
-	
-	self.get_player_name = return_empty_string
-	self.get_player_velocity = return_nil
-	self.get_look_dir = return_value({x=0,y=1,z=0})
-	self.get_look_horizontal = return_zero
-	self.set_look_horizontal = return_nil
-	self.get_look_vertical = return_zero
-	self.set_look_vertical = return_nil
-
-	--self.get_look_pitch`: pitch in radians - Deprecated as broken. Use `get_look_vertical`
-	--self.get_look_yaw`: yaw in radians - Deprecated as broken. Use `get_look_horizontal`
-	--self.set_look_pitch(radians)`: sets look pitch - Deprecated. Use `set_look_vertical`.
-	--self.set_look_yaw(radians)`: sets look yaw - Deprecated. Use `set_look_horizontal`.
-	self.get_breath = return_value(10)
-	self.set_breath = return_nil
-	self.get_attribute = return_nil
-	self.set_attribute = return_nil
-
-	self.set_inventory_formspec = return_nil
-	self.get_inventory_formspec = return_empty_string
-	self.get_player_control = return_value({jump=false, right=false, left=false, LMB=false, RMB=false, sneak=false, aux1=false, down=false, up=false} )
-    self.get_player_control_bits = return_zero
-
-	self.set_physics_override = return_nil
-	self.get_physics_override = return_value({speed = 1, jump = 1, gravity = 1, sneak = true, sneak_glitch = false, new_move = true,})
-	
-	
-	self.hud_add = return_nil
-	self.hud_remove = return_nil
-	self.hud_change = return_nil
-	self.hud_get = return_nil -- possibly important return value?
-	self.hud_set_flags = return_nil	
-	self.hud_get_flags = return_value({ hotbar=true, healthbar=true, crosshair=true, wielditem=true, breathbar=true, minimap=true })
-	self.hud_set_hotbar_itemcount = return_nil
-	self.hud_get_hotbar_itemcount = return_zero
-	self.hud_set_hotbar_image = return_nil
-	self.hud_get_hotbar_image = return_empty_string
-	self.hud_set_hotbar_selected_image = return_nil
-	self.hud_get_hotbar_selected_image = return_empty_string
-	self.set_sky = return_nil
-	self.get_sky = return_empty_table -- may need members on this table
-	
-	self.set_clouds = return_nil
-	self.get_clouds = return_value({density = 0, color = "#fff0f0e5", ambient = "#000000", height = 120, thickness = 16, speed = {x=0, y=-2}})
-	
-	self.override_day_night_ratio = return_nil
-	self.get_day_night_ratio = return_nil
-	
-	self.set_local_animation = return_nil
-	self.get_local_animation = return_empty_table
-	
-	self.set_eye_offset = return_nil
-	self.get_eye_offset = return_value({x=0,y=0,z=0},{x=0,y=0,z=0})
-	
-	return self
-end
-
-return FakePlayer

i18n.py

@@ -1,421 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# Script to generate the template file and update the translation files.
-# Copy the script into the mod or modpack root folder and run it there.
-#
-# Copyright (C) 2019 Joachim Stolberg, 2020 FaceDeer, 2020 Louis Royer
-# LGPLv2.1+
-#
-# See https://github.com/minetest-tools/update_translations for
-# potential future updates to this script.
-
-from __future__ import print_function
-import os, fnmatch, re, shutil, errno
-from sys import argv as _argv
-
-# Running params
-params = {"recursive": False,
-    "help": False,
-    "mods": False,
-    "verbose": False,
-    "folders": []
-}
-# Available CLI options
-options = {"recursive": ['--recursive', '-r'],
-    "help": ['--help', '-h'],
-    "mods": ['--installed-mods'],
-    "verbose": ['--verbose', '-v']
-}
-
-# Strings longer than this will have extra space added between
-# them in the translation files to make it easier to distinguish their
-# beginnings and endings at a glance
-doublespace_threshold = 60
-
-def set_params_folders(tab: list):
-    '''Initialize params["folders"] from CLI arguments.'''
-    # Discarding argument 0 (tool name)
-    for param in tab[1:]:
-        stop_param = False
-        for option in options:
-            if param in options[option]:
-                stop_param = True
-                break
-        if not stop_param:
-            params["folders"].append(os.path.abspath(param))
-
-def set_params(tab: list):
-    '''Initialize params from CLI arguments.'''
-    for option in options:
-        for option_name in options[option]:
-            if option_name in tab:
-                params[option] = True
-                break
-
-def print_help(name):
-    '''Prints some help message.'''
-    print(f'''SYNOPSIS
-    {name} [OPTIONS] [PATHS...]
-DESCRIPTION
-    {', '.join(options["help"])}
-        prints this help message
-    {', '.join(options["recursive"])}
-        run on all subfolders of paths given
-    {', '.join(options["mods"])}
-        run on locally installed modules
-    {', '.join(options["verbose"])}
-        add output information
-''')
-
-
-def main():
-    '''Main function'''
-    set_params(_argv)
-    set_params_folders(_argv)
-    if params["help"]:
-        print_help(_argv[0])
-    elif params["recursive"] and params["mods"]:
-        print("Option --installed-mods is incompatible with --recursive")
-    else:
-        # Add recursivity message
-        print("Running ", end='')
-        if params["recursive"]:
-            print("recursively ", end='')
-        # Running
-        if params["mods"]:
-            print(f"on all locally installed modules in {os.path.abspath('~/.minetest/mods/')}")
-            run_all_subfolders("~/.minetest/mods")
-        elif len(params["folders"]) >= 2:
-            print("on folder list:", params["folders"])
-            for f in params["folders"]:
-                if params["recursive"]:
-                    run_all_subfolders(f)
-                else:
-                    update_folder(f)
-        elif len(params["folders"]) == 1:
-            print("on folder", params["folders"][0])
-            if params["recursive"]:
-                run_all_subfolders(params["folders"][0])
-            else:
-                update_folder(params["folders"][0])
-        else:
-            print("on folder", os.path.abspath("./"))
-            if params["recursive"]:
-                run_all_subfolders(os.path.abspath("./"))
-            else:
-                update_folder(os.path.abspath("./"))
-
-#group 2 will be the string, groups 1 and 3 will be the delimiters (" or ')
-#See https://stackoverflow.com/questions/46967465/regex-match-text-in-either-single-or-double-quote
-pattern_lua = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
-pattern_lua_bracketed = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
-
-# Handles "concatenation" .. " of strings"
-pattern_concat = re.compile(r'["\'][\s]*\.\.[\s]*["\']', re.DOTALL)
-
-pattern_tr = re.compile(r'(.+?[^@])=(.*)')
-pattern_name = re.compile(r'^name[ ]*=[ ]*([^ \n]*)')
-pattern_tr_filename = re.compile(r'\.tr$')
-pattern_po_language_code = re.compile(r'(.*)\.po$')
-
-#attempt to read the mod's name from the mod.conf file. Returns None on failure
-def get_modname(folder):
-    try:
-        with open(os.path.join(folder, "mod.conf"), "r", encoding='utf-8') as mod_conf:
-            for line in mod_conf:
-                match = pattern_name.match(line)
-                if match:
-                    return match.group(1)
-    except FileNotFoundError:
-        pass
-    return None
-
-#If there are already .tr files in /locale, returns a list of their names
-def get_existing_tr_files(folder):
-    out = []
-    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
-        for name in files:
-            if pattern_tr_filename.search(name):
-                out.append(name)
-    return out
-
-# A series of search and replaces that massage a .po file's contents into
-# a .tr file's equivalent
-def process_po_file(text):
-    # The first three items are for unused matches
-    text = re.sub(r'#~ msgid "', "", text)
-    text = re.sub(r'"\n#~ msgstr ""\n"', "=", text)
-    text = re.sub(r'"\n#~ msgstr "', "=", text)
-    # comment lines
-    text = re.sub(r'#.*\n', "", text)
-    # converting msg pairs into "=" pairs
-    text = re.sub(r'msgid "', "", text)
-    text = re.sub(r'"\nmsgstr ""\n"', "=", text)
-    text = re.sub(r'"\nmsgstr "', "=", text)
-    # various line breaks and escape codes
-    text = re.sub(r'"\n"', "", text)
-    text = re.sub(r'"\n', "\n", text)
-    text = re.sub(r'\\"', '"', text)
-    text = re.sub(r'\\n', '@n', text)
-    # remove header text
-    text = re.sub(r'=Project-Id-Version:.*\n', "", text)
-    # remove double-spaced lines
-    text = re.sub(r'\n\n', '\n', text)
-    return text
-
-# Go through existing .po files and, if a .tr file for that language
-# *doesn't* exist, convert it and create it.
-# The .tr file that results will subsequently be reprocessed so
-# any "no longer used" strings will be preserved.
-# Note that "fuzzy" tags will be lost in this process.
-def process_po_files(folder, modname):
-    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
-        for name in files:
-            code_match = pattern_po_language_code.match(name)
-            if code_match == None:
-                continue
-            language_code = code_match.group(1)
-            tr_name = modname + "." + language_code + ".tr"
-            tr_file = os.path.join(root, tr_name)
-            if os.path.exists(tr_file):
-                if params["verbose"]:
-                    print(f"{tr_name} already exists, ignoring {name}")
-                continue
-            fname = os.path.join(root, name)
-            with open(fname, "r", encoding='utf-8') as po_file:
-                if params["verbose"]:
-                    print(f"Importing translations from {name}")
-                text = process_po_file(po_file.read())
-                with open(tr_file, "wt", encoding='utf-8') as tr_out:
-                    tr_out.write(text)
-
-# from https://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python/600612#600612
-# Creates a directory if it doesn't exist, silently does
-# nothing if it already exists
-def mkdir_p(path):
-    try:
-        os.makedirs(path)
-    except OSError as exc: # Python >2.5
-        if exc.errno == errno.EEXIST and os.path.isdir(path):
-            pass
-        else: raise
-
-# Converts the template dictionary to a text to be written as a file
-# dKeyStrings is a dictionary of localized string to source file sets
-# dOld is a dictionary of existing translations and comments from
-# the previous version of this text
-def strings_to_text(dkeyStrings, dOld, mod_name):
-    lOut = [f"# textdomain: {mod_name}\n"]
-    
-    dGroupedBySource = {}
-
-    for key in dkeyStrings:
-        sourceList = list(dkeyStrings[key])
-        sourceList.sort()
-        sourceString = "\n".join(sourceList)
-        listForSource = dGroupedBySource.get(sourceString, [])
-        listForSource.append(key)
-        dGroupedBySource[sourceString] = listForSource
-    
-    lSourceKeys = list(dGroupedBySource.keys())
-    lSourceKeys.sort()
-    for source in lSourceKeys:
-        localizedStrings = dGroupedBySource[source]
-        localizedStrings.sort()
-        lOut.append("")
-        lOut.append(source)
-        lOut.append("")
-        for localizedString in localizedStrings:
-            val = dOld.get(localizedString, {})
-            translation = val.get("translation", "")
-            comment = val.get("comment")
-            if len(localizedString) > doublespace_threshold and not lOut[-1] == "":
-                lOut.append("")
-            if comment != None:
-                lOut.append(comment)
-            lOut.append(f"{localizedString}={translation}")
-            if len(localizedString) > doublespace_threshold:
-                lOut.append("")
-
-
-    unusedExist = False
-    for key in dOld:
-        if key not in dkeyStrings:
-            val = dOld[key]
-            translation = val.get("translation")
-            comment = val.get("comment")
-            # only keep an unused translation if there was translated
-            # text or a comment associated with it
-            if translation != None and (translation != "" or comment):
-                if not unusedExist:
-                    unusedExist = True
-                    lOut.append("\n\n##### not used anymore #####\n")
-                if len(key) > doublespace_threshold and not lOut[-1] == "":
-                    lOut.append("")
-                if comment != None:
-                    lOut.append(comment)
-                lOut.append(f"{key}={translation}")
-                if len(key) > doublespace_threshold:
-                    lOut.append("")
-    return "\n".join(lOut) + '\n'
-
-# Writes a template.txt file
-# dkeyStrings is the dictionary returned by generate_template
-def write_template(templ_file, dkeyStrings, mod_name):
-    # read existing template file to preserve comments
-    existing_template = import_tr_file(templ_file)
-    
-    text = strings_to_text(dkeyStrings, existing_template[0], mod_name)
-    mkdir_p(os.path.dirname(templ_file))
-    with open(templ_file, "wt", encoding='utf-8') as template_file:
-        template_file.write(text)
-
-
-# Gets all translatable strings from a lua file
-def read_lua_file_strings(lua_file):
-    lOut = []
-    with open(lua_file, encoding='utf-8') as text_file:
-        text = text_file.read()
-        #TODO remove comments here
-
-        text = re.sub(pattern_concat, "", text)
-
-        strings = []
-        for s in pattern_lua.findall(text):
-            strings.append(s[1])
-        for s in pattern_lua_bracketed.findall(text):
-            strings.append(s)
-                
-        for s in strings:
-            s = re.sub(r'"\.\.\s+"', "", s)
-            s = re.sub("@[^@=0-9]", "@@", s)
-            s = s.replace('\\"', '"')
-            s = s.replace("\\'", "'")
-            s = s.replace("\n", "@n")
-            s = s.replace("\\n", "@n")
-            s = s.replace("=", "@=")
-            lOut.append(s)
-    return lOut
-
-# Gets strings from an existing translation file
-# returns both a dictionary of translations
-# and the full original source text so that the new text
-# can be compared to it for changes.
-def import_tr_file(tr_file):
-    dOut = {}
-    text = None
-    if os.path.exists(tr_file):
-        with open(tr_file, "r", encoding='utf-8') as existing_file :
-            # save the full text to allow for comparison
-            # of the old version with the new output
-            text = existing_file.read()
-            existing_file.seek(0)
-            # a running record of the current comment block
-            # we're inside, to allow preceeding multi-line comments
-            # to be retained for a translation line
-            latest_comment_block = None
-            for line in existing_file.readlines():
-                line = line.rstrip('\n')
-                if line[:3] == "###":
-                    # Reset comment block if we hit a header
-                    latest_comment_block = None
-                    continue
-                if line[:1] == "#":
-                    # Save the comment we're inside
-                    if not latest_comment_block:
-                        latest_comment_block = line
-                    else:
-                        latest_comment_block = latest_comment_block + "\n" + line
-                    continue
-                match = pattern_tr.match(line)
-                if match:
-                    # this line is a translated line
-                    outval = {}
-                    outval["translation"] = match.group(2)
-                    if latest_comment_block:
-                        # if there was a comment, record that.
-                        outval["comment"] = latest_comment_block
-                    latest_comment_block = None
-                    dOut[match.group(1)] = outval
-    return (dOut, text)
-
-# Walks all lua files in the mod folder, collects translatable strings,
-# and writes it to a template.txt file
-# Returns a dictionary of localized strings to source file sets
-# that can be used with the strings_to_text function.
-def generate_template(folder, mod_name):
-    dOut = {}
-    for root, dirs, files in os.walk(folder):
-        for name in files:
-            if fnmatch.fnmatch(name, "*.lua"):
-                fname = os.path.join(root, name)
-                found = read_lua_file_strings(fname)
-                if params["verbose"]:
-                    print(f"{fname}: {str(len(found))} translatable strings")
-
-                for s in found:
-                    sources = dOut.get(s, set())
-                    sources.add(f"### {os.path.basename(fname)} ###")
-                    dOut[s] = sources
-                    
-    if len(dOut) == 0:
-        return None
-    templ_file = os.path.join(folder, "locale/template.txt")
-    write_template(templ_file, dOut, mod_name)
-    return dOut
-
-# Updates an existing .tr file, copying the old one to a ".old" file
-# if any changes have happened
-# dNew is the data used to generate the template, it has all the
-# currently-existing localized strings
-def update_tr_file(dNew, mod_name, tr_file):
-    if params["verbose"]:
-        print(f"updating {tr_file}")
-
-    tr_import = import_tr_file(tr_file)
-    dOld = tr_import[0]
-    textOld = tr_import[1]
-
-    textNew = strings_to_text(dNew, dOld, mod_name)
-
-    if textOld and textOld != textNew:
-        print(f"{tr_file} has changed.")
-        shutil.copyfile(tr_file, f"{tr_file}.old")
-
-    with open(tr_file, "w", encoding='utf-8') as new_tr_file:
-        new_tr_file.write(textNew)
-
-# Updates translation files for the mod in the given folder
-def update_mod(folder):
-    modname = get_modname(folder)
-    if modname is not None:
-        process_po_files(folder, modname)
-        print(f"Updating translations for {modname}")
-        data = generate_template(folder, modname)
-        if data == None:
-            print(f"No translatable strings found in {modname}")
-        else:
-            for tr_file in get_existing_tr_files(folder):
-                update_tr_file(data, modname, os.path.join(folder, "locale/", tr_file))
-    else:
-        print("Unable to find modname in folder " + folder)
-
-# Determines if the folder being pointed to is a mod or a mod pack
-# and then runs update_mod accordingly
-def update_folder(folder):
-    is_modpack = os.path.exists(os.path.join(folder, "modpack.txt")) or os.path.exists(os.path.join(folder, "modpack.conf"))
-    if is_modpack:
-        subfolders = [f.path for f in os.scandir(folder) if f.is_dir()]
-        for subfolder in subfolders:
-            update_mod(subfolder + "/")
-    else:
-        update_mod(folder)
-    print("Done.")
-
-def run_all_subfolders(folder):
-    for modfolder in [f.path for f in os.scandir(folder) if f.is_dir()]:
-        update_folder(modfolder + "/")
-
-
-main()

init.lua

@@ -1,10 +1,7 @@
-local modname = minetest.get_current_modname()
-local modpath = minetest.get_modpath(modname)
 local tnt_modpath = minetest.get_modpath("tnt")
-local S = minetest.get_translator(modname)
-
-local FakePlayer = dofile(modpath .. "/" .. "class_fakeplayer.lua")
-local fakeplayer = FakePlayer.create({x=0,y=0,z=0}, "torch_bomb")
+local mcl_tnt_modpath = minetest.get_modpath("mcl_tnt")
+local mcl_explosions_modpath = minetest.get_modpath("mcl_explosions")
+local S = minetest.get_translator("torch_bomb")
 
 -- Default to enabled when in singleplayer
 local enable_tnt = minetest.settings:get_bool("enable_tnt")
@@ -12,10 +9,37 @@ if enable_tnt == nil then
 	enable_tnt = minetest.is_singleplayer()
 end
 
+local mcl_expl_info = {
+   drop_chance = 1.0,
+   max_blast_resistance = 1,
+   sound = true,
+   particles = false,
+   fire = false,
+   griefing = true,
+   grief_protected = false,
+}
+
+local sounds = {}
+local torch_item
+
+if minetest.get_modpath("default") then
+   torch_item = "default:torch"
+   sounds = default
+end
+if minetest.get_modpath("mcl_torches") then
+   torch_item = "mcl_torches:torch"
+end
+if minetest.get_modpath("mcl_sounds") then
+   sounds = mcl_sounds
+end
+
+torch_item = minetest.settings:get("torch_bomb_torch_item") or torch_item
+
+assert(torch_item, "The mod 'torch_bomb' requires either 'default' or MineClone 2 to function properly.")
+
 local grenade_range = tonumber(minetest.settings:get("torch_bomb_grenade_range")) or 25
 local bomb_range = tonumber(minetest.settings:get("torch_bomb_range")) or 50
 local mega_bomb_range = tonumber(minetest.settings:get("torch_bomb_mega_range")) or 150
-local torch_item = minetest.settings:get("torch_bomb_torch_item") or "default:torch"
 
 local enable_rockets = minetest.settings:get_bool("torch_bomb_enable_rockets", true)
 local rocket_max_fuse = tonumber(minetest.settings:get("torch_bomb_max_fuse")) or 14 -- 14 seconds at 1 m/s^2 is 98 meters traveled
@@ -27,12 +51,6 @@ local crossbow_range = tonumber(minetest.settings:get("torch_bomb_base_crossbow_
 local enable_crossbows = minetest.settings:get_bool("torch_bomb_enable_crossbows", true)
 local torch_bow_uses = tonumber(minetest.settings:get("torch_bomb_base_crossbow_uses")) or 30
 
--- Detect creative mod
-local creative_mod = minetest.get_modpath("creative")
--- Cache creative mode setting as fallback if creative mod not present
-local creative_mode_cache = minetest.settings:get_bool("creative_mode")
-
-
 -- 12 torches grenade
 local ico1 = {
 	vector.new(0.000000,	-1.000000,	0.000000),
@@ -283,7 +301,7 @@ local function find_target(raycast)
 		local above_node = minetest.get_node(above_pos)
 		local above_def = minetest.registered_nodes[above_node.name]
 
-		if above_def.buildable_to and not under_def.buildable_to then
+		if above_def and above_def.buildable_to and ((under_def and not under_def.buildable_to) or not under_def) then
 			return next_pointed
 		end
 
@@ -297,7 +315,7 @@ minetest.after(0, function()
 end)
 
 local function play_bolt_hit(pos)
-	minetest.sound_play("torch_bomb_bolt_hit", {pos=pos, gain=1, max_hear_distance=32})
+	minetest.sound_play({name="torch_bomb_bolt_hit", gain=1}, {pos=pos, gain=1, max_hear_distance=32}, true)
 end
 
 local function embed_torch(target, placer, pos)
@@ -307,7 +325,6 @@ local function embed_torch(target, placer, pos)
 	torch_def_on_place(ItemStack(torch_item), placer, target)
 	local target_pos = target.above
 	local dir_back = vector.normalize(vector.subtract(pos, target_pos))
-	local vel_back = vector.multiply(dir_back, 10)
 	minetest.add_particlespawner({
 		amount = math.random(1,6),
 		time = 0.1,
@@ -328,7 +345,7 @@ local function embed_torch(target, placer, pos)
 	minetest.after(math.random()*0.1, play_bolt_hit, pos)
 end
 
-local function kerblam(pos, placer, dirs, min_range)
+local function kerblam(pos, player, dirs, min_range)
 	pos = vector.round(pos)
 	local targets = {}
 	for _, pos2 in ipairs(dirs) do
@@ -340,17 +357,11 @@ local function kerblam(pos, placer, dirs, min_range)
 			end
 		end
 	end
-
-	if not placer then
-		placer = fakeplayer
-		fakeplayer:update(pos, "torch_bomb")
-	end
-	
-	minetest.log("action", placer:get_player_name() .. " detonated a torch bomb at " ..
+	minetest.log("action", player:get_player_name() .. " detonated a torch bomb at " ..
 		minetest.pos_to_string(pos) .. " and placed " .. #targets .. " torches.")
 
 	for _, target in ipairs(targets) do
-		embed_torch(target, placer, pos)
+		embed_torch(target, player, pos)
 	end
 end
 
@@ -420,11 +431,13 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 		tiles = {"torch_bomb_top.png", "torch_bomb_bottom.png", side_texture},
 		paramtype = "light",
 		paramtype2 = "facedir",
-		sounds = default.node_sound_wood_defaults(),
-		groups = {tnt = 1, oddly_breakable_by_hand = 1},
+		sounds = sounds.node_sound_wood_defaults(),
+		groups = {tnt = 1, oddly_breakable_by_hand = 1, handy = 1, axey = 1},
+		_mcl_blast_resistance = 1,
+		_mcl_hardness = 0.8,
 
 		on_punch = function(pos, node, puncher)
-			if puncher:get_wielded_item():get_name() == "default:torch" then
+			if puncher:get_wielded_item():get_name() == torch_item then
 				minetest.set_node(pos, {name = "torch_bomb:"..name.."_burning"})
 				minetest.get_meta(pos):set_string("torch_bomb_ignitor", puncher:get_player_name())
 				minetest.log("action", puncher:get_player_name() .. " ignites " .. node.name .. " at " ..
@@ -450,7 +463,7 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 				}
 			},
 			"torch_bomb_bottom.png", side_texture},
-		sounds = default.node_sound_wood_defaults(),
+		sounds = sounds.node_sound_wood_defaults(),
 		groups = {falling_node = 1, not_in_creative_inventory = 1},
 		paramtype = "light",
 		paramtype2 = "facedir",
@@ -458,23 +471,24 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 		drop = "torch_bomb:" .. name,
 
 		on_construct = function(pos)
-			if tnt_modpath then
-				minetest.sound_play("tnt_ignite", {pos = pos})
+			if tnt_modpath or mcl_tnt_modpath then
+				minetest.sound_play({name="tnt_ignite", gain=1}, {pos = pos, max_hear_distance=16}, true)
 			end
 			minetest.get_node_timer(pos):start(3)
+			minetest.check_for_falling(pos)
 		end,
 
 		on_timer = function(pos, elapsed)
-			local ignitor_name = minetest.get_meta(pos):get("torch_bomb_ignitor")
-			local puncher
-			if ignitor_name then
-				puncher = minetest.get_player_by_name(ignitor_name)
-			end
+			local player_name = minetest.get_meta(pos):get("torch_bomb_ignitor")
+			local player = fakelib.create_player(player_name)
 			minetest.set_node(pos, {name="air"})
 			if tnt_modpath then
 				tnt.boom(pos, {radius=blast_radius, damage_radius=blast_radius+3})
 			end
-			kerblam(pos, puncher, dirs, min_range)
+			if mcl_explosions_modpath then
+			   mcl_explosions.explode(pos, blast_radius, mcl_expl_info, player)
+			end
+			kerblam(pos, player, dirs, min_range)
 		end,
 	})
 
@@ -487,13 +501,13 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 
 	local function entity_detonate(player_name, target)
 		--minetest.chat_send_all("entity detonate " .. (player_name or "") .. " " .. minetest.pos_to_string(target))
-		local player
-		if player_name then
-			player = minetest.get_player_by_name(player_name)
-		end
+		local player = fakelib.create_player(player_name)
 		if tnt_modpath then
 			tnt.boom(target, {radius=blast_radius, damage_radius=blast_radius+3})
 		end
+		if mcl_explosions_modpath then
+		   mcl_explosions.explode(target, blast_radius, mcl_expl_info, player)
+		end
 		kerblam(target, player, dirs, min_range)
 	end
 
@@ -564,11 +578,13 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 		tiles = {"torch_bomb_top.png", rocket_bottom_texture, rocket_side_texture},
 		paramtype = "light",
 		paramtype2 = "facedir",
-		sounds = default.node_sound_wood_defaults(),
-		groups = {tnt = 1, oddly_breakable_by_hand = 1, torch_bomb_rocket = 1},
+		sounds = sounds.node_sound_wood_defaults(),
+		groups = {tnt = 1, oddly_breakable_by_hand = 1, torch_bomb_rocket = 1, handy = 1, axey = 1},
+		_mcl_blast_resistance = 1,
+		_mcl_hardness = 0.8,
 
 		on_punch = function(pos, node, puncher)
-			if puncher:get_wielded_item():get_name() == "default:torch" then
+			if puncher:get_wielded_item():get_name() == torch_item then
 				local fuse = minetest.get_meta(pos):get("fuse")
 				minetest.set_node(pos, {name = "torch_bomb:"..name.."_rocket_burning"})
 				local meta = minetest.get_meta(pos)
@@ -607,7 +623,7 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 				}
 			},
 			rocket_bottom_texture, rocket_side_texture},
-		sounds = default.node_sound_wood_defaults(),
+		sounds = sounds.node_sound_wood_defaults(),
 		groups = {falling_node = 1, not_in_creative_inventory = 1},
 		paramtype = "light",
 		paramtype2 = "facedir",
@@ -616,9 +632,10 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 
 		on_construct = function(pos)
 			if tnt_modpath then
-				minetest.sound_play("tnt_ignite", {pos = pos})
+				minetest.sound_play("tnt_ignite", {pos = pos, max_hear_distance=16}, true)
 			end
 			minetest.get_node_timer(pos):start(3)
+			minetest.check_for_falling(pos)
 		end,
 
 		on_timer = function(pos, elapsed)
@@ -628,7 +645,7 @@ local function register_torch_bomb(name, desc, dirs, min_range, blast_radius, te
 			minetest.set_node(pos, {name="air"})
 
 			local obj = minetest.add_entity(pos, "torch_bomb:"..name.."_rocket_entity")
-			obj:setacceleration({x=0, y=1, z=0})
+			obj:set_acceleration({x=0, y=1, z=0})
 			local lua_entity = obj:get_luaentity()
 			lua_entity.player_name = ignitor_name
 			lua_entity.fuse = fuse
@@ -659,21 +676,19 @@ if enable_grenade then
 			local player_pos = user:get_pos()
 			local obj = minetest.add_entity({x = player_pos.x, y = player_pos.y + 1.5, z = player_pos.z}, "torch_bomb:torch_grenade_entity")
 			local dir = user:get_look_dir()
-			obj:setvelocity(vector.multiply(dir, throw_velocity))
-			obj:setacceleration(gravity)
-			obj:setyaw(user:get_look_yaw()+math.pi)
+			obj:set_velocity(vector.multiply(dir, throw_velocity))
+			obj:set_acceleration(gravity)
+			obj:set_yaw(user:get_look_horizontal()+math.pi)
 			local lua_entity = obj:get_luaentity()
 			lua_entity.player_name = user:get_player_name()
 
-			minetest.sound_play({name="tnt_ignite"},
-			{
-				object = object,
+			minetest.sound_play({name="tnt_ignite"}, {
+				pos = player_pos,
 				gain = 1.0,
 				max_hear_distance = 32,
-			})
+			}, true)
 
-			if not ((creative_mod and creative.is_enabled_for(user:get_player_name())) or
-						creative_mode_cache) then
+			if not minetest.is_creative_enabled(user:get_player_name()) then
 				itemstack:set_count(itemstack:get_count() - 1)
 			end
 
@@ -709,14 +724,14 @@ if enable_grenade then
 				lastpos = vector.round(lastpos)
 				local luaentity = object:get_luaentity()
 				local player_name = luaentity.player_name
-				local player
-				if player_name then
-					player = minetest.get_player_by_name(player_name)
-				end
+				local player = fakelib.create_player(player_name)
 				object:remove()
 				if tnt_modpath then
 					tnt.boom(lastpos, {radius=1, damage_radius=2})
 				end
+				if mcl_explosions_modpath then
+				   mcl_explosions.explode(lastpos, 1, mcl_expl_info, player)
+				end
 				kerblam(lastpos, player, ico1, 2)
 			end
 			self.lastpos={x=pos.x, y=pos.y, z=pos.z}
@@ -727,11 +742,10 @@ end
 ----------------------------------------------------------------------
 -- Torch crossbows
 
-local function register_torch_bow(name, desc, material, image, torch_bow_range, torch_bow_uses)
+local function register_torch_bow(name, desc, material, image, torch_bow_range, local_torch_bow_uses)
     minetest.register_tool("torch_bomb:torch_crossbow_" .. name, {
         description = S("@1 Torch Crossbow", desc),
         inventory_image = image,
-        wield_scale = 1,
         stack_max = 1,
         groups = nil,
 		sound = {
@@ -744,14 +758,13 @@ local function register_torch_bow(name, desc, material, image, torch_bow_range,
 			playerpos.y = playerpos.y + 1.5
 
             if not inv:contains_item("main", {name=torch_item, count=1}) then
-                minetest.sound_play("torch_bomb_crossbow_reload", {pos=playerpos, gain=1, max_hear_distance=64}) --out of ammo sound
+                minetest.sound_play("torch_bomb_crossbow_reload", {pos=playerpos, gain=1, max_hear_distance=64}, true) --out of ammo sound
                 return
             end
 
-			if not ((creative_mod and creative.is_enabled_for(user:get_player_name())) or
-				creative_mode_cache) then
+			if not minetest.is_creative_enabled(user:get_player_name()) then
 				inv:remove_item("main", {name=torch_item, count=1})
-				itemstack:add_wear(65535/(torch_bow_uses-1))
+				itemstack:add_wear(65535/(local_torch_bow_uses-1))
 			end
 
             local dir = user:get_look_dir()
@@ -764,38 +777,43 @@ local function register_torch_bow(name, desc, material, image, torch_bow_range,
 				embed_torch(target_pointed, user, playerpos)
 			end
 
-            minetest.sound_play("torch_bomb_crossbow_fire", {pos=playerpos, gain=1, max_hear_distance=64})
+            minetest.sound_play("torch_bomb_crossbow_fire", {pos=playerpos, gain=1, max_hear_distance=64}, true)
 
             return itemstack
         end,
     })
 
-	if minetest.get_modpath("farming") then
-		minetest.register_craft({
-			output = "torch_bomb:torch_crossbow_" .. name,
-			recipe = {
-				{material, torch_item, material},
-				{'farming:string', 'group:stick', 'farming:string'},
-				{'', 'group:stick', ''},
-			},
-		})
-	else
-		minetest.register_craft({
-			output = "torch_bomb:torch_crossbow_" .. name,
-			recipe = {
-				{material, torch_item, material},
-				{'', 'group:stick', ''},
-				{'', 'group:stick', ''},
-			},
-		})
+    local astring = ""
+    if minetest.get_modpath("mcl_mobitems") then
+       astring = "mcl_mobitems:string"
+    elseif minetest.get_modpath("farming") then
+       astring = "farming:string"
     end
+
+    minetest.register_craft({
+	  output = "torch_bomb:torch_crossbow_" .. name,
+	  recipe = {
+	     {material, torch_item, material},
+	     {astring, 'group:stick', astring},
+	     {'', 'group:stick', ''},
+	  },
+    })
 end
 
 
 if enable_crossbows then
+   if minetest.get_modpath("default") then
       register_torch_bow("wood", S("Wooden"), "group:wood", "torch_bomb_crossbow_wood.png", crossbow_range, torch_bow_uses)
       register_torch_bow("bronze", S("Bronze"), "default:bronze_ingot", "torch_bomb_crossbow_bronze.png", crossbow_range * 2, torch_bow_uses * 3)
       register_torch_bow("steel", S("Steel"), "default:steel_ingot", "torch_bomb_crossbow_steel.png", crossbow_range * 3, torch_bow_uses * 3)
+   end
+   if minetest.get_modpath("mcl_core") then
+      register_torch_bow("wood", S("Wooden"), "group:wood", "torch_bomb_crossbow_wood.png", crossbow_range, torch_bow_uses)
+      register_torch_bow("iron", S("Iron"), "mcl_core:iron_ingot", "torch_bomb_crossbow_steel.png", crossbow_range * 3, torch_bow_uses * 3)
+   end
+   if minetest.get_modpath("mcl_copper") then
+      register_torch_bow("copper", S("Copper"), "mcl_copper:copper_ingot", "torch_bomb_crossbow_bronze.png", crossbow_range * 2, torch_bow_uses * 3)
+   end
 end
 
 
@@ -862,3 +880,98 @@ if enable_tnt and tnt_modpath then
 		})
 	end
 end
+
+if enable_tnt and mcl_tnt_modpath then
+	minetest.register_craft({
+		output = "torch_bomb:torch_grenade",
+		recipe = {
+			{'mcl_core:coalblock'},
+			{'group:wood'},
+			{'mcl_mobitems:gunpowder'},
+		},
+	})
+
+	minetest.register_craft({
+		output = "torch_bomb:torch_bomb",
+		recipe = {
+			{'mcl_core:coalblock', 'mcl_core:coalblock', 'mcl_core:coalblock'},
+			{'group:wood', 'group:wood', 'group:wood'},
+			{'mcl_mobitems:gunpowder', 'mcl_mobitems:gunpowder', 'mcl_mobitems:gunpowder'},
+		},
+	})
+
+	minetest.register_craft({
+		type = "shapeless",
+		output = "torch_bomb:mega_torch_bomb",
+		recipe = {"torch_bomb:torch_bomb", "torch_bomb:torch_bomb", "torch_bomb:torch_bomb"},
+	})
+
+	minetest.register_craft({
+		type = "shapeless",
+		output = "torch_bomb:torch_bomb 3",
+		recipe = {"torch_bomb:mega_torch_bomb"},
+	})
+
+	if enable_grenade then
+
+		minetest.register_craft({
+			type = "shapeless",
+			output = "torch_bomb:torch_bomb",
+			recipe = {"torch_bomb:torch_grenade", "torch_bomb:torch_grenade", "torch_bomb:torch_grenade"},
+		})
+
+		minetest.register_craft({
+			type = "shapeless",
+			output = "torch_bomb:torch_grenade 3",
+			recipe = {"torch_bomb:torch_bomb"},
+		})
+	end
+
+	if enable_rockets then
+		minetest.register_craft({
+			type = "shapeless",
+			output = "torch_bomb:torch_bomb_rocket",
+			recipe = {"torch_bomb:torch_bomb", "mcl_tnt:tnt"},
+		})
+
+		minetest.register_craft({
+			type = "shapeless",
+			output = "torch_bomb:mega_torch_bomb_rocket",
+			recipe = {"torch_bomb:mega_torch_bomb", "mcl_tnt:tnt"},
+		})
+	end
+end
+
+--------------------------------------------------------------------------
+-- Admin/creative tools
+
+minetest.register_craftitem("torch_bomb:torch_blossom_1", {
+	description = S("Small Torch Blossom"),
+	inventory_image = "torch_bomb_torch_grenade.png^[multiply:#CCCC33^torch_bomb_blossom.png",
+	on_use = function(itemstack, user, pointed_thing)
+		local player_pos = user:get_pos()
+		kerblam(player_pos, user, ico1, 2)
+		return itemstack
+	end
+})
+
+minetest.register_craftitem("torch_bomb:torch_blossom_2", {
+	description = S("Torch Blossom"),
+	inventory_image = "torch_bomb_torch_grenade.png^[multiply:#CC8033^torch_bomb_blossom.png",
+	on_use = function(itemstack, user, pointed_thing)
+		local player_pos = user:get_pos()
+		kerblam(player_pos, user, ico2, 5)
+		return itemstack
+	end
+})
+
+minetest.register_craftitem("torch_bomb:torch_blossom_3", {
+	description = S("Mega Torch Blossom"),
+	inventory_image = "torch_bomb_torch_grenade.png^[multiply:#CC3333^torch_bomb_blossom.png",
+	on_use = function(itemstack, user, pointed_thing)
+		local player_pos = user:get_pos()
+		kerblam(player_pos, user, ico3, 15)
+		return itemstack
+	end
+})
+

locale/template.txt

@@ -1,24 +1,16 @@
 # textdomain: torch_bomb
-
-
-### init.lua ###
-
-#@1 is the type of bomb that this rocket lofts
-@1 Rocket=
-#@1 is the material the crossbow is made out of
-@1 Torch Crossbow=
-#material the crossbow is made out of
-Bronze=
-Mega Torch Bomb=
-
-#help text in the fuse setting window
 Rocket accelerates at 1 m/s^2.@nFuse duration from 1 to @1 seconds:=
-
-#button label
 Set=
-#material the crossbow is made out of
-Steel=
+@1 Rocket=
 Torch Bomb=
+Mega Torch Bomb=
 Torch Grenade=
-#material the crossbow is made out of
+@1 Torch Crossbow=
 Wooden=
+Bronze=
+Steel=
+Iron=
+Copper=
+Small Torch Blossom=
+Torch Blossom=
+Mega Torch Blossom=

locale/torch_bomb.es.tr

@@ -0,0 +1,16 @@
+# textdomain: torch_bomb
+Rocket accelerates at 1 m/s^2.@nFuse duration from 1 to @1 seconds:=El cohete se acelera a 1 m/s^2.@nDuración del fusiblee de 1 a @1 segundos:
+Set=Establecer
+@1 Rocket=Cohete de @1
+Torch Bomb=Bomba de Antorcha
+Mega Torch Bomb=Mega Bomba de Antorcha
+Torch Grenade=Granada de Antorcha
+@1 Torch Crossbow=Ballesta Antorcha de @1
+Wooden=Madera
+Bronze=Bronce
+Steel=Hierro
+Iron=
+Copper=
+Small Torch Blossom=Pequeña Antorcha de Flor
+Torch Blossom=Antorcha de Flor.
+Mega Torch Blossom=Mega Antorcha de Flor

mod.conf

@@ -1,4 +1,5 @@
 name = torch_bomb
 description = Place torches throughout your entire surroundings with a torch bomb
-depends = default
-optional_depends = tnt, creative, farming
+depends = fakelib
+optional_depends = mcl_core, mcl_sounds, mcl_explosions, mcl_tnt, default, tnt, creative, farming
+min_minetest_version = 5.3.0