From daa3fd3aa599e0ac013887ae9fc359ca35922780 Mon Sep 17 00:00:00 2001
From: Cassian Godsted <ms@congodsted.com>
Date: Tue, 3 Dec 2024 13:56:46 -0500
Subject: [PATCH] Provide generators for 1.21.1-1.21.4 (#23)

* Provide generators for 1.21.1-1.21.3

* Add note to clarify where web server is viewed

* Add 1.21.4
---
 README.md                         |  2 +-
 src/app/versions.rs               |  2 +-
 version_resolver/src/minecraft.rs | 37 +++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3130b45..29547aa 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ A generator for Architectury mod templates with a web UI and an interactive comm
 
 Run `./gradlew buildWeb`. The output will be in `build/web`.
 
-The local test web server can be launched with `./gradlew runTestServer` (requires Python).
+The local test web server can be launched with `./gradlew runTestServer` (requires Python). While running, this web server can be viewed at http://localhost:8000.
 
 ## Building (native)
 
diff --git a/src/app/versions.rs b/src/app/versions.rs
index a7f94bb..069994d 100644
--- a/src/app/versions.rs
+++ b/src/app/versions.rs
@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-pub const LOOM_VERSION: &'static str = "1.6-SNAPSHOT";
+pub const LOOM_VERSION: &'static str = "1.7-SNAPSHOT";
 pub const PLUGIN_VERSION: &'static str = "3.4-SNAPSHOT";
 
 use miette::Result;
diff --git a/version_resolver/src/minecraft.rs b/version_resolver/src/minecraft.rs
index 016a962..5bf6c72 100644
--- a/version_resolver/src/minecraft.rs
+++ b/version_resolver/src/minecraft.rs
@@ -37,6 +37,14 @@ pub enum MinecraftVersion {
     Minecraft1_20_6,
     #[serde(rename = "1.21")]
     Minecraft1_21,
+    #[serde(rename = "1.21.1")]
+    Minecraft1_21_1,
+    #[serde(rename = "1.21.2")]
+    Minecraft1_21_2,
+    #[serde(rename = "1.21.3")]
+    Minecraft1_21_3,
+    #[serde(rename = "1.21.4")]
+    Minecraft1_21_4,
 }
 
 impl MinecraftVersion {
@@ -62,6 +70,10 @@ impl MinecraftVersion {
             Self::Minecraft1_20_5 => "1.20.5",
             Self::Minecraft1_20_6 => "1.20.6",
             Self::Minecraft1_21 => "1.21",
+            Self::Minecraft1_21_1 => "1.21.1",
+            Self::Minecraft1_21_2 => "1.21.2",
+            Self::Minecraft1_21_3 => "1.21.3",
+            Self::Minecraft1_21_4 => "1.21.4",
         }
     }
 
@@ -127,6 +139,10 @@ impl MinecraftVersion {
             Self::Minecraft1_20_5 => None,
             Self::Minecraft1_20_6 => None,
             Self::Minecraft1_21 => None,
+            Self::Minecraft1_21_1 => None,
+            Self::Minecraft1_21_2 => None,
+            Self::Minecraft1_21_3 => None,
+            Self::Minecraft1_21_4 => None,
         }
     }
 
@@ -147,6 +163,11 @@ impl MinecraftVersion {
             Self::Minecraft1_20_5 => "12.0",
             Self::Minecraft1_20_6 => "12",
             Self::Minecraft1_21 => "13",
+            Self::Minecraft1_21_1 => "13",
+            Self::Minecraft1_21_2 => "14",
+            Self::Minecraft1_21_3 => "14",
+            Self::Minecraft1_21_4 => "15",
+
         }
     }
 
@@ -156,6 +177,10 @@ impl MinecraftVersion {
             Self::Minecraft1_20_5 => Some("2"),
             Self::Minecraft1_20_6 => Some("2"),
             Self::Minecraft1_21 => Some("4"),
+            Self::Minecraft1_21_1 => Some("4"),
+            Self::Minecraft1_21_2 => Some("4"),
+            Self::Minecraft1_21_3 => Some("4"),
+            Self::Minecraft1_21_4 => Some("4"),
             _ => None,
         }
     }
@@ -166,6 +191,10 @@ impl MinecraftVersion {
             Self::Minecraft1_20_5 => Some("20.5"),
             Self::Minecraft1_20_6 => Some("20.6"),
             Self::Minecraft1_21 => Some("21.0"),
+            Self::Minecraft1_21_1 => Some("21.1"),
+            Self::Minecraft1_21_2 => Some("21.2"),
+            Self::Minecraft1_21_3 => Some("21.3"),
+            Self::Minecraft1_21_4 => Some("21.4"),
             _ => None,
         }
     }
@@ -175,6 +204,10 @@ impl MinecraftVersion {
             Self::Minecraft1_20_5 => Some("1.20.5"),
             Self::Minecraft1_20_6 => Some("1.20.6"),
             Self::Minecraft1_21 => Some("1.21"),
+            Self::Minecraft1_21_1 => Some("1.21"),
+            Self::Minecraft1_21_2 => Some("1.21"),
+            Self::Minecraft1_21_3 => Some("1.21"),
+            Self::Minecraft1_21_4 => Some("1.21"),
             _ => None,
         }
     }
@@ -196,6 +229,10 @@ impl MinecraftVersion {
             Self::Minecraft1_20_5 => None,
             Self::Minecraft1_20_6 => None,
             Self::Minecraft1_21 => None,
+            Self::Minecraft1_21_1 => None,
+            Self::Minecraft1_21_2 => None,
+            Self::Minecraft1_21_3 => None,
+            Self::Minecraft1_21_4 => None,
         }
     }