Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ jobs:
- name: Generate ${{ matrix.version }}
run: ./gradlew :mc:${{ matrix.version }}:runServer --stacktrace

- name: Check legacy item display names
if: contains(fromJSON('["1.11.2", "1.12.2"]'), matrix.version)
run: node tools/testLegacyItemNames.js mc/${{ matrix.version }}/run/server/minecraft-data/${{ matrix.version }}

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static JsonObject generateItem(Item item) {
itemDesc.addProperty("id", Registries.ITEMS.getRawId(item));
itemDesc.addProperty("name", Objects.requireNonNull(registryKey).getPath());

itemDesc.addProperty("displayName", DGU.translateText(item.getTranslationKey()));
itemDesc.addProperty("displayName", item.getDisplayName(DGU.stackFor(item)));
itemDesc.addProperty("stackSize", item.getMaxCount());

JsonArray enchantCategoriesArray = new JsonArray();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static JsonObject generateItem(Item item) {
itemDesc.addProperty("id", Registries.ITEMS.getRawId(item));
itemDesc.addProperty("name", Objects.requireNonNull(registryKey).getPath());

itemDesc.addProperty("displayName", DGU.translateText(item.getTranslationKey()));
itemDesc.addProperty("displayName", item.getDisplayName(DGU.stackFor(item)));
itemDesc.addProperty("stackSize", item.getMaxCount());

JsonArray enchantCategoriesArray = new JsonArray();
Expand Down
11 changes: 11 additions & 0 deletions tools/testLegacyItemNames.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const assert = require('node:assert/strict')
const fs = require('node:fs')
const path = require('node:path')

assert.ok(process.argv[2], 'Usage: node tools/testLegacyItemNames.js <generated-version-directory>')
const items = JSON.parse(fs.readFileSync(path.join(process.argv[2], 'items.json')))
const byName = Object.fromEntries(items.map(item => [item.name, item]))
assert.strictEqual(byName.stone.displayName, 'Stone')
assert.strictEqual(byName.apple.displayName, 'Apple')
assert.strictEqual(byName.wool.displayName, 'White Wool')
console.log('Legacy block, item and metadata-dependent display names passed')
Loading