Skip to content

Commit

Permalink
Merge pull request #48 from Fasguy/carry
Browse files Browse the repository at this point in the history
v1.3.2
  • Loading branch information
Fasguy authored Aug 6, 2023
2 parents 89bd24b + 5f9ce1d commit 32f844c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "toolbox",
"version": "1.3.1",
"version": "1.3.2",
"type": "commonjs",
"scripts": {
"ng": "ng",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

:host,
.container {
z-index: 1;
z-index: 2;
position: fixed;
top: 0;
left: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
will-change: transform;
overflow-x: hidden;
overflow-y: auto;
z-index: 1;
z-index: 2;
position: fixed;
top: 0;
left: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { LootTableFile } from "../../../../lib/ts-datapack-extensions/loot_table
import "../../../../lib/ts-datapack-extensions/loot_table_file_ex";
import { DatapackSerializer } from "../../../../lib/ts-datapack-fflate/datapack-serializer";
import { Datapack } from "../../../../lib/ts-datapack/datapack";
import { PackFormat } from "../../../../lib/ts-datapack/enums/packformat";
import { GenericAdvancement } from "../../../../lib/ts-datapack/generic-advancement";
import { GenericFile } from "../../../../lib/ts-datapack/genericfile";
import { IFolder } from "../../../../lib/ts-datapack/interfaces/folder";
import { IPredicate_EntityProperties } from "../../../../lib/ts-datapack/interfaces/predicate";
import { Pack_MCMeta } from "../../../../lib/ts-datapack/pack_mcmeta";
import { addMainDatapackAdvancement, filenameWithoutExtension, seededRandom, shuffle } from "../../../../lib/utils";
import { PackFormat } from "../../../../lib/ts-datapack/enums/packformat";

export class LootTableRandomizerWorker {
private _defaultLootTableFilePaths!: string[];
Expand Down Expand Up @@ -76,6 +76,13 @@ export class LootTableRandomizerWorker {
uz.register(UnzipInflate);

const reader: ReadableStreamDefaultReader<Uint8Array> = blob.stream().getReader();

// Firefox locks up, when trying to read the last bit of data of v1.20.0
// It seems, causing a bit of delay prevents the lock-up, outputting the reader instance in the console seems to do the trick.
// The only corresponding bug i could find has been resolved as "WORKSFORME" :/
// https://bugzilla.mozilla.org/show_bug.cgi?id=1646204
console.log(reader);

while (true) {
const { done, value } = await reader.read();
if (done) {
Expand Down
13 changes: 13 additions & 0 deletions projects/toolbox-main/src/resources/data/changelog.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,18 @@
"removals": []
},
"notes": ""
},
{
"version": "1.3.2",
"build_date": "2023-08-06",
"changes": {
"additions": [],
"modifications": [
"Small style fixes for the new tool menu",
"Fixed a deadlock when using the v1.20.0 Loot-Table randomizer in Firefox"
],
"removals": []
},
"notes": ""
}
]

0 comments on commit 32f844c

Please sign in to comment.