Skip to content

Commit 10b604c

Browse files
misodemisode
committed
Add support for 26.1 snapshots
1 parent 3908442 commit 10b604c

File tree

7 files changed

+265
-182
lines changed

7 files changed

+265
-182
lines changed

‎package-lock.json‎

Lines changed: 179 additions & 146 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
"license": "MIT",
1717
"dependencies": {
1818
"@giscus/react": "^2.2.3",
19-
"@spyglassmc/core": "^0.4.39",
20-
"@spyglassmc/java-edition": "^0.3.51",
21-
"@spyglassmc/json": "^0.3.43",
22-
"@spyglassmc/locales": "^0.3.19",
19+
"@spyglassmc/core": "^0.4.42",
20+
"@spyglassmc/java-edition": "^0.3.54",
21+
"@spyglassmc/json": "^0.3.46",
22+
"@spyglassmc/locales": "^0.3.21",
2323
"@spyglassmc/mcdoc": "^0.3.43",
24-
"@spyglassmc/nbt": "^0.3.45",
24+
"@spyglassmc/nbt": "^0.3.48",
2525
"@zip.js/zip.js": "^2.4.5",
2626
"brace": "^0.11.1",
2727
"buffer": "^6.0.3",
28-
"deepslate": "^0.23.6",
28+
"deepslate": "^0.24.0",
2929
"deepslate-1.18": "npm:[email protected]",
3030
"deepslate-1.18.2": "npm:[email protected]",
3131
"deepslate-1.20.4": "npm:[email protected]",

‎src/app/components/previews/LootTable.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,13 @@ function computeInt(provider: any, ctx: LootContext): number {
646646
result += 1
647647
}
648648
}
649-
return result
649+
return result
650+
case 'sum':
651+
let sum = 0
652+
for (const summand of provider.summands ?? []) {
653+
sum += computeInt(summand, ctx)
654+
}
655+
return sum
650656
}
651657
return 0
652658
}
@@ -672,7 +678,13 @@ function computeFloat(provider: any, ctx: LootContext): number {
672678
result += 1
673679
}
674680
}
675-
return result
681+
return result
682+
case 'sum':
683+
let sum = 0
684+
for (const summand of provider.summands ?? []) {
685+
sum += computeFloat(summand, ctx)
686+
}
687+
return sum
676688
}
677689
return 0
678690
}

‎src/app/pages/Transformation.tsx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -336,35 +336,35 @@ class MeshRenderer extends Renderer {
336336

337337
this.mesh = new Mesh([
338338
new Quad( // E
339-
new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.25, 0.50], undefined, undefined),
340-
new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.25, 0.25], undefined, undefined),
341-
new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.00, 0.25], undefined, undefined),
342-
new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.00, 0.50], undefined, undefined)),
339+
new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.25, 0.50], undefined, undefined, undefined),
340+
new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.25, 0.25], undefined, undefined, undefined),
341+
new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.00, 0.25], undefined, undefined, undefined),
342+
new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.00, 0.50], undefined, undefined, undefined)),
343343
new Quad( // W
344-
new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.75, 0.50], undefined, undefined),
345-
new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.75, 0.25], undefined, undefined),
346-
new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined),
347-
new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.50], undefined, undefined)),
344+
new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.75, 0.50], undefined, undefined, undefined),
345+
new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.75, 0.25], undefined, undefined, undefined),
346+
new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined),
347+
new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.50], undefined, undefined, undefined)),
348348
new Quad( // U
349-
new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined),
350-
new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined),
351-
new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.50, 0.00], undefined, undefined),
352-
new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.25, 0.00], undefined, undefined)),
349+
new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined, undefined),
350+
new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined),
351+
new Vertex(new Vector(1, 1, 0), [0, 0, 0], [0.50, 0.00], undefined, undefined, undefined),
352+
new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.25, 0.00], undefined, undefined, undefined)),
353353
new Quad( // D
354-
new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined),
355-
new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined),
356-
new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.75, 0.00], undefined, undefined),
357-
new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.50, 0.00], undefined, undefined)),
354+
new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined),
355+
new Vertex(new Vector(1, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined, undefined),
356+
new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.75, 0.00], undefined, undefined, undefined),
357+
new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.50, 0.00], undefined, undefined, undefined)),
358358
new Quad( // S
359-
new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.25, 0.50], undefined, undefined),
360-
new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.50, 0.50], undefined, undefined),
361-
new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined),
362-
new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined)),
359+
new Vertex(new Vector(0, 0, 1), [0, 0, 0], [0.25, 0.50], undefined, undefined, undefined),
360+
new Vertex(new Vector(1, 0, 1), [0, 0, 0], [0.50, 0.50], undefined, undefined, undefined),
361+
new Vertex(new Vector(1, 1, 1), [0, 0, 0], [0.50, 0.25], undefined, undefined, undefined),
362+
new Vertex(new Vector(0, 1, 1), [0, 0, 0], [0.25, 0.25], undefined, undefined, undefined)),
363363
new Quad( // N
364-
new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.75, 0.50], undefined, undefined),
365-
new Vertex(new Vector(1, 1, 0), [0, 0, 0], [1.00, 0.50], undefined, undefined),
366-
new Vertex(new Vector(1, 0, 0), [0, 0, 0], [1.00, 0.25], undefined, undefined),
367-
new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined)),
364+
new Vertex(new Vector(0, 1, 0), [0, 0, 0], [0.75, 0.50], undefined, undefined, undefined),
365+
new Vertex(new Vector(1, 1, 0), [0, 0, 0], [1.00, 0.50], undefined, undefined, undefined),
366+
new Vertex(new Vector(1, 0, 0), [0, 0, 0], [1.00, 0.25], undefined, undefined, undefined),
367+
new Vertex(new Vector(0, 0, 0), [0, 0, 0], [0.75, 0.25], undefined, undefined, undefined)),
368368
])
369369
for (const q of this.mesh.quads) {
370370
const normal = q.normal()

‎src/app/services/Versions.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import config from '../Config.js'
22

3-
export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2', '1.19', '1.19.3', '1.19.4', '1.20', '1.20.2', '1.20.3', '1.20.5', '1.21', '1.21.2', '1.21.4', '1.21.5', '1.21.6', '1.21.9', '1.21.11'] as const
3+
export const VersionIds = ['1.15', '1.16', '1.17', '1.18', '1.18.2', '1.19', '1.19.3', '1.19.4', '1.20', '1.20.2', '1.20.3', '1.20.5', '1.21', '1.21.2', '1.21.4', '1.21.5', '1.21.6', '1.21.9', '1.21.11', '26.1'] as const
44
export type VersionId = typeof VersionIds[number]
55

6-
export const DEFAULT_VERSION: VersionId = '1.21.9'
6+
export const DEFAULT_VERSION: VersionId = '1.21.11'
77

88
export function checkVersion(versionId: string, minVersionId: string | undefined, maxVersionId?: string) {
99
const version = config.versions.findIndex(v => v.id === versionId)

‎src/config.json‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,16 @@
205205
},
206206
{
207207
"id": "1.21.11",
208-
"dynamic": true,
208+
"ref": "1.21.11",
209209
"name": "1.21.11",
210-
"pack_format": 90,
210+
"pack_format": 94,
211+
"show": true
212+
},
213+
{
214+
"id": "26.1",
215+
"dynamic": true,
216+
"name": "26.1 (dev)",
217+
"pack_format": 95,
211218
"show": true
212219
}
213220
],
@@ -372,6 +379,17 @@
372379
"url": "zombie-nautilus-variant",
373380
"minVersion": "1.21.11"
374381
},
382+
{
383+
"id": "villager_trade",
384+
"url": "villager-trade",
385+
"minVersion": "26.1",
386+
"wiki": "https://minecraft.wiki/w/Villager_trade_definition"
387+
},
388+
{
389+
"id": "trade_set",
390+
"url": "trade-set",
391+
"minVersion": "26.1"
392+
},
375393
{
376394
"id": "text_component",
377395
"url": "text-component",
@@ -668,6 +686,22 @@
668686
"minVersion": "1.21.11",
669687
"wiki": "https://minecraft.wiki/w/Tag_(Java_Edition)"
670688
},
689+
{
690+
"id": "tag/villager_trade",
691+
"url": "tags/villager-trade",
692+
"tags": ["tags"],
693+
"path": "tags/villager_trade",
694+
"minVersion": "26.1",
695+
"wiki": "https://minecraft.wiki/w/Tag_(Java_Edition)"
696+
},
697+
{
698+
"id": "tag/trade_set",
699+
"url": "tags/trade-set",
700+
"tags": ["tags"],
701+
"path": "tags/trade_set",
702+
"minVersion": "26.1",
703+
"wiki": "https://minecraft.wiki/w/Tag_(Java_Edition)"
704+
},
671705
{
672706
"id": "block_definition",
673707
"url": "assets/blockstate",

‎src/locales/en.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@
131131
"generator.tag/painting_variant": "Painting Variant Tag",
132132
"generator.tag/point_of_interest_type": "Point of Interest Type Tag",
133133
"generator.tag/timeline": "Timeline Tag",
134+
"generator.tag/trade_set": "Trade Set Tag",
135+
"generator.tag/villager_trade": "Villager Trade Tag",
134136
"generator.tag/worldgen/biome": "Biome Tag",
135137
"generator.tag/worldgen/flat_level_generator_preset": "Flat World Preset Tag",
136138
"generator.tag/worldgen/structure": "Structure Tag",
@@ -157,9 +159,11 @@
157159
"generator.pixelmon:pokedex": "Pokedex",
158160
"generator.pixelmon:pokedex_trigger": "Pokedex Trigger",
159161
"generator.pixelmon:pokedex_region": "Region",
162+
"generator.trade_set": "Trade Set",
160163
"generator.trial_spawner": "Trial Spawner",
161164
"generator.trim_material": "Trim Material",
162165
"generator.trim_pattern": "Trim Pattern",
166+
"generator.villager_trade": "Villager Trade",
163167
"generator.wolf_variant": "Wolf Variant",
164168
"generator.wolf_sound_variant": "Wolf Sound Variant",
165169
"generator.world": "World Settings",

0 commit comments

Comments
 (0)