Merge remote-tracking branch 'upstream/master'

Author: Ironnoob73

.editorconfig

@@ -0,0 +1,10 @@
+[*]
+end_of_line = lf
+indent_style = space
+indent_size = 4
+
+[*.js]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2

.github/FUNDING.yml

@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+  - https://afdian.net/@teahouse

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,11 +25,10 @@ assignees: ''
 可以的话，加上截图可以帮助解释你的问题。
 
 **版本**
-
 * 操作系统：[例：Windows]
-* Minecraft 版本：[例：1.15.2]
-* 资源包版本：[例：0.1.0]
-* 环境 [例：加载了Fabric/Forge，安装了CustomSkinLoader]
+* Minecraft 版本：[例：1.18.2]
+* 资源包版本：[例：1.6.1]
+* 环境：[例：加载了Fabric/Forge，安装了CustomSkinLoader]
 
 **其他内容**
 添加更多关于漏洞的来龙去脉。

.github/workflows/check_news.yml

@@ -0,0 +1,39 @@
+name: Deploy Web Builder dynamic Content
+
+on:
+  push:
+    paths:
+      - 'dynamic/**'
+  pull_request:
+    paths:
+      - 'dynamic/**'
+  workflow_dispatch:
+
+jobs:
+  check-news:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+      - run: node check_news.js
+      - name: Create comment
+        uses: peter-evans/commit-comment@v1
+        if: ${{ failure() }}
+        with:
+          body: |
+            您的 `news.json` 或 `alerts.json` 格式出了些问题, 请及时修正
+  deploy:
+    environment: production
+    if: ${{ github.ref_name == 'master' && !failure() }}
+    needs:
+      - check-news
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: Teahouse-Studios/[email protected]
+        with:
+          KEY_ID: ${{ secrets.KEY_ID }}
+          KEY_SECRET: ${{ secrets.KEY_SECRET }}
+          BUCKET: frontend-wdljt
+          LOCAL_PATH: ./dynamic/
+          REMOTE_PREFIX: meme/dynamic/

.github/workflows/deploy.yml

@@ -12,31 +12,32 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.9
-
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install flake8
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        yarn
 
     - name: Test build
       run: |
-        python preset_build.py
+        node preset_build.js
 
     - name: Upload files built
       uses: actions/upload-artifact@v2
       with:
         name: files-built
         path: |
           builds
+  deploy:
+    if: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
+    needs:
+      - test
+    runs-on: ubuntu-latest
+    steps:
+     - uses: actions/checkout@master
+     - name: Update Deployment Status
+       run: |
+         curl \
+         -X POST \
+         -H "Authorization: token ${{secrets.GITHUB_TOKEN}}" \
+         -H "Accept: application/vnd.github.v3+json" \
+         https://api.github.com/repos/${{github.repository}}/deployments \
+         -d '{"ref":"${{ github.sha }}", "required_contexts": []}'

.github/workflows/deploy_dynamic_content.yml

@@ -10,4 +10,6 @@ Lib/
 Scripts/
 pyvenv.cfg
 !/news.json
-!/alerts.json
+!/alerts.json
+node_modules
+!package.json

.github/workflows/test_ci.yml

@@ -0,0 +1,18 @@
+{
+  "semi": false,
+  "useTabs": false,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "printWidth": 80,
+  "endOfLine": "lf",
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "tabWidth": 4,
+        "useTabs": false
+      }
+    }
+  ]
+}

.gitignore

@@ -2,12 +2,19 @@
 
 [![GitHub issues](https://img.shields.io/github/issues/Teahouse-Studios/mcwzh-meme-resourcepack?logo=github&style=flat-square)](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack/issues)    [![GitHub pull requests](https://img.shields.io/github/issues-pr/Teahouse-Studios/mcwzh-meme-resourcepack?logo=github&style=flat-square)](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack/pulls)    [![License](https://img.shields.io/static/v1?label=License&message=CC%20BY-SA%204.0&color=db2331&style=flat-square&logo=creative%20commons)](https://creativecommons.org/licenses/by-sa/4.0/)    [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/Teahouse-Studios/mcwzh-meme-resourcepack?label=latest%20version&style=flat-square)](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack/releases)    [![Minecraft ver](https://img.shields.io/static/v1?label=Minecraft%20version&message=1.12.2%2B&color=db2331&style=flat-square&logo=)](https://minecraft.net)
 
-[![Banner](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack/blob/master/materials/zh_meme_banner.png?raw=true)](https://www.mcbbs.net/thread-1004643-1-1.html)
-
 此资源包仅适用于**Minecraft Java版**。**关于适用于Minecraft基岩版的资源包，参见[基岩版梗体中文](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack-bedrock)。**
 
 **注：若发现可能存在该资源包上头的情况，请立刻~~食用~~阅读[译名标准化](https://minecraft.fandom.com/zh/wiki/Minecraft_Wiki:译名标准化)。**
 
+[![Banner](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack/blob/master/materials/zh_meme_banner.png?raw=true)](https://www.mcbbs.net/thread-1004643-1-1.html)
+
+## 赞助者
+<p align="center">
+  <a href="https://afdian.net/@teahouse">
+    <img src='https://fe.wd-ljt.com/m3me/sP0ns0r5/sP0ns0r5.svg'>
+  </a>
+</p>
+
 ## 作用
 
 这个资源包将一部分译名或其他游戏内字符串替换成了一些知名/不知名的梗或笑话，或将其用诙谐的语言重写了一遍。
@@ -58,32 +65,24 @@
 
 #### 先决条件
 
-请确保已经安装了Python 3.9+和Git。如果没有，请到[Python官网](https://www.python.org)和[Git官网](https://www.git-scm.com)下载。
+请确保已经安装了NodeJS主流版本和Git。如果没有，请到[NodeJS官网](https://nodejs.org/zh-cn/)和[Git官网](https://www.git-scm.com)下载。
 
 #### 步骤
 
 1. 下载源码；
 2. 进入文件夹；
-3. 安装相关pip依赖；
+3. 安装相关依赖；
 4. 运行预设打包命令。
 
 ``` sh
 git clone https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack.git
 cd mcwzh-meme-resourcepack
-pip install -r requirements.txt
-python preset_build.py
+npm install
+node preset_build.js
 ```
 
 在 `builds` 文件夹中会生成 `mcwzh-meme.zip` 、 `mcwzh-meme_compatible_sfw.zip` 、 `mcwzh-meme_compatible_nofigure_legacy_sfw.zip` 等预设的资源包，名称和作用如上所述。
 
-如果需要预设以外的资源包，可输入需要的参数：
-
-``` sh
-python -m memepack_builder ...
-```
-
-具体用法可见[此处](https://github.com/Teahouse-Studios/memepack-builder/blob/main/doc/CLI_Manual.zh-hans.md)。
-
 ### 自助跟进游戏版本
 
 此资源包的语言文件顺序与原版的英文顺序并不一致（本资源包是将key按照字母顺序排序）。如果原版的英文译名跟进了，请先将解包的英文语言文件按照前文所述排序，可以参考[这个网站](https://tool.funsmall.cn/jsonsort/)或本repo中的 `sort.py`。推荐使用[Visual Studio Code](https://github.com/microsoft/vscode)的比较功能以方便查看新字符串。
@@ -105,6 +104,6 @@ python -m memepack_builder ...
   * 这意味着，你可在署名的情况下自由修改本资源包，但是你再创作的作品必须以本协议发布。
   * 这不是法律建议。
 * 本项目附带的Mod内容字符串、未经梗体中文修改过的部分，按照 ***原作品的协议*** 发布。
-* 本项目 `tools` 目录下的脚本和根目录下的 `preset_build.py` 文件，可选择 ***CC BY-SA 4.0*** 或 ***Apache License 2.0*** 协议之一授权。
+* 本项目 `tools` 目录下的脚本和根目录下的 `preset_build.js` 文件，可选择 ***CC BY-SA 4.0*** 或 ***Apache License 2.0*** 协议之一授权。
 
 ![GitHub forks](https://img.shields.io/github/forks/Teahouse-Studios/mcwzh-meme-resourcepack?style=social)    ![GitHub stars](https://img.shields.io/github/stars/Teahouse-Studios/mcwzh-meme-resourcepack?style=social)    ![GitHub watchers](https://img.shields.io/github/watchers/Teahouse-Studios/mcwzh-meme-resourcepack?style=social)

.prettierrc

@@ -1,8 +1,8 @@
 const fs = require('fs')
 const path = require('path')
 
-const news = fs.readFileSync(path.resolve(__dirname, 'news.json'))
+const news = fs.readFileSync(path.resolve(__dirname, './dynamic/news.json'))
 JSON.parse(news)
 
-const alerts = fs.readFileSync(path.resolve(__dirname, 'alerts.json'))
+const alerts = fs.readFileSync(path.resolve(__dirname, './dynamic/alerts.json'))
 JSON.parse(alerts)