From ecc9a7a99f6254b1051783a4544fff28f1867966 Mon Sep 17 00:00:00 2001 From: Ivory Date: Thu, 12 Jan 2023 09:03:41 -0500 Subject: [PATCH] cleanup: warnings --- .../java/xyz/valnet/engine/scenegraph/SceneGraph.java | 1 - src/main/java/xyz/valnet/engine/sound/Sound.java | 3 --- src/main/java/xyz/valnet/engine/util/Names.java | 7 ------- .../valnet/hadean/designation/HaulItemDesignation.java | 1 - .../valnet/hadean/gameobjects/worldobjects/FarmPlot.java | 3 +-- .../gameobjects/worldobjects/constructions/Bed.java | 4 +--- .../gameobjects/worldobjects/constructions/Wall.java | 3 +-- .../valnet/hadean/gameobjects/worldobjects/pawn/Pawn.java | 5 +---- .../gameobjects/worldobjects/pawn/WanderActivity.java | 8 ++------ 9 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java b/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java index 99dca73..90381ed 100644 --- a/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java +++ b/src/main/java/xyz/valnet/engine/scenegraph/SceneGraph.java @@ -2,7 +2,6 @@ package xyz.valnet.engine.scenegraph; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.NotSerializableException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.ArrayList; diff --git a/src/main/java/xyz/valnet/engine/sound/Sound.java b/src/main/java/xyz/valnet/engine/sound/Sound.java index bc0e763..cc39691 100644 --- a/src/main/java/xyz/valnet/engine/sound/Sound.java +++ b/src/main/java/xyz/valnet/engine/sound/Sound.java @@ -1,11 +1,8 @@ package xyz.valnet.engine.sound; -import java.io.FileInputStream; import java.nio.IntBuffer; import java.nio.ShortBuffer; -import org.lwjgl.BufferUtils; -import org.lwjgl.PointerBuffer; import static org.lwjgl.openal.AL10.*; import static org.lwjgl.stb.STBVorbis.*; diff --git a/src/main/java/xyz/valnet/engine/util/Names.java b/src/main/java/xyz/valnet/engine/util/Names.java index 8b0915d..3df7615 100644 --- a/src/main/java/xyz/valnet/engine/util/Names.java +++ b/src/main/java/xyz/valnet/engine/util/Names.java @@ -5,9 +5,7 @@ import java.io.InputStream; import java.util.List; import java.lang.Math; -import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.constructor.Constructor; public class Names { @@ -32,11 +30,6 @@ public class Names { private void load() { InputStream fileStream = null; try { - // Constructor constructor = new Constructor(); - // TypeDescription typeDescription = new TypeDescription(NameYaml.class); - // // typeDescription.putListPropertyType("things", ConfigurableThing.class); - // constructor.addTypeDescription(typeDescription); - Yaml yaml = new Yaml(); fileStream = new FileInputStream("res/names.yaml"); var loaded = yaml.loadAs(fileStream, NamesYaml.class).names; diff --git a/src/main/java/xyz/valnet/hadean/designation/HaulItemDesignation.java b/src/main/java/xyz/valnet/hadean/designation/HaulItemDesignation.java index 002b89b..46d2ca9 100644 --- a/src/main/java/xyz/valnet/hadean/designation/HaulItemDesignation.java +++ b/src/main/java/xyz/valnet/hadean/designation/HaulItemDesignation.java @@ -1,6 +1,5 @@ package xyz.valnet.hadean.designation; -import xyz.valnet.hadean.gameobjects.ui.tabs.BuildTab; import xyz.valnet.hadean.gameobjects.worldobjects.items.Item; import xyz.valnet.hadean.interfaces.BuildableMetadata; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/FarmPlot.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/FarmPlot.java index 930f70e..93c732b 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/FarmPlot.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/FarmPlot.java @@ -4,14 +4,13 @@ import xyz.valnet.engine.math.Vector4f; import xyz.valnet.engine.math.Vector4i; import xyz.valnet.hadean.gameobjects.Tile; import xyz.valnet.hadean.interfaces.BuildableMetadata; -import xyz.valnet.hadean.interfaces.ISelectable; 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; @BuildableMetadata(category = "Zones", name = "Farm Plot") -public class FarmPlot extends Buildable implements ISelectable { +public class FarmPlot extends Buildable { @Override public void renderAlpha() { diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java index 3c666fb..2ee2aa7 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Bed.java @@ -4,13 +4,11 @@ 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.Tile; import xyz.valnet.hadean.gameobjects.worldobjects.Buildable; 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.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; @@ -21,7 +19,7 @@ import xyz.valnet.hadean.util.detail.ObjectDetail; import xyz.valnet.hadean.util.detail.PercentDetail; @BuildableMetadata(category = "Furniture", name = "Bed", type = BuildableMetadata.Type.SINGLE) -public class Bed extends Buildable implements IItemReceiver, IWorkable, ISelectable { +public class Bed extends Buildable implements IItemReceiver, IWorkable { private int logs = 0; private float work = 0; diff --git a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java index 7d629ce..2d13d0b 100644 --- a/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java +++ b/src/main/java/xyz/valnet/hadean/gameobjects/worldobjects/constructions/Wall.java @@ -14,7 +14,6 @@ import xyz.valnet.hadean.gameobjects.worldobjects.items.Item; import xyz.valnet.hadean.interfaces.BuildableMetadata; import xyz.valnet.hadean.interfaces.IItemReceiver; import xyz.valnet.hadean.interfaces.IPingable; -import xyz.valnet.hadean.interfaces.ISelectable; import xyz.valnet.hadean.interfaces.IWorkable; import xyz.valnet.hadean.util.Action; import xyz.valnet.hadean.util.Assets; @@ -25,7 +24,7 @@ import xyz.valnet.hadean.util.detail.ObjectDetail; import xyz.valnet.hadean.util.detail.PercentDetail; @BuildableMetadata(category = "Structure", name = "Wall", type = BuildableMetadata.Type.SINGLE) -public class Wall extends Buildable implements IItemReceiver, IWorkable, ISelectable, IPingable { +public class Wall extends Buildable implements IItemReceiver, IWorkable, IPingable { private int boulders = 0; private float work = 0; 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 5fa3dd6..193c4be 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 @@ -28,7 +28,6 @@ import xyz.valnet.hadean.util.detail.PercentDetail; public class Pawn extends Agent { - private static int pawnCount = 0; private String name = Names.getRandomName(); private Needs needs = new Needs(); @@ -40,8 +39,6 @@ public class Pawn extends Agent { private transient List activities = new ArrayList(); private Activity currentActivity = null; - private Item heldItem = null; - public void pickupItemByPredicate(IItemPredicate itemPredicate) { Item item = getTile().pickupByItemPredicate(itemPredicate); inventory.add(item); @@ -100,7 +97,7 @@ public class Pawn extends Agent { activities.add(new JobActivity(this, get(JobBoard.class))); activities.add(new SleepActivity(needs, get(Clock.class))); - activities.add(new WanderActivity(this, needs, get(Terrain.class))); + activities.add(new WanderActivity(get(Terrain.class))); } protected void create() { 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 fe74646..f1fc154 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,20 +3,16 @@ package xyz.valnet.hadean.gameobjects.worldobjects.pawn; import xyz.valnet.engine.math.Vector2i; import xyz.valnet.hadean.gameobjects.Terrain; import xyz.valnet.hadean.gameobjects.Tile; -import xyz.valnet.hadean.gameobjects.worldobjects.agents.Agent; // TODO actually implement this activity. public class WanderActivity extends Activity { - - private Agent agent; + // TODO implement fun? // private Needs needs; private Terrain terrain; - public WanderActivity(Agent agent, Needs needs, Terrain terrain) { - // this.needs = needs; - this.agent = agent; + public WanderActivity(Terrain terrain) { this.terrain = terrain; }