Skip to content

Commit

Permalink
small fix for remote res
Browse files Browse the repository at this point in the history
  • Loading branch information
@Katodiy
Katodiy committed Mar 25, 2023
1 parent 71cff63 commit 1842eb4
Show file tree
Hide file tree
Showing 18 changed files with 40 additions and 42 deletions.
4 changes: 2 additions & 2 deletions src/haven/res/gfx/hud/rosters/cow/CowRoster.java
View file
Expand Up @@ -7,7 +7,7 @@
import haven.res.ui.croster.*;
import java.util.*;

@FromResource(name = "gfx/hud/rosters/cow", version = 72)
@haven.FromResource(name = "gfx/hud/rosters/cow", version = 74)
public class CowRoster extends CattleRoster<Ochs> {
public static List<Column> cols = initcols(
new Column<Entry>("Name", Comparator.comparing((Entry e) -> e.name), 200),
Expand Down Expand Up @@ -39,7 +39,7 @@ public static CattleRoster mkwidget(UI ui, Object... args) {

public Ochs parse(Object... args) {
int n = 0;
long id = (Long)args[n++];
long id = ((Number)args[n++]).longValue();
String name = (String)args[n++];
Ochs ret = new Ochs(id, name);
ret.grp = (Integer)args[n++];
Expand Down
3 changes: 1 addition & 2 deletions src/haven/res/gfx/hud/rosters/cow/Ochs.java
View file
Expand Up @@ -4,13 +4,12 @@
package haven.res.gfx.hud.rosters.cow;

import haven.*;
import haven.res.gfx.hud.rosters.pig.PigRoster;
import haven.res.ui.croster.*;
import nurgling.NConfiguration;

import java.util.*;

@FromResource(name = "gfx/hud/rosters/cow", version = 72)
@haven.FromResource(name = "gfx/hud/rosters/cow", version = 74)
public class Ochs extends Entry {
public int meat, milk;
public int meatq, milkq, hideq;
Expand Down
3 changes: 1 addition & 2 deletions src/haven/res/gfx/hud/rosters/goat/Goat.java
View file
Expand Up @@ -4,13 +4,12 @@
package haven.res.gfx.hud.rosters.goat;

import haven.*;
import haven.res.gfx.hud.rosters.sheep.SheepRoster;
import haven.res.ui.croster.*;
import nurgling.NConfiguration;

import java.util.*;

@FromResource(name = "gfx/hud/rosters/goat", version = 62)
@haven.FromResource(name = "gfx/hud/rosters/goat", version = 63)
public class Goat extends Entry {
public int meat, milk, wool;
public int meatq, milkq, woolq, hideq;
Expand Down
5 changes: 2 additions & 3 deletions src/haven/res/gfx/hud/rosters/goat/GoatRoster.java
View file
Expand Up @@ -4,11 +4,10 @@
package haven.res.gfx.hud.rosters.goat;

import haven.*;
import haven.res.gfx.hud.rosters.sheep.Sheep;
import haven.res.ui.croster.*;
import java.util.*;

@FromResource(name = "gfx/hud/rosters/goat", version = 61)
@haven.FromResource(name = "gfx/hud/rosters/goat", version = 63)
public class GoatRoster extends CattleRoster<Goat> {
public static List<Column> cols = initcols(
new Column<Entry>("Name", Comparator.comparing((Entry e) -> e.name), 200),
Expand Down Expand Up @@ -42,7 +41,7 @@ public static CattleRoster mkwidget(UI ui, Object... args) {

public Goat parse(Object... args) {
int n = 0;
long id = (Long)args[n++];
long id = ((Number)args[n++]).longValue();
String name = (String)args[n++];
Goat ret = new Goat(id, name);
ret.grp = (Integer)args[n++];
Expand Down
3 changes: 1 addition & 2 deletions src/haven/res/gfx/hud/rosters/horse/Horse.java
View file
Expand Up @@ -4,13 +4,12 @@
package haven.res.gfx.hud.rosters.horse;

import haven.*;
import haven.res.gfx.hud.rosters.pig.PigRoster;
import haven.res.ui.croster.*;
import nurgling.NConfiguration;

import java.util.*;

@FromResource(name = "gfx/hud/rosters/horse", version = 60)
@haven.FromResource(name = "gfx/hud/rosters/horse", version = 62)
public class Horse extends Entry {
public int meat, milk;
public int meatq, milkq, hideq;
Expand Down
7 changes: 3 additions & 4 deletions src/haven/res/gfx/hud/rosters/horse/HorseRoster.java
View file
Expand Up @@ -4,14 +4,13 @@
package haven.res.gfx.hud.rosters.horse;

import haven.*;
import haven.res.gfx.hud.rosters.pig.Pig;
import haven.res.ui.croster.*;
import java.util.*;

@FromResource(name = "gfx/hud/rosters/horse", version = 60)
@haven.FromResource(name = "gfx/hud/rosters/horse", version = 62)
public class HorseRoster extends CattleRoster<Horse> {
public static List<Column> cols = initcols(
new Column<Entry>("Name", Comparator.comparing((Entry e) -> e.name), 170),
new Column<Entry>("Name", Comparator.comparing((Entry e) -> e.name), 160),

new Column<Horse>(Resource.local().load("hud/rosters/sex", 2), Comparator.comparing((Horse e) -> e.stallion).reversed(), 20).runon(),
new Column<Horse>(Resource.local().load("hud/rosters/growth", 2), Comparator.comparing((Horse e) -> e.foal).reversed(), 20).runon(),
Expand Down Expand Up @@ -44,7 +43,7 @@ public static CattleRoster mkwidget(UI ui, Object... args) {

public Horse parse(Object... args) {
int n = 0;
long id = (Long)args[n++];
long id = ((Number)args[n++]).longValue();
String name = (String)args[n++];
Horse ret = new Horse(id, name);
ret.grp = (Integer)args[n++];
Expand Down
2 changes: 1 addition & 1 deletion src/haven/res/gfx/hud/rosters/pig/Pig.java
View file
Expand Up @@ -9,7 +9,7 @@

import java.util.*;

@FromResource(name = "gfx/hud/rosters/pig", version = 60)
@haven.FromResource(name = "gfx/hud/rosters/pig", version = 62)
public class Pig extends Entry {
public int meat, milk;
public int meatq, milkq, hideq;
Expand Down
4 changes: 2 additions & 2 deletions src/haven/res/gfx/hud/rosters/pig/PigRoster.java
View file
Expand Up @@ -7,7 +7,7 @@
import haven.res.ui.croster.*;
import java.util.*;

@FromResource(name = "gfx/hud/rosters/pig", version = 60)
@haven.FromResource(name = "gfx/hud/rosters/pig", version = 62)
public class PigRoster extends CattleRoster<Pig> {
public static List<Column> cols = initcols(
new Column<Entry>("Name", Comparator.comparing((Entry e) -> e.name), 200),
Expand Down Expand Up @@ -41,7 +41,7 @@ public static CattleRoster mkwidget(UI ui, Object... args) {

public Pig parse(Object... args) {
int n = 0;
long id = (Long)args[n++];
long id = ((Number)args[n++]).longValue();
String name = (String)args[n++];
Pig ret = new Pig(id, name);
ret.grp = (Integer)args[n++];
Expand Down
3 changes: 1 addition & 2 deletions src/haven/res/gfx/hud/rosters/sheep/Sheep.java
View file
Expand Up @@ -4,13 +4,12 @@
package haven.res.gfx.hud.rosters.sheep;

import haven.*;
import haven.res.gfx.hud.rosters.cow.CowRoster;
import haven.res.ui.croster.*;
import nurgling.NConfiguration;

import java.util.*;

@FromResource(name = "gfx/hud/rosters/sheep", version = 61)
@haven.FromResource(name = "gfx/hud/rosters/sheep", version = 64)
public class Sheep extends Entry {
public int meat, milk, wool;
public int meatq, milkq, woolq, hideq;
Expand Down
5 changes: 2 additions & 3 deletions src/haven/res/gfx/hud/rosters/sheep/SheepRoster.java
View file
Expand Up @@ -4,11 +4,10 @@
package haven.res.gfx.hud.rosters.sheep;

import haven.*;
import haven.res.gfx.hud.rosters.cow.Ochs;
import haven.res.ui.croster.*;
import java.util.*;

@FromResource(name = "gfx/hud/rosters/sheep", version = 61)
@haven.FromResource(name = "gfx/hud/rosters/sheep", version = 64)
public class SheepRoster extends CattleRoster<Sheep> {
public static List<Column> cols = initcols(
new Column<Entry>("Name", Comparator.comparing((Entry e) -> e.name), 200),
Expand Down Expand Up @@ -42,7 +41,7 @@ public static CattleRoster mkwidget(UI ui, Object... args) {

public Sheep parse(Object... args) {
int n = 0;
long id = (Long)args[n++];
long id = ((Number)args[n++]).longValue();
String name = (String)args[n++];
Sheep ret = new Sheep(id, name);
ret.grp = (Integer)args[n++];
Expand Down
2 changes: 1 addition & 1 deletion src/haven/res/ui/croster/CattleId.java
View file
Expand Up @@ -9,7 +9,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;

@haven.FromResource(name = "ui/croster", version = 73)
@haven.FromResource(name = "ui/croster", version = 74)
public class CattleId extends GAttrib implements RenderTree.Node, PView.Render2D {
public final long id;

Expand Down
2 changes: 1 addition & 1 deletion src/haven/res/ui/croster/CattleRoster.java
View file
Expand Up @@ -11,7 +11,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;

@haven.FromResource(name = "ui/croster", version = 73)
@haven.FromResource(name = "ui/croster", version = 74)
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);
Expand Down
2 changes: 1 addition & 1 deletion src/haven/res/ui/croster/Column.java
View file
Expand Up @@ -9,7 +9,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;

@haven.FromResource(name = "ui/croster", version = 73)
@haven.FromResource(name = "ui/croster", version = 74)
public class Column <E extends Entry> {
public final Tex head;
public final String tip;
Expand Down
2 changes: 1 addition & 1 deletion src/haven/res/ui/croster/Entry.java
View file
Expand Up @@ -9,7 +9,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;

@haven.FromResource(name = "ui/croster", version = 73)
@haven.FromResource(name = "ui/croster", version = 74)
public class Entry extends Widget {
public static final int WIDTH = CattleRoster.WIDTH;
public static final int HEIGHT = UI.scale(20);
Expand Down
2 changes: 1 addition & 1 deletion src/haven/res/ui/croster/RosterButton.java
View file
Expand Up @@ -9,7 +9,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;

@haven.FromResource(name = "ui/croster", version = 73)
@haven.FromResource(name = "ui/croster", version = 74)
public class RosterButton extends MenuGrid.PagButton {
public final GameUI gui;
public RosterWindow wnd;
Expand Down
2 changes: 1 addition & 1 deletion src/haven/res/ui/croster/RosterWindow.java
View file
Expand Up @@ -15,7 +15,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;

@haven.FromResource(name = "ui/croster", version = 73)
@haven.FromResource(name = "ui/croster", version = 74)
public class RosterWindow extends Window {
public static final Map<Glob, RosterWindow> rosters = new HashMap<>();
public static int rmseq = 0;
Expand Down
6 changes: 3 additions & 3 deletions src/haven/res/ui/croster/TypeButton.java
View file
Expand Up @@ -9,7 +9,7 @@
import java.awt.Color;
import java.awt.image.BufferedImage;

@haven.FromResource(name = "ui/croster", version = 73)
@haven.FromResource(name = "ui/croster", version = 74)
public class TypeButton extends IButton {
public final int order;

Expand All @@ -19,10 +19,10 @@ public TypeButton(BufferedImage up, BufferedImage down, int order) {
}

protected void depress() {
Audio.play(Button.lbtdown.stream());
ui.sfx(Button.clbtdown.stream());
}

protected void unpress() {
Audio.play(Button.lbtup.stream());
ui.sfx(Button.clbtup.stream());
}
}
25 changes: 15 additions & 10 deletions src/haven/res/ui/tt/attrmod/AttrMod.java
View file
Expand Up @@ -9,8 +9,8 @@
import java.util.*;
import java.awt.image.BufferedImage;

/* >tt: AttrMod */
@haven.FromResource(name = "ui/tt/attrmod", version = 7)
/* >tt: AttrMod$Fac */
@haven.FromResource(name = "ui/tt/attrmod", version = 10)
public class AttrMod extends ItemInfo.Tip {
public final Collection<Mod> mods;

Expand All @@ -35,16 +35,21 @@ public AttrMod(Owner owner, Collection<Mod> mods) {
}
}

public static ItemInfo mkinfo(Owner owner, Object... args) {
Resource.Resolver rr = owner.context(Resource.Resolver.class);
Collection<Mod> mods = new ArrayList<Mod>();
for(int a = 1; a < args.length; a += 2)
mods.add(new Mod(rr.getres((Integer)args[a]).get(), (Integer)args[a + 1]));
return(new AttrMod(owner, mods));
public static class Fac implements InfoFactory {
public ItemInfo build(Owner owner, Raw raw, Object... args) {
Resource.Resolver rr = owner.context(Resource.Resolver.class);
Collection<Mod> mods = new ArrayList<Mod>();
for(int a = 1; a < args.length; a += 2)
mods.add(new Mod(rr.getres((Integer)args[a]).get(), (Integer)args[a + 1]));
return(new AttrMod(owner, mods));
}

public ItemInfo build(Owner owner, Object... args) {
return(null);
}
}

public static String buff = "128,255,128";
public static String debuff = "255,128,128";
public static String buff = "128,255,128", debuff = "255,128,128";
public static BufferedImage modimg(Collection<Mod> mods) {
Collection<BufferedImage> lines = new ArrayList<BufferedImage>(mods.size());
for(Mod mod : mods) {
Expand Down

0 comments on commit 1842eb4

Please sign in to comment.