From 8e30412515dd9cd59e0b68f1da6624ef0bc155de Mon Sep 17 00:00:00 2001 From: mrkubax10 Date: Tue, 11 Mar 2025 22:19:46 +0100 Subject: [PATCH] Refactor Mass Fabricator --- machines/cable_former.lua | 2 +- machines/compressor.lua | 2 +- machines/extractor.lua | 2 +- machines/macerator.lua | 2 +- machines/mass_fabricator.lua | 54 ++++++++++++++++++++++++++++++------ 5 files changed, 49 insertions(+), 13 deletions(-) diff --git a/machines/cable_former.lua b/machines/cable_former.lua index 40dc41c..919a0f4 100644 --- a/machines/cable_former.lua +++ b/machines/cable_former.lua @@ -52,7 +52,7 @@ function industrialtest.CableFormer.getCraftResult(self,itemstack) return { item=ItemStack(), time=0, - src=item + src=itemstack } end local srcAfter=ItemStack(itemstack:get_name()) diff --git a/machines/compressor.lua b/machines/compressor.lua index 3140b79..5711b0d 100644 --- a/machines/compressor.lua +++ b/machines/compressor.lua @@ -52,7 +52,7 @@ function industrialtest.Compressor.getCraftResult(self,itemstack) return { item=ItemStack(), time=0, - src=item + src=itemstack } end local srcAfter=ItemStack(itemstack:get_name()) diff --git a/machines/extractor.lua b/machines/extractor.lua index c5edc6e..acffb25 100644 --- a/machines/extractor.lua +++ b/machines/extractor.lua @@ -52,7 +52,7 @@ function industrialtest.Extractor.getCraftResult(self,itemstack) return { item=ItemStack(), time=0, - src=item + src=itemstack } end local srcAfter=ItemStack(itemstack:get_name()) diff --git a/machines/macerator.lua b/machines/macerator.lua index acad1ea..70828c0 100644 --- a/machines/macerator.lua +++ b/machines/macerator.lua @@ -52,7 +52,7 @@ function industrialtest.Macerator.getCraftResult(self,itemstack) return { item=ItemStack(), time=0, - src=item + src=itemstack } end local srcAfter=ItemStack(itemstack:get_name()) diff --git a/machines/mass_fabricator.lua b/machines/mass_fabricator.lua index d471a0c..c5bb7a2 100644 --- a/machines/mass_fabricator.lua +++ b/machines/mass_fabricator.lua @@ -15,20 +15,56 @@ -- along with this program. If not, see . local S=minetest.get_translator("industrialtest") -local massFabricator={} - -industrialtest.internal.registerSimpleElectricItemProcessor({ - name="mass_fabricator", - displayName=S("Mass Fabricator"), - capacity=100000, +industrialtest.MassFabricator=table.copy(industrialtest.SimpleElectricItemProcessor) +industrialtest.internal.unpackTableInto(industrialtest.MassFabricator,{ + name="industrialtest:mass_fabricator", + description=S("Mass Fabricator"), + tiles={ + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png^industrialtest_mass_fabricator_front.png", + "industrialtest_advanced_machine_block.png" + }, requiresWrench=true, + active={ + tiles={ + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png", + "industrialtest_advanced_machine_block.png^industrialtest_mass_fabricator_front_active.png", + "industrialtest_advanced_machine_block.png" + } + }, + capacity=100000, flow=industrialtest.api.evPowerFlow, opPower=10000, - machineBlockTexture="industrialtest_advanced_machine_block.png", - customFrontTexture=true, - method="industrialtest.mass_fabricating", efficiency=1 }) + +function industrialtest.MassFabricator.getCraftResult(self,itemstack) + if itemstack:get_count()<34 or itemstack:get_name()~="industrialtest:scrap" then + return { + item=ItemStack(), + time=0, + src=itemstack + } + end + local srcAfter=ItemStack(itemstack:get_name()) + srcAfter:set_count(itemstack:get_count()-34) + return { + item=ItemStack("industrialtest:uu_matter"), + time=15, + src=srcAfter + } +end + +industrialtest.MassFabricator:register() + minetest.register_craft({ type="shaped", output="industrialtest:mass_fabricator",