color

src/newhorizon/content/blocks/DistributionBlock.java

@@ -3,15 +3,12 @@
 import mindustry.type.Category;
 import mindustry.world.Block;
 import mindustry.world.meta.BuildVisibility;
-import newhorizon.expand.block.distribution.transport.AdaptConveyor;
-import newhorizon.expand.block.distribution.transport.AdaptDirectionalGate;
-import newhorizon.expand.block.distribution.transport.AdaptDirectionalRouter;
-import newhorizon.expand.block.distribution.transport.AdaptJunction;
+import newhorizon.expand.block.distribution.transport.*;
 
 import static mindustry.type.ItemStack.with;
 
 public class DistributionBlock {
-    public static Block conveyor, conveyorJunction, conveyorRouter, conveyorGate;
+    public static Block conveyor, conveyorJunction, conveyorRouter, conveyorMerger, conveyorGate;
 
     public static void load(){
         conveyor = new AdaptConveyor("hard-light-rail"){{
@@ -39,6 +36,13 @@ public static void load(){
             speed = 4f;
         }};
 
+        conveyorMerger = new AdaptDirectionMerger("logistics-merger", (AdaptConveyor) conveyor){{
+            requirements(Category.distribution, with());
+            buildVisibility = BuildVisibility.shown;
+
+            speed = 4f;
+        }};
+
         conveyorGate = new AdaptDirectionalGate("logistics-gate", (AdaptConveyor) conveyor){{
             requirements(Category.distribution, with());
             buildVisibility = BuildVisibility.shown;

src/newhorizon/expand/block/distribution/transport/AdaptDirectionMerger.java

@@ -0,0 +1,41 @@
+package newhorizon.expand.block.distribution.transport;
+
+import arc.util.Nullable;
+import mindustry.gen.Building;
+import mindustry.type.Item;
+import mindustry.world.Edges;
+
+public class AdaptDirectionMerger extends AdaptDirectionalRouter{
+    public AdaptDirectionMerger(String name, AdaptConveyor conveyorBlock) {
+        super(name, conveyorBlock);
+    }
+
+    public class AdaptDirectionalMergerBuild extends AdaptDirectionalRouterBuild{
+
+        public void draw() {
+            LogisticsBlock.draw(this, cBlock, upperIndex, 4, sortItem);
+        }
+
+        @Nullable
+        public Building target(){
+            if(front().team == team && front().acceptItem(this, current)){
+                return front();
+            }
+
+            return null;
+        }
+
+        @Override
+        public boolean acceptItem(Building source, Item item){
+            return current == null && items.total() == 0 && (item == sortItem || sortItem == null) &&
+                    (Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) != (rotation + 2) % 4);
+        }
+
+        @Override
+        public int removeStack(Item item, int amount){
+            int removed = super.removeStack(item, amount);
+            if(item == current) current = null;
+            return removed;
+        }
+    }
+}

src/newhorizon/expand/block/distribution/transport/AdaptDirectionalRouter.java

@@ -26,7 +26,7 @@ public TextureRegion[] icons(){
         return new TextureRegion[]{region};
     }
 
-    public class AdaptDirectionalBuild extends DuctRouterBuild implements LogisticBuild {
+    public class AdaptDirectionalRouterBuild extends DuctRouterBuild implements LogisticBuild {
         public int upperIndex;
 
         @Override

src/newhorizon/expand/block/distribution/transport/LogisticsBlock.java

@@ -26,7 +26,7 @@ public class LogisticsBlock {
 
     public static void load(){
         upperRegion = SpriteUtil.splitRegionArray(Core.atlas.find(NewHorizon.name("logistics-upper")), 32, 32, 1, SpriteUtil.ATLAS_INDEX_4_4);
-        overlayRegion = new TextureRegion[4];
+        overlayRegion = new TextureRegion[5];
         edgeRegion = new TextureRegion[2];
         itemsRegion = Core.atlas.find(NewHorizon.name("logistics-item"));
         for (int i = 0; i < overlayRegion.length; i++){overlayRegion[i] = Core.atlas.find(NewHorizon.name("logistics-overlay-"+i));}