From d247060c2ec6998b2260319a318f2f262c4b9185 Mon Sep 17 00:00:00 2001 From: mrkubax10 Date: Tue, 11 Mar 2025 21:25:01 +0100 Subject: [PATCH] Refactor Recycler --- machines/recycler.lua | 43 +++++++++++++++--- machines/simple_electric_item_processor.lua | 4 +- ....png => industrialtest_recycler_front.png} | Bin ... industrialtest_recycler_front_active.png} | Bin 4 files changed, 39 insertions(+), 8 deletions(-) rename textures/{industrialtest_recycler_top.png => industrialtest_recycler_front.png} (100%) rename textures/{industrialtest_recycler_top_active.png => industrialtest_recycler_front_active.png} (100%) diff --git a/machines/recycler.lua b/machines/recycler.lua index 3068e2e..3c7650e 100644 --- a/machines/recycler.lua +++ b/machines/recycler.lua @@ -15,18 +15,49 @@ -- along with this program. If not, see . local S=minetest.get_translator("industrialtest") - -industrialtest.internal.registerSimpleElectricItemProcessor({ - name="recycler", - displayName=S("Recycler"), - customTopTexture=true, +industrialtest.Recycler=table.copy(industrialtest.SimpleElectricItemProcessor) +industrialtest.internal.unpackTableInto(industrialtest.Recycler,{ + name="industrialtest:recycler", + description=S("Recycler"), + 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_recycler_front.png", + "industrialtest_machine_block.png" + }, requiresWrench=true, + active={ + 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_recycler_front_active.png", + "industrialtest_machine_block.png" + } + }, capacity=80, flow=industrialtest.api.lvPowerFlow, opPower=40, - method="industrialtest.recycling", efficiency=1 }) + +function industrialtest.Recycler.getCraftResult(self,itemstack) + local srcAfter=ItemStack(itemstack:get_name()) + srcAfter:set_count(itemstack:get_count()-1) + return { + item=ItemStack(industrialtest.random:next(1,8)==1 and "industrialtest:scrap" or ""), + time=2, + src=srcAfter + } +end + +industrialtest.Recycler:register() + minetest.register_craft({ type="shaped", output="industrialtest:recycler", diff --git a/machines/simple_electric_item_processor.lua b/machines/simple_electric_item_processor.lua index 458e075..c2daaed 100644 --- a/machines/simple_electric_item_processor.lua +++ b/machines/simple_electric_item_processor.lua @@ -201,9 +201,9 @@ function industrialtest.SimpleElectricItemProcessor.activeUpdate(self,pos,elapse if output.item:get_count()>0 then output.item:set_count(output.item:get_count()*multiplier) inv:add_item("dst",output.item) - meta:set_float("srcTime",-1) - meta:set_float("maxSrcTime",0) end + meta:set_float("srcTime",-1) + meta:set_float("maxSrcTime",0) srcSlot:set_count(srcSlot:get_count()-multiplier*usedItems) inv:set_stack("src",1,srcSlot) end diff --git a/textures/industrialtest_recycler_top.png b/textures/industrialtest_recycler_front.png similarity index 100% rename from textures/industrialtest_recycler_top.png rename to textures/industrialtest_recycler_front.png diff --git a/textures/industrialtest_recycler_top_active.png b/textures/industrialtest_recycler_front_active.png similarity index 100% rename from textures/industrialtest_recycler_top_active.png rename to textures/industrialtest_recycler_front_active.png