Hide installer version selection, and fix package name validation.

Closes #73 Closes #72
FabricMC · Dec 14, 2023 · 3ae6b14 · 3ae6b14
1 parent 9a68c98
commit 3ae6b14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts/src/lib/Installer.svelte b/scripts/src/lib/Installer.svelte
@@ -3,6 +3,7 @@
   import DownloadIcon from "./DownloadIcon.svelte";
 
   const win32 = navigator.platform == "Win32"
+  const showVersionSelection = false;
 
   let expertOptions = false;
   let selectedVersion = "";
@@ -38,7 +39,7 @@
 
       <br />
       <br />
-    {:else}
+    {:else if showVersionSelection}
       {#await getVersion() then latest}
         <p>
           {#if latest?.stable}Installer Version: {latest.version} (Latest){/if}

diff --git a/scripts/src/lib/template/java.ts b/scripts/src/lib/template/java.ts
@@ -40,13 +40,13 @@ export function getJavaVersion(minecraftVersion: string): JavaVersion {
 	return JAVA_17;
 }
 
-const JAVA_PACKAGE_REGEX = /^[a-zA-Z]+(\.[a-zA-Z][a-zA-Z0-9]*)*$/;
+const JAVA_PACKAGE_REGEX = /^[a-z][a-z0-9_]*(\.[a-z0-9_]+)+[0-9a-z_]$/;
 const RESERVED_PACKAGE_PREFIXES = ["net.minecraft.", "com.mojang.", "net.fabricmc.", "java."];
 
 export function computePackageNameErrors(packageName: string): string[] {
 	let errorList : string[] = [];
 
-	if (!JAVA_PACKAGE_REGEX.test(packageName)) {
+	if (!JAVA_PACKAGE_REGEX.test(packageName.toLowerCase())) {
 		errorList.push("Package name is not a valid Java package name!");
 	}