From ea422c5999f7650dde1d8937ec64cb49d3c50ea4 Mon Sep 17 00:00:00 2001 From: mrkubax10 Date: Wed, 7 May 2025 18:51:00 +0200 Subject: [PATCH] Some Miner tweaks --- machines/machine.lua | 8 ++++++++ machines/miner.lua | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/machines/machine.lua b/machines/machine.lua index aa1dbb0..15087ea 100644 --- a/machines/machine.lua +++ b/machines/machine.lua @@ -36,6 +36,11 @@ function industrialtest.Machine.afterDigNode(self,pos,oldnode,oldmetadata,digger -- dummy function end +function industrialtest.Machine.onDig(self,pos,node,digger) + -- dummy function + return minetest.node_dig(pos,node,digger) +end + function industrialtest.Machine.getFormspec(self,pos) local formspec if industrialtest.mtgAvailable then @@ -202,6 +207,9 @@ function industrialtest.Machine.createDefinitionTable(self) after_dig_node=function(pos,oldnode,oldmetadata,digger) self:afterDigNode(pos,oldnode,oldmetadata,digger) end, + on_dig=function(pos,node,digger) + return self:onDig(pos,node,digger) + end, on_timer=function(pos,elapsed) return self:onTimer(pos,elapsed) end, diff --git a/machines/miner.lua b/machines/miner.lua index f06439a..e653eb0 100644 --- a/machines/miner.lua +++ b/machines/miner.lua @@ -173,8 +173,9 @@ function industrialtest.Miner.onDestruct(self,pos) industrialtest.ElectricMachine.onDestruct(self,pos) end -function industrialtest.Miner.afterDigNode(self,pos,oldnode,oldmetadata,digger) +function industrialtest.Miner.onDig(self,pos,node,digger) destructMiningPipe(vector.new(pos.x,pos.y-1,pos.z),digger) + return industrialtest.ElectricMachine.onDig(self,pos,node,digger) end function industrialtest.Miner.getFormspec(self,pos) @@ -199,6 +200,8 @@ function industrialtest.Miner.getFormspec(self,pos) or "image[9.1,2.29;1,1;industrialtest_gui_electricity_bg.png]"), "list[context;powerStorage;9.1,3.5;1,1]", industrialtest.internal.getItemSlotBg(9.1,3.5,1,1), + "listring[context;src]", + "listring[context;dst]" } return parentFormspec..table.concat(formspec,"") end @@ -245,7 +248,7 @@ function industrialtest.Miner.allowMetadataInventoryPut(self,pos,listname,index, if listname=="dst" then return 0 end - return industrialtest.ElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,stack,player) + return industrialtest.ElectricMachine.allowMetadataInventoryPut(self,pos,listname,index,itemstack,player) end function industrialtest.Miner.onMetadataInventoryMove(self,pos,fromList,fromIndex,toList,toIndex,count)