From 25b9c2e1b8eeec8a860da5bd3eb682b6811a4c38 Mon Sep 17 00:00:00 2001 From: mrkubax10 Date: Fri, 14 Nov 2025 13:19:02 +0100 Subject: [PATCH] Buckets can now take fluids from Pump --- compatibility.lua | 31 +++++++++++++++++++++++++++++++ machines/pump.lua | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/compatibility.lua b/compatibility.lua index ac6ae35..38b0e2d 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -53,6 +53,21 @@ industrialtest.internal={} if industrialtest.mclAvailable then industrialtest.stackMax=64 + minetest.override_item("mcl_buckets:bucket_empty",{ + groups={ + _industrialtest_simpleFluidStorage=1 + }, + _industrialtest_getResultingFluidStorageItemByNode=function(fluidType) + local resultingItem=mcl_buckets.liquids[fluidType] + if resultingItem then + return { + name=resultingItem.bucketname + } + end + end, + _industrialtest_simpleFluidStorageCapacity=1000 + }) + industrialtest.internal.mclMakeStrippedTrunk=function(itemstack,placer,pointedThing,electricTool) -- Taken from https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/init.lua#L360 if pointedThing.type ~= "node" then return end @@ -90,6 +105,22 @@ if industrialtest.mclAvailable then elseif industrialtest.mtgAvailable then industrialtest.stackMax=99 + -- Override bucket to add function which will be used to query bucket with fluid + minetest.override_item("bucket:bucket_empty",{ + groups={ + _industrialtest_simpleFluidStorage=1 + }, + _industrialtest_getResultingFluidStorageItemByNode=function(fluidType) + local resultingItem=bucket.liquids[fluidType] + if resultingItem then + return { + name=resultingItem.itemname + } + end + end, + _industrialtest_simpleFluidStorageCapacity=1000 + }) + industrialtest.internal.explode=function(pos,radius) tnt.boom(pos,{radius=radius}) end diff --git a/machines/pump.lua b/machines/pump.lua index 411a4c2..14f1c9f 100644 --- a/machines/pump.lua +++ b/machines/pump.lua @@ -96,8 +96,8 @@ function industrialtest.Pump.getFormspec(self,pos) (srcPercent>0 and "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png]" or "image[6.7,2.7;1,1;gui_furnace_arrow_bg.png]"), (fluidPercent>0 and "image[7.7,2.7;1,1;industrialtest_gui_fluid_bg.png^[lowpart:"..fluidPercent..":"..tile.."]" or "image[7.7,2.7;1,1;industrialtest_gui_fluid_bg.png]"), - "label[3.2,1.5;"..S("Input").."]", - "label[4.6,1.5;"..S("Output").."]", + "label[3.2,1.35;"..S("Input").."]", + "label[4.6,1.35;"..S("Output").."]", "listring[context;src]", "listring[context;dst]" }