Skip to content

Commit

Permalink
Added Beta 1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
Matriks404 committed Jan 25, 2024
1 parent 3284a58 commit 83be128
Show file tree
Hide file tree
Showing 18 changed files with 292 additions and 22 deletions.
1 change: 1 addition & 0 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ $default-ui-elements-color: #4b4b4b;
$color-default-message: black;
$color-unobtainable: #c00000;
$color-migratable: #006c00;
$color-obtainable-by-block-transmutation: #0047ab;
$color-obtainable-by-notch: #eaee57;
$color-obtainable-in-winter-mode: #00f3f3;
$color-removed: #006c00;
Expand Down
16 changes: 10 additions & 6 deletions scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,18 @@ p {
color: $color-default-message;
}

//#info-presumed-item-ids {
// display: none;
//
// color: $color-default-message;
//}

#info-removed {
display: none;

color: $color-removed;
}

#info-obtainable-by-block-transmutation {
display: none;

color: $color-obtainable-by-block-transmutation;
}

#info-obtainable-by-notch {
display: none;

Expand Down Expand Up @@ -263,6 +263,10 @@ p {
color: $color-migratable;
}

.id-obtainable-by-block-transmutation {
color: $color-obtainable-by-block-transmutation;
}

.id-obtainable-by-notch {
color: $color-obtainable-by-notch;
}
Expand Down
243 changes: 243 additions & 0 deletions site/ids.json

Large diffs are not rendered by default.

Binary file added site/images/blocks/beta/bed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/cobblestone_slab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/double_sandstone_slab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/double_seamless_slab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/double_wooden_slab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/redstone_wire.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/sandstone_slab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/seamless_slab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/unpowered_repeater.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/blocks/beta/wooden_slab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/items/bed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/images/items/repeater.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 18 additions & 14 deletions site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,37 @@
</div>

<div id="parameters-input">
<div id="exclude-unobtainable-setting">
<div>
<input type="checkbox" id="exclude-unobtainable" name="exclude-unobtainable" />
<label for="exclude-unobtainable">Exclude unobtainable blocks/items</label>
</div>

<div id="exclude-migratable-setting">
<div>
<input type="checkbox" id="exclude-migratable" name="exclude-migratable" />
<label for="exclude-migratable">Exclude blocks/items obtainable by migration</label>
</div>

<div id="exclude-obtainable-by-notch-setting">
<div>
<input type="checkbox" id="exclude-obtainable-by-block-transmutation" name="exclude-obtainable-by-block-transmutation" />
<label for="exclude-obtainable-by-block-transmutation">Exclude blocks obtainable by transmutation</label>
</div>

<div>
<input type="checkbox" id="exclude-obtainable-by-notch" name="exclude-obtainable-by-notch" />
<label for="exclude-obtainable-by-notch">Exclude blocks/items obtainable by Notch</label>
<label for="exclude-obtainable-by-notch">Exclude items obtainable by Notch</label>
</div>

<div id="exclude-obtainable-in-winter-mode-setting">
<div>
<input type="checkbox" id="exclude-obtainable-in-winter-mode" name="exclude-obtainable-in-winter-mode" />
<label for="exclude-obtainable-in-winter-mode">Exclude blocks/items obtainable in winter mode</label>
</div>

<div id="display-air-block-setting">
<div>
<input type="checkbox" id="display-air-block" name="display-air-block" />
<label for="display-air-block">Display air "block"</label>
</div>

<!--<div id="use-beta173-graphics-setting">
<!--<div>
<input type="checkbox" id="use-beta173-graphics" name="use-beta173-graphics" />
<label for="use-beta173-graphics">Use Beta 1.7.3 graphics (prevents image reloading)</label>
</div>-->
Expand Down Expand Up @@ -105,12 +110,6 @@
<p>This is very naive assumption, so if you know IDs for these items, please contribute.</p>
</div>

<!--<div id="info-presumed-item-ids">
<p>This version has presumed item IDs. </p>
<p>It is assumed that items available are in the same order as in later versions.</p>
<p>This is naive assumption, so if you can confirm IDs for these items, please contribute.</p>
</div>-->

<div id="info-unobtainable">
<p>Data values colored in red cannot be legitimately obtained.</p>
<p>These are only available with cheats/server commands.</p>
Expand All @@ -121,9 +120,14 @@
<p>unless you migrate from older version or use cheat/server commands.</p>
</div>

<div id="info-obtainable-by-block-transmutation">
<p>Data values colored in blue cannot be legitimately obtained,</p>
<p>unless using block transmutation method via migrating through one ore more versions with placed block in the world that has specific data value.</p>
</div>

<div id="info-obtainable-by-notch">
<p>Data values colored in gold cannot be legitimately obtained,</p>
<p>unless the player is named "Notch".</p>
<p>unless the player is Notch.</p>
</div>

<div id="info-obtainable-in-winter-mode">
Expand Down
22 changes: 20 additions & 2 deletions site/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ function loadVersionList() {
function loadEntries(entries, el, entriesName, hasUnknownIds) {
var excludeUnobtainable = document.getElementById('exclude-unobtainable').checked;
var excludeMigratable = document.getElementById('exclude-migratable').checked;
var excludeObtainableByBlockTransmutation = document.getElementById('exclude-obtainable-by-block-transmutation').checked;
var excludeObtainableByNotch = document.getElementById('exclude-obtainable-by-notch').checked
var excludeObtainableInWinterMode = document.getElementById('exclude-obtainable-in-winter-mode').checked
var displayAirBlock = document.getElementById('display-air-block').checked;
Expand All @@ -133,6 +134,10 @@ function loadEntries(entries, el, entriesName, hasUnknownIds) {
return;
}

if (excludeObtainableByBlockTransmutation && entry.isObtainableByBlockTransmutation) {
return;
}

if (excludeObtainableByNotch && entry.isObtainableByNotch) {
return;
}
Expand All @@ -157,6 +162,8 @@ function loadEntries(entries, el, entriesName, hasUnknownIds) {
idElement.className += ' id-unobtainable';
} else if (entry.isObtainableByMigration) {
idElement.className += ' id-migratable';
} else if (entry.isObtainableByBlockTransmutation) {
idElement.className += ' id-obtainable-by-block-transmutation';
} else if (entry.isObtainableByNotch) {
idElement.className += ' id-obtainable-by-notch';
} else if (entry.isObtainableInWinterMode) {
Expand Down Expand Up @@ -188,7 +195,7 @@ function loadEntries(entries, el, entriesName, hasUnknownIds) {
var tooltip = document.createElement('div');
tooltip.className = 'tooltip';

var name = entry.name ? entry.name : "NO NAME";
var name = entry.name ? entry.name : "[NO NAME]";

tooltip.innerHTML = name;

Expand All @@ -209,6 +216,7 @@ function checkVersionProperty(elementName, version, property) {
function doEntriesContainEntryType(entries, type) {
var excludeUnobtainable = document.getElementById('exclude-unobtainable').checked;
var excludeMigratable = document.getElementById('exclude-migratable').checked;
var excludeObtainableByBlockTransmutation = document.getElementById('exclude-obtainable-by-block-transmutation').checked;
var excludeObtainableByNotch = document.getElementById('exclude-obtainable-by-notch').checked;
var excludeObtainableInWinterMode = document.getElementById('exclude-obtainable-in-winter-mode').checked;
var countAirBlock = document.getElementById('display-air-block').checked;
Expand Down Expand Up @@ -300,7 +308,6 @@ function loadCurrentVersion() {
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 All @@ -326,12 +333,14 @@ function loadCurrentVersion() {

var infoUnobtainableElement = document.getElementById('info-unobtainable');
var infoMigratableElement = document.getElementById('info-migratable');
var infoObtainableByBlockTransmutationElement = document.getElementById('info-obtainable-by-block-transmutation');
var infoObtainableByNotchElement = document.getElementById('info-obtainable-by-notch');
var infoObtainableInWinterModeElement = document.getElementById('info-obtainable-in-winter-mode');
var infoRemovedElement = document.getElementById('info-removed');

checkEntries(blocks, infoUnobtainableElement, "isUnobtainable");
checkEntries(blocks, infoMigratableElement, "isObtainableByMigration");
checkEntries(blocks, infoObtainableByBlockTransmutationElement, "isObtainableByBlockTransmutation");
checkEntries(blocks, infoObtainableByNotchElement, "isObtainableByNotch");
checkEntries(blocks, infoObtainableInWinterModeElement, "isObtainableInWinterMode");
checkEntries(blocks, infoRemovedElement, "isRemoved");
Expand Down Expand Up @@ -413,6 +422,9 @@ function reloadCheckboxes() {
var excludeMigratableCheckbox = document.getElementById('exclude-migratable');
excludeMigratableCheckbox.disabled = "disabled";

var excludeObtainableByBlockTransmutationCheckbox = document.getElementById('exclude-obtainable-by-block-transmutation');
excludeObtainableByBlockTransmutationCheckbox.disabled = "disabled";

var excludeObtainableByNotchCheckbox = document.getElementById('exclude-obtainable-by-notch');
excludeObtainableByNotchCheckbox.disabled = "disabled";

Expand Down Expand Up @@ -470,12 +482,14 @@ document.addEventListener('DOMContentLoaded', function () {

var excludeUnobtainable = document.getElementById('exclude-unobtainable').checked;
var excludeMigratableCheckbox = document.getElementById('exclude-migratable');
var excludeObtainableByBlockTransmutationCheckbox = document.getElementById('exclude-obtainable-by-block-transmutation');
var excludeObtainableByNotchCheckbox = document.getElementById('exclude-obtainable-by-notch');
var excludeObtainableInWinterModeCheckbox = document.getElementById('exclude-obtainable-in-winter-mode');
var displayAirCheckbox = document.getElementById('display-air-block');

if (excludeUnobtainable) {
excludeMigratableCheckbox.disabled = "";
excludeObtainableByBlockTransmutationCheckbox.disabled = "";
excludeObtainableByNotchCheckbox.disabled = "";
excludeObtainableInWinterModeCheckbox.disabled = "";

Expand All @@ -485,6 +499,9 @@ document.addEventListener('DOMContentLoaded', function () {
excludeMigratableCheckbox.checked = false;
excludeMigratableCheckbox.disabled = "disabled";

excludeObtainableByBlockTransmutationCheckbox.checked = false;
excludeObtainableByBlockTransmutationCheckbox.disabled = "disabled";

excludeObtainableByNotchCheckbox.checked = false;
excludeObtainableByNotchCheckbox.disabled = "disabled";

Expand All @@ -496,6 +513,7 @@ document.addEventListener('DOMContentLoaded', function () {
});

document.getElementById('exclude-migratable').addEventListener('change', updateSettingsStatus);
document.getElementById('exclude-obtainable-by-block-transmutation').addEventListener('change', updateSettingsStatus);
document.getElementById('exclude-obtainable-by-notch').addEventListener('change', updateSettingsStatus);
document.getElementById('exclude-obtainable-in-winter-mode').addEventListener('change', updateSettingsStatus);
document.getElementById('display-air-block').addEventListener('change', updateSettingsStatus);
Expand Down

0 comments on commit 83be128

Please sign in to comment.