From ce4e1b52ba79cb9dda5e0f009bd7b08d53d0e813 Mon Sep 17 00:00:00 2001 From: mrkubax10 Date: Sun, 8 Sep 2024 22:56:01 +0200 Subject: [PATCH] Some leftover API files fixes --- api.lua | 24 ------------------------ api/common.lua | 8 +++++++- api/fluid.lua | 2 ++ api/power.lua | 2 ++ init.lua | 1 - 5 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 api.lua diff --git a/api.lua b/api.lua deleted file mode 100644 index 0f76e3c..0000000 --- a/api.lua +++ /dev/null @@ -1,24 +0,0 @@ --- IndustrialTest --- Copyright (C) 2023 mrkubax10 - --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 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 General Public License for more details. - --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . - -local S=minetest.get_translator("industrialtest") - --- \brief Returns machine speed in items per operation --- \param meta MetaDataRef --- \returns number -industrialtest.api.getMachineSpeed=function(meta) - return meta:contains("industrialtest.speed") and meta:get_int("industrialtest.speed") or 1 -end diff --git a/api/common.lua b/api/common.lua index 07d3be5..1483684 100644 --- a/api/common.lua +++ b/api/common.lua @@ -30,7 +30,13 @@ industrialtest.api.hvPowerFlow=10200 industrialtest.api.evPowerFlow=40800 industrialtest.api.ivPowerFlow=163800 -industrialtest.internal.clamp=function(num,min,max) +function industrialtest.internal.clamp(num,min,max) return math.max(math.min(num,max),min) end +-- \brief Returns machine speed in items per operation +-- \param meta MetaDataRef +-- \returns number +function industrialtest.api.getMachineSpeed(meta) + return meta:contains("industrialtest.speed") and meta:get_int("industrialtest.speed") or 1 +end diff --git a/api/fluid.lua b/api/fluid.lua index f5e08c7..ff0af96 100644 --- a/api/fluid.lua +++ b/api/fluid.lua @@ -14,6 +14,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . +local S=minetest.get_translator("industrialtest") + -- \brief Prepares itemstack containing fluid storage -- \param itemstack ItemStack -- \returns bool diff --git a/api/power.lua b/api/power.lua index fcb105b..49c673d 100644 --- a/api/power.lua +++ b/api/power.lua @@ -14,6 +14,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . +local S=minetest.get_translator("industrialtest") + -- \brief Adds power storage to metadata -- \param capacity How much EU item/node can store -- \param flow How much EU can flow in or out item/node per industrialtest.updateDelay diff --git a/init.lua b/init.lua index 6ae40e6..ccde4b7 100644 --- a/init.lua +++ b/init.lua @@ -38,7 +38,6 @@ dofile(modpath.."/api/power.lua") dofile(modpath.."/api/registration.lua") dofile(modpath.."/api/side.lua") dofile(modpath.."/api/tool.lua") -dofile(modpath.."/api.lua") dofile(modpath.."/machines/common.lua") dofile(modpath.."/machines/canning_machine.lua")