mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-21 15:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

List each region biome's palettes in the Here tab

Browse Source 
The Here tab listed palettes only for the biome you stand on. The other
biomes in your region, including child biomes nested under their parent,
showed just their name, so a child like Grassland Hills had no way to
reach its wall blocks from there. Every biome in the region now lists its
palettes under it, indented with the biome.

Model used: Claude Opus 5.5
This commit is contained in:
piexel committed 2026-10-19 14:37:27 +02:00
1 parent 6270b62552
commit b24c38896d
1 file changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/volmit/iris/core/gui/PaletteNavigator.java
+10 -6
View File
@@ -246,8 +246,12 @@ final class PaletteNavigator extends JPanel {
}
hereRows.addElement(HereRow.header(title));
hereRows.addElement(HereRow.biome(biomeText(biome, childOfText(biome)), biomeKey, 0));
addPaletteRows(biome, 0);
}
private void addPaletteRows(BiomeEntry biome, int nesting) {
for (PaletteCatalog.PaletteSummary summary : biome.palettes()) {
hereRows.addElement(HereRow.palette(summary.text(), summary.palette()));
hereRows.addElement(HereRow.palette(summary.text(), summary.palette(), nesting));
}
}
@@ -259,6 +263,7 @@ final class PaletteNavigator extends JPanel {
}
boolean standingHere = biomeKey.equals(here.surfaceBiomeKey()) || biomeKey.equals(here.biomeAtPositionKey());
hereRows.addElement(HereRow.biome(biomeText(biome, standingHere ? "you are here" : null), biomeKey, nesting));
addPaletteRows(biome, nesting);
for (String childKey : biome.childKeys()) {
addRegionBiome(childKey, nesting + 1, new HashSet<>(ancestors), here);
}
@@ -408,7 +413,7 @@ final class PaletteNavigator extends JPanel {
}
/**
* @param nesting how many parent biomes deep a child biome sits
* @param nesting how many parent biomes deep the row's biome sits
*/
private record HereRow(String text, String biomeKey, BiomePalette palette, int nesting, boolean header) {
private static HereRow header(String text) {
@@ -419,8 +424,8 @@ final class PaletteNavigator extends JPanel {
return new HereRow(text, biomeKey, null, nesting, false);
}
private static HereRow palette(String text, BiomePalette palette) {
return new HereRow(text, palette.biomeKey(), palette, 0, false);
private static HereRow palette(String text, BiomePalette palette, int nesting) {
return new HereRow(text, palette.biomeKey(), palette, nesting, false);
}
}
@@ -451,8 +456,7 @@ final class PaletteNavigator extends JPanel {
setForeground(StudioTheme.MUTED_TEXT);
}
int indent = row.header() ? HEADER_INDENT
: row.palette() != null ? PALETTE_INDENT
: BIOME_INDENT + row.nesting() * CHILD_INDENT;
: (row.palette() != null ? PALETTE_INDENT : BIOME_INDENT) + row.nesting() * CHILD_INDENT;
setBorder(StudioTheme.emptyBorder(row.header() ? 11 : 4, indent, 4, 10));
return this;
}