Skip to content

Commit 71f9381

Browse files
author
ozelot379
committed
fix
1 parent e8a9d72 commit 71f9381

4 files changed

Lines changed: 14 additions & 100 deletions

File tree

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2424
"dependencies": {},
2525
"devDependencies": {
26-
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "latest",
26+
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "https://github.com/ozelot379/ConvertJavaTextureToBedrockApi/tarball/master",
2727
"clean-webpack-plugin": "^3.0.0",
2828
"css-loader": "^3.2.0",
2929
"favicons-webpack-plugin": "^1.0.1",
@@ -48,8 +48,8 @@
4848
},
4949
"main": "dist/index.js",
5050
"scripts": {
51-
"build": "webpack",
52-
"debug": "webpack-dev-server",
51+
"build": "yarn --cwd=node_modules/@ozelot379/convert-minecraft-java-texture-to-bedrock && webpack",
52+
"debug": "yarn --cwd=node_modules/@ozelot379/convert-minecraft-java-texture-to-bedrock && webpack-dev-server",
5353
"prepublishOnly": "yarn build && gh-pages -d ./dist"
5454
},
5555
"private": true

‎src/js/worker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ConvertJavaTextureToBedrock, {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";
1+
import ConvertJavaTextureToBedrock, {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "@ozelot379/convert-minecraft-java-texture-to-bedrock/src";
22

33
addEventListener("message", async (e) => {
44
try {

‎webpack.config.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ module.exports = {
107107
fs: __dirname + "/src/fs_browser_null.js",
108108
"fs-extra": __dirname + "/src/fs_browser_null.js",
109109
"graceful-fs": __dirname + "/src/fs_browser_null.js",
110-
net: __dirname + "/src/fs_browser_null.js",
111110
path: "path-browserify", // Latest version which supports `path.parse`
112111
readdirp: __dirname + "/src/fs_browser_null.js"
113112
}

‎yarn.lock‎

Lines changed: 10 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,9 @@
262262
dependencies:
263263
core-js "^2.5.7"
264264

265-
"@ozelot379/convert-minecraft-java-texture-to-bedrock@latest":
265+
"@ozelot379/convert-minecraft-java-texture-to-bedrock@https://github.com/ozelot379/ConvertJavaTextureToBedrockApi/tarball/master":
266266
version "3.3.0"
267-
resolved "https://registry.yarnpkg.com/@ozelot379/convert-minecraft-java-texture-to-bedrock/-/convert-minecraft-java-texture-to-bedrock-3.3.0.tgz#a95c45123da42e549666c73f5dd869e64f9ee8b6"
268-
integrity sha512-OR9qvjV/8CejjLp0Ls11AykHOkVoSGJ1rJP8uGf1W1BzNR4G8bAkM97OrmTf6HmCeRJK4r6tBIUIZhuYQJ1xow==
267+
resolved "https://github.com/ozelot379/ConvertJavaTextureToBedrockApi/tarball/master#9a19dbc1dbbf156ce50f1bca9e82bd5901ab7d18"
269268

270269
"@types/anymatch@*":
271270
version "1.3.1"
@@ -495,11 +494,6 @@
495494
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
496495
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
497496

498-
abbrev@1:
499-
version "1.1.1"
500-
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
501-
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
502-
503497
accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
504498
version "1.3.7"
505499
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -1688,7 +1682,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
16881682
dependencies:
16891683
ms "2.0.0"
16901684

1691-
debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
1685+
debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
16921686
version "3.2.6"
16931687
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
16941688
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -1824,7 +1818,7 @@ detect-file@^1.0.0:
18241818
resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
18251819
integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
18261820

1827-
detect-libc@^1.0.2, detect-libc@^1.0.3:
1821+
detect-libc@^1.0.3:
18281822
version "1.0.3"
18291823
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
18301824
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -2955,7 +2949,7 @@ humanize-url@^1.0.0:
29552949
normalize-url "^1.0.0"
29562950
strip-url-auth "^1.0.0"
29572951

2958-
iconv-lite@0.4.24, iconv-lite@^0.4.4:
2952+
iconv-lite@0.4.24:
29592953
version "0.4.24"
29602954
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
29612955
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -2979,13 +2973,6 @@ iferr@^0.1.5:
29792973
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
29802974
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
29812975

2982-
ignore-walk@^3.0.1:
2983-
version "3.0.3"
2984-
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
2985-
integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
2986-
dependencies:
2987-
minimatch "^3.0.4"
2988-
29892976
image-size@^0.5.0, image-size@~0.5.0:
29902977
version "0.5.5"
29912978
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -3956,15 +3943,6 @@ napi-build-utils@^1.0.1:
39563943
resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
39573944
integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
39583945

3959-
needle@^2.2.1:
3960-
version "2.3.3"
3961-
resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
3962-
integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
3963-
dependencies:
3964-
debug "^3.2.6"
3965-
iconv-lite "^0.4.4"
3966-
sax "^1.2.4"
3967-
39683946
negotiator@0.6.2:
39693947
version "0.6.2"
39703948
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -4028,22 +4006,6 @@ node-libs-browser@^2.2.1:
40284006
util "^0.11.0"
40294007
vm-browserify "^1.0.1"
40304008

4031-
node-pre-gyp@*:
4032-
version "0.14.0"
4033-
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
4034-
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
4035-
dependencies:
4036-
detect-libc "^1.0.2"
4037-
mkdirp "^0.5.1"
4038-
needle "^2.2.1"
4039-
nopt "^4.0.1"
4040-
npm-packlist "^1.1.6"
4041-
npmlog "^4.0.2"
4042-
rc "^1.2.7"
4043-
rimraf "^2.6.1"
4044-
semver "^5.3.0"
4045-
tar "^4.4.2"
4046-
40474009
node-releases@^1.1.50:
40484010
version "1.1.50"
40494011
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
@@ -4056,14 +4018,6 @@ noop-logger@^0.1.1:
40564018
resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
40574019
integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
40584020

4059-
nopt@^4.0.1:
4060-
version "4.0.1"
4061-
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
4062-
integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
4063-
dependencies:
4064-
abbrev "1"
4065-
osenv "^0.1.4"
4066-
40674021
normalize-path@^2.1.1:
40684022
version "2.1.1"
40694023
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -4091,35 +4045,14 @@ normalize-url@^3.0.0:
40914045
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
40924046
integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
40934047

4094-
npm-bundled@^1.0.1:
4095-
version "1.1.1"
4096-
resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
4097-
integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
4098-
dependencies:
4099-
npm-normalize-package-bin "^1.0.1"
4100-
4101-
npm-normalize-package-bin@^1.0.1:
4102-
version "1.0.1"
4103-
resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
4104-
integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
4105-
4106-
npm-packlist@^1.1.6:
4107-
version "1.4.8"
4108-
resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
4109-
integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
4110-
dependencies:
4111-
ignore-walk "^3.0.1"
4112-
npm-bundled "^1.0.1"
4113-
npm-normalize-package-bin "^1.0.1"
4114-
41154048
npm-run-path@^2.0.0:
41164049
version "2.0.2"
41174050
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
41184051
integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
41194052
dependencies:
41204053
path-key "^2.0.0"
41214054

4122-
npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
4055+
npmlog@^4.0.1, npmlog@^4.1.2:
41234056
version "4.1.2"
41244057
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
41254058
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -4284,11 +4217,6 @@ os-browserify@^0.3.0:
42844217
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
42854218
integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
42864219

4287-
os-homedir@^1.0.0:
4288-
version "1.0.2"
4289-
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
4290-
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
4291-
42924220
os-locale@^3.0.0, os-locale@^3.1.0:
42934221
version "3.1.0"
42944222
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -4298,19 +4226,6 @@ os-locale@^3.0.0, os-locale@^3.1.0:
42984226
lcid "^2.0.0"
42994227
mem "^4.0.0"
43004228

4301-
os-tmpdir@^1.0.0:
4302-
version "1.0.2"
4303-
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
4304-
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
4305-
4306-
osenv@^0.1.4:
4307-
version "0.1.5"
4308-
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
4309-
integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
4310-
dependencies:
4311-
os-homedir "^1.0.0"
4312-
os-tmpdir "^1.0.0"
4313-
43144229
p-defer@^1.0.0:
43154230
version "1.0.0"
43164231
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -5293,7 +5208,7 @@ rgba-regex@^1.0.0:
52935208
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
52945209
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
52955210

5296-
rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
5211+
rimraf@^2.5.4, rimraf@^2.6.3:
52975212
version "2.7.1"
52985213
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
52995214
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -5337,7 +5252,7 @@ safe-regex@^1.1.0:
53375252
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
53385253
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
53395254

5340-
sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
5255+
sax@>=0.6.0, sax@~1.2.4:
53415256
version "1.2.4"
53425257
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
53435258
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -5379,7 +5294,7 @@ selfsigned@^1.10.7:
53795294
dependencies:
53805295
node-forge "0.9.0"
53815296

5382-
semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
5297+
semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
53835298
version "5.7.1"
53845299
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
53855300
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -5928,7 +5843,7 @@ tar-stream@^2.0.0:
59285843
inherits "^2.0.3"
59295844
readable-stream "^3.1.1"
59305845

5931-
tar@^4.4.2, tar@^4.4.8:
5846+
tar@^4.4.8:
59325847
version "4.4.13"
59335848
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
59345849
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==

0 commit comments

Comments
 (0)