From 3520fe8bba09d99db3bbb0f5467eae4fa9aab4ab Mon Sep 17 00:00:00 2001 From: Misode Date: Mon, 1 Jun 2020 00:11:21 +0200 Subject: [PATCH] Copy schema locales + add advancement tab --- src/app/Sandbox.ts | 3 +-- src/app/app.ts | 17 +++++++++++------ src/locales/en.json | 11 ----------- webpack.config.js | 9 ++++++++- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/app/Sandbox.ts b/src/app/Sandbox.ts index 3f391778..8034acc5 100644 --- a/src/app/Sandbox.ts +++ b/src/app/Sandbox.ts @@ -6,8 +6,7 @@ import { BooleanNode, RangeNode, MapNode, - ListNode, - SCHEMAS + ListNode } from 'minecraft-schemas' const EntityCollection = ['sheep', 'pig'] diff --git a/src/app/app.ts b/src/app/app.ts index 788cecba..9caf364c 100644 --- a/src/app/app.ts +++ b/src/app/app.ts @@ -4,6 +4,7 @@ import { SourceView, ConditionSchema, LootTableSchema, + AdvancementSchema, LOCALES } from 'minecraft-schemas' @@ -11,13 +12,18 @@ import { SandboxSchema } from './Sandbox' const predicateModel = new DataModel(ConditionSchema) const lootTableModel = new DataModel(LootTableSchema) +const advancementModel = new DataModel(AdvancementSchema) const sandboxModel = new DataModel(SandboxSchema) let model = lootTableModel +let sourceView = new SourceView(model, document.getElementById('source')!, {indentation: 2}) +let treeView = new TreeView(model, document.getElementById('view')!) + const modelSelector = document.createElement('select') modelSelector.value = 'predicate' modelSelector.innerHTML = ` + ` @@ -26,19 +32,18 @@ modelSelector.addEventListener('change', evt => { model = sandboxModel } else if (modelSelector.value === 'loot-table') { model = lootTableModel + } else if (modelSelector.value === 'advancement') { + model = advancementModel } else { model = predicateModel } - new TreeView(model, document!.getElementById('view')!) - new SourceView(model, document!.getElementById('source')!) + sourceView.setModel(model) + treeView.setModel(model) model.invalidate() }) document.getElementById('header')?.append(modelSelector) -new TreeView(model, document!.getElementById('view')!) -new SourceView(model, document!.getElementById('source')!) - -fetch('build/locales/en.json') +fetch('build/locales-schema/en.json') .then(r => r.json()) .then(l => { LOCALES.register('en', l) diff --git a/src/locales/en.json b/src/locales/en.json index 96ffa999..2c63c085 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,13 +1,2 @@ { - "add": "Add", - "chance": "Chance", - "condition": "Condition", - "condition.random_chance": "Random Chance", - "false": "False", - "remove": "Remove", - "true": "True", - "type": "Type", - "overworld": "Overworld", - "the_nether": "The Nether", - "the_end": "The End" } diff --git a/webpack.config.js b/webpack.config.js index b26bf208..59e8786b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -18,7 +18,14 @@ module.exports = (env, argv) => ({ plugins: [ new CopyWebpackPlugin({ patterns: [ - { from: 'src/locales', to: 'build/locales'} + { + from: 'src/locales', + to: 'build/locales' + }, + { + from: 'node_modules/minecraft-schemas/src/locales', + to: 'build/locales-schema' + } ] }) ]