Skip to content

Commit b59d942

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Develop See merge request minecraft/convert-minecraft-java-texture-to-bedrock/webapp!48
2 parents c88c25e + 76ffb39 commit b59d942

10 files changed

Lines changed: 53 additions & 15 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# Changelog
22

3-
Look at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi/blob/master/CHANGELOG.md
3+
## [3.5.0]
4+
- Convert dolphin texture
5+
6+
Changelog for previous versions are available at https://github.com/ozelot379/ConvertJavaTextureToBedrockApi/blob/master/CHANGELOG.md#341

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock
6363
You can also use the web app with Docker like
6464

6565
```bash
66+
docker pull ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
6667
docker run --rm -p 127.0.0.1:8080:80 ozelot379/convert-minecraft-java-texture-to-bedrock-webapp
6768
```
6869

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock-webapp",
3-
"productName": "ConvertJavaTextureToBedrock",
4-
"version": "3.4.1",
3+
"productName": "ConvertJavaTextureToBedrockWebApp",
4+
"version": "3.5.0",
55
"description": "Web app for convert Minecraft Java texture packs to Bedrock texture packs",
66
"keywords": [
77
"Minecraft",
@@ -23,7 +23,7 @@
2323
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2424
"dependencies": {},
2525
"devDependencies": {
26-
"@ozelot379/convert-minecraft-java-texture-to-bedrock": "3.4.1",
26+
"@ozelot379/convert-minecraft-java-texture-to-bedrock-api": "3.5.0",
2727
"clean-webpack-plugin": "3.0.0",
2828
"css-loader": "3.4.2",
2929
"favicons-webpack-plugin": "1.0.2",

‎src/js/browserify/fs/index.mjs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
function existsSync() {
2+
3+
}
4+
5+
export {existsSync};
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
async function copyFile() {
2+
}
3+
4+
async function mkdir() {
5+
}
6+
7+
async function readdir() {
8+
}
9+
10+
async function readFile() {
11+
}
12+
13+
async function rename() {
14+
}
15+
16+
async function rmdir() {
17+
}
18+
19+
async function stat() {
20+
}
21+
22+
async function writeFile() {
23+
}
24+
25+
export {copyFile, mkdir, readdir, readFile, rename, rmdir, stat, writeFile};

‎src/js/browserify/path/index.mjs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import path from "path-browserify"; // Latest version which supports `path.parse`
2+
3+
const {dirname, join, parse, sep} = path;
4+
5+
export {dirname, join, parse, sep};

‎src/js/fs_browser_null.js‎

Whitespace-only changes.
File renamed without changes.

‎src/js/worker.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import {
22
AbstractLog,
33
ArrayInput,
4-
ConvertJavaTextureToBedrock,
4+
ConvertJavaTextureToBedrockApi,
55
FileInputEntry,
66
FileOutput
7-
} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";
7+
} from "@ozelot379/convert-minecraft-java-texture-to-bedrock-api";
88

99
addEventListener("message", async (e) => {
1010
try {
1111
const {files, options} = e.data;
1212

1313
const output = {
14-
output: await new ConvertJavaTextureToBedrock(
14+
output: await new ConvertJavaTextureToBedrockApi(
1515
new ArrayInput(Array.prototype.map.call(files, file => new FileInputEntry(file))),
1616
new FileOutput(),
1717
new class extends AbstractLog {

‎webpack.config.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
77
const PACKAGE = require("./package");
88
const TerserJSPlugin = require("terser-webpack-plugin");
99

10-
const isDebug = (process.env.NODE_ENV === "development");
10+
const {env} = process;
11+
12+
const isDebug = (env.NODE_ENV === "development");
1113

1214
module.exports = {
1315
devtool: false,
1416
entry: {
15-
index: "./src/js/index.js"
17+
index: "./src/js/index.mjs"
1618
},
1719
mode: (isDebug ? "development" : "production"),
1820
module: {
@@ -25,7 +27,7 @@ module.exports = {
2527
test: /worker\.js$/,
2628
loader: "worker-loader",
2729
options: {
28-
name: "[name].[contenthash].[ext]"
30+
name: "[name].[contenthash].js"
2931
}
3032
}
3133
]
@@ -41,11 +43,8 @@ module.exports = {
4143
},
4244
resolve: {
4345
alias: {
44-
fs: __dirname + "/src/js/fs_browser_null.js",
45-
"fs-extra": __dirname + "/src/js/fs_browser_null.js",
46-
"graceful-fs": __dirname + "/src/js/fs_browser_null.js",
47-
path: "path-browserify", // Latest version which supports `path.parse`
48-
readdirp: __dirname + "/src/js/fs_browser_null.js"
46+
fs: __dirname + "/src/js/browserify/fs",
47+
path: __dirname + "/src/js/browserify/path"
4948
}
5049
},
5150
plugins: [

0 commit comments

Comments
 (0)