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 out){ + out.add(leftRegion, rightRegion, capRegion); } public class PayloadDriverBuild extends PayloadBlockBuild implements RotBlock{