Merge branch 'main' into elifoster-patch-1

.github/workflows/build-pr.yml

@@ -11,15 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
       - name: Setup hugo
         uses: peaceiris/actions-hugo@v2
         with:
           hugo-version: "0.119.0"
 
       - name: Build
-        run: hugo
+        run: hugo -F
 
       - uses: matyrobbrt/cloudflare-pr-previews/upload@v1
         name: Upload website
         with:
-          build-dir: ./public/
+          build-dir: ./public/

.gitignore

@@ -1,2 +1,3 @@
 public/
 .hugo_build.lock
+.idea

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "themes/hugo-notice"]
+	path = themes/hugo-notice
+	url = https://github.com/martignoni/hugo-notice.git

assets/js/neoforge.js

@@ -3,23 +3,39 @@ const FORGE_GAV = 'net/neoforged/neoforge'
 const LEGACY_GAV = 'net/neoforged/forge'
 const LATEST_ENDPOINT = 'https://maven.neoforged.net/api/maven/latest/version/releases/'
 const DOWNLOAD_URL = 'https://maven.neoforged.net/releases'
-//https://maven.neoforged.net/api/maven/latest/version/releases/net%2Fneoforged%2Fneoforge?filter=20.2
+// For the latest version: https://maven.neoforged.net/api/maven/latest/version/releases/net/neoforged/neoforge
+// For legacy version(s): https://maven.neoforged.net/api/maven/latest/version/releases/net/neoforged/forge
+// To filter a specific MC version: https://maven.neoforged.net/api/maven/latest/version/releases/net/neoforged/neoforge?filter=20.4
 async function loadLatestVersions(minecraftVersions) {
     for (const mcVersion of minecraftVersions) {
-	let gav;
-	let fn;
-	let mcvers;
-	if (mcVersion.startsWith("1.20.1")) {
-		gav = LEGACY_GAV;
-                fn = "forge";
-		mcvers = "1.20.1"
-	} else {
-		gav = FORGE_GAV;
-                fn = "neoforge";
-		mcvers = `1.${mcVersion}`
-	}
-        let currentMcVersionUrl = new URL(LATEST_ENDPOINT + encodeURIComponent(gav) + '?filter=' + encodeURIComponent(mcVersion));
+        let gav;
+        let fn;
+        let mcvers;
+        let dropDown_VAL;
+        let badges_beta;
+        let badges_new;
+        if (mcVersion.startsWith("1.20.1")) {
+            gav = LEGACY_GAV;
+            fn = "forge";
+            mcvers = "1.20.1";
+            badges_new = "";
+            badges_beta = "";
+            dropDown_VAL = "";
+        } else {
+            gav = FORGE_GAV;
+            fn = "neoforge";
+            badges_beta = "";
+            badges_new = `<font class="badges_new">NEW</font>`;
+            dropDown_VAL = ` open="open"`;
+        }
+
+        let currentMcVersionUrl;
         let versionJson;
+        if (mcvers == "1.20.1") {
+            currentMcVersionUrl = new URL(LATEST_ENDPOINT + encodeURIComponent(gav) + '?filter=' + encodeURIComponent(mcVersion));
+        } else {
+            currentMcVersionUrl = new URL(LATEST_ENDPOINT + encodeURIComponent(gav));
+        }
 
         try {
             const response = await fetch(currentMcVersionUrl);
@@ -34,17 +50,27 @@ async function loadLatestVersions(minecraftVersions) {
 
         if (versionJson) {
             const {version} = versionJson;
+            if (mcVersion == "latest") {
+                mcvers = "1." + Array.from(version)[0] + Array.from(version)[1] + Array.from(version)[2] + Array.from(version)[3];
+            }
+            if (version.includes("beta")) {
+                badges_beta = `<font class="badges_beta">BETA</font>`;
+            }
+
             const vs = `#filelist${mcVersion}`.split('.').join("");
             const installerUrl = `${DOWNLOAD_URL}/${gav}/${encodeURIComponent(version)}/${fn}-${encodeURIComponent(version)}-installer.jar`;
             const changelogUrl = `${DOWNLOAD_URL}/${gav}/${encodeURIComponent(version)}/${fn}-${encodeURIComponent(version)}-changelog.txt`;
+
             document.querySelector(vs).innerHTML = `
-                <div class="fileinfo__header">NeoForge ${version} for Minecraft ${mcvers}</div>
+                <details${dropDown_VAL}>
+                <summary class="fileinfo__header">${badges_beta} ${badges_new} NeoForge ${version} for Minecraft ${mcvers}</summary>
                 <div class="fileinfo__body">
                 <a href="${installerUrl}"><span class="fileinfo__icon"><i class="bi-file-earmark-zip-fill" style="font-size: 2rem;"></i></span>
-			<span class="fileinfo__content"><span>Latest <em>NeoForge</em> Installer</span><span>${fn}-${version}-installer.jar</span></span></a>
+			    <span class="fileinfo__content"><span>Latest <em>NeoForge</em> Installer</span><span>${fn}-${version}-installer.jar</span></span></a>
                 <a href="${changelogUrl}"><span class="fileinfo__icon"><i class="bi-file-earmark-text-fill" style="font-size: 2rem;"></i></span>
-			<span class="fileinfo__content"><span>Latest Changelog</span><span>${version}</span></span></a>
+			    <span class="fileinfo__content"><span>Latest Changelog</span><span>${version}</span></span></a>
                 </div>
+                </details>
             `;
         }
     }

content/_index.md

@@ -12,14 +12,9 @@ description: |
 # NeoForge installer files
 You can find a direct link to our latest installer files below.
 
+{{< files "latest" >}}
 {{< files "1.20.1" >}}
-
-Note: this file is still called forge because we're trying to maintain compatibility with launchers,
-assuming they don't hardcode things too much.
-
-## The new version is here
-
-{{<files "20.2" >}}
+{{< versions >}}
 
 # Using NeoForge for mod development
 
@@ -29,20 +24,7 @@ assuming they don't hardcode things too much.
 2. Clone this project locally, and get started! Our [Documentation] and the [Modding Wiki] are great places to learn more.
 
 ## If you have an existing mod project
-You can use neoforge in your existing mod development as well. To do so:
-1. Update your repositories to use `https://maven.neoforged.net/releases` instead of `https://maven.minecraftforge.net`
-2. Update your ForgeGradle to use NeoGradle 6.0.13 or above:
-    ```
-    plugins {
-        ...
-        id 'net.neoforged.gradle' version '[6.0.13, 6.2)'
-    }
-    ```
-3. Update your `minecraft` dependency to use `net.neoforged:forge` and the version as shown above.
-
-### Some things to note
-1. At the present time, mods built by either system should be intercompatible between forks.
-2. Do note that recently, there were some changes in the recommended way to use ForgeGradle/NeoGradle. Note especially the way that `settings.gradle` has changed, as well as the removal of the `buildscript` section in `build.gradle`. Refer to [The MDK] for an example and more.
+Refer to [The MDK] for an example of how to update your build script to use NeoForge.
 
 [The MDK]: https://github.com/neoforged/MDK
 [Documentation]: https://docs.neoforged.net