From 5d1b6247d484b19114e72e493342082a9afb6246 Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Thu, 2 Jun 2022 17:32:04 +0200
Subject: [PATCH] - Change Stacker design - Fix stack behavior - Set status
 text at start

---
 .../com/yes/yes/behaviours/StackBehaviour.java |  2 ++
 .../com/yes/yes/entities/machines/Stacker.java | 18 +++++++++++++-----
 .../java/com/yes/yes/managers/HubManager.java  | 14 +++++++-------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/yes/yes/behaviours/StackBehaviour.java b/src/main/java/com/yes/yes/behaviours/StackBehaviour.java
index 8453b57..276abf9 100644
--- a/src/main/java/com/yes/yes/behaviours/StackBehaviour.java
+++ b/src/main/java/com/yes/yes/behaviours/StackBehaviour.java
@@ -47,6 +47,8 @@ public class StackBehaviour extends Component {
                 parent.setData(receiveDataKey1, null);
                 parent.setData(receiveDataKey2, null);
 
+                progress = 0;
+
             } else if (parent.getData(receiveDataKey1) != null && parent.getData(receiveDataKey2) != null) {
                 progress++;
             }
diff --git a/src/main/java/com/yes/yes/entities/machines/Stacker.java b/src/main/java/com/yes/yes/entities/machines/Stacker.java
index 768e268..52c7acc 100644
--- a/src/main/java/com/yes/yes/entities/machines/Stacker.java
+++ b/src/main/java/com/yes/yes/entities/machines/Stacker.java
@@ -15,22 +15,30 @@ public class Stacker extends Entity {
 
     public Stacker() {
         super();
-        Polygon p = new Polygon();
-        p.getPoints().addAll(
+        Polygon p1 = new Polygon();
+        p1.getPoints().addAll(
                 Chunk.ENTITY_SIZE / 2d, 0.0,
                 0.0, (double) Chunk.ENTITY_SIZE,
                 (double) Chunk.ENTITY_SIZE, (double) Chunk.ENTITY_SIZE);
-        p.setFill(new Color(1, 0, 0, 1));
+        p1.setFill(Color.BLACK);
 
-        this.getChildren().addAll(p);
+        Polygon p2 = new Polygon();
+        p2.getPoints().addAll(
+                Chunk.ENTITY_SIZE / 2d, Chunk.ENTITY_SIZE / 2d,
+                (double) Chunk.ENTITY_SIZE, (double) Chunk.ENTITY_SIZE / 4d,
+                (double) Chunk.ENTITY_SIZE, (double) Chunk.ENTITY_SIZE / 4d * 3);
+        p2.setFill(Color.GRAY);
+
+        this.getChildren().addAll(p1, p2);
     }
 
+    @SuppressWarnings("unused") // Called dynamically
     public Stacker(BlockContainer blockContainer) {
         this();
         this.addBehaviour(new PlaceBehaviour(this, blockContainer));
         this.addBehaviour(new StackBehaviour(this, blockContainer, "Input1", "Input2", "Output", 2));
         this.addBehaviour(new OfferBehaviour(this, blockContainer, Direction.UP, "Output"));
-        this.addBehaviour(new ReceiveBehaviour(this, blockContainer, Direction.LEFT, "Input1"));
+        this.addBehaviour(new ReceiveBehaviour(this, blockContainer, Direction.DOWN, "Input1"));
         this.addBehaviour(new ReceiveBehaviour(this, blockContainer, Direction.RIGHT, "Input2"));
     }
 }
diff --git a/src/main/java/com/yes/yes/managers/HubManager.java b/src/main/java/com/yes/yes/managers/HubManager.java
index bea2956..3b46fe3 100644
--- a/src/main/java/com/yes/yes/managers/HubManager.java
+++ b/src/main/java/com/yes/yes/managers/HubManager.java
@@ -15,6 +15,7 @@ public class HubManager {
     public void initialize() {
         GlobalEventHandler.addListener("hub:objectiveCompletion", this, this::objectiveCompletion);
         newLevel();
+        GlobalEventHandler.trigger("hub:statusText", getStatusText());
     }
 
     private void newLevel() {
@@ -36,18 +37,17 @@ public class HubManager {
         int layerCount = (level / 10) + 1;
         int complexity = level % 10; //TODO: Make complexity make stuff more complex
 
-        //for (int l = 0; l < layerCount && l < 4; l++) {
-        for (int i = 0; i < 4; i++) {
-            //item.setPart(l, i, new Square(Color.RED));
-            item.setPart(0, i, new Square(Color.GREEN));
+        for (int l = 0; l < layerCount && l < 4; l++) {
+            for (int i = 0; i < 4; i++) {
+                item.setPart(l, i, new Square(Color.RED));
+                item.setPart(0, i, new Square(Color.GREEN));
+            }
         }
-
-        //}
         return item;
     }
 
     private String getStatusText() {
-        return String.format("%s\n%s/%s", level, objectiveCompletion, objectiveTotal);
+        return String.format("Level: %s\n%s/%s", level, objectiveCompletion, objectiveTotal);
     }
 
     private void objectiveCompletion(Item item) {