Merge branch 'gh-pages' into layers-new

.github/workflows/webapp.yml

@@ -0,0 +1,38 @@
+name: Deploy Web App with build step
+
+on:
+  push:
+    branches: [ "gh-pages" ]
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Build
+        run: |
+          npm install
+          npm run prepublish
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          # Upload entire repository
+          path: '.'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

.gitignore

@@ -1,4 +1,7 @@
 /dist/
 index.php
 electron-builder.env
-node_modules/
+node_modules/
+js/bundle.js
+workbox-*.js
+service_worker.js

.travis.yml

@@ -3,7 +3,7 @@ dist: trusty
 
 language: node_js
 node:
-  - 14
+  - 18
 
 if: tag IS blank AND commit_message =~ ci-build
 
@@ -13,11 +13,13 @@ jobs:
       os: osx
       osx_image: "xcode12.5"
       script:
+        - npm run prepublish
         - electron-builder --publish=always
 
     - name: "Linux"
       os: linux
       script:
+        - npm run prepublish
         - sudo apt-get install rpm
         - electron-builder --publish=onTagOrDraft
 

css/dialogs.css

@@ -1582,7 +1582,10 @@ dialog#edit_bedrock_binding > .dialog_wrapper > .dialog_content {
 		background-color: transparent;
 	}
 	#bar_item_list li {
-		padding: 4px; 
+		padding: 4px;
+		height: 32px;
+		display: flex;
+		gap: 8px;
 	}
 	#bar_item_list li:hover {
 		color: var(--color-light);
@@ -1592,7 +1595,7 @@ dialog#edit_bedrock_binding > .dialog_wrapper > .dialog_content {
 		height: 26px;
 		vertical-align: text-top;
 	}
-	#bar_item_list li:not(:hover) div.icon_wrapper.add, #bar_item_list li:hover div.icon_wrapper.normal {
+	#bar_item_list li:not(:hover) div.icon_wrapper.add, #bar_item_list li:hover > .icon {
 		display: none;
 	}
 	#bar_items_current {

index.html

@@ -87,7 +87,7 @@
 		<script src="lib/molang.umd.js"></script>
 		<script src="lib/wintersky.umd.js"></script>
 		
-		<script src="js/webpack/bundle.js"></script>
+		<script src="js/bundle.js"></script>
 		<script src="js/preview/OrbitControls.js"></script>
 		<script src="js/util/util.js"></script>
 		<script src="js/util/math_util.js"></script>

scripts/generate_pwa.js

@@ -1,11 +1,4 @@
 const workbox = require('workbox-build');
-const fs = require('fs');
-
-let bundle_file = fs.readFileSync('./js/webpack/bundle.js', 'utf-8');
-/*if (bundle_file.match(/</)) {
-	console.error('\x1b[31m', 'Invalid symbol detected in bundle');
-	process.exit(1);
-}*/
 
 workbox.generateSW({
 	cacheId: 'blockbench',

webpack.config.js

@@ -7,7 +7,7 @@ module.exports = {
     entry: './src/index.js',
     output: {
         filename: 'bundle.js',
-        path: PathModule.resolve(__dirname, 'js', 'webpack')
+        path: PathModule.resolve(__dirname, 'js')
     },
     module: {
         rules: [