From 77dfd84590af715408a785ab5ac41c36d677b117 Mon Sep 17 00:00:00 2001 From: OgelGames Date: Fri, 24 May 2024 13:46:39 +1000 Subject: [PATCH] replace fake player with fakelib --- README.md | 4 +- basic_machines/quarry.lua | 12 ++-- basis/fake_player.lua | 117 -------------------------------------- init.lua | 1 - mod.conf | 2 +- 5 files changed, 8 insertions(+), 128 deletions(-) delete mode 100644 basis/fake_player.lua diff --git a/README.md b/README.md index d43c666..e85e4be 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,14 @@ Many thanks to Thomas-S, niklp09, and others for their contributions ### Dependencies -Required: default, doors, bucket, stairs, screwdriver, basic_materials, tubelib2, networks, minecart, lcdlib, safer_lua, doclib +Required: default, doors, bucket, stairs, screwdriver, basic_materials, tubelib2, networks, minecart, lcdlib, safer_lua, doclib, fakelib Recommended: signs_bot, hyperloop, compost, techpack_stairway, autobahn Optional: unified_inventory, wielded_light, unifieddyes, lua-mashal, lsqlite3, moreores, ethereal, mesecon The mods `default`, `doors`, `bucket`, `stairs`, and `screwdriver` are part of Minetest Game. -`basic_materials` will be found here: https://content.minetest.net/ +`basic_materials` and `fakelib` can be found on ContentDB: https://content.minetest.net/ The following mods in the newest version have to be downloaded directly from GitHub: * [tubelib2](https://github.com/joe7575/tubelib2) diff --git a/basic_machines/quarry.lua b/basic_machines/quarry.lua index 41df119..124bd60 100644 --- a/basic_machines/quarry.lua +++ b/basic_machines/quarry.lua @@ -167,13 +167,11 @@ local function quarry_task(pos, crd, nvm) local y_last = y_first - nvm.quarry_depth + 1 local facedir = minetest.get_node(pos).param2 local owner = M(pos):get_string("owner") - local fake_player = techage.Fake_player:new() - fake_player.get_pos = function (...) - return pos - end - fake_player.get_inventory = function(...) - return M(pos):get_inventory() - end + local fake_player = fakelib.create_player({ + name = owner, + position = pos, + inventory = M(pos):get_inventory(), + }) local add_to_inv = function(itemstacks) local at_least_one_added = false diff --git a/basis/fake_player.lua b/basis/fake_player.lua deleted file mode 100644 index 3526762..0000000 --- a/basis/fake_player.lua +++ /dev/null @@ -1,117 +0,0 @@ ---[[ - - TechAge - ======= - - Copyright (C) 2019-2020 Joachim Stolberg - Copyright (C) 2020 Thomas S. - - AGPL v3 - See LICENSE.txt for more information - - Fake Player - -]]-- - --- Map method names to their return values -local methods = { - get_pos = { x = 0, y = 0, z = 0 }, - set_pos = nil, - moveto = nil, - punch = nil, - right_click = nil, - get_hp = 20, - set_hp = nil, - get_inventory = nil, - get_wield_list = "", - get_wield_index = 0, - get_wielded_item = ItemStack(), - set_wielded_item = true, - set_armor_groups = nil, - get_armor_groups = {}, - set_animation = nil, - get_animation = {}, - set_animation_frame_speed = nil, - set_attach = nil, - get_attach = nil, - set_detach = nil, - get_bone_position = {}, - set_properties = nil, - get_properties = {}, - is_player = false, - get_nametag_attributes = {}, - set_nametag_attributes = nil, - get_player_name = "", - get_player_velocity = nil, - add_player_velocity = nil, - get_look_dir = vector.new(0, 0, 1), - get_look_vertical = 0, - get_look_horizontal = 0, - set_look_vertical = nil, - set_look_horizontal = nil, - get_look_pitch = 0, - get_look_yaw = 0, - set_look_pitch = nil, - set_look_yaw = nil, - get_breath = 10, - set_breath = nil, - set_fov = nil, - get_fov = 0, - set_attribute = nil, - get_attribute = nil, - get_meta = nil, - set_inventory_formspec = nil, - get_inventory_formspec = "", - set_formspec_prepend = nil, - get_formspec_prepend = "", - get_player_control = {}, - get_player_control_bits = 0, - set_physics_override = nil, - get_physics_override = {}, - hud_add = 0, - hud_remove = nil, - hud_change = nil, - hud_get = {}, - hud_set_flags = nil, - hud_get_flags = {}, - hud_set_hotbar_itemcount = nil, - hud_get_hotbar_itemcount = 8, - hud_set_hotbar_image = nil, - hud_get_hotbar_image = "", - hud_set_hotbar_selected_image = nil, - hud_get_hotbar_selected_image = "", - set_sky = nil, - get_sky = {}, - get_sky_color = {}, - set_sun = nil, - get_sun = {}, - set_moon = nil, - get_moon = {}, - set_stars = nil, - get_stars = {}, - set_clouds = nil, - get_clouds = {}, - override_day_night_ratio = nil, - get_day_night_ratio = nil, - set_local_animation = nil, - get_local_animation = {}, - set_eye_offset = nil, - get_eye_offset = {}, - send_mapblock = nil, -} - -techage.Fake_player = {} -techage.Fake_player.__index = techage.Fake_player - -function techage.Fake_player:new() - local fake_player = {} - setmetatable(fake_player, techage.Fake_player) - return fake_player -end - - -for method_name, return_value in pairs(methods) do - techage.Fake_player[method_name] = function(self, ...) - return return_value - end -end diff --git a/init.lua b/init.lua index f359717..fcbaf59 100644 --- a/init.lua +++ b/init.lua @@ -79,7 +79,6 @@ end local MP = minetest.get_modpath("techage") dofile(MP.."/basis/lib.lua") -- helper functions dofile(MP.."/basis/counting.lua") -- command counting -dofile(MP.."/basis/fake_player.lua") -- dummy player object dofile(MP.."/basis/node_store.lua") dofile(MP.."/basis/gravel_lib.lua") -- ore probability dofile(MP.."/basis/node_states.lua") -- state model diff --git a/mod.conf b/mod.conf index 8f76061..b929574 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,5 @@ name = techage -depends = default,doors,flowers,tubelib2,networks,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua,doclib +depends = default,doors,flowers,tubelib2,networks,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua,doclib,fakelib optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecons,mesecons_materials,mesecons_mvps,digtron,bakedclay,moreblocks,i3,creative,craftguide,farming description = Techage, go through 5 tech ages in search of wealth and power! supported_games = minetest_game