BlueGit

timfa questward

fix

timfa Tim Falken · pushed by timfa

Authored 2026-08-28 · 2 months ago

Hash
8922b85c099a80c7a64cd982dac34511dbfe7559
Parent
b0ea3281
1 file changed +28 −25
shared/definitions/tiles.js +28 −25
@@ -1,27 +1,31 @@
1 import {
2 ORE_BEARING_MATERIALS,
3 oreBoulderState,
4 materialFromOreBoulderState,
5 MATERIAL_DISPLAY_NAME,
6 WoodTier,
7 WOOD_TIER_ORDER
8 } from "./materialTiers.js";
9 import {
10 FLOWER_COLOR_ORDER,
11 FLOWER_COLOR_DISPLAY,
12 flowerBlockState
13 } from "./dyes.js";
14 import {
15 HERB_ORDER,
16 HERB_DEFINITIONS,
17 herbDefinition
18 } from "./herbs.js";
19 import { spriteImageName, resolveState } from "./tileSprites.js";
1 import
2 {
3 ORE_BEARING_MATERIALS,
4 oreBoulderState,
5 materialFromOreBoulderState,
6 MATERIAL_DISPLAY_NAME,
7 WoodTier,
8 WOOD_TIER_ORDER
9 } from "./materialTiers.js";
10 import
11 {
12 FLOWER_COLOR_ORDER,
13 FLOWER_COLOR_DISPLAY,
14 flowerBlockState
15 } from "./dyes.js";
16 import
17 {
18 HERB_ORDER,
19 HERB_DEFINITIONS,
20 herbDefinition
21 } from "./herbs.js";
22 import { spriteImageName, defaultStateForType } from "./tileSprites.js";
20 23 import { isSeasonalStumpState, SeasonId } from "../world/season.js";
21 import {
22 composeNeighborConnectState,
23 definitionUsesMaterialNeighborConnect
24 } from "../world/neighborConnect.js";
24 import
25 {
26 composeNeighborConnectState,
27 definitionUsesMaterialNeighborConnect
28 } from "../world/neighborConnect.js";
25 29
26 30 export const GroundType = Object.freeze({
27 31 grass: 1,
@@ -709,8 +713,7 @@ export function listPlaceableBlockPaletteEntries (catalog = null)
709 713 });
710 714 continue;
711 715 }
712 const states = catalog?.blocks?.[def.key]?.states ?? [];
713 const state = resolveState(states, def.defaultState ?? null) ?? def.defaultState ?? null;
716 const state = defaultStateForType(catalog, "block", def.key);
714 717 entries.push({
715 718 typeId: def.id,
716 719 state,
@@ -1,27 +1,31 @@
1import {
1import
2 ORE_BEARING_MATERIALS,
2 {
3 oreBoulderState,
3 ORE_BEARING_MATERIALS,
4 materialFromOreBoulderState,
4 oreBoulderState,
5 MATERIAL_DISPLAY_NAME,
5 materialFromOreBoulderState,
6 WoodTier,
6 MATERIAL_DISPLAY_NAME,
7 WOOD_TIER_ORDER
7 WoodTier,
8} from "./materialTiers.js";
8 WOOD_TIER_ORDER
9import {
9 } from "./materialTiers.js";
10 FLOWER_COLOR_ORDER,
10import
11 FLOWER_COLOR_DISPLAY,
11 {
12 flowerBlockState
12 FLOWER_COLOR_ORDER,
13} from "./dyes.js";
13 FLOWER_COLOR_DISPLAY,
14import {
14 flowerBlockState
15 HERB_ORDER,
15 } from "./dyes.js";
16 HERB_DEFINITIONS,
16import
17 herbDefinition
17 {
18} from "./herbs.js";
18 HERB_ORDER,
19import { spriteImageName, resolveState } from "./tileSprites.js";
19 HERB_DEFINITIONS,
20 herbDefinition
21 } from "./herbs.js";
22import { spriteImageName, defaultStateForType } from "./tileSprites.js";
20import { isSeasonalStumpState, SeasonId } from "../world/season.js";
23import { isSeasonalStumpState, SeasonId } from "../world/season.js";
21import {
24import
22 composeNeighborConnectState,
25 {
23 definitionUsesMaterialNeighborConnect
26 composeNeighborConnectState,
24} from "../world/neighborConnect.js";
27 definitionUsesMaterialNeighborConnect
28 } from "../world/neighborConnect.js";
25
29
26export const GroundType = Object.freeze({
30export const GroundType = Object.freeze({
27 grass: 1,
31 grass: 1,
@@ -709,8 +713,7 @@ export function listPlaceableBlockPaletteEntries (catalog = null)
709 });
713 });
710 continue;
714 continue;
711 }
715 }
712 const states = catalog?.blocks?.[def.key]?.states ?? [];
716 const state = defaultStateForType(catalog, "block", def.key);
713 const state = resolveState(states, def.defaultState ?? null) ?? def.defaultState ?? null;
714 entries.push({
717 entries.push({
715 typeId: def.id,
718 typeId: def.id,
716 state,
719 state,