From 8cfbbab9f3403a878c7e6afd33e5e09a66b6bde3 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:26:17 -0700
Subject: [PATCH] Item Liquid Junction sprite

---
 .../hybrid/item-liquid-junction-item.png      | Bin 0 -> 123 bytes
 .../hybrid/item-liquid-junction-liquid.png    | Bin 0 -> 123 bytes
 .../blocks/hybrid/item-liquid-junction.png    | Bin 0 -> 403 bytes
 .../blocks/hybrid/ItemLiquidJunction.java     |  42 +++++++++++++++++-
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 assets/sprites/blocks/hybrid/item-liquid-junction-item.png
 create mode 100644 assets/sprites/blocks/hybrid/item-liquid-junction-liquid.png
 create mode 100644 assets/sprites/blocks/hybrid/item-liquid-junction.png

diff --git a/assets/sprites/blocks/hybrid/item-liquid-junction-item.png b/assets/sprites/blocks/hybrid/item-liquid-junction-item.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b25a548f9c75fb3d5e902ae841e0ca224a1ad3d
GIT binary patch
literal 123
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&lw6bDDbcxY<Q*NETXm`RY`$&_ucS%!2|EzzCVnsyl1<cS&Na0g+oBWf#Cov&q8K%
Uk<73DKm!;&UHx3vIVCg!07`iw-~a#s

literal 0
HcmV?d00001

diff --git a/assets/sprites/blocks/hybrid/item-liquid-junction-liquid.png b/assets/sprites/blocks/hybrid/item-liquid-junction-liquid.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c4195fe6c531ef02e45ee5e7a2605388fbdcef6
GIT binary patch
literal 123
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_
z&lw6bDDbcxY<L*qpr^MWRY`$&_ucS%!2|Ezz9+7$y=S|dS&Na0g+oBWf#CqFSTfT$
U_guzbKm!;&UHx3vIVCg!09qv?asU7T

literal 0
HcmV?d00001

diff --git a/assets/sprites/blocks/hybrid/item-liquid-junction.png b/assets/sprites/blocks/hybrid/item-liquid-junction.png
new file mode 100644
index 0000000000000000000000000000000000000000..69ccb141766385efaa53a4b0c52cdac777834878
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$O-V#SR9J=WmOBo@Fbsy>sE0s^fq?;f1SUWXh{GU8Mvj4)IYY&Opc6+Z3=9ki
zA<lpV1Ft0H;W%k0{;5eS|DPP&Z8REB@4zWZ8vGJ==RWwTRb2_|JU<9)W->2AvIo;0
zlm)@cHkTn{n|Zgr_cFR1%@9m~3{a`pyv#8%v;ZN@F|m{YA<b<uqiZ@5=D;={XoFmi
zCoeMqfc9-Etc^85F?W3z1+Y%Dp9vNU!V0iXv(Ix85V2Fl7etaYe(u>N?Yz)6z)MwR
z)Xs4R=nXsCGYSML10nSXa0cMpQWm8XNEuK;P=*x%VGfue0KRhqD{BT!ZKu;a6PUI{
zT>%9GI}^|~-~!?DZZw-O?($|4KO_L^E>UKH`eAW3*8+rwFvT*~KnMt1jM&z<n{Cqz
xpjFia<oV&50m=mP)!UQF8)cdc0A)eQ9uE!NdrBdoHH`oO002ovPDHLkV1nUbn3Vtk

literal 0
HcmV?d00001

diff --git a/src/tranqol/world/blocks/hybrid/ItemLiquidJunction.java b/src/tranqol/world/blocks/hybrid/ItemLiquidJunction.java
index 23c5350..12cde1f 100644
--- a/src/tranqol/world/blocks/hybrid/ItemLiquidJunction.java
+++ b/src/tranqol/world/blocks/hybrid/ItemLiquidJunction.java
@@ -1,8 +1,11 @@
 package tranqol.world.blocks.hybrid;
 
+import arc.*;
+import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
 import arc.util.io.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
@@ -15,16 +18,44 @@ public class ItemLiquidJunction extends LiquidBlock{
     public float speed = 26; //frames taken for item go through this junction
     public int capacity = 6;
 
+    protected TextureRegion[][] directionRegions;
+
     public ItemLiquidJunction(String name){
         super(name);
 
         rotate = true;
-        //rotateDraw = false;
+        rotateDraw = false;
+        drawArrow = false;
         unloadable = false;
         floating = true;
         noUpdateDisabled = true;
     }
 
+    @Override
+    public void load(){
+        super.load();
+
+        directionRegions = new TextureRegion[2][2];
+        for(int j = 0; j <= 1; j++){
+            directionRegions[j][0] = Core.atlas.find(name + "-item" + j, name + "-item");
+            directionRegions[j][1] = Core.atlas.find(name + "-liquid" + j, name + "-liquid");
+        }
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        super.drawPlanRegion(plan, list);
+
+        for(int i = 0; i < 4; i++){
+            Draw.rect(directionRegions[i > 1 ? 1 : 0][(plan.rotation + i) % 2], plan.drawx(), plan.drawy(), i * 90f);
+        }
+    }
+
+    @Override
+    public TextureRegion[] icons(){
+        return new TextureRegion[]{region};
+    }
+
     @Override
     public void setStats(){
         super.setStats();
@@ -45,6 +76,15 @@ public boolean outputsItems(){
     public class ItemLiquidJunctionBuild extends LiquidBuild{
         public DirectionalItemBuffer buffer = new DirectionalItemBuffer(capacity);
 
+        @Override
+        public void draw(){
+            Draw.rect(region, x, y);
+
+            for(int i = 0; i < 4; i++){
+                Draw.rect(directionRegions[i > 1 ? 1 : 0][(rotation + i) % 2], x, y, i * 90f);
+            }
+        }
+
         @Override
         public Building getLiquidDestination(Building source, Liquid liquid){
             if(!enabled || relativeSelf(source) % 2 == 0) return this;