From cf77644f4b06796e04b9c25789f2438745f8770f Mon Sep 17 00:00:00 2001
From: Ivory <valerie@valnet.xyz>
Date: Tue, 3 Jan 2023 01:11:18 -0500
Subject: [PATCH 1/8] width in world objects, bed stubbed

---
 .../hadean/gameobjects/worldobjects/Bed.java  | 26 +++++++++++++++++++
 .../gameobjects/worldobjects/WorldObject.java |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java

diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
new file mode 100644
index 0000000..91f3ad6
--- /dev/null
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
@@ -0,0 +1,26 @@
+package xyz.valnet.hadean.gameobjects.worldobjects;
+
+import xyz.valnet.engine.math.Vector4f;
+import xyz.valnet.hadean.interfaces.IBuildable;
+
+public class Bed extends WorldObject implements IBuildable {
+
+  @Override
+  public void buildAt(int x, int y, int w, int h) {
+    // TODO Auto-generated method stub
+    
+  }
+
+  @Override
+  public String getName() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public Vector4f getWorldBox() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+  
+}
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java
index 30415d5..52ebc9d 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/WorldObject.java
@@ -11,6 +11,8 @@ public abstract class WorldObject extends GameObject {
   
   protected float x;
   protected float y;
+  protected float w;
+  protected float h;
 
   protected Camera camera;
   protected Terrain terrain;

From 43c035ba5b4a1650e7e8806773483a244ee667b5 Mon Sep 17 00:00:00 2001
From: Bronwen <marcus@valnet.xyz>
Date: Tue, 3 Jan 2023 02:03:53 -0500
Subject: [PATCH 2/8] build tab: use a struct for tracking buildables

---
 .../hadean/gameobjects/ui/tabs/BuildTab.java  | 66 ++++++++++---------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java b/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java
index 2dbf3cd..e50c10d 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java
@@ -18,7 +18,6 @@ import xyz.valnet.engine.scenegraph.GameObject;
 import xyz.valnet.engine.scenegraph.IMouseCaptureArea;
 import xyz.valnet.hadean.gameobjects.BottomBar;
 import xyz.valnet.hadean.gameobjects.Camera;
-import xyz.valnet.hadean.gameobjects.Terrain;
 import xyz.valnet.hadean.gameobjects.inputlayer.BuildLayer;
 import xyz.valnet.hadean.gameobjects.inputlayer.SelectionLayer;
 import xyz.valnet.hadean.input.Button;
@@ -31,7 +30,6 @@ import xyz.valnet.hadean.interfaces.ISelectable;
 import xyz.valnet.hadean.interfaces.ISelectionChangeListener;
 import xyz.valnet.hadean.util.Assets;
 import xyz.valnet.hadean.util.Layers;
-import xyz.valnet.hadean.util.Pair;
 import xyz.valnet.hadean.util.SmartBoolean;
 
 public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCaptureArea, IButtonListener {
@@ -39,7 +37,6 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
   private SelectionLayer selection;
   private BuildLayer buildLayer;
   private Camera camera;
-  private Terrain terrain;
 
   private SmartBoolean opened;
   private int width = 200;
@@ -51,13 +48,19 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
 
   private String selectedCategory = "";
 
-  private transient Constructor<? extends IBuildable> selectedBuildable = null;
-  private transient Map<String, List<Pair<String, Constructor<? extends IBuildable>>>> buildables = null;
-  private transient Map<Button, Constructor<? extends IBuildable>> buildableButtons = null;
-
+  private transient BuildableRecord selectedBuildable = null;
+  private transient Map<String, List<BuildableRecord>> buildables = null;
+  private transient Map<Button, BuildableRecord> buildableButtons = null;
 
   private int height = 0;
-  private String selectedBuildableName = "";
+
+  private record BuildableRecord(
+    String name,
+    Constructor<? extends IBuildable> constructor,
+    int type
+  ) {
+
+  }
 
   private void calculateBuildables() {
     try {
@@ -81,10 +84,11 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
         }
         String category = annotation.category();
         String name = annotation.name();
+        int type = annotation.type();
 
         if(!buildables.containsKey(category))
-          buildables.put(category, new ArrayList<Pair<String, Constructor<? extends IBuildable>>>());
-        buildables.get(category).add(new Pair<String, Constructor<? extends IBuildable>>(name, constructor));
+          buildables.put(category, new ArrayList<BuildableRecord>());
+        buildables.get(category).add(new BuildableRecord(name, constructor, type));
 
         System.out.println("Added " + category + " / " + name);
       }
@@ -107,7 +111,7 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
       // draw the currently selected build item
       Assets.flat.pushColor(new Vector4f(1f, 1f, 1f, 1.0f));
       Vector2i topLeft = camera.world2screen(x, y).asInt();
-      Assets.font.drawString(selectedBuildableName, topLeft.x, topLeft.y - 20);
+      Assets.font.drawString(selectedBuildable.name, topLeft.x, topLeft.y - 20);
       Assets.flat.swapColor(new Vector4f(1f, 1f, 1f, 0.5f));
       for(int i = 0; i < w; i ++) for(int j = 0; j < h; j ++) {{
         camera.draw(Layers.BUILD_INTERACTABLE, Assets.checkerBoard, x + i, y + j);
@@ -122,7 +126,6 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
     buildLayer = get(BuildLayer.class);
     selection = get(SelectionLayer.class);
     camera = get(Camera.class);
-    terrain = get(Terrain.class);
 
     opened = new SmartBoolean(false, new SmartBoolean.IListener() {
 
@@ -142,22 +145,23 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
       selection.subscribe(this);
     }
 
-    buildables = new HashMap<String, List<Pair<String, Constructor<? extends IBuildable>>>>();
-    buildableButtons = new HashMap<Button, Constructor<? extends IBuildable>>();
+    buildables = new HashMap<String, List<BuildableRecord>>();
+    buildableButtons = new HashMap<Button, BuildableRecord>();
 
     calculateBuildables();
   }
 
   private List<Button> categoryButtons = new ArrayList<Button>();
 
-  private void selectBuildable(String name, Constructor<? extends IBuildable> constructor) {
-    if(selectedBuildable != null && constructor == null) {
-      buildLayer.deactiveate();
-    } else if (selectedBuildable == null && constructor != null) {
-      activateBuildLayer();
-    }
-    selectedBuildable = constructor;
-    selectedBuildableName = name;
+  private void deselectBuilding() {
+    if(selectedBuildable != null) buildLayer.deactiveate();
+    selectedBuildable = null;
+  }
+
+  private void selectBuildable(BuildableRecord buildableRecord) {
+    if(buildableRecord == null) deselectBuilding();
+    if (selectedBuildable == null) activateBuildLayer();
+    selectedBuildable = buildableRecord;
   }
 
   private void activateBuildLayer() {
@@ -174,7 +178,7 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
       public void build(int x1, int y1, int x2, int y2) {
         if(selectedBuildable == null) return;
         try {
-          IBuildable building = selectedBuildable.newInstance();
+          IBuildable building = selectedBuildable.constructor.newInstance();
           if(building instanceof GameObject) {
             add((GameObject) building);
           }
@@ -192,7 +196,7 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
           opened.set(false);
           buildLayer.deactiveate();
         } else {
-          selectBuildable("", null);
+          deselectBuilding();
         }
       }
     });
@@ -278,7 +282,7 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
 
     if(!opened.value()) return;
 
-    List<Pair<String, Constructor<? extends IBuildable>>> categoryBuildables = buildables.get(selectedCategory);
+    List<BuildableRecord> categoryBuildables = buildables.get(selectedCategory);
     if(categoryBuildables == null) return;
 
     int left = width + padding * 2;
@@ -286,16 +290,16 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
     int buttonWidth = 100;
     int top = 576 - BottomBar.bottomBarHeight - padding - buttonHeight;
     int i = 0;
-    for(Pair<String, Constructor<? extends IBuildable>> nameConstructorPair : categoryBuildables) {
+    for(BuildableRecord buildableRecord : categoryBuildables) {
       int x = left + (buttonWidth + padding) * i;
       int y = top;
       int w = buttonWidth;
       int h = buttonHeight;
       i ++;
-      Button btn = new SimpleButton(nameConstructorPair.first(), x, y, w, h, Layers.GENERAL_UI_INTERACTABLE);
+      Button btn = new SimpleButton(buildableRecord.name, x, y, w, h, Layers.GENERAL_UI_INTERACTABLE);
       btn.registerClickListener(this);
       add(btn);
-      buildableButtons.put(btn, nameConstructorPair.second());
+      buildableButtons.put(btn, buildableRecord);
     }
   }
 
@@ -303,11 +307,11 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
   public void click(Button target) {
     if(categoryButtons.contains(target)) {
       selectedCategory = target.getText();
-      selectBuildable("", null);
+      deselectBuilding();
       constructItemButtons();
     } else if(buildableButtons.containsKey(target)) {
-      Constructor<? extends IBuildable> newConstructor = buildableButtons.get(target);
-      selectBuildable(target.getText(), newConstructor);
+      BuildableRecord newBuildableRecord = buildableButtons.get(target);
+      selectBuildable(newBuildableRecord);
     }
   }
 

From e8b94f990081b9d67447a5a695d25f629e668be0 Mon Sep 17 00:00:00 2001
From: Bronwen <marcus@valnet.xyz>
Date: Tue, 3 Jan 2023 02:08:52 -0500
Subject: [PATCH 3/8] agents move normally regardless of framerate

---
 .../gameobjects/worldobjects/agents/Agent.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java
index e79681c..77176a3 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/agents/Agent.java
@@ -27,7 +27,7 @@ import static xyz.valnet.engine.util.Math.lerp;
 
 public abstract class Agent extends WorldObject implements ISelectable {
   public abstract String getName();
-  private int frameCounter = 0;
+  private float frameCounter = 0;
   private int speed = 100 + (int)(Math.random() * 50);
 
   private IPathfinder pathfinder;
@@ -58,14 +58,14 @@ public abstract class Agent extends WorldObject implements ISelectable {
   @Override
   public void update(float dTime) {
     think();
-    act();
+    act(dTime);
     postAct();
   }
 
   protected abstract void postAct();
 
-  private void move() {
-    frameCounter++;
+  private void move(float dTime) {
+    frameCounter += dTime;
     if(frameCounter >= speed) {
       Vector2i nextPos = path.pop().getPosition();
       this.x = nextPos.x;
@@ -75,7 +75,7 @@ public abstract class Agent extends WorldObject implements ISelectable {
         nextPath = null;
       }
       if(path.isComplete()) path = null;
-      frameCounter = 0;
+      frameCounter -= speed;
       if(stopPathingFlag) {
         path = null;
         nextPath = null;
@@ -112,9 +112,9 @@ public abstract class Agent extends WorldObject implements ISelectable {
     correctPath();
   }
 
-  protected boolean act() {
+  protected boolean act(float dTime) {
     if(path != null) {
-      move();
+      move(dTime);
       return true;
     }
 
@@ -127,7 +127,7 @@ public abstract class Agent extends WorldObject implements ISelectable {
     Path newPath = pathfinder.getPath((int)this.x, (int)this.y, x, y);
     if(path == null) {
       path = newPath;
-      frameCounter = 0;
+      frameCounter -= 0;
     } else {
       nextPath = newPath;
     }

From 3cc774a3121d933d97492d92fd6d777afcaae7d5 Mon Sep 17 00:00:00 2001
From: Bronwen <marcus@valnet.xyz>
Date: Tue, 3 Jan 2023 02:17:23 -0500
Subject: [PATCH 4/8] framerate independence

---
 src/main/java/xyz/valnet/hadean/gameobjects/Job.java      | 4 ++--
 src/main/java/xyz/valnet/hadean/gameobjects/Tile.java     | 4 ++--
 .../hadean/gameobjects/inputlayer/SelectionLayer.java     | 2 +-
 .../xyz/valnet/hadean/gameobjects/worldobjects/Tree.java  | 4 ++--
 .../hadean/gameobjects/worldobjects/pawn/Activity.java    | 2 +-
 .../hadean/gameobjects/worldobjects/pawn/JobActivity.java | 8 ++++----
 .../hadean/gameobjects/worldobjects/pawn/Needs.java       | 8 ++++----
 .../valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java | 6 +++---
 .../gameobjects/worldobjects/pawn/SleepActivity.java      | 4 ++--
 .../gameobjects/worldobjects/pawn/WanderActivity.java     | 2 +-
 src/main/java/xyz/valnet/hadean/interfaces/IWorkable.java | 2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
index 9c53a2a..de8b9eb 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
@@ -72,8 +72,8 @@ public class Job extends GameObject {
     public Vector2i[] getLocations() {
       return subject.getWorkablePositions();
     }
-    public boolean doWork() {
-      return subject.doWork();
+    public boolean doWork(float dTime) {
+      return subject.doWork(dTime);
     }
 
     @Override
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
index 8a2e7f5..0c99a05 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
@@ -168,8 +168,8 @@ public class Tile extends WorldObject implements IWorkable {
   }
 
   @Override
-  public boolean doWork() {
-    tillLevel += 0.005f;
+  public boolean doWork(float dTime) {
+    tillLevel += 0.005f * dTime;
     tillLevel = Math.min(tillLevel, 1);
     return tillLevel >= 1;
   }
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java
index 7114d7b..cb38a67 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/SelectionLayer.java
@@ -49,7 +49,7 @@ public class SelectionLayer extends GameObject implements IMouseCaptureArea, ITr
 
   @Override
   public void update(float dTime) {
-    if(animation < animationMax) animation ++;
+    if(animation < animationMax) animation += dTime;
     if(animation > animationMax) animation = animationMax;
 
     // if(!active) return;
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java
index 0315f07..efef0b9 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java
@@ -87,8 +87,8 @@ public class Tree extends WorldObject implements ITileThing, ISelectable, IWorka
   }
 
   @Override
-  public boolean doWork() {
-    choppage ++;
+  public boolean doWork(float dTime) {
+    choppage += dTime;
     return getProgress() >= 1;
   }
 
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Activity.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Activity.java
index 00eb8a1..7133b3f 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Activity.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Activity.java
@@ -14,7 +14,7 @@ public abstract class Activity implements Serializable {
   public abstract boolean isUrgent();
   public abstract float getBenefit();
   public abstract boolean isValid();
-  public abstract void act();
+  public abstract void act(float dTime);
   public abstract void begin(ActivityCancellationCallback callback);
   public abstract void end();
   public abstract String toString();
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java
index d513320..3f15a04 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java
@@ -32,8 +32,8 @@ public class JobActivity extends Activity {
   }
 
   @Override
-  public void act() {
-    if (doJob()) return;
+  public void act(float dTime) {
+    if (doJob(dTime)) return;
   }
 
 
@@ -83,7 +83,7 @@ public class JobActivity extends Activity {
     job = null;
   }
 
-  private boolean doJob() {
+  private boolean doJob(float dTime) {
     if(!jobboard.workerHasJob(worker)) return false;
     JobStep step = job.getCurrentStep();
     // if we're not at the location of the job...
@@ -91,7 +91,7 @@ public class JobActivity extends Activity {
 
     if(step instanceof Job.Work) {
       Job.Work workStep = (Job.Work)step;
-      if(workStep.doWork()) step.next();
+      if(workStep.doWork(dTime)) step.next();
       return true;
     } else if(step instanceof Job.PickupItem) {
       Job.PickupItem pickupStep = (Job.PickupItem) step;
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Needs.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Needs.java
index 0d10e08..0b9f821 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Needs.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Needs.java
@@ -14,12 +14,12 @@ public class Needs implements Serializable {
   private float decay = 0.000004f;
 
   public void update(float dTime) {
-    energy = Math.max(energy - decay, 0);
-    recreation = Math.max(recreation - decay, 0);
+    energy = Math.max(energy - decay * dTime, 0);
+    recreation = Math.max(recreation - decay * dTime, 0);
   }
 
-  public void sleep() {
-    energy = Math.min(energy + decay * restRatio, 1);
+  public void sleep(float dTime) {
+    energy = Math.min(energy + decay * dTime * restRatio, 1);
   }
 
   public float getSleepNeed() {
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
index 835203c..5a4ad92 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
@@ -177,11 +177,11 @@ public class Pawn extends Agent {
   // TODO at some point rewrite this to use an actor component array
   // where we loop through until something _does_ sometihng.
   @Override
-  protected boolean act() {
-    if(super.act()) return true;
+  protected boolean act(float dTime) {
+    if(super.act(dTime)) return true;
     // if(doJob()) return true;
     if(currentActivity != null) {
-      currentActivity.act();
+      currentActivity.act(dTime);
       return true;
     }
     return false;
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java
index 24b80e3..b6c510a 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java
@@ -47,8 +47,8 @@ public class SleepActivity extends Activity {
   }
 
   @Override
-  public void act() {
-    needs.sleep();
+  public void act(float dTime) {
+    needs.sleep(dTime);
     if(needs.getSleepNeed() == 0) {
       callback.apply(this);
     }
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java
index 3590285..cace818 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java
@@ -29,7 +29,7 @@ public class WanderActivity extends Activity {
   }
 
   @Override
-  public void act() {
+  public void act(float dTime) {
     // since wandering is literally just pathing.
   }
 
diff --git a/src/main/java/xyz/valnet/hadean/interfaces/IWorkable.java b/src/main/java/xyz/valnet/hadean/interfaces/IWorkable.java
index a912fc9..bdcef68 100644
--- a/src/main/java/xyz/valnet/hadean/interfaces/IWorkable.java
+++ b/src/main/java/xyz/valnet/hadean/interfaces/IWorkable.java
@@ -3,7 +3,7 @@ package xyz.valnet.hadean.interfaces;
 import xyz.valnet.engine.math.Vector2i;
 
 public interface IWorkable {
-  public boolean doWork();
+  public boolean doWork(float dTime);
   public Vector2i[] getWorkablePositions();
   public String getJobName();
 }

From a10f9bf25ff9acbcd3dad91c1d2a442dfe60ffbc Mon Sep 17 00:00:00 2001
From: Bronwen <marcus@valnet.xyz>
Date: Tue, 3 Jan 2023 02:17:43 -0500
Subject: [PATCH 5/8] buildtab: added buildable types

---
 .../java/xyz/valnet/hadean/interfaces/BuildableMetadata.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/xyz/valnet/hadean/interfaces/BuildableMetadata.java b/src/main/java/xyz/valnet/hadean/interfaces/BuildableMetadata.java
index 2da84de..89b2110 100644
--- a/src/main/java/xyz/valnet/hadean/interfaces/BuildableMetadata.java
+++ b/src/main/java/xyz/valnet/hadean/interfaces/BuildableMetadata.java
@@ -5,6 +5,11 @@ import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface BuildableMetadata {
+
+  public static int AREA = 0;
+  public static int SINGLE = 1;
+
   public String name();
   public String category();
+  public int type() default AREA;
 }

From 68a4142944d579ce1932adde9f81d0bfa9294344 Mon Sep 17 00:00:00 2001
From: Bronwen <marcus@valnet.xyz>
Date: Tue, 3 Jan 2023 02:25:02 -0500
Subject: [PATCH 6/8] fix nonsensical pickupitem jobstep constructor

---
 src/main/java/xyz/valnet/hadean/gameobjects/Job.java           | 3 +--
 .../xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
index de8b9eb..aaf967f 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
@@ -26,9 +26,8 @@ public class Job extends GameObject {
 
   public class PickupItem extends JobStep {
     public Item item;
-    public Vector2f[] locations;
     
-    public PickupItem(Item item, Vector2f[] possibleLocations) {
+    public PickupItem(Item item) {
       this.item = item;
     }
 
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java
index 2dfc6c8..18ebcf5 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java
@@ -80,7 +80,7 @@ public abstract class Item extends WorldObject implements ISelectable, ITileThin
   private void markForHaul() {
     if(haulJob != null) return;
     haulJob = add(new Job("Haul " + this.getName()));
-    haulJob.addStep(haulJob.new PickupItem(this, new Vector2f[] { this.getWorldPosition() }));
+    haulJob.addStep(haulJob.new PickupItem(this));
     haulJob.addStep(haulJob.new DropoffAtStockpile(this));
     haulJob.registerClosedListener(() -> {
       haulJob = null;

From ea713fd3b5c6a3d8f75abe36bbfe852d44f6a32a Mon Sep 17 00:00:00 2001
From: Bronwen <marcus@valnet.xyz>
Date: Tue, 3 Jan 2023 03:06:09 -0500
Subject: [PATCH 7/8] basic bed implementation

---
 .../xyz/valnet/hadean/gameobjects/Job.java    |  22 +++
 .../hadean/gameobjects/worldobjects/Bed.java  | 127 +++++++++++++++++-
 .../worldobjects/pawn/JobActivity.java        |   4 +
 .../gameobjects/worldobjects/pawn/Pawn.java   |  10 ++
 .../hadean/interfaces/IItemReceiver.java      |  11 ++
 5 files changed, 167 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/xyz/valnet/hadean/interfaces/IItemReceiver.java

diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
index aaf967f..00b663c 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
@@ -9,6 +9,7 @@ import xyz.valnet.engine.math.Vector2i;
 import xyz.valnet.engine.scenegraph.GameObject;
 import xyz.valnet.hadean.gameobjects.worldobjects.Stockpile;
 import xyz.valnet.hadean.gameobjects.worldobjects.items.Item;
+import xyz.valnet.hadean.interfaces.IItemReceiver;
 import xyz.valnet.hadean.interfaces.IWorkable;
 
 public class Job extends GameObject {
@@ -42,6 +43,27 @@ public class Job extends GameObject {
     }
   }
 
+  public class DropoffAtItemReceiver extends JobStep {
+
+    public IItemReceiver receiver;
+    public Item item;
+
+    public DropoffAtItemReceiver(IItemReceiver receiver, Item item) {
+      this.receiver = receiver;
+      this.item = item;
+    }
+
+    @Override
+    public Vector2i[] getLocations() {
+      return receiver.getItemDropoffLocations();
+    }
+
+    @Override
+    public boolean isValid() {
+      return true;
+    }
+  }
+
   public class DropoffAtStockpile extends JobStep {
     public Item item;
     public DropoffAtStockpile(Item item) {
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
index 91f3ad6..ec21d16 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
@@ -1,26 +1,139 @@
 package xyz.valnet.hadean.gameobjects.worldobjects;
 
+import xyz.valnet.engine.math.Vector2i;
 import xyz.valnet.engine.math.Vector4f;
+import xyz.valnet.hadean.gameobjects.Job;
+import xyz.valnet.hadean.gameobjects.JobBoard;
+import xyz.valnet.hadean.gameobjects.worldobjects.items.Item;
+import xyz.valnet.hadean.gameobjects.worldobjects.items.Log;
+import xyz.valnet.hadean.interfaces.BuildableMetadata;
 import xyz.valnet.hadean.interfaces.IBuildable;
+import xyz.valnet.hadean.interfaces.IItemReceiver;
+import xyz.valnet.hadean.interfaces.ISelectable;
+import xyz.valnet.hadean.interfaces.IWorkable;
+import xyz.valnet.hadean.util.Action;
+import xyz.valnet.hadean.util.Assets;
+import xyz.valnet.hadean.util.Layers;
+import xyz.valnet.hadean.util.detail.BooleanDetail;
+import xyz.valnet.hadean.util.detail.Detail;
+import xyz.valnet.hadean.util.detail.PercentDetail;
 
-public class Bed extends WorldObject implements IBuildable {
+import static xyz.valnet.engine.util.Math.lerp;
+
+@BuildableMetadata(category = "Furniture", name = "Bed", type = BuildableMetadata.SINGLE)
+public class Bed extends WorldObject implements IBuildable, IItemReceiver, IWorkable, ISelectable {
+
+  private int logs = 0;
+  private float work = 0;
+  private final float maxWork = 500;
+
+  private Job job = null;
+
+  @Override
+  protected void create() {
+    super.create();
+    // TODO eventually we're going to need a serializable ItemPredicate to select valid items.
+    // it will be useful for stockpile filters, pickup items, etc. basically a placeholder
+    // for "any item that matches X" as a data type.
+    job = add(new Job("Build Bed"));
+    Log log = get(Log.class);
+    job.addStep(job.new PickupItem(log));
+    job.addStep(job.new DropoffAtItemReceiver(this, log));
+    job.addStep(job.new Work(this));
+    get(JobBoard.class).postJob(job);
+  }
+
+  @Override
+  public void render() {
+    super.render();
+    if(isBuilt()) {
+      camera.draw(Layers.GROUND, Assets.bed, (int)x, (int)y, 1, 2);
+    } else {
+      Assets.flat.pushColor(Vector4f.opacity(lerp(0.5f, 1.0f, work / maxWork)));
+      camera.draw(Layers.GROUND, Assets.bed, (int)x, (int)y, 1, 2);
+      Assets.flat.popColor();
+    }
+  }
 
   @Override
   public void buildAt(int x, int y, int w, int h) {
-    // TODO Auto-generated method stub
-    
+    this.x = x;
+    this.y = y;
+    this.w = 1;
+    this.h = 2;
   }
 
   @Override
   public String getName() {
-    // TODO Auto-generated method stub
-    return null;
+    return "Bed";
   }
 
   @Override
   public Vector4f getWorldBox() {
-    // TODO Auto-generated method stub
-    return null;
+    return new Vector4f(x, y, x+w, y+h);
+  }
+
+  @Override
+  public boolean receive(Item item) {
+    remove(item);
+    return true;
+  }
+
+  private boolean isBuilt() {
+    return work >= maxWork;
+  }
+
+  @Override
+  public boolean doWork(float dTime) {
+    work += dTime;
+    return isBuilt();
+  }
+
+  private Vector2i[] getBorders() {
+    return new Vector2i[] {
+      new Vector2i((int) x, (int) y - 1),
+
+      new Vector2i((int) x - 1, (int) y),
+      new Vector2i((int) x + 1, (int) y),
+
+      new Vector2i((int) x - 1, (int) y + 1),
+      new Vector2i((int) x + 1, (int) y + 1),
+
+      new Vector2i((int) x, (int) y + 2),
+    };
+  }
+
+  @Override
+  public Vector2i[] getWorkablePositions() {
+    return getBorders();
+  }
+
+  @Override
+  public String getJobName() {
+    return "Build Bed";
+  }
+
+  @Override
+  public Vector2i[] getItemDropoffLocations() {
+    return getBorders();
+  }
+
+  @Override
+  public Action[] getActions() {
+    return new Action[0];
+  }
+
+  @Override
+  public void runAction(Action action) {
+
+  }
+
+  @Override
+  public Detail[] getDetails() {
+    return new Detail[] {
+      new BooleanDetail("Built", isBuilt()),
+      new PercentDetail("Work", work / maxWork),
+    };
   }
   
 }
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java
index 3f15a04..e3b54b2 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/JobActivity.java
@@ -104,6 +104,10 @@ public class JobActivity extends Activity {
       worker.dropoffItem(dropoffStep.item);
       step.next();
       return true;
+    } else if(step instanceof Job.DropoffAtItemReceiver) {
+      Job.DropoffAtItemReceiver dropoffStep = (Job.DropoffAtItemReceiver) step;
+      worker.dropoffItem(dropoffStep.item, dropoffStep.receiver);
+      step.next();
     }
 
     return false;
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
index 5a4ad92..73ea197 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
@@ -13,6 +13,7 @@ import xyz.valnet.hadean.gameobjects.JobBoard;
 import xyz.valnet.hadean.gameobjects.Terrain;
 import xyz.valnet.hadean.gameobjects.worldobjects.agents.Agent;
 import xyz.valnet.hadean.gameobjects.worldobjects.items.Item;
+import xyz.valnet.hadean.interfaces.IItemReceiver;
 import xyz.valnet.hadean.util.Action;
 import xyz.valnet.hadean.util.Assets;
 import xyz.valnet.hadean.util.Layers;
@@ -52,6 +53,15 @@ public class Pawn extends Agent {
     getTile().placeThing(item);
   }
 
+  public void dropoffItem(Item item, IItemReceiver receiver) {
+    if(!inventory.contains(item)) {
+      return;
+    }
+    inventory.remove(item);
+    add(item);
+    receiver.receive(item);
+  }
+
   @Override
   protected void ready() {
     super.ready();
diff --git a/src/main/java/xyz/valnet/hadean/interfaces/IItemReceiver.java b/src/main/java/xyz/valnet/hadean/interfaces/IItemReceiver.java
new file mode 100644
index 0000000..21d6601
--- /dev/null
+++ b/src/main/java/xyz/valnet/hadean/interfaces/IItemReceiver.java
@@ -0,0 +1,11 @@
+package xyz.valnet.hadean.interfaces;
+
+import java.io.Serializable;
+
+import xyz.valnet.engine.math.Vector2i;
+import xyz.valnet.hadean.gameobjects.worldobjects.items.Item;
+
+public interface IItemReceiver extends Serializable {
+  public boolean receive(Item item);
+  public Vector2i[] getItemDropoffLocations();
+}

From 79733c969a4905c045f0a84c69cde6dc83813f47 Mon Sep 17 00:00:00 2001
From: Bronwen <marcus@valnet.xyz>
Date: Tue, 3 Jan 2023 03:57:31 -0500
Subject: [PATCH 8/8] cleanup: fix all the non todo errors

---
 .../scenegraph/CustomObjectDeserializer.java  |  1 +
 .../valnet/engine/scenegraph/SceneGraph.java  |  7 ++---
 .../java/xyz/valnet/hadean/HadeanGame.java    |  1 -
 .../xyz/valnet/hadean/gameobjects/Job.java    |  2 +-
 .../valnet/hadean/gameobjects/JobBoard.java   |  1 -
 .../xyz/valnet/hadean/gameobjects/Tile.java   |  7 -----
 .../gameobjects/inputlayer/BuildLayer.java    |  3 ---
 .../hadean/gameobjects/ui/tabs/BuildTab.java  | 13 +++++----
 .../hadean/gameobjects/worldobjects/Bed.java  |  7 +++--
 .../hadean/gameobjects/worldobjects/Rice.java | 27 +------------------
 .../gameobjects/worldobjects/Stockpile.java   |  1 -
 .../hadean/gameobjects/worldobjects/Tree.java |  5 +---
 .../gameobjects/worldobjects/items/Item.java  |  1 -
 .../gameobjects/worldobjects/items/Log.java   |  5 ++++
 .../gameobjects/worldobjects/pawn/Pawn.java   |  6 +----
 .../worldobjects/pawn/SleepActivity.java      |  8 +-----
 .../worldobjects/pawn/WanderActivity.java     |  3 +++
 .../xyz/valnet/hadean/scenes/MenuScene.java   | 10 +++----
 18 files changed, 36 insertions(+), 72 deletions(-)

diff --git a/src/main/java/xyz/valnet/engine/scenegraph/CustomObjectDeserializer.java b/src/main/java/xyz/valnet/engine/scenegraph/CustomObjectDeserializer.java
index ed58b7a..9fdb1eb 100644
--- a/src/main/java/xyz/valnet/engine/scenegraph/CustomObjectDeserializer.java
+++ b/src/main/java/xyz/valnet/engine/scenegraph/CustomObjectDeserializer.java
@@ -13,6 +13,7 @@ public class CustomObjectDeserializer extends ObjectInputStream {
         super(in);
     }
  
+    @SuppressWarnings("rawtypes")
     protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
         ObjectStreamClass resultClassDescriptor = super.readClassDescriptor(); // initially streams descriptor
         Class localClass; // the class in the local JVM that this descriptor represents.
diff --git a/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java b/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java
index c18b191..5f98b8a 100644
--- a/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java
+++ b/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java
@@ -153,14 +153,14 @@ public abstract class SceneGraph implements IScene {
   }
 
   private void dump(List<GameObject> objects) {
-    Map<Class, Integer> count = new HashMap<Class, Integer>();
+    Map<Class<? extends GameObject>, Integer> count = new HashMap<Class<? extends GameObject>, Integer>();
     for(GameObject go : objects) {
-      Class clazz = go.getClass();
+      Class<? extends GameObject> clazz = go.getClass();
       if(!count.containsKey(clazz))
         count.put(clazz, 0);
       count.put(clazz, count.get(clazz) + 1);
     }
-    for(Entry<Class, Integer> entry : count.entrySet()) {
+    for(Entry<Class<? extends GameObject>, Integer> entry : count.entrySet()) {
       System.out.println("" + entry.getValue() + "x " + entry.getKey().getSimpleName());
     }
   }
@@ -190,6 +190,7 @@ public abstract class SceneGraph implements IScene {
     saveFlag = false;
   }
 
+  @SuppressWarnings("unchecked")
   private void load() {
     try {
       FileInputStream file = new FileInputStream("SAVE_DATA.TXT");
diff --git a/src/main/java/xyz/valnet/hadean/HadeanGame.java b/src/main/java/xyz/valnet/hadean/HadeanGame.java
index dcf33b4..8070cb8 100644
--- a/src/main/java/xyz/valnet/hadean/HadeanGame.java
+++ b/src/main/java/xyz/valnet/hadean/HadeanGame.java
@@ -11,7 +11,6 @@ import xyz.valnet.engine.math.Vector4f;
 import xyz.valnet.hadean.scenes.GameScene;
 import xyz.valnet.hadean.util.Assets;
 
-
 public class HadeanGame extends Game {
   public static final HadeanGame Hadean = new HadeanGame();
 
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
index 00b663c..de0e96e 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/Job.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import xyz.valnet.engine.math.Vector2f;
 import xyz.valnet.engine.math.Vector2i;
 import xyz.valnet.engine.scenegraph.GameObject;
 import xyz.valnet.hadean.gameobjects.worldobjects.Stockpile;
@@ -64,6 +63,7 @@ public class Job extends GameObject {
     }
   }
 
+  // TODO find the _best_ place to dropoff, instead of just the top left place.
   public class DropoffAtStockpile extends JobStep {
     public Item item;
     public DropoffAtStockpile(Item item) {
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/JobBoard.java b/src/main/java/xyz/valnet/hadean/gameobjects/JobBoard.java
index fd3d9e6..f8d4c6b 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/JobBoard.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/JobBoard.java
@@ -1,7 +1,6 @@
 package xyz.valnet.hadean.gameobjects;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
index 0c99a05..3166cd7 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/Tile.java
@@ -87,8 +87,6 @@ public class Tile extends WorldObject implements IWorkable {
     }
     thing.onPlaced(this);
     if(thing instanceof FarmPlot) {
-      desiredTill = true;
-
       get(JobBoard.class).postSimpleWorkJob("Till Soil", this);
     }
   }
@@ -140,13 +138,8 @@ public class Tile extends WorldObject implements IWorkable {
     return true;
   }
 
-  private boolean desiredTill = false;
   private float tillLevel = 0;
 
-  public void setTill(boolean till) {
-    desiredTill = till;
-  }
-
   @Override
   public Vector2i[] getWorkablePositions() {
     return new Vector2i[] {
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java
index 7423070..1648041 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/inputlayer/BuildLayer.java
@@ -70,7 +70,6 @@ public class BuildLayer extends GameObject implements IMouseCaptureArea, ITransi
   }
 
   private int x, y;
-  private int screenX, screenY;
   private boolean mouseDown = false;
 
   @Override
@@ -80,8 +79,6 @@ public class BuildLayer extends GameObject implements IMouseCaptureArea, ITransi
     } else if(button == 0 && active && hovered) {
       Vector2i worldcoords = camera.screen2world(App.mouseX, App.mouseY).asInt();
       mouseDown = true;
-      screenX = App.mouseX;
-      screenY = App.mouseY;
       x = worldcoords.x;
       y = worldcoords.y;
     }
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java b/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java
index e50c10d..016c06f 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/ui/tabs/BuildTab.java
@@ -62,17 +62,18 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
 
   }
 
+  @SuppressWarnings("unchecked")
   private void calculateBuildables() {
     try {
-      Class<? extends IBuildable>[] maybeBuildables = getClasses("xyz.valnet.hadean");
+      Class<?>[] maybeBuildables = getClasses("xyz.valnet.hadean");
 
-      for(Class<? extends IBuildable> clazz : maybeBuildables) {
+      for(Class<?> clazz : maybeBuildables) {
         if(clazz.isAnonymousClass()) continue;
         if(!IBuildable.class.isAssignableFrom(clazz)) continue;
         if(clazz.isInterface()) continue;
         if(Modifier.isAbstract(clazz.getModifiers())) continue;
 
-        Constructor<? extends IBuildable> constructor = clazz.getConstructor();
+        Constructor<? extends IBuildable> constructor = (Constructor<? extends IBuildable>) clazz.getConstructor();
         if(constructor.getParameterCount() != 0) {
           System.out.println(clazz + " has no default constructor (no params)");
           continue;
@@ -315,7 +316,8 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
     }
   }
 
-  private static Class[] getClasses(String packageName) throws ClassNotFoundException, IOException {
+  @SuppressWarnings("rawtypes")
+  private static Class<?>[] getClasses(String packageName) throws ClassNotFoundException, IOException {
       ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
       assert classLoader != null;
       String path = packageName.replace('.', '/');
@@ -329,9 +331,10 @@ public class BuildTab extends Tab implements ISelectionChangeListener, IMouseCap
       for (File directory : dirs) {
           classes.addAll(findClasses(directory, packageName));
       }
-      return classes.toArray(new Class[classes.size()]);
+      return (Class<?>[]) classes.toArray(new Class[classes.size()]);
   }
   
+  @SuppressWarnings("rawtypes")
   private static List<Class> findClasses(File directory, String packageName) throws ClassNotFoundException {
     List<Class> classes = new ArrayList<Class>();
     if (!directory.exists()) {
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
index ec21d16..50b9f9c 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Bed.java
@@ -1,5 +1,7 @@
 package xyz.valnet.hadean.gameobjects.worldobjects;
 
+import static xyz.valnet.engine.util.Math.lerp;
+
 import xyz.valnet.engine.math.Vector2i;
 import xyz.valnet.engine.math.Vector4f;
 import xyz.valnet.hadean.gameobjects.Job;
@@ -16,10 +18,9 @@ import xyz.valnet.hadean.util.Assets;
 import xyz.valnet.hadean.util.Layers;
 import xyz.valnet.hadean.util.detail.BooleanDetail;
 import xyz.valnet.hadean.util.detail.Detail;
+import xyz.valnet.hadean.util.detail.ObjectDetail;
 import xyz.valnet.hadean.util.detail.PercentDetail;
 
-import static xyz.valnet.engine.util.Math.lerp;
-
 @BuildableMetadata(category = "Furniture", name = "Bed", type = BuildableMetadata.SINGLE)
 public class Bed extends WorldObject implements IBuildable, IItemReceiver, IWorkable, ISelectable {
 
@@ -76,6 +77,7 @@ public class Bed extends WorldObject implements IBuildable, IItemReceiver, IWork
   @Override
   public boolean receive(Item item) {
     remove(item);
+    logs ++;
     return true;
   }
 
@@ -133,6 +135,7 @@ public class Bed extends WorldObject implements IBuildable, IItemReceiver, IWork
     return new Detail[] {
       new BooleanDetail("Built", isBuilt()),
       new PercentDetail("Work", work / maxWork),
+      new ObjectDetail<Integer>("Logs", logs),
     };
   }
   
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Rice.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Rice.java
index 8672233..cd7a927 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Rice.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Rice.java
@@ -2,39 +2,14 @@ package xyz.valnet.hadean.gameobjects.worldobjects;
 
 import xyz.valnet.engine.math.Vector2f;
 import xyz.valnet.engine.math.Vector4f;
-import xyz.valnet.hadean.gameobjects.JobBoard;
 import xyz.valnet.hadean.gameobjects.worldobjects.items.Item;
-import xyz.valnet.hadean.interfaces.ISelectable;
-import xyz.valnet.hadean.interfaces.ITileThing;
 import xyz.valnet.hadean.util.Action;
 import xyz.valnet.hadean.util.Assets;
 import xyz.valnet.hadean.util.Layers;
 import xyz.valnet.hadean.util.detail.Detail;
 
-public class Rice extends Item implements ITileThing, ISelectable {
+public class Rice extends Item {
 
-  // private SmartBoolean haul;
-
-  private JobBoard jobboard;
-
-  @Override
-  public void start() {
-    super.start();
-    jobboard = get(JobBoard.class);
-    Rice that = this;
-
-    // haul = new SmartBoolean(false, new IListener() {
-    //   @Override
-    //   public void rise() {
-    //     jobboard.postJob(that);
-    //   }
-
-    //   @Override
-    //   public void fall() {
-    //     jobboard.rescindJob(that);
-    //   }
-    // });
-  }
 
   public Rice(int x, int y) {
     this.x = x;
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Stockpile.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Stockpile.java
index cb3831d..e1f0bce 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Stockpile.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Stockpile.java
@@ -113,7 +113,6 @@ public class Stockpile extends WorldObject implements ISelectable, ITileThing, I
 
   @Override
   public String getName() {
-    // TODO Auto-generated method stub
     return "Stockpile";
   }
 
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java
index efef0b9..e106ad9 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/Tree.java
@@ -135,8 +135,5 @@ public class Tree extends WorldObject implements ITileThing, ISelectable, IWorka
   }
 
   @Override
-  public void onPlaced(Tile tile) {
-    // TODO Auto-generated method stub
-    
-  }
+  public void onPlaced(Tile tile) {}
 }
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java
index 18ebcf5..cc894ce 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Item.java
@@ -1,6 +1,5 @@
 package xyz.valnet.hadean.gameobjects.worldobjects.items;
 
-import xyz.valnet.engine.math.Vector2f;
 import xyz.valnet.engine.math.Vector4f;
 import xyz.valnet.hadean.gameobjects.Job;
 import xyz.valnet.hadean.gameobjects.JobBoard;
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Log.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Log.java
index 218d67e..224734d 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Log.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/items/Log.java
@@ -4,6 +4,11 @@ import xyz.valnet.hadean.util.Assets;
 import xyz.valnet.hadean.util.Layers;
 import xyz.valnet.hadean.util.detail.Detail;
 
+// TODO haul on placed in non stockpile. we could have a situation
+// where the job gets cancelled, because a pawn has the item
+// while it wants to be hauled. thats fine, but what if the pawn then drops
+// the item? it should still be hauled. ergo, we should autohaul
+// when placed in a non stockpile, not just on create.
 public class Log extends Item {
 
   public Log(int x, int y) {
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
index 73ea197..203a57d 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java
@@ -73,7 +73,7 @@ public class Pawn extends Agent {
     super.start();
 
     activities.add(new JobActivity(this, get(JobBoard.class)));
-    activities.add(new SleepActivity(this, needs, get(Clock.class)));
+    activities.add(new SleepActivity(needs, get(Clock.class)));
   }
 
   protected void create() {
@@ -172,10 +172,6 @@ public class Pawn extends Agent {
     currentActivity.begin(a -> endActivity(a));
   }
 
-  private void endActivity() {
-    endActivity(currentActivity);
-  }
-
   private void endActivity(Activity activity) {
     activity.end();
     stopPathing();
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java
index b6c510a..ef83ffc 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/SleepActivity.java
@@ -3,23 +3,17 @@ package xyz.valnet.hadean.gameobjects.worldobjects.pawn;
 import xyz.valnet.engine.math.Vector2i;
 import xyz.valnet.engine.util.Math.WeightedAverage;
 import xyz.valnet.hadean.gameobjects.Clock;
-import xyz.valnet.hadean.gameobjects.worldobjects.agents.Agent;
-
-import static xyz.valnet.engine.util.Math.lerp;
 
 public class SleepActivity extends Activity {
   
-  private Agent agent;
   private Needs needs;
   private Clock clock;
 
   private float circadianStrength = (float)Math.random() * 5f;
 
-  private int stage;
 
-  public SleepActivity(Agent agent, Needs needs, Clock clock) {
+  public SleepActivity(Needs needs, Clock clock) {
     this.needs = needs;
-    this.agent = agent;
     this.clock = clock;
   }
 
diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java
index cace818..75e71d7 100644
--- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java
+++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/pawn/WanderActivity.java
@@ -3,9 +3,12 @@ package xyz.valnet.hadean.gameobjects.worldobjects.pawn;
 import xyz.valnet.engine.math.Vector2i;
 import xyz.valnet.hadean.gameobjects.worldobjects.agents.Agent;
 
+// TODO actually implement this activity.
 public class WanderActivity extends Activity {
   
+  @SuppressWarnings("unused")
   private Agent agent;
+  @SuppressWarnings("unused")
   private Needs needs;
 
   public WanderActivity(Agent agent, Needs needs) {
diff --git a/src/main/java/xyz/valnet/hadean/scenes/MenuScene.java b/src/main/java/xyz/valnet/hadean/scenes/MenuScene.java
index 1f9f699..6c56576 100644
--- a/src/main/java/xyz/valnet/hadean/scenes/MenuScene.java
+++ b/src/main/java/xyz/valnet/hadean/scenes/MenuScene.java
@@ -1,6 +1,5 @@
 package xyz.valnet.hadean.scenes;
 
-import xyz.valnet.engine.App;
 import xyz.valnet.engine.math.Vector4f;
 import xyz.valnet.engine.scenegraph.IScene;
 import xyz.valnet.hadean.input.Button;
@@ -10,6 +9,7 @@ import xyz.valnet.hadean.util.Layers;
 
 import static xyz.valnet.hadean.HadeanGame.Hadean;
 
+// TODO convert this to a scenegraph
 public class MenuScene implements IScene, IButtonListener {
 
   private Button btnNewGame = new Button(Assets.frame, "New Game", 50, 200, 128, 32, Layers.GENERAL_UI);
@@ -44,10 +44,10 @@ public class MenuScene implements IScene, IButtonListener {
 
   @Override
   public void update(float dTime) {
-    btnNewGame.setMouseCoords(App.mouseX, App.mouseY);
-    btnLoadGame.setMouseCoords(App.mouseX, App.mouseY);
-    btnOptions.setMouseCoords(App.mouseX, App.mouseY);
-    btnQuit.setMouseCoords(App.mouseX, App.mouseY);
+    // btnNewGame.setMouseCoords(App.mouseX, App.mouseY);
+    // btnLoadGame.setMouseCoords(App.mouseX, App.mouseY);
+    // btnOptions.setMouseCoords(App.mouseX, App.mouseY);
+    // btnQuit.setMouseCoords(App.mouseX, App.mouseY);
     btnNewGame.update();
     btnLoadGame.update();
     btnOptions.update();