Merge branch 'MeteorDevelopment:master' into master

MeteorDevelopment · Aug 24, 2024 · a4829f1 · a4829f1
2 parents b2b81f3 + 8f83d5d
commit a4829f1
Show file tree

Hide file tree

Showing 622 changed files with 12,843 additions and 6,825 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -8,32 +8,34 @@ body:
       label: Describe the bug
       description: |
         A clear and concise description of what the issue is.
-        Provide as much information as possible, videos, crash reports, etc.
-        DO NOT PASTE A CRASH REPORT HERE!!!!
+        Provide as much information as possible, videos, images, etc.
+      placeholder: |
+          This module is broken / not working as intended.
+          It should do X but it does Y instead.
     validations:
       required: true
   - type: textarea
     id: reproducing
     attributes:
       label: Steps to reproduce
       description: How do you trigger this bug?
-      render: bash
+      placeholder: |
+          1. I did this thing;
+          2. Then I did this other thing, which caused the bug.
     validations:
       required: true
-  - type: input
-    id: crash-report
-    attributes:
-      label: Link to crash report/log if applicable (https://mclo.gs)
   - type: input
     id: meteor-version
     attributes:
       label: Meteor Version
+      placeholder: Meteor X.Y.Z (or X.Y.Z-build_number)
     validations:
       required: true
   - type: input
     id: mc-version
     attributes:
       label: Minecraft Version
+      placeholder: MC X.Y.Z
     validations:
       required: true
   - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/crash.yml b/.github/ISSUE_TEMPLATE/crash.yml
@@ -0,0 +1,56 @@
+name: Crash
+description: Report a crash to help us improve Meteor.
+labels: [ crash ]
+body:
+  - type: textarea
+    id: reproducing
+    attributes:
+      label: Steps to reproduce
+      description: How do you trigger this crash?
+      placeholder: |
+          1. I did this thing;
+          2. Then I did this other thing, which caused the crash.
+    validations:
+      required: true
+  - type: input
+    id: crash-report
+    attributes:
+      label: Link to crash report/log (upload to https://mclo.gs and paste resulting link here)
+      placeholder: https://mclo.gs/xxxxxx
+    validations:
+        required: true
+  - type: input
+    id: meteor-version
+    attributes:
+      label: Meteor Version
+      placeholder: Meteor X.Y.Z (or X.Y.Z-build_number)
+    validations:
+      required: true
+  - type: input
+    id: mc-version
+    attributes:
+      label: Minecraft Version
+      placeholder: MC X.Y.Z
+    validations:
+      required: true
+  - type: dropdown
+    id: operating-systems
+    attributes:
+      label: Operating System
+      options:
+        - macOS
+        - Windows
+        - Linux
+    validations:
+      required: true
+  - type: checkboxes
+    id: prerequisites
+    attributes:
+      label: Before submitting a crash report
+      options:
+        - label: |
+            This crash wasn't already reported (I have searched crash reports on GitHub).
+          required: true
+        - label: |
+            This is a valid crash (I am able to reproduce this on the latest dev build).
+          required: true
diff --git a/.github/devbuilds/get_number.js b/.github/devbuilds/get_number.js
@@ -1,5 +1,3 @@
-const axios = require("axios").default;
-
-axios.get("https://meteorclient.com/api/stats").then(res => {
-    console.log("number=" + (parseInt(res.data.devBuild) + 1));
-});
+fetch("https://meteorclient.com/api/stats")
+    .then(res => res.json())
+    .then(res => console.log("number=" + (parseInt(res.devBuild) + 1)))
diff --git a/.github/devbuilds/index.js b/.github/devbuilds/index.js
@@ -1,47 +1,54 @@
-const axios = require("axios").default;
-const FormData = require("form-data");
 const fs = require("fs");
+const path = require("path");
 
 const branch = process.argv[2];
 const compareUrl = process.argv[3];
 const success = process.argv[4] === "true";
 
 function send(version, number) {
-    axios.get(compareUrl).then(res => {
-        let description = "";
+    fetch(compareUrl)
+        .then(res => res.json())
+        .then(res => {
+            let description = "";
 
-        description += "**Branch:** " + branch;
-        description += "\n**Status:** " + (success ? "success" : "failure");
+            description += "**Branch:** " + branch;
+            description += "\n**Status:** " + (success ? "success" : "failure");
 
-        let changes = "\n\n**Changes:**";
-        let hasChanges = false;
-        for (let i in res.data.commits) {
-            let commit = res.data.commits[i];
+            let changes = "\n\n**Changes:**";
+            let hasChanges = false;
+            for (let i in res.commits) {
+                let commit = res.commits[i];
 
-            changes += "\n- [`" + commit.sha.substring(0, 7) + "`](https://github.com/MeteorDevelopment/meteor-client/commit/" + commit.sha + ") *" + commit.commit.message + "*";
-            hasChanges = true;
-        }
-        if (hasChanges) description += changes;
+                changes += "\n- [`" + commit.sha.substring(0, 7) + "`](https://github.com/MeteorDevelopment/meteor-client/commit/" + commit.sha + ") *" + commit.commit.message + "*";
+                hasChanges = true;
+            }
+            if (hasChanges) description += changes;
 
-        if (success) {
-            description += "\n\n**Download:** [meteor-client-" + version + "-" + number + "](https://meteorclient.com/download?devBuild=" + number + ")";
-        }
+            if (success) {
+                description += "\n\n**Download:** [meteor-client-" + version + "-" + number + "](https://meteorclient.com/download?devBuild=" + number + ")";
+            }
 
-        const webhook = {
-            username: "Dev Builds",
-            avatar_url: "https://meteorclient.com/icon.png",
-            embeds: [
-                {
-                    title: "meteor client v" + version + " build #" + number,
-                    description: description,
-                    url: "https://meteorclient.com",
-                        color: success ? 2672680 : 13117480
-                }
-            ]
-        };
+            const webhook = {
+                username: "Dev Builds",
+                avatar_url: "https://meteorclient.com/icon.png",
+                embeds: [
+                    {
+                        title: "meteor client v" + version + " build #" + number,
+                        description: description,
+                        url: "https://meteorclient.com",
+                            color: success ? 2672680 : 13117480
+                    }
+                ]
+            };
 
-        axios.post(process.env.DISCORD_WEBHOOK, webhook);
-    });
+            fetch(process.env.DISCORD_WEBHOOK, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify(webhook)
+            });
+        });
 }
 
 if (success) {
@@ -51,19 +58,32 @@ if (success) {
     });
 
     let form = new FormData();
-    form.append("file", fs.createReadStream(jar));
+    form.set(
+        "file",
+        new Blob([fs.readFileSync(jar)], { type: "application/java-archive" }),
+        path.basename(jar)
+    );
 
-    axios.post("https://meteorclient.com/api/uploadDevBuild", form, {
+    fetch("https://meteorclient.com/api/uploadDevBuild", {
+        method: "POST",
         headers: {
-            ...form.getHeaders(),
             "Authorization": process.env.SERVER_TOKEN
-        }
-    }).then(res => {
-        send(res.data.version, res.data.number)
-    });
+        },
+        body: form
+    })
+        .then(async res => {
+            let data = await res.json();
+
+            if (res.ok) {
+                send(data.version, data.number);
+            }
+            else {
+                console.log("Failed to upload dev build: " + data.error);
+            }
+        });
 }
 else {
-    axios.get("https://meteorclient.com/api/stats").then(res => {
-        send(res.data.dev_build_version, parseInt(res.data.devBuild) + 1)
-    });
+    fetch("https://meteorclient.com/api/stats")
+        .then(res => res.json())
+        .then(res => send(res.dev_build_version, parseInt(res.devBuild) + 1));
 }
diff --git a/.github/devbuilds/package.json b/.github/devbuilds/package.json
@@ -9,8 +9,5 @@
     "get_number": "node get_number.js",
     "start": "node index.js"
   },
-  "dependencies": {
-    "axios": "^0.27.2",
-    "form-data": "^4.0.0"
-  }
+  "dependencies": {}
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - run: chmod +x gradlew
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - run: chmod +x gradlew
 

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - run: chmod +x gradlew
 

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <img src="https://meteorclient.com/icon.png" alt="meteor-client-logo" width="15%"/>
 </p>
 
-<h1 align="center">Meteor Client</h1>
+<h1 align="center">Meteor</h1>
 <p align="center">A Minecraft Fabric Utility Mod for anarchy servers.</p>
 
 <div align="center">
@@ -14,7 +14,7 @@
     <img src="https://img.shields.io/github/contributors/MeteorDevelopment/meteor-client" alt="GitHub contributors"/>
     <br>
     <img src="https://img.shields.io/github/languages/code-size/MeteorDevelopment/meteor-client" alt="GitHub code size in bytes"/>
-    <img src="https://tokei.rs/b1/github/MeteorDevelopment/meteor-client" alt="GitHub lines of code"/>
+    <img src="https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/MeteorDevelopment/meteor-client/badge?filter=.java$&label=lines%20of%20code&color=blue" alt="GitHub lines of code"/>
 </div>
 
 ## Usage
@@ -40,11 +40,9 @@ Bug reports and suggestions should be made in this repo's [issue tracker](https:
 Please provide as much information as you can to best help us understand your issue and give a better chance of it being resolved.
 
 ## Donations
-All of our work is completely free and non-profit, therefore we are very grateful for all donations made to help support us in running our community.  
-All of the money made through donations is used to pay for our servers, none of it is taken for profit.
-
+All of our work is completely free and non-profit (donations pay only for hosting costs), therefore we are very grateful for all donations made to support us in running our community.  
 Donations can be made via our [website](https://meteorclient.com/donate) and the minimum amount to get donor benefits is €5.  
-You will be rewarded with a role on our Discord server, an in-game cape, and an extra kit as well as donor status on our [PvP server](https://namemc.com/server/pvp.meteorclient.com).  
+You will be rewarded with a role on our Discord server and a customisable in-game cape.  
 ⚠️ _Make sure to create a Meteor account and link your Discord and Minecraft accounts to fully experience your rewards._ ⚠️
 
 ## Credits