2 Commits

Author SHA1 Message Date
25b9c2e1b8 Buckets can now take fluids from Pump 2025-11-14 13:19:02 +01:00
1e1797e1dc Fix misaligned labels in Miner formspec 2025-11-14 13:14:00 +01:00
3 changed files with 36 additions and 5 deletions

View File

@@ -53,6 +53,21 @@ industrialtest.internal={}
if industrialtest.mclAvailable then if industrialtest.mclAvailable then
industrialtest.stackMax=64 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) 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 -- 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 if pointedThing.type ~= "node" then return end
@@ -90,6 +105,22 @@ if industrialtest.mclAvailable then
elseif industrialtest.mtgAvailable then elseif industrialtest.mtgAvailable then
industrialtest.stackMax=99 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) industrialtest.internal.explode=function(pos,radius)
tnt.boom(pos,{radius=radius}) tnt.boom(pos,{radius=radius})
end end

View File

@@ -186,13 +186,13 @@ function industrialtest.Miner.getFormspec(self,pos)
local meta=minetest.get_meta(pos) local meta=minetest.get_meta(pos)
local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100 local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
local formspec={ local formspec={
"label[0.7,1.2;"..S("Drill").."]", "label[0.7,1.15;"..S("Drill").."]",
"list[context;drill;0.7,1.5;1,1]", "list[context;drill;0.7,1.5;1,1]",
industrialtest.internal.getItemSlotBg(0.7,1.5,1,1), industrialtest.internal.getItemSlotBg(0.7,1.5,1,1),
"label[0.7,2.8;"..S("Pipe").."]", "label[0.7,2.75;"..S("Pipe").."]",
"list[context;src;0.7,3.1;1,1]", "list[context;src;0.7,3.1;1,1]",
industrialtest.internal.getItemSlotBg(0.7,3.1,1,1), industrialtest.internal.getItemSlotBg(0.7,3.1,1,1),
"label[0.7,4.4;"..S("Scanner").."]", "label[0.7,4.35;"..S("Scanner").."]",
"list[context;scanner;0.7,4.7;1,1]", "list[context;scanner;0.7,4.7;1,1]",
industrialtest.internal.getItemSlotBg(0.7,4.7,1,1), industrialtest.internal.getItemSlotBg(0.7,4.7,1,1),
"list[context;dst;2.28,1.9;5,3]", "list[context;dst;2.28,1.9;5,3]",

View File

@@ -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]" (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]"), 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]"), (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[3.2,1.35;"..S("Input").."]",
"label[4.6,1.5;"..S("Output").."]", "label[4.6,1.35;"..S("Output").."]",
"listring[context;src]", "listring[context;src]",
"listring[context;dst]" "listring[context;dst]"
} }