DynRes fix

Katodiy · Mar 8, 2023 · de24863 · de24863
1 parent 51fbdd5
commit de24863
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 28 deletions.
diff --git a/src/haven/res/gfx/invobjs/meat/Meat.java b/src/haven/res/gfx/invobjs/meat/Meat.java
@@ -9,7 +9,7 @@
 import java.util.*;
 
 /* >ispr: Meat */
-@FromResource(name = "gfx/invobjs/meat", version = 22)
+@haven.FromResource(name = "gfx/invobjs/meat", version = 23)
 public class Meat extends Layered implements haven.res.ui.tt.defn.DynName {
     public final String name;
 

diff --git a/src/haven/res/lib/tspec/Spec.java b/src/haven/res/lib/tspec/Spec.java
@@ -7,7 +7,7 @@
 @FromResource(name = "lib/tspec", version = 3, override = true)
 public class Spec implements GSprite.Owner, ItemInfo.SpriteOwner {
     private static final Object[] definfo = {
-	new Object[] {Resource.remote().loadwait("ui/tt/defn").pool.load("ui/tt/defn", 5)},
+	new Object[] {Resource.remote().loadwait("ui/tt/defn").pool.load("ui/tt/defn", 6)},
     };
     public final Object[] info;
     public final ResData res;

diff --git a/src/haven/res/ui/croster/CattleId.java b/src/haven/res/ui/croster/CattleId.java
@@ -9,7 +9,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-@FromResource(name = "ui/croster", version = 72)
+@haven.FromResource(name = "ui/croster", version = 73)
 public class CattleId extends GAttrib implements RenderTree.Node, PView.Render2D {
     public final long id;
 

diff --git a/src/haven/res/ui/croster/CattleRoster.java b/src/haven/res/ui/croster/CattleRoster.java
@@ -11,7 +11,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-@FromResource(name = "ui/croster", version = 72)
+@haven.FromResource(name = "ui/croster", version = 73)
 public abstract class CattleRoster <T extends Entry> extends Widget {
     public static final int WIDTH = UI.scale(900);
     public static final Comparator<Entry> namecmp = (a, b) -> a.name.compareTo(b.name);
@@ -201,7 +201,7 @@ public void uimsg(String msg, Object... args) {
 	    delentry(entry.id);
 	    addentry(entry);
 	} else if(msg == "rm") {
-	    delentry((Long)args[0]);
+	    delentry(((Number)args[0]).longValue());
 	} else if(msg == "addto") {
 	    GameUI gui = (GameUI)ui.getwidget((Integer)args[0]);
 	    Pagina pag = gui.menu.paginafor(ui.sess.getres((Integer)args[1]));

diff --git a/src/haven/res/ui/croster/Column.java b/src/haven/res/ui/croster/Column.java
@@ -9,7 +9,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-@FromResource(name = "ui/croster", version = 72)
+@haven.FromResource(name = "ui/croster", version = 73)
 public class Column <E extends Entry> {
     public final Tex head;
     public final String tip;

diff --git a/src/haven/res/ui/croster/Entry.java b/src/haven/res/ui/croster/Entry.java
@@ -9,7 +9,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-@FromResource(name = "ui/croster", version = 72)
+@haven.FromResource(name = "ui/croster", version = 73)
 public class Entry extends Widget {
     public static final int WIDTH = CattleRoster.WIDTH;
     public static final int HEIGHT = UI.scale(20);
@@ -18,27 +18,26 @@ public class Entry extends Widget {
     public static final Function<Integer, String> percent = v -> String.format("%d%%", v);
     public static final Function<Number, String> quality = v -> Long.toString(Math.round(v.doubleValue()));
     public static final Function<Entry, Tex> namerend = e -> {
-	return(CharWnd.attrf2.render(e.name, BuddyWnd.gc[e.grp]).tex());
+	return(CharWnd.attrf.render(e.name, BuddyWnd.gc[e.grp]).tex());
     };
-    public static final Tex male = new TexI(Resource.loadsimg("hud/rosters/male"));
-    public static final Tex female = new TexI(Resource.loadsimg("hud/rosters/female"));
+    public static final Tex male   = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/male", 2)::get).layer(Resource.imgc).tex();
+    public static final Tex female = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/female", 2)::get).layer(Resource.imgc).tex();
     public static final Function<Boolean, Tex> sex = v -> (v ? male : female);
-    public static final Tex adult = new TexI(Resource.loadsimg("hud/rosters/adult"));
-    public static final Tex child = new TexI(Resource.loadsimg("hud/rosters/child"));
+    public static final Tex adult = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/adult", 2)::get).layer(Resource.imgc).tex();
+    public static final Tex child = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/child", 2)::get).layer(Resource.imgc).tex();
     public static final Function<Boolean, Tex> growth = v -> (v ? child : adult);
-    public static final Tex dead  = new TexI(Resource.loadsimg("hud/rosters/dead"));
-    public static final Tex alive  = new TexI(Resource.loadsimg("hud/rosters/alive"));
-
+    public static final Tex dead  = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/dead", 2)::get).layer(Resource.imgc).tex();
+    public static final Tex alive = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/alive", 2)::get).layer(Resource.imgc).tex();
     public static final Function<Boolean, Tex> deadrend = v -> (v ? dead : alive);
-    public static final Tex pregy  = new TexI(Resource.loadsimg("hud/rosters/pregnant-y"));
-    public static final Tex pregn  = new TexI(Resource.loadsimg("hud/rosters/pregnant-n"));
+    public static final Tex pregy = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/pregnant-y", 2)::get).layer(Resource.imgc).tex();
+    public static final Tex pregn = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/pregnant-n", 2)::get).layer(Resource.imgc).tex();
     public static final Function<Boolean, Tex> pregrend = v -> (v ? pregy : pregn);
-    public static final Tex lacty  = new TexI(Resource.loadsimg("hud/rosters/lactate-y"));
-    public static final Tex lactn  = new TexI(Resource.loadsimg("hud/rosters/lactate-n"));
+    public static final Tex lacty = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/lactate-y", 1)::get).layer(Resource.imgc).tex();
+    public static final Tex lactn = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/lactate-n", 1)::get).layer(Resource.imgc).tex();
     public static final Function<Boolean, Tex> lactrend = v -> (v ? lacty : lactn);
-    public static final Tex ownedn  = new TexI(Resource.loadsimg("hud/rosters/owned-n"));
-    public static final Tex ownedo  = new TexI(Resource.loadsimg("hud/rosters/owned-o"));
-    public static final Tex ownedm  = new TexI(Resource.loadsimg("hud/rosters/owned-m"));
+    public static final Tex ownedn = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/owned-n", 1)::get).layer(Resource.imgc).tex();
+    public static final Tex ownedo = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/owned-o", 1)::get).layer(Resource.imgc).tex();
+    public static final Tex ownedm = Loading.waitfor(Resource.classres(Entry.class).pool.load("gfx/hud/rosters/owned-m", 1)::get).layer(Resource.imgc).tex();
     public static final Function<Integer, Tex> ownrend = v -> ((v == 3) ? ownedm : ((v == 1) ? ownedo : ownedn));
     public final long id;
     public String name;

diff --git a/src/haven/res/ui/croster/RosterButton.java b/src/haven/res/ui/croster/RosterButton.java
@@ -9,7 +9,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-@FromResource(name = "ui/croster", version = 72)
+@haven.FromResource(name = "ui/croster", version = 73)
 public class RosterButton extends MenuGrid.PagButton {
     public final GameUI gui;
     public RosterWindow wnd;

diff --git a/src/haven/res/ui/croster/RosterWindow.java b/src/haven/res/ui/croster/RosterWindow.java
@@ -8,24 +8,22 @@
 import haven.MenuGrid.Pagina;
 import haven.res.gfx.hud.rosters.cow.Ochs;
 import haven.res.gfx.hud.rosters.goat.Goat;
-import haven.res.gfx.hud.rosters.goat.GoatRoster;
 import haven.res.gfx.hud.rosters.horse.Horse;
 import haven.res.gfx.hud.rosters.pig.Pig;
 import haven.res.gfx.hud.rosters.sheep.Sheep;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-@FromResource(name = "ui/croster", version = 72)
+@haven.FromResource(name = "ui/croster", version = 73)
 public class RosterWindow extends Window {
     public static final Map<Glob, RosterWindow> rosters = new HashMap<>();
     public static int rmseq = 0;
     public int btny = 0;
     public List<TypeButton> buttons = new ArrayList<>();
 
     RosterWindow() {
-		super(Coord.z, "Cattle Roster", true);
-		sz.x+=20;
+	super(Coord.z, "Cattle Roster", true);
     }
 
     public void show(CattleRoster rost) {

diff --git a/src/haven/res/ui/croster/TypeButton.java b/src/haven/res/ui/croster/TypeButton.java
@@ -9,7 +9,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
-@FromResource(name = "ui/croster", version = 72)
+@haven.FromResource(name = "ui/croster", version = 73)
 public class TypeButton extends IButton {
     public final int order;