From c193206ccb37b2829ff9e42e1f2500fe2d33936c Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 7 Jul 2024 08:42:45 -0700
Subject: [PATCH] Modded payload factory sprites (#8595)

* Search for modded payload factory blocks

* Generate payload mass driver outlines in mods

* Revert weird change

* Revert "Revert weird change"

This reverts commit 0afd64077a44094082362f929c820c88beebcfa9.
---
 .../world/blocks/payloads/PayloadBlock.java       | 15 ++++++++++++---
 .../world/blocks/payloads/PayloadMassDriver.java  |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
index b4b0de0f37..ab7dc95320 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
@@ -33,9 +33,18 @@ public class PayloadBlock extends Block{
     public void load(){
         super.load();
 
-        topRegion = Core.atlas.find(name + "-top", "factory-top-" + size + regionSuffix);
-        outRegion = Core.atlas.find(name + "-out", "factory-out-" + size + regionSuffix);
-        inRegion = Core.atlas.find(name + "-in", "factory-in-" + size + regionSuffix);
+        topRegion = findFactoryRegion("-top");
+        outRegion =  findFactoryRegion("-out");
+        inRegion =  findFactoryRegion("-in");
+    }
+
+    protected TextureRegion findFactoryRegion(String suf){
+        TextureRegion region = Core.atlas.find(name + suf);
+
+        if(!region.found() && minfo.mod != null) region = Core.atlas.find(minfo.mod.name + "-factory" + suf + "-" + size + regionSuffix);
+        if(!region.found()) region = Core.atlas.find("factory" + suf + "-" + size + regionSuffix);
+
+        return region;
     }
 
     public static boolean blends(Building build, int direction){
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
index 0b3efc09c9..0e129a7b39 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
@@ -123,8 +123,8 @@ public class PayloadMassDriver extends PayloadBlock{
     }
 
     @Override
-    public TextureRegion[] makeIconRegions(){
-        return new TextureRegion[]{leftRegion, rightRegion, capRegion};
+    public void getRegionsToOutline(Seq<TextureRegion> out){
+        out.add(leftRegion, rightRegion, capRegion);
     }
 
     public class PayloadDriverBuild extends PayloadBlockBuild<Payload> implements RotBlock{