[Auto] Update to Minecraft 26.1.2

.editorconfig

@@ -11,5 +11,5 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{yml,js,json}]
+[*.{yml,js,json,md,ts}]
 indent_style = space

.gitattributes

@@ -1,11 +1,22 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
+* text eol=lf
+*.bat text eol=crlf
+*.patch text eol=lf
+*.java text eol=lf
+*.gradle text eol=crlf
+*.png binary
+*.gif binary
+*.exe binary
+*.dll binary
+*.jar binary
+*.lzma binary
+*.zip binary
+*.pyd binary
+*.cfg text eol=lf
+*.jks binary
+*.ogg binary
+
 # Linux start script should use lf
 /gradlew        text eol=lf
 
-# These are Windows script files and should use crlf
-*.bat           text eol=crlf
-
 # While BlockBench files are actually JSON, they're minified so don't diff well.
 *.bbmodel       binary

.github/actions/update-versions/action.yml

@@ -4,26 +4,20 @@ description: Get versions of the game for the build and test workflow
 inputs:
   minecraft-version:
     description: Minecraft version to update to. If not supplied, falls back to latest version.
-  max-minecraft-version:
-    description: Maximum Minecraft version if there are known incompatibilities with later minor versions. If not specified then it's assumed that any future minor version will be compatible.
-  ignore-mod-dependencies:
-    description: Ignore mod dependency versions
 
 outputs:
-  has-updates:
-    description: Whether there are updates to include
   minecraft-version:
     description: Highest Minecraft version supported
-  minecraft-version-range:
-    description: Range of Minecraft versions supported
   java-version:
     description: Java version required for this version
+  fabric-loader-version:
+    description: Version of Fabric loader used by this project
   fabric-api-version:
     description: Version of the Fabric API mod used by this project
   mod-menu-version:
     description: Version of the Mod Menu mod used by this project
-  loader-version:
-    description: Version of Fabric loader used by this project
+  neoforge-version:
+    description: Version of the NeoForge used by this project
 
 runs:
   using: "node20"

.github/actions/update-versions/index.js

@@ -1,21 +1,8 @@
 import { getInput, info, setOutput, warning } from "@actions/core";
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
 import { URL, URLSearchParams } from "node:url";
-import { minSatisfying, satisfies } from "semver";
+import { compare, SemVer } from "semver";
 import { getAllMinecraftVersions, getMinecraftVersion } from "../lib/mojang.js";
-import {
-  addAllZeroVersions,
-  parseVersionSafe,
-  trimAllZeroVersions,
-} from "../lib/versions.js";
-
-const fileString = await readFile(
-  join(process.cwd(), "src/main/resources", "fabric.mod.json"),
-  { encoding: "utf8" }
-);
-const modJson = JSON.parse(fileString);
-const recommendsRange = addAllZeroVersions(modJson.recommends.minecraft);
+import { parseVersionSafe, trimAllZeroVersions } from "../lib/versions.js";
 
 const allVersions = await getAllMinecraftVersions();
 
@@ -33,84 +20,17 @@ function getUpdateVersion() {
   return allVersions.latest.release;
 }
 
-/**
- * @returns {string | null}
- */
-function getMaxUpdateVersion() {
-  const inputValue = getInput("max-minecraft-version");
-  if (inputValue) {
-    return inputValue;
-  }
-
-  return null;
-}
-
 const versionToUpdate = getUpdateVersion();
+const versionToUpdateSemver = new SemVer(versionToUpdate);
 const updateVersionInfo = await getMinecraftVersion(versionToUpdate);
 
-async function getNewVersionRange() {
-  if (updateVersionInfo.type !== "release") {
-    return versionToUpdate;
-  }
-
-  const updateSemver = parseVersionSafe(versionToUpdate);
-
-  if (recommendsRange === updateSemver.toString()) {
-    return versionToUpdate;
-  }
-
-  if (satisfies(updateSemver, recommendsRange)) {
-    // New version already satisfies the current range, but double check Java version first.
-    const allReleaseVersions = allVersions.versions.filter(
-      (v) => v.type === "release"
-    );
-    const minMatchingSemver = minSatisfying(
-      allReleaseVersions.map((v) => parseVersionSafe(v.id)),
-      recommendsRange
-    );
-    if (!minMatchingSemver) {
-      throw new Error(`No versions matched range ${recommendsRange}`);
-    }
-
-    const minMatchingInfo = await getMinecraftVersion(
-      minMatchingSemver.toString()
-    );
-
-    const isSameJava =
-      updateVersionInfo.javaVersion.majorVersion ===
-      minMatchingInfo.javaVersion.majorVersion;
-    if (isSameJava) {
-      return recommendsRange;
-    }
-
-    // New version satisfies range, but has new Java version so is incompatible.
-  }
-
-  const minVersion = versionToUpdate;
-  const maxUpdateVersion = getMaxUpdateVersion();
-  // Current rules mean that the minor version is always the same, so we can use a range here
-  // Also we're assuming middle versions are compatible. This should always be the case, but
-  // I can't wait to eat my words on that one.
-  const simplified = trimAllZeroVersions(
-    maxUpdateVersion !== null
-      ? `${minVersion} - ${maxUpdateVersion}`
-      : `~${minVersion}`
-  );
-
-  info(
-    `New version is likely compatible with existing versions of Minecraft. Adding to version range ${simplified}`
-  );
-
-  return simplified;
-}
-
 /**
  * @param {string} projectId
  * @returns {Promise<string>}
  */
 async function getModrinthProjectVersion(projectId) {
   const url = new URL(
-    `https://api.modrinth.com/v2/project/${projectId}/version`
+    `https://api.modrinth.com/v2/project/${projectId}/version`,
   );
   url.search = new URLSearchParams({
     game_versions: `["${versionToUpdate}"]`,
@@ -128,12 +48,12 @@ async function getModrinthProjectVersion(projectId) {
       getInput("ignore-mod-dependencies") === "true";
     if (!shouldIgnoreModDependencies) {
       throw new Error(
-        `No versions of ${projectId} for Minecraft ${versionToUpdate}`
+        `No versions of ${projectId} for Minecraft ${versionToUpdate}`,
       );
     }
 
     warning(
-      `No versions of ${projectId} for Minecraft ${versionToUpdate}. Ignoring, but you may need to revert some changes until I update this action`
+      `No versions of ${projectId} for Minecraft ${versionToUpdate}. Ignoring, but you may need to revert some changes until I update this action`,
     );
     return "";
   }
@@ -165,18 +85,72 @@ async function getFabricLoaderVersion() {
   return data[0].version;
 }
 
-// Early exit if latest version already matches
-const newVersionRange = await getNewVersionRange();
+/**
+ * @returns {Promise<{neoforge:string;}>}
+ */
+async function getArchitecturyVersions() {
+  const response = await fetch(
+    "https://generate.architectury.dev/version_index.json",
+    {
+      headers: {
+        "user-agent": "secret_online/mod-auto-updater (mc@secretonline.co)",
+      },
+    },
+  );
+  /** @type {Record<string,any>} */
+  const data = await response.json();
+
+  const versionData = data[versionToUpdate];
+  if (versionData) {
+    if (!versionData.neoforge) {
+      throw new Error(`No Neoforge version in Architectury index`);
+    }
+
+    info(`Found Architectury data: neoforge ${versionData.neoforge}`);
+
+    return versionData;
+  }
+
+  warning(
+    `No version for ${versionToUpdate} in Architectury index. Trying Neoforge release`,
+  );
+
+  // Get latest Neoforge version from Neoforge Maven
+  const neoforgeResponse = await fetch(
+    "https://maven.neoforged.net/api/maven/versions/releases/net%2Fneoforged%2Fneoforge",
+    {
+      headers: {
+        "user-agent": "secret_online/mod-auto-updater (mc@secretonline.co)",
+      },
+    },
+  );
+  /** @type {{versions:string[]}} */
+  const neoforgeData = await neoforgeResponse.json();
+  const matchRegex = new RegExp(
+    `^${versionToUpdateSemver.major}.${versionToUpdateSemver.minor}.`,
+  );
+  const matchingVersions = neoforgeData.versions.filter((version) =>
+    matchRegex.test(version),
+  );
+  if (matchingVersions.length === 0) {
+    throw new Error(`No version for ${versionToUpdate} in Neoforge Maven`);
+  }
+  matchingVersions.sort();
+  const neoforgeVersion = matchingVersions[0];
+  info(`Found Neoforge data: neoforge ${neoforgeVersion}`);
+
+  return {
+    neoforge: neoforgeVersion,
+  };
+}
+
 const fabricApiVersion = await getModrinthProjectVersion("fabric-api");
-const modMenuVersion = await getModrinthProjectVersion("modmenu");
 const fabricLoaderVersion = await getFabricLoaderVersion();
+const { neoforge } = await getArchitecturyVersions();
 
 setOutput("has-updates", true);
 setOutput("minecraft-version", versionToUpdate);
-setOutput("minecraft-version-range", newVersionRange);
 setOutput("java-version", updateVersionInfo.javaVersion.majorVersion);
 setOutput("fabric-api-version", fabricApiVersion);
-setOutput("mod-menu-version", modMenuVersion);
-setOutput("loader-version", fabricLoaderVersion);
-// Do not add code below the above closing brace, as it will run whether or not any updates happened.
-// Control flow is hard.
+setOutput("fabric-loader-version", fabricLoaderVersion);
+setOutput("neoforge-version", neoforge);

.github/dependabot.yml

@@ -14,3 +14,12 @@ updates:
       all:
         patterns:
           - "*"
+  - package-ecosystem: "npm"
+    directory: "/misc/mod-generator"
+    schedule:
+      interval: "monthly"
+      timezone: "Pacific/Auckland"
+    groups:
+      all:
+        patterns:
+          - "*"