Skip to content

Commit 54d1960

Browse files
PiSaucerPiSaucer
committed
v4.3.0
1 parent 24772f8 commit 54d1960

File tree

8 files changed

+142
-55
lines changed

8 files changed

+142
-55
lines changed

‎CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## [[v4.3.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.3.0) - Lastest Commit - Feb 4, 2022
4+
- Reformated some files
5+
- Fix all the packages with [API](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi) version [`v4.0.8`](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrockApi/releases/tag/v4.0.8)
6+
- Automated builds for `gh-pages` with [GitHub Actions](https://github.com/features/actions)
7+
- Updated Readme and Source Footer Links
8+
- Made mobile have a shorter name than desktop
9+
- Created `src/js/images.js` for images for webpack
10+
- Customized Stylesheet
11+
- Added Header Image
12+
- Added Margin around Drag and Drop Zone
13+
- Colored Drag and Drop Zone
14+
- Made Experimental conversions Label and Switch Green
15+
- Added Bootstrap
16+
- Make three columns for better mobile support
17+
318
## [[v4.2.0]](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/releases/tag/v4.2.0) - [a1c27d8](https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/commit/a1c27d888058f61bbb3e67170b5f9cb66e3b53a8) - Dec 10, 2020
419
- Weather converter are now experimental
520
- Log current `pack_format` if incompatible

‎package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@modifiedcommand/convert-minecraft-java-texture-to-bedrock-webapp",
33
"productName": "ConvertJavaTextureToBedrockWebApp",
4-
"version": "4.2.1",
4+
"version": "4.3.0",
55
"description": "Web app for converting Minecraft Java texture packs to Bedrock texture packs",
66
"keywords": [
77
"Minecraft",
@@ -21,9 +21,11 @@
2121
"url": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/issues"
2222
},
2323
"homepage": "https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock#readme",
24-
"dependencies": {},
24+
"dependencies": {
25+
"file-loader": "^6.2.0"
26+
},
2527
"devDependencies": {
26-
"@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi#v4.0.8",
28+
"@modifiedcommand/convert-minecraft-java-texture-to-bedrock-api": "github:ModifiedCommand/ConvertJavaTextureToBedrockApi",
2729
"clean-webpack-plugin": "3.0.0",
2830
"css-loader": "3.4.2",
2931
"favicons-webpack-plugin": "1.0.2",
@@ -51,4 +53,4 @@
5153
"build": "node_modules/.bin/webpack --config webpack.config.js"
5254
},
5355
"private": false
54-
}
56+
}

‎src/css/style.less

+51-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import (less) "~materialize-css/dist/css/materialize.min.css";
22

3-
html, body {
3+
html,
4+
body {
45
.white;
56
.black-text;
67
display: flex;
@@ -51,8 +52,8 @@ footer {
5152
label {
5253
.yellow-text;
5354

54-
input[type=checkbox]:checked + .lever,
55-
input[type=checkbox]:checked + .lever:after {
55+
input[type="checkbox"]:checked + .lever,
56+
input[type="checkbox"]:checked + .lever:after {
5657
.yellow;
5758
}
5859

@@ -83,7 +84,8 @@ footer {
8384
}
8485

8586
@media (prefers-color-scheme: dark) {
86-
html, body {
87+
html,
88+
body {
8789
.grey.darken-4;
8890
.white-text;
8991
}
@@ -119,3 +121,48 @@ footer {
119121
.grey.darken-3;
120122
}
121123
}
124+
125+
.mobileOnly {
126+
display: none;
127+
}
128+
129+
.dekstopOnly {
130+
display: block;
131+
}
132+
133+
@media (max-width: 768px) {
134+
.mobileOnly {
135+
display: block;
136+
}
137+
.dekstopOnly {
138+
display: none;
139+
}
140+
}
141+
142+
main {
143+
background: #c78a73 !important;
144+
margin: 25px;
145+
}
146+
147+
body {
148+
background-color: #795548 !important;
149+
}
150+
151+
nav .nav-title {
152+
margin: 0px 28px;
153+
}
154+
155+
nav.nav-extended {
156+
background-image: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)),
157+
url("./../img/header.jpg");
158+
background-position: center;
159+
}
160+
161+
footer .switch label {
162+
color: #4caf50 !important;
163+
}
164+
165+
footer .switch label input[type="checkbox"]:checked + .lever,
166+
footer .switch label input[type="checkbox"]:checked + .lever:after {
167+
background: #4caf50 !important;
168+
}

‎src/html/index.html

+61-46
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,76 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
34
<head>
45
<meta charset="UTF-8">
5-
<title><%= require("./../../package").description %></title>
6+
<title>
7+
<%= require("./../../package").description %>
8+
</title>
69
<meta content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
10+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
711
</head>
12+
813
<body>
9-
<header>
10-
<nav class="nav-extended brown">
11-
<div class="nav-content">
12-
<span class="nav-title"><%= require("./../../package").description %></span>
13-
</div>
14-
</nav>
15-
</header>
16-
<main>
17-
<span>Select&nbsp;</span>
18-
<label class="btn green"><input accept=".zip" id="selectInputFileButton" title="Select zip file" type="file">Zip
19-
file</label>
20-
<label>&nbsp;</label>
21-
<label class="btn green disabled"><input id="selectInputFolderButton" title="Select folder" type="file"
22-
webkitdirectory>Folder</label>
23-
<span>&nbsp;or drag'n'drop</span>
24-
</main>
25-
<footer class="page-footer brown">
26-
<div class="switch">
27-
<label>
28-
<input id="experimentalSwitch" type="checkbox">
29-
<span class="lever"></span>
30-
Experimental conversions
31-
</label>
32-
</div>
33-
<div class="footer-copyright">
34-
<div class="container">
35-
<div class="row">
36-
<div class="col l6">
37-
<div>Works directly in your browser - no upload required and offline usage</div>
38-
<div>More infos in the <a class="green-text"
39-
href="https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/blob/master/README.md"
40-
target="_blank">Readme</a></div>
14+
<header>
15+
<div class="row text-center">
16+
<nav class="nav-extended brown">
17+
<div class="nav-content">
18+
<span class="nav-title">
19+
<span class="dekstopOnly">
20+
<%= require("./../../package").description %>
21+
</span>
22+
<span class="mobileOnly">
23+
MCJava to MCBedrock
24+
</span>
25+
</span>
4126
</div>
42-
<div class="col l6">
43-
<div>
44-
NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG
27+
</nav>
28+
</div>
29+
</header>
30+
<main>
31+
<span>Select&nbsp;</span>
32+
<label class="btn green"><input accept=".zip" id="selectInputFileButton" title="Select zip file" type="file">Zip
33+
file</label>
34+
<label>&nbsp;</label>
35+
<label class="btn green"><input id="selectInputFolderButton" title="Select folder" type="file"
36+
webkitdirectory>Folder</label>
37+
<span>&nbsp;or drag'n'drop</span>
38+
</main>
39+
<footer class="page-footer brown">
40+
<div class="footer-copyright">
41+
<div class="container">
42+
<div class="row justify-content-center">
43+
<div class="col-lg-4">
44+
<div class="switch">
45+
<label>
46+
<input id="experimentalSwitch" type="checkbox">
47+
<span class="lever"></span>
48+
Experimental conversions
49+
</label>
50+
</div>
51+
<br>
4552
</div>
46-
<div>&nbsp;</div>
47-
<div>
48-
Version: <%= require("./../../package").version %>
53+
<div class="col-lg-4">
54+
<div>Works directly in your browser - no upload required and offline usage. For more infomation, please read the <a class="green-text" href="https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock/blob/master/README.md" target="_blank">Readme</a></div>
55+
<br>
4956
</div>
50-
<div>
51-
<a class="green-text" href="https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock"
52-
target="_blank">Source</a>
57+
<div class="col-lg-4">
58+
<div>
59+
NOT OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH MOJANG
60+
</div>
61+
<div>&nbsp;</div>
62+
<div>
63+
Version:
64+
<%= require("./../../package").version %>
65+
<a class="green-text" href="https://github.com/ModifiedCommand/ConvertJavaTextureToBedrock" target="_blank">Source</a>
66+
</div>
67+
<br>
5368
</div>
5469
</div>
5570
</div>
5671
</div>
57-
</div>
58-
</footer>
59-
<div class="toast" id="toastMessage"></div>
72+
</footer>
73+
<div class="toast" id="toastMessage"></div>
6074
</body>
61-
</html>
75+
76+
</html>

‎src/img/header.jpg

5.54 KB
Loading

‎src/js/images.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import headerImage from './../img/header.jpg';

‎src/js/index.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import OfflinePluginRuntime from "offline-plugin/runtime";
33
import swal from "sweetalert";
44
import Worker from "./worker.js";
55
import "./../css/style.less";
6+
import Images from "./images.js";
67

78
document.addEventListener("DOMContentLoaded", () => {
89
const toastMessage = document.getElementById("toastMessage");

‎webpack.config.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ module.exports = {
3030
options: {
3131
name: "[name].[contenthash].js"
3232
}
33-
}
33+
}, {
34+
test: /\.(jpe?g|png|gif|svg)$/i,
35+
loader: 'file-loader',
36+
options: {
37+
name: '[name].[ext]'
38+
}
39+
},
3440
]
3541
},
3642
optimization: {

0 commit comments

Comments
 (0)