Merge pull request #6 from OrnitheMC/develop-support-gen2

Add gen2 support to develop page

Author: SpaceWalkerRS

.gitignore

@@ -6,6 +6,7 @@ dist/*
 
 # dependencies
 node_modules/*
+package-lock.json
 
 # logs
 npm-debug.log*

public/develop.js

@@ -10,12 +10,24 @@ import {
 } from "./meta_maven_utils.js";
 
 (async () => {
-    const minecraftStableVersions = await getMinecraftStableVersions();
-    const minecraftAllVersions = await getMinecraftVersions();
+    let minecraftStableVersions = await getMinecraftStableVersions("gen1");
+    let minecraftAllVersions = await getMinecraftVersions("gen1");
 
     let possibleVersions;
 
-    const loaderSelectorRadios = { fabric: document.getElementById("mod-loader-fabric"), quilt: document.getElementById("mod-loader-quilt") }
+    const loaderSelectorRadios = {
+        fabric: document.getElementById("mod-loader-fabric"),
+        quilt: document.getElementById("mod-loader-quilt")
+    }
+    const genSelectorRadios = {
+        gen1: document.getElementById("generation-gen1"),
+        gen2: document.getElementById("generation-gen2")
+    }
+    document.getElementById("calamus-gen-selectors").addEventListener("change", async (e) => {
+        const gen = Object.entries(genSelectorRadios).find(([_, button]) => button === e.target)[0];
+        minecraftStableVersions = await getMinecraftStableVersions(gen);
+        minecraftAllVersions = await getMinecraftVersions(gen);
+    })
     const versionSelectorInput = document.getElementById("mc-version");
     const versionListElement = document.getElementById("version-list");
     const allowSnapshotsCheck = document.getElementById("allow-snapshots");
@@ -47,6 +59,7 @@ import {
         ];
 
         const loader = Object.entries(loaderSelectorRadios).find(([_, button]) => button.checked)[0];
+        const gen = Object.entries(genSelectorRadios).find(([_, button]) => button.checked)[0];
 
         const minecraftVersion = versionSelectorInput.value;
         const loaderVersion = await getLatestLoader(loader);
@@ -58,7 +71,7 @@ import {
             `osl_version = ${oslVersion}`
         );
 
-        const featherBuild = await getLatestFeatherBuild(minecraftVersion);
+        const featherBuild = await getLatestFeatherBuild(gen, minecraftVersion);
 
         if (featherBuild !== null) {
             addExtraMsg("Make sure to use the \"merged\" mod template for this Minecraft version!");

public/meta_maven_utils.js

@@ -16,32 +16,42 @@ async function getFromMeta(...pathComponents) {
     return response.json();
 }
 
-async function getMinecraftVersionsMeta() {
-    return await getFromMeta("versions", "game");
+async function getVersionsFromMeta(...pathComponents) {
+    let response = await getFromMeta("versions", ...pathComponents);
+    return response;
 }
 
-export async function getFeatherVersionMeta(mcVersion) {
-    return await getFromMeta("versions", "feather", mcVersion);
+async function getVersionsWithGenFromMeta(ornitheGen, ...pathComponents) {
+    let response = await getVersionsFromMeta(ornitheGen, ...pathComponents);
+    return response;
+}
+
+async function getMinecraftVersionsMeta(ornitheGen) {
+    return await getVersionsWithGenFromMeta(ornitheGen, "game");
+}
+
+export async function getFeatherVersionMeta(ornitheGen, mcVersion) {
+    return await getVersionsWithGenFromMeta(ornitheGen, "feather", mcVersion);
 }
 
 async function getRavenVersionMeta(mcVersion) {
-    return await getFromMeta("versions", "raven", mcVersion);
+    return await getVersionsFromMeta("raven", mcVersion);
 }
 
 async function getSparrowVersionMeta(mcVersion) {
-    return await getFromMeta("versions", "sparrow", mcVersion);
+    return await getVersionsFromMeta("sparrow", mcVersion);
 }
 
 async function getNestsVersionMeta(mcVersion) {
-    return await getFromMeta("versions", "nests", mcVersion);
+    return await getVersionsFromMeta("nests", mcVersion);
 }
 
 async function getLoaderVersionsMeta(loader) {
-    return await getFromMeta("versions", loader + "-loader");
+    return await getVersionsFromMeta(loader + "-loader");
 }
 
 async function getOslVersionsMeta() {
-    return await getFromMeta("versions", "osl");
+    return await getVersionsFromMeta("osl");
 }
 
 function compareVersion(sv1, sv2) {
@@ -61,21 +71,24 @@ function compareVersion(sv1, sv2) {
     return rec(sv1.split("."), sv2.split("."));
 }
 
-export async function getMinecraftVersions() {
-    return await getMinecraftVersionsMeta()
+export async function getMinecraftVersions(gen) {
+    return await getMinecraftVersionsMeta(gen)
         .then(l => l.map(v => v.version));
 }
 
-export async function getMinecraftStableVersions() {
-    return await getMinecraftVersionsMeta()
+export async function getMinecraftStableVersions(gen) {
+    return await getMinecraftVersionsMeta(gen)
         .then(l => l.filter(v => v.stable))
         .then(l => l.map(v => v.version));
 }
 
-export async function getLatestFeatherBuild(mcVersion) {
-    return await getFeatherVersionMeta(mcVersion)
+export async function getLatestFeatherBuild(gen, mcVersion) {
+    return await getFeatherVersionMeta(gen, mcVersion)
         .then(l => l.sort((e1, e2) => e2.build - e1.build))
-        .then(s => { console.log(s); return s; })
+        .then(s => {
+            console.log(s);
+            return s;
+        })
         .then(([head, ..._]) => head)
         .then(e => e !== undefined ? e.build : null);
 }
@@ -133,4 +146,4 @@ function makeOrnitheMavenUrl(...pathComponents) {
 export async function getFeatherBuildMaven(version) {
     const url = makeOrnitheMavenUrl("feather", version, "feather-" + version + "-tiny.gz");
     return await fetch(url);
-}
+}

src/pages/develop.astro

@@ -32,6 +32,15 @@ import Layout from "../layouts/Layout.astro";
         <label for="mod-loader-quilt">Quilt</label>
       </fieldset>
 
+      <fieldset id="calamus-gen-selectors">
+        <legend>Select a Calamus (Intermediary) Generation</legend>
+        <input type="radio" id="generation-gen1" name="calamus-generation" checked />
+        <label for="generation-gen1">Gen1</label>
+
+        <input type="radio" id="generation-gen2" name="calamus-generation" />
+        <label for="generation-gen2">Gen2</label>
+      </fieldset>
+
       <label for="mc-version">Game version</label>
       <input type="text" id="mc-version" list="version-list" value="1.7.2" />
       <datalist id="version-list">