Skip to content

Commit

Permalink
Automatically add '?' to ID's that are unknown based on appropriate v…
Browse files Browse the repository at this point in the history 
…ersion property. This commit also adds property for version having unknown block ID's but this is just to be consistent with unknown block ID's.
  • Loading branch information
@Matriks404
Matriks404 committed Jan 15, 2024
1 parent bc9823a commit 71b9555
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 63 deletions.
96 changes: 48 additions & 48 deletions site/ids.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,26 +507,26 @@
},

"items": {
"1?": { "name": "Leather Cap", "sprite": "leather_cap" },
"2?": { "name": "Studded Helmet", "sprite": "studded_helmet" },
"3?": { "name": "Chain Helmet", "sprite": "chain_helmet" },
"4?": { "name": "Iron Helmet", "sprite": "iron_helmet" },
"5?": { "name": "Apple", "sprite": "apple" },
"6?": { "name": "Leather Tunic", "sprite": "leather_tunic" },
"7?": { "name": "Studded Chestplate", "sprite": "studded_chestplate" },
"8?": { "name": "Chain Chestplate", "sprite": "chain_chestplate" },
"9?": { "name": "Iron Chestplate", "sprite": "iron_chestplate" },
"10?": { "name": "Iron Sword", "sprite": "iron_sword" },
"11?": { "name": "Leather Pants", "sprite": "leather_pants" },
"12?": { "name": "Studded Leggings", "sprite": "studded_leggings" },
"13?": { "name": "Chain Leggings", "sprite": "chain_leggings" },
"14?": { "name": "Iron Leggings", "sprite": "iron_leggings" },
"15?": { "name": "Quiver", "sprite": "quiver" },
"16?": { "name": "Leather Boots", "sprite": "leather_boots" },
"17?": { "name": "Studded Boots", "sprite": "studded_boots" },
"18?": { "name": "Chain Boots", "sprite": "chain_boots" },
"19?": { "name": "Iron Boots", "sprite": "iron_boots" },
"20?": { "name": "Iron Shovel", "sprite": "iron_shovel" }
"1": { "name": "Leather Cap", "sprite": "leather_cap" },
"2": { "name": "Studded Helmet", "sprite": "studded_helmet" },
"3": { "name": "Chain Helmet", "sprite": "chain_helmet" },
"4": { "name": "Iron Helmet", "sprite": "iron_helmet" },
"5": { "name": "Apple", "sprite": "apple" },
"6": { "name": "Leather Tunic", "sprite": "leather_tunic" },
"7": { "name": "Studded Chestplate", "sprite": "studded_chestplate" },
"8": { "name": "Chain Chestplate", "sprite": "chain_chestplate" },
"9": { "name": "Iron Chestplate", "sprite": "iron_chestplate" },
"10": { "name": "Iron Sword", "sprite": "iron_sword" },
"11": { "name": "Leather Pants", "sprite": "leather_pants" },
"12": { "name": "Studded Leggings", "sprite": "studded_leggings" },
"13": { "name": "Chain Leggings", "sprite": "chain_leggings" },
"14": { "name": "Iron Leggings", "sprite": "iron_leggings" },
"15": { "name": "Quiver", "sprite": "quiver" },
"16": { "name": "Leather Boots", "sprite": "leather_boots" },
"17": { "name": "Studded Boots", "sprite": "studded_boots" },
"18": { "name": "Chain Boots", "sprite": "chain_boots" },
"19": { "name": "Iron Boots", "sprite": "iron_boots" },
"20": { "name": "Iron Shovel", "sprite": "iron_shovel" }
}
},

Expand Down Expand Up @@ -590,26 +590,26 @@
},

"items": {
"1?": { "name": "Leather Cap", "sprite": "leather_cap" },
"2?": { "name": "Studded Helmet", "sprite": "studded_helmet" },
"3?": { "name": "Chain Helmet", "sprite": "chain_helmet" },
"4?": { "name": "Iron Helmet", "sprite": "iron_helmet" },
"5?": { "name": "Apple", "sprite": "apple" },
"6?": { "name": "Leather Tunic", "sprite": "leather_tunic" },
"7?": { "name": "Studded Chestplate", "sprite": "studded_chestplate" },
"8?": { "name": "Chain Chestplate", "sprite": "chain_chestplate" },
"9?": { "name": "Iron Chestplate", "sprite": "iron_chestplate" },
"10?": { "name": "Iron Sword", "sprite": "iron_sword" },
"11?": { "name": "Leather Pants", "sprite": "leather_pants" },
"12?": { "name": "Studded Leggings", "sprite": "studded_leggings" },
"13?": { "name": "Chain Leggings", "sprite": "chain_leggings" },
"14?": { "name": "Iron Leggings", "sprite": "iron_leggings" },
"15?": { "name": "Quiver", "sprite": "quiver" },
"16?": { "name": "Leather Boots", "sprite": "leather_boots" },
"17?": { "name": "Studded Boots", "sprite": "studded_boots" },
"18?": { "name": "Chain Boots", "sprite": "chain_boots" },
"19?": { "name": "Iron Boots", "sprite": "iron_boots" },
"20?": { "name": "Iron Shovel", "sprite": "iron_shovel" }
"1": { "name": "Leather Cap", "sprite": "leather_cap" },
"2": { "name": "Studded Helmet", "sprite": "studded_helmet" },
"3": { "name": "Chain Helmet", "sprite": "chain_helmet" },
"4": { "name": "Iron Helmet", "sprite": "iron_helmet" },
"5": { "name": "Apple", "sprite": "apple" },
"6": { "name": "Leather Tunic", "sprite": "leather_tunic" },
"7": { "name": "Studded Chestplate", "sprite": "studded_chestplate" },
"8": { "name": "Chain Chestplate", "sprite": "chain_chestplate" },
"9": { "name": "Iron Chestplate", "sprite": "iron_chestplate" },
"10": { "name": "Iron Sword", "sprite": "iron_sword" },
"11": { "name": "Leather Pants", "sprite": "leather_pants" },
"12": { "name": "Studded Leggings", "sprite": "studded_leggings" },
"13": { "name": "Chain Leggings", "sprite": "chain_leggings" },
"14": { "name": "Iron Leggings", "sprite": "iron_leggings" },
"15": { "name": "Quiver", "sprite": "quiver" },
"16": { "name": "Leather Boots", "sprite": "leather_boots" },
"17": { "name": "Studded Boots", "sprite": "studded_boots" },
"18": { "name": "Chain Boots", "sprite": "chain_boots" },
"19": { "name": "Iron Boots", "sprite": "iron_boots" },
"20": { "name": "Iron Shovel", "sprite": "iron_shovel" }
}
},

Expand Down Expand Up @@ -674,11 +674,11 @@
},

"items": {
"1?": { "name": "Apple", "sprite": "apple" },
"2?": { "name": "Iron Shovel", "sprite": "iron_shovel" },
"3?": { "name": "Iron Pickaxe", "sprite": "iron_pick" },
"4?": { "name": "Iron Axe", "sprite": "iron_axe" },
"5?": { "name": "Flint and Steel", "sprite": "flint_and_steel" }
"1": { "name": "Apple", "sprite": "apple" },
"2": { "name": "Iron Shovel", "sprite": "iron_shovel" },
"3": { "name": "Iron Pickaxe", "sprite": "iron_pick" },
"4": { "name": "Iron Axe", "sprite": "iron_axe" },
"5": { "name": "Flint and Steel", "sprite": "flint_and_steel" }
}
},

Expand Down Expand Up @@ -2014,7 +2014,7 @@

"versions": {
"infdev201002272": {
"name": "20100227-2",
"name": "20100227-2 (Incomplete)",
"hasUnknownRenders": true,

"blocks": {
Expand Down Expand Up @@ -2155,7 +2155,7 @@
},

"infdev201002313": {
"name": "20100313",
"name": "20100313 (Incomplete)",
"hasUnknownRenders": true,

"blocks": {
Expand Down Expand Up @@ -2296,7 +2296,7 @@
},

"infdev20100316": {
"name": "20100316",
"name": "20100316 (Incomplete)",
"hasUnknownRenders": true,

"blocks": {
Expand Down
5 changes: 5 additions & 0 deletions site/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@
<p>If you know how to obtain these renders, please contribute.</p>
</div>

<div id="info-unknown-block-ids">
<p>This version has unknown block IDs. </p>
<p>If you know IDs for blocks for this version, please contribute.</p>
</div>

<div id="info-unknown-item-ids">
<p>This version has unknown item IDs. </p>
<p>It is assumed that only items that are in the starting inventory exist, and are ordered by slots they appear in.</p>
Expand Down
35 changes: 20 additions & 15 deletions site/script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ function loadConfig() {
var versionType = config.versionType;
var versionEasyName = config.versionEasyName;

var version_string = "";
var versionString = "";

if (versionType == "release") {
version_string = "v" + versionNumber + " (" + versionEasyName + ")";
versionString = "v" + versionNumber + " (" + versionEasyName + ")";
} else {
version_string = "v" + versionNumber + "-" + versionType + " (" + versionEasyName + ")";
versionString = "v" + versionNumber + "-" + versionType + " (" + versionEasyName + ")";
}

var versionInfoElement = document.getElementById('version-info');
versionInfoElement.innerHTML = version_string;
versionInfoElement.innerHTML = versionString;
});
}

Expand Down Expand Up @@ -108,7 +108,7 @@ function loadVersionList() {
});
}

function loadEntries(entries, el, entriesName) {
function loadEntries(entries, el, entriesName, hasUnknownIds) {
var excludeUnobtainable = document.getElementById('exclude-unobtainable').checked;
var excludeMigratable = document.getElementById('exclude-migratable').checked;
var displayAirBlock = document.getElementById('display-air-block').checked;
Expand Down Expand Up @@ -144,6 +144,10 @@ function loadEntries(entries, el, entriesName) {

idElement.innerHTML = id;

if (hasUnknownIds) {
idElement.innerHTML += '?';
}

var elementWithTooltip = document.createElement('div');
elementWithTooltip.classList.add('with-tooltip');
entry.appendChild(elementWithTooltip);
Expand Down Expand Up @@ -239,15 +243,15 @@ function loadCurrentVersion() {
loadedVersionGroupId = groupId;
loadedVersionId = id;

var versions = versionGroups[groupId].versions;
var version = versionGroups[groupId].versions[id];

if (!versions[id]) {
if (!version) {
alert("Invalid game version!");

return;
}

var blocks = versions[id].blocks;
var blocks = version.blocks;

if (!blocks || !Object.keys(blocks).length) {
alert(id + " game version blocks data is corrupted!");
Expand All @@ -258,10 +262,11 @@ function loadCurrentVersion() {
var info = document.getElementById('info');
info.style.display = "flex";

checkVersionProperty('info-early-classic', versions[id], 'isEarlyClassic');
checkVersionProperty('info-unknown-renders', versions[id], 'hasUnknownRenders');
checkVersionProperty('info-unknown-item-ids', versions[id], 'hasUnknownItemIds');
checkVersionProperty('info-presumed-item-ids', versions[id], 'hasPresumedItemIds');
checkVersionProperty('info-early-classic', version, 'isEarlyClassic');
checkVersionProperty('info-unknown-renders', version, 'hasUnknownRenders');
checkVersionProperty('info-unknown-block-ids', version, 'hasUnknownBlockIds');
checkVersionProperty('info-unknown-item-ids', version, 'hasUnknownItemIds');
checkVersionProperty('info-presumed-item-ids', version, 'hasPresumedItemIds');

var containerElement = document.getElementById('container');
var oldMainElement = document.getElementsByTagName('main')[0];
Expand Down Expand Up @@ -293,9 +298,9 @@ function loadCurrentVersion() {
checkEntries(blocks, infoMigratableElement, "isObtainableByMigration");
checkEntries(blocks, infoRemovedElement, "isRemoved");

loadEntries(blocks, blocksContentElement, "blocks");
loadEntries(blocks, blocksContentElement, "blocks", version.hasUnknownBlockIds);

var items = versions[id].items;
var items = version.items;

if (items && Object.keys(items).length) {
var itemsElement = document.createElement('fieldset');
Expand All @@ -322,7 +327,7 @@ function loadCurrentVersion() {
checkEntries(items, infoRemovedElement, "isRemoved");
}

loadEntries(items, itemsContentElement, "items");
loadEntries(items, itemsContentElement, "items", version.hasUnknownItemIds);
}

var elementsWithTooltips = document.querySelectorAll('.with-tooltip');
Expand Down

0 comments on commit 71b9555

Please sign in to comment.