Skip to content

Commit d7315c0

Browse files
author
ozelot379
committed
Merge branch 'develop' into 'master'
Develop See merge request minecraft/ConvertJavaTextureToBedrock!9
2 parents 5f6941e + 0b5dece commit d7315c0

8 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ THIS PROJECT IS NO OFFICIAL [MINECRAFT](https://minecraft.net/) PRODUCT - NOT AU
44

55
# Convert Minecraft Java texture packs to Minecraft Bedrock texture packs
66

7-
Look at https://ozelot379.github.io/ConvertMinecraftJavaTextureToBedrock
7+
Look at https://ozelot379.github.io/ConvertJavaTextureToBedrock
88

99
It works directly in your browser
1010

@@ -35,7 +35,7 @@ yarn global add @ozelot379/convert-minecraft-java-texture-to-bedrock
3535
You can now convert your texture packs like
3636

3737
```bash
38-
ConvertMinecraftJavaTextureToBedrock -i input/java_texture_pack.zip -o output/bedrock_texture_pack.mcpack
38+
ConvertJavaTextureToBedrock -i input/java_texture_pack.zip -o output/bedrock_texture_pack.mcpack
3939
```
4040

4141
| Parameter | Description |
@@ -104,25 +104,25 @@ yarn add @ozelot379/convert-minecraft-java-texture-to-bedrock
104104

105105
Import it in your code, if you use webpack
106106
```javascript
107-
import ConvertMinecraftJavaTextureToBedrock, {ConsoleLog, Input, LocalFileInputEntry, LocalFileOutput} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";
107+
import ConvertJavaTextureToBedrock, {ConsoleLog, Input, LocalFileInputEntry, LocalFileOutput} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";
108108
```
109109
or require it if you use native NodeJs
110110
```javascript
111-
const {default: ConvertMinecraftJavaTextureToBedrock, ConsoleLog, Input, LocalFileInputEntry, LocalFileOutput} = require("@ozelot379/convert-minecraft-java-texture-to-bedrock");
111+
const {default: ConvertJavaTextureToBedrock, ConsoleLog, Input, LocalFileInputEntry, LocalFileOutput} = require("@ozelot379/convert-minecraft-java-texture-to-bedrock");
112112
```
113113

114114
You can now convert your texture packs in an `async function`
115115
```javascript
116116
let output;
117117
try {
118-
output = await new ConvertMinecraftJavaTextureToBedrock(input, output, log).convert();
118+
output = await new ConvertJavaTextureToBedrock(input, output, log).convert();
119119
} catch (err) {
120120

121121
}
122122
```
123123
or self handle the `Promise`
124124
```javascript
125-
new ConvertMinecraftJavaTextureToBedrock(input, output, log).convert().then((output) => {}).catch((err) => {});
125+
new ConvertJavaTextureToBedrock(input, output, log).convert().then((output) => {}).catch((err) => {});
126126
```
127127

128128
## Input
@@ -162,13 +162,13 @@ new ConvertMinecraftJavaTextureToBedrock(input, output, log).convert().then((out
162162

163163
## Example
164164
```javascript
165-
import ConvertMinecraftJavaTextureToBedrock, {ConsoleLog, Input, LocalFileInputEntry, LocalFileOutput} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";
165+
import ConvertJavaTextureToBedrock, {ConsoleLog, Input, LocalFileInputEntry, LocalFileOutput} from "@ozelot379/convert-minecraft-java-texture-to-bedrock";
166166

167167
(async () => {
168168
let output;
169169

170170
try {
171-
output = await new ConvertMinecraftJavaTextureToBedrock(new Input(new LocalFileInputEntry("input/java_texture_pack.zip")), new LocalFileOutput("output/bedrock_texture_pack.mcpack"), new ConsoleLog()).convert();
171+
output = await new ConvertJavaTextureToBedrock(new Input(new LocalFileInputEntry("input/java_texture_pack.zip")), new LocalFileOutput("output/bedrock_texture_pack.mcpack"), new ConsoleLog()).convert();
172172
} catch (err) {
173173
console.log(err);
174174

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ozelot379/convert-minecraft-java-texture-to-bedrock",
3-
"productName": "ConvertMinecraftJavaTextureToBedrock",
3+
"productName": "ConvertJavaTextureToBedrock",
44
"version": "1.13.3",
55
"description": "Convert Minecraft Java texture packs to Minecraft Bedrock texture packs",
66
"keywords": [
@@ -15,12 +15,12 @@
1515
"license": "GPL-3.0-only",
1616
"repository": {
1717
"type": "git",
18-
"url": "git+https://github.com/ozelot379/ConvertMinecraftJavaTextureToBedrock.git"
18+
"url": "git+https://github.com/ozelot379/ConvertJavaTextureToBedrock.git"
1919
},
2020
"bugs": {
21-
"url": "https://github.com/ozelot379/ConvertMinecraftJavaTextureToBedrock/issues"
21+
"url": "https://github.com/ozelot379/ConvertJavaTextureToBedrock/issues"
2222
},
23-
"homepage": "https://github.com/ozelot379/ConvertMinecraftJavaTextureToBedrock#readme",
23+
"homepage": "https://github.com/ozelot379/ConvertJavaTextureToBedrock#readme",
2424
"dependencies": {},
2525
"devDependencies": {
2626
"css-loader": "^3.2.0",
@@ -53,7 +53,7 @@
5353
},
5454
"main": "dist/index.js",
5555
"bin": {
56-
"ConvertMinecraftJavaTextureToBedrock": "dist/cli.js"
56+
"ConvertJavaTextureToBedrock": "dist/cli.js"
5757
},
5858
"scripts": {
5959
"build": "webpack --config ./webpack.config.cli.js && webpack --config ./webpack.config.webapp.js",

‎src/cli.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ConvertMinecraftJavaTextureToBedrock, {
1+
import ConvertJavaTextureToBedrock, {
22
ConsoleLog,
33
Input,
44
LocalFileInputEntry,
@@ -38,7 +38,7 @@ import yargs from "yargs";
3838
.argv;
3939

4040
try {
41-
return new ConvertMinecraftJavaTextureToBedrock(
41+
return new ConvertJavaTextureToBedrock(
4242
new Input(fs.statSync(argv.input).isDirectory() ? new LocalFolderInputEntry(argv.input) : new LocalFileInputEntry(argv.input)),
4343
(argv.output.includes(".") ? new LocalFileOutput(argv.output) : new LocalFolderOutput(argv.output)),
4444
(argv.log ? new ConsoleLog() : new SilentLog())

‎src/converter/MetadataConverter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class MetadataConverter extends AbstractConverter {
4040
const mcmeta = JSON.parse((await this.output.read(from)).toString("utf8").trim()); // trim it to supports UF8 files with 'BOOM' at the beginning
4141

4242
if (mcmeta.pack.pack_format !== 4) {
43-
throw new Error("Only supports pack_format 4!");
43+
throw new Error("Only supports pack_format 4 (v1.13 or v1.14)!");
4444
}
4545

4646
const manifest = {

‎src/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import {AbstractLog} from "./log";
44
import {AbstractOutput} from "./output";
55

66
/**
7-
* Class ConvertMinecraftJavaTextureToBedrock
7+
* Class ConvertJavaTextureToBedrock
88
*/
9-
class ConvertMinecraftJavaTextureToBedrock {
9+
class ConvertJavaTextureToBedrock {
1010
/**
11-
* ConvertMinecraftJavaTextureToBedrock constructor
11+
* ConvertJavaTextureToBedrock constructor
1212
*
1313
* @param {AbstractInput} input
1414
* @param {AbstractOutput} output
@@ -62,7 +62,7 @@ class ConvertMinecraftJavaTextureToBedrock {
6262
}
6363
}
6464

65-
export default ConvertMinecraftJavaTextureToBedrock;
65+
export default ConvertJavaTextureToBedrock;
6666

6767
//export {AbstractConverter, addAdditionalConverters} from "./converter";
6868
export {AbstractInput, ArrayInput, Input} from "./input";

‎src/webapp/html/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
Version: <%= require("./../../../package").version %>
3838
</div>
3939
<div>
40-
<a class="green-text" href="https://github.com/ozelot379/ConvertMinecraftJavaTextureToBedrock" target="_blank">Source</a>
40+
<a class="green-text" href="https://github.com/ozelot379/ConvertJavaTextureToBedrock" target="_blank">Source</a>
4141
</div>
4242
</div>
4343
</div>

‎src/webapp/js/worker.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import ConvertMinecraftJavaTextureToBedrock, {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "./../..";
1+
import ConvertJavaTextureToBedrock, {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "./../..";
22

33
addEventListener("message", async (e) => {
44
const files = e.data;
55

66
let output;
77
try {
88
output = {
9-
output: await new ConvertMinecraftJavaTextureToBedrock(
9+
output: await new ConvertJavaTextureToBedrock(
1010
new ArrayInput(Array.prototype.map.call(files, file => new FileInputEntry(file))),
1111
new FileOutput(),
1212
new class extends AbstractLog {

‎webpack.config.webapp.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = (env, argv) => {
1010

1111
return {
1212
devServer: {
13+
disableHostCheck: true,
1314
host: "0.0.0.0",
1415
open: true
1516
},

0 commit comments

Comments
 (0)