Implement Canning Machine

2024-01-12 20:17:36 +01:00 · 2024-01-12 20:17:36 +01:00 · 6cf004ff0e
commit 6cf004ff0e
parent eaff4a9065
5 changed files with 319 additions and 9 deletions
--- a/api.lua
+++ b/api.lua
@ -172,7 +172,7 @@ end
 industrialtest.api.updateItemFluidText=function(itemstack)
 	local meta=itemstack:get_meta()
 	local def=itemstack:get_definition()
-	meta:set_string("description",S("@1\n@2 / @3",def.description,meta:get_int("industrialtest.fluidAmount"),meta:get_int("industrialtest.fluidCapacity")))
+	meta:set_string("description",S("@1\n@2 / @3 mB",def.description,meta:get_int("industrialtest.fluidAmount"),meta:get_int("industrialtest.fluidCapacity")))
 	itemstack:set_wear(65535-meta:get_int("industrialtest.fluidAmount")/meta:get_int("industrialtest.fluidCapacity")*65534)
 end

@ -185,7 +185,7 @@ industrialtest.api.prepareFluidStorageItem=function(itemstack)
 	if industrialtest.api.itemHasFluidStorage(itemstack) or not def.groups or not def.groups._industrialtest_fluidStorage or not def._industrialtest_fluidCapacity then
 		return false
 	end
-	meta:set_int("industrialtest.fluidAmount",100)
+	meta:set_int("industrialtest.fluidAmount",0)
 	meta:set_int("industrialtest.fluidCapacity",def._industrialtest_fluidCapacity)
 	industrialtest.api.updateItemFluidText(itemstack)
 	return true
@ -209,18 +209,20 @@ industrialtest.api.addFluidToItem=function(itemstack,amount)
 	return fluidAmount-prevFluidAmount
 end

-- \brief Adds fluid to destination itemstack while subtracting it from source metadata
-- \param srcMeta MetaDataRef
+-- \brief Adds fluid to destination itemstack while subtracting it from source itemstack's metadata
+-- \param srcItemstack ItemStack
 -- \param itemstack ItemStack
 -- \param amount number
 -- \returns number
-industrialtest.api.transferFluidToItem=function(srcMeta,itemstack,amount)
-	local flow=math.min(srcMeta:get_int("industrialtest.fluidAmount"),amount)
+industrialtest.api.transferFluidToItem=function(srcItemstack,itemstack,amount)
+	local meta=srcItemstack:get_meta()
+	local flow=math.min(meta:get_int("industrialtest.fluidAmount"),amount)
 	if flow==0 then
 		return 0
 	end
 	local actualFlow=industrialtest.api.addFluidToItem(itemstack,flow)
-	srcMeta:set_int("industrialtest.fluidAmount",srcMeta:get_int("industrialtest.fluidAmount")-actualFlow)
+	meta:set_int("industrialtest.fluidAmount",meta:get_int("industrialtest.fluidAmount")-actualFlow)
+	industrialtest.api.updateItemFluidText(srcItemstack)
 	return actualFlow
 end

--- a/craftitems.lua
+++ b/craftitems.lua
@ -559,8 +559,10 @@ minetest.register_craftitem("industrialtest:biofuel_cell",{
 	description=S("Biofuel Cell"),
 	inventory_image="industrialtest_bio_cell.png",
 	groups={
-		_industrialtest_jetpackFuel=1
-	}
+		_industrialtest_fuel=1
+	},
+	_industrialtest_fuelAmount=500,
+	_industrialtest_emptyVariant="industrialtest:empty_cell"
 })
 industrialtest.api.registerExtractorRecipe({
 	output="industrialtest:biofuel_cell",
@ -690,6 +692,7 @@ minetest.register_tool("industrialtest:fuel_can",{
 	inventory_image="industrialtest_fuel_can.png",
 	groups={
 		_industrialtest_fueled=1,
+		_industrialtest_fuel=1,
 		_industrialtest_fluidStorage=1
 	},
 	_industrialtest_fluidCapacity=10000
--- a/init.lua
+++ b/init.lua
@ -33,6 +33,7 @@ dofile(modpath.."/api.lua")
 dofile(modpath.."/minerals.lua")

 dofile(modpath.."/machines/common.lua")
+dofile(modpath.."/machines/canning_machine.lua")
 dofile(modpath.."/machines/compressor.lua")
 dofile(modpath.."/machines/cable_former.lua")
 dofile(modpath.."/machines/electric_furnace.lua")
--- a/machines/canning_machine.lua
+++ b/machines/canning_machine.lua
@ -0,0 +1,294 @@
+-- IndustrialTest
+-- Copyright (C) 2024 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 <http://www.gnu.org/licenses/>.
+
+local S=minetest.get_translator("industrialtest")
+local canningMachine={}
+
+canningMachine.opPower=200
+canningMachine.canningTime=5
+
+canningMachine.getFormspec=function(pos)
+	local meta=minetest.get_meta(pos)
+	local powerPercent=meta:get_int("industrialtest.powerAmount")/meta:get_int("industrialtest.powerCapacity")*100
+	local srcPercent=meta:get_float("srcTime")/canningMachine.canningTime*100
+	local formspec
+	if industrialtest.mtgAvailable then
+		formspec={
+			"list[context;fuel;3.4,1.8;1,1]",
+			(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
+			 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
+			"list[context;powerStorage;3.4,3.9;1,1]",
+			(srcPercent>0 and "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
+			 or "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
+			"list[context;target;6.4,1.8;1,1]",
+			"list[context;leftover;6.4,2.8;1,1]",
+			"list[context;upgrades;9,0.9;1,4]",
+			"listring[context;fuel]",
+			"listring[context;powerStorage]",
+			"listring[context;target]",
+			"listring[context;leftover]",
+			"listring[context;upgrades]"
+		}
+	elseif industrialtest.mclAvailable then
+		formspec={
+		"list[context;fuel;3.4,1.8;1,1]",
+		mcl_formspec.get_itemslot_bg(3.4,1.8,1,1),
+		(powerPercent>0 and "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png^[lowpart:"..powerPercent..":industrialtest_gui_electricity_fg.png]"
+		 or "image[3.4,2.8;1,1;industrialtest_gui_electricity_bg.png]"),
+		"list[context;powerStorage;3.4,3.9;1,1]",
+		mcl_formspec.get_itemslot_bg(3.4,3.9,1,1),
+		(srcPercent>0 and "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[lowpart:"..srcPercent..":gui_furnace_arrow_fg.png^[transformR270]"
+		 or "image[4.9,1.8;1,1;gui_furnace_arrow_bg.png^[transformR270]"),
+		"list[context;target;6.4,1.8;1,1]",
+		mcl_formspec.get_itemslot_bg(6.4,1.8,1,1),
+		"list[context;leftover;6.4,2.8;1,1]",
+		mcl_formspec.get_itemslot_bg(6.4,2.8,1,1),
+		"list[context;upgrades;9,0.9;1,4]",
+		mcl_formspec.get_itemslot_bg(9,0.9,1,4),
+		"listring[context;fuel]",
+		"listring[context;powerStorage]",
+		"listring[context;target]",
+		"listring[context;upgrades]"
+		}
+	end
+	return table.concat(formspec,"")
+end
+
+canningMachine.onConstruct=function(pos,meta,inv)
+	inv:set_size("fuel",1)
+	inv:set_size("target",1)
+	inv:set_size("leftover",1)
+	inv:set_size("powerStorage",1)
+	inv:set_size("upgrades",4)
+	meta:set_float("srcTime",0)
+end
+
+canningMachine.onTimer=function(pos,elapsed,meta,inv)
+	local shouldRerunTimer=false
+	local shouldUpdateFormspec=false
+	local fuelSlot=inv:get_stack("fuel",1)
+	local targetSlot=inv:get_stack("target",1)
+	local leftoverSlot=inv:get_stack("leftover",1)
+	local powerStorageSlot=inv:get_stack("powerStorage",1)
+	local targetMeta=targetSlot:get_meta()
+
+	if not powerStorageSlot:is_empty() then
+		local stackMeta=powerStorageSlot:get_meta()
+		if industrialtest.api.transferPower(stackMeta,meta,stackMeta:get_int("industrialtest.powerFlow"))>0 then
+			shouldUpdateFormspec=true
+			shouldRerunTimer=true
+			industrialtest.api.updateItemPowerText(powerStorageSlot)
+			inv:set_stack("powerStorage",1,powerStorageSlot)
+		end
+	end
+
+	local def=fuelSlot:get_definition()
+	if not fuelSlot:is_empty() and not targetSlot:is_empty() and meta:get_int("industrialtest.powerAmount")>=canningMachine.opPower and (not def._industrialtest_emptyVariant or leftoverSlot:item_fits(ItemStack(def._industrialtest_emptyVariant))) and
+		(not industrialtest.api.itemHasFluidStorage(fuelSlot) or fuelSlot:get_meta():get_int("industrialtest.fluidAmount")>0) and targetMeta:get_int("industrialtest.fluidAmount")<targetMeta:get_int("industrialtest.fluidCapacity") then
+		minetest.swap_node(pos,{
+			name="industrialtest:canning_machine_active",
+			param2=minetest.get_node(pos).param2
+		})
+		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		return false,shouldUpdateFormspec
+	end
+	
+	return shouldRerunTimer,true
+end
+
+canningMachine.allowMetadataInventoryMove=function(pos,fromList,fromIndex,toList,count)
+	if toList=="fuel" then
+		local inv=minetest.get_meta(pos):get_inventory()
+		local itemstack=inv:get_stack(fromList,fromIndex)
+		local def=itemstack:get_definition()
+		return (def.groups and def.groups._industrialtest_fuel) and count or 0
+	end
+	if toList=="target" then
+		local inv=minetest.get_meta(pos):get_inventory()
+		local itemstack=inv:get_stack(fromList,fromIndex)
+		local def=itemstack:get_definition()
+		return (def.groups and def.groups._industrialtest_fueled) and count or 0
+	end
+	return count
+end
+
+canningMachine.allowMetadataInventoryPut=function(pos,listname,index,stack)
+	if listname=="fuel" then
+		local def=stack:get_definition()
+		return (def.groups and def.groups._industrialtest_fuel) and stack:get_count() or 0
+	end
+	if listname=="target" then
+		local def=stack:get_definition()
+		return (def.groups and def.groups._industrialtest_fueled) and stack:get_count() or 0
+	end
+	return stack:get_count()
+end
+
+canningMachine.allowMetadataInventoryTake=function(pos,listname,index,stack)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local fuelSlot=inv:get_stack("fuel",1)
+	local targetSlot=inv:get_stack("target",1)
+	if ((listname=="fuel" and stack:get_count()==fuelSlot:get_count()) or (listname=="target" and stack:get_count()==targetSlot:get_count())) and meta:get_float("srcTime")>0 then
+		meta:set_float("srcTime",0)
+		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+	end
+	return stack:get_count()
+end
+
+canningMachine.onMetadataInventoryPut=function(pos)
+	minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+end
+
+canningMachine.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
+	local meta=minetest.get_meta(pos)
+	local inv=meta:get_inventory()
+	local fuelSlot=inv:get_stack("fuel",1)
+	local targetSlot=inv:get_stack("target",1)
+	if ((fromList=="fuel" and count==fuelSlot:get_count()) or (fromList=="target" and count==targetSlot:get_count())) and meta:get_float("srcTime")>0 then
+		meta:set_float("srcTime",0)
+		meta:set_string("formspec",canningMachine.getFormspec(pos))
+	end
+end
+
+canningMachine.activeOnTimer=function(pos,elapsed,meta,inv)
+	local shouldUpdateFormspec=false
+	local fuelSlot=inv:get_stack("fuel",1)
+	local targetSlot=inv:get_stack("target",1)
+	local powerStorageSlot=inv:get_stack("powerStorage",1)
+
+	if not powerStorageSlot:is_empty() then
+		local stackMeta=powerStorageSlot:get_meta()
+		if industrialtest.api.transferPower(stackMeta,meta,stackMeta:get_int("industrialtest.powerFlow"))>0 then
+			shouldUpdateFormspec=true
+			industrialtest.api.updateItemPowerText(powerStorageSlot)
+			inv:set_stack("powerStorage",1,powerStorageSlot)
+		end
+	end
+
+	if fuelSlot:is_empty() or targetSlot:is_empty() or meta:get_int("industrialtest.powerAmount")<canningMachine.opPower then
+		if meta:get_int("industrialtest.powerAmount")>=canningMachine.opPower then
+			meta:set_float("srcTime",0)
+		end
+		minetest.swap_node(pos,{
+			name="industrialtest:canning_machine",
+			param2=minetest.get_node(pos).param2
+		})
+		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		return false,true
+	end
+
+	local fuelMeta=fuelSlot:get_meta()
+	local targetMeta=targetSlot:get_meta()
+	if (industrialtest.api.itemHasFluidStorage(fuelSlot) and fuelMeta:get_int("industrialtest.fluidAmount")==0) or targetMeta:get_int("industrialtest.fluidAmount")==targetMeta:get_int("industrialtest.fluidCapacity") then
+		meta:set_float("srcTime",0)
+		minetest.swap_node(pos,{
+			name="industrialtest:canning_machine",
+			param2=minetest.get_node(pos).param2
+		})
+		minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+		return false,true
+	end
+
+	local srcTime=meta:get_float("srcTime")
+	srcTime=srcTime+elapsed*industrialtest.api.getMachineSpeed(meta)
+	if srcTime>=canningMachine.canningTime then
+		if industrialtest.api.itemHasFluidStorage(fuelSlot) then
+			industrialtest.api.transferFluidToItem(fuelSlot,targetSlot,fuelMeta:get_int("industrialtest.fluidAmount"))
+			inv:set_stack("fuel",1,fuelSlot)
+			inv:set_stack("target",1,targetSlot)
+		else
+			local def=fuelSlot:get_definition()
+			local leftoverSlot=inv:get_stack("leftover",1)
+			if targetMeta:get_int("industrialtest.fluidCapacity")-targetMeta:get_int("industrialtest.fluidAmount")<def._industrialtest_fuelAmount or (def._industrialtest_emptyVariant and not leftoverSlot:item_fits(ItemStack(def._industrialtest_emptyVariant))) then
+				minetest.swap_node(pos,{
+					name="industrialtest:canning_machine",
+					param2=minetest.get_node(pos).param2
+				})
+				minetest.get_node_timer(pos):start(industrialtest.updateDelay)
+				return false,shouldUpdateFormspec
+			end
+			industrialtest.api.addFluidToItem(targetSlot,def._industrialtest_fuelAmount)
+			inv:set_stack("target",1,targetSlot)
+			fuelSlot:take_item(1)
+			inv:set_stack("fuel",1,fuelSlot)
+			leftoverSlot:add_item(ItemStack(def._industrialtest_emptyVariant))
+			inv:set_stack("leftover",1,leftoverSlot)
+		end
+		meta:set_float("srcTime",0)
+	else
+		meta:set_float("srcTime",srcTime)
+	end
+	industrialtest.api.addPower(meta,-canningMachine.opPower)
+
+	return true,true
+end
+
+industrialtest.internal.registerMachine({
+	name="canning_machine",
+	displayName=S("Canning Machine"),
+	capacity=industrialtest.api.lvPowerFlow*2,
+	getFormspec=canningMachine.getFormspec,
+	flow=industrialtest.api.lvPowerFlow,
+	ioConfig="iiiiii",
+	requiresWrench=true,
+	registerActiveVariant=true,
+	sounds="metal",
+	powerSlots={"powerStorage"},
+	storageSlots={"fuel","target","powerStorage","upgrades"},
+	groups={
+		_industrialtest_hasPowerInput=1
+	},
+	customKeys={
+		tiles={
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png^industrialtest_canning_machine_front.png"
+		},
+		paramtype2="facedir",
+		legacy_facedir_simple=true
+	},
+	activeCustomKeys={
+		tiles={
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png",
+			"industrialtest_machine_block.png^industrialtest_canning_machine_front_active.png"
+		}
+	},
+	onConstruct=canningMachine.onConstruct,
+	onTimer=canningMachine.onTimer,
+	allowMetadataInventoryMove=canningMachine.allowMetadataInventoryMove,
+	allowMetadataInventoryPut=canningMachine.allowMetadataInventoryPut,
+	allowMetadataInventoryTake=canningMachine.allowMetadataInventoryTake,
+	onMetadataInventoryPut=canningMachine.onMetadataInventoryPut,
+	onMetadataInventoryMove=canningMachine.onMetadataInventoryMove,
+	activeOnTimer=canningMachine.activeOnTimer
+})
+minetest.register_craft({
+	type="shaped",
+	output="industrialtest:canning_machine",
+	recipe={
+		{industrialtest.elementKeys.tinIngot,"industrialtest:electronic_circuit",industrialtest.elementKeys.tinIngot},
+		{industrialtest.elementKeys.tinIngot,"industrialtest:machine_block",industrialtest.elementKeys.tinIngot},
+		{industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.tinIngot,industrialtest.elementKeys.tinIngot}
+	}
+})
--- a/machines/common.lua
+++ b/machines/common.lua
@ -221,6 +221,13 @@ machine.allowMetadataInventoryPut=function(pos,listname,index,stack,player,confi
 	return stack:get_count()
 end

+machine.allowMetadataInventoryTake=function(pos,listname,index,stack,player,config)
+	if config.allowMetadataInventoryTake then
+		return config.allowMetadataInventoryTake(pos,listname,index,stack,player)
+	end
+	return stack:get_count()
+end
+
 machine.onMetadataInventoryMove=function(pos,fromList,fromIndex,toList,toIndex,count)
 	if toList=="upgrades" then
 		local meta=minetest.get_meta(pos)
@ -274,6 +281,9 @@ function industrialtest.internal.registerMachine(config)
 		allow_metadata_inventory_put=function(pos,listname,index,stack,player)
 			return machine.allowMetadataInventoryPut(pos,listname,index,stack,player,config)
 		end,
+		allow_metadata_inventory_take=function(pos,listname,index,stack,player)
+			return machine.allowMetadataInventoryTake(pos,listname,index,stack,player,config)
+		end,
 		on_metadata_inventory_put=function(pos,listname,index,stack,player)
 			machine.onMetadataInventoryPut(pos,listname,index,stack)
 			if config.onMetadataInventoryPut then