akanealw/misode.github.io
1
0
Fork 0
mirror of https://github.com/misode/misode.github.io.git synced 2026-05-04 06:32:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Simplify filters

Browse Source
This commit is contained in:
Misode
2019-12-28 17:49:37 +01:00
parent aeab7c9d7b
commit c00ceebe37
3 changed files with 26 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
schemas/1.14.json
+5 -20
View File
@@ -486,32 +486,17 @@
"minecraft:alternative",
"minecraft:inverted",
"minecraft:entity_properties",
{
"value": "minecraft:block_state_property",
"require": ["minecraft:block"]
},
{
"value": "minecraft:match_tool",
"require": ["minecraft:block", "minecraft:fishing"]
},
{
"value": "minecraft:damage_source_properties",
"require": ["minecraft:entity"]
},
"minecraft:block_state_property",
"minecraft:match_tool",
"minecraft:damage_source_properties",
"minecraft:location_check",
"minecraft:weather_check",
"minecraft:entity_scores",
"minecraft:random_chance",
"minecraft:random_chance_with_looting",
{
"value": "minecraft:table_bonus",
"require": ["minecraft:block"]
},
"minecraft:table_bonus",
"minecraft:killed_by_player",
{
"value": "minecraft:survives_explosion",
"require": ["minecraft:block"]
}
"minecraft:survives_explosion"
]
},
{
schemas/1.15.json
+5 -20
View File
@@ -608,33 +608,18 @@
"minecraft:inverted",
"minecraft:reference",
"minecraft:entity_properties",
{
"value": "minecraft:block_state_property",
"require": ["minecraft:block"]
},
{
"value": "minecraft:match_tool",
"require": ["minecraft:block", "minecraft:fishing"]
},
{
"value": "minecraft:damage_source_properties",
"require": ["minecraft:entity"]
},
"minecraft:block_state_property",
"minecraft:match_tool",
"minecraft:damage_source_properties",
"minecraft:location_check",
"minecraft:weather_check",
"minecraft:time_check",
"minecraft:entity_scores",
"minecraft:random_chance",
"minecraft:random_chance_with_looting",
{
"value": "minecraft:table_bonus",
"require": ["minecraft:block"]
},
"minecraft:table_bonus",
"minecraft:killed_by_player",
{
"value": "minecraft:survives_explosion",
"require": ["minecraft:block"]
}
"minecraft:survives_explosion"
]
},
{
view.js
+16 -38
View File
@@ -394,6 +394,7 @@ function generateObject(data, struct, options) {
}
$header.append('<button type="button" class="btn btn-outline-dark mr-3 mb-2 float-left" onclick="collapseComponent(this)"><img src="' + icon + '" alt=""></button>');
}
let parentFilter = options ? options.filter : undefined;
if (struct.card !== false) {
$el.addClass('card bg-' + struct.color);;
$header.addClass('card-header pb-1');
@@ -406,19 +407,25 @@ function generateObject(data, struct, options) {
let child = components.find(e => e.id === struct.value);
return generateObject(data, child);
}
let filterField = struct.fields.find(e => e.type === 'enum');
;
let filter;
if (filterField) {
filter = data[filterField.id];
}
if (filter === undefined && options) {
filter = options.filter;
}
for (let field of struct.fields) {
if (filter === undefined) {
filterField = struct.fields.find(e => e.type === 'enum');
if (filterField) {
filter = data[filterField.id];
}
}
if (!luckBased && field.luckBased) {
continue;
}
if (field.require && !field.require.includes(filter || parentFilter)) {
continue;
}
if (field.collapse) {
let hasNoValue = data[field.id] === undefined;
let arrowDirection = hasNoValue ? 'dropright' : 'dropdown'
$body.append('<span class="mt-3 ' + arrowDirection + '"><button type="button" class="btn btn-light dropdown-toggle" onclick="toggleCollapseObject(this)" data-index="' + field.id + '" data-i18n="' + field.translate + '"></button></span>');
$body.append('<span class="' + arrowDirection + '"><button type="button" class="mt-3 btn btn-light dropdown-toggle" onclick="toggleCollapseObject(this)" data-index="' + field.id + '" data-i18n="' + field.translate + '"></button></span>');
if (field.help) {
$body.find('span').append(generateTooltip(field.translate));
}
@@ -448,41 +455,12 @@ function generateObject(data, struct, options) {
$body.append($field);
}
}
$body.children().first().children('button').removeClass('mt-3');
$body.children().first().removeClass('mt-3');
return {out: out, component: $el};
}
function generateField(data, field, parent, filter) {
if (!luckBased && field.luckBased) {
return false;
}
if (field.require) {
let passing = false;
for (let requirement of field.require) {
if (typeof requirement === 'string') {
if (requirement === correctNamespace(filter)) {
passing = true;
}
} else {
let match = true;
for (let id in requirement) {
if (requirement.hasOwnProperty(id)) {
if (requirement[id] !== correctNamespace(data[parent.fields.find(e => e.id === id).id])) {
match = false;
}
}
}
if (match) {
passing = true;
}
}
}
if (!passing) {
return {out: undefined, component: false};
}
}
let $field;
if (data[field.id] === undefined) {
if (field.type === 'object') {
data[field.id] = {};