Merge pull request #19 from Ryex/javas

Add java runtime metadata 

3 files changed, 24 insertions, 7 deletions

diff --git a/meta/common/__init__.py b/meta/common/__init__.py
index 9e623bdca8..d7ee49ac4a 100644
--- a/meta/common/__init__.py
+++ b/meta/common/__init__.py
@@ -2,10 +2,11 @@ import os
 import os.path
 import datetime
 from urllib.parse import urlparse
+from typing import Any, Optional
 
 import requests
-from cachecontrol import CacheControl
-from cachecontrol.caches import FileCache
+from cachecontrol import CacheControl  # type: ignore
+from cachecontrol.caches import FileCache  # type: ignore
 
 LAUNCHER_MAVEN = "https://files.prismlauncher.org/maven/%s"
 
@@ -41,7 +42,7 @@ def ensure_upstream_dir(path):
         os.makedirs(path)
 
 
-def ensure_component_dir(component_id):
+def ensure_component_dir(component_id: str):
     path = os.path.join(launcher_path(), component_id)
     if not os.path.exists(path):
         os.makedirs(path)
@@ -51,7 +52,7 @@ def transform_maven_key(maven_key: str):
     return maven_key.replace(":", ".")
 
 
-def replace_old_launchermeta_url(url):
+def replace_old_launchermeta_url(url: str):
     o = urlparse(url)
     if o.netloc == "launchermeta.mojang.com":
         return o._replace(netloc="piston-meta.mojang.com").geturl()
@@ -59,7 +60,7 @@ def replace_old_launchermeta_url(url):
     return url
 
 
-def get_all_bases(cls, bases=None):
+def get_all_bases(cls: type, bases: Optional[list[type]] = None):
     bases = bases or []
     bases.append(cls)
     for c in cls.__bases__:
@@ -67,10 +68,10 @@ def get_all_bases(cls, bases=None):
     return tuple(bases)
 
 
-def merge_dict(base: dict, overlay: dict):
+def merge_dict(base: dict[Any, Any], overlay: dict[Any, Any]):
     for k, v in base.items():
         if isinstance(v, dict):
-            merge_dict(v, overlay.setdefault(k, {}))
+            merge_dict(v, overlay.setdefault(k, {}))  # type: ignore
         else:
             if k not in overlay:
                 overlay[k] = v
diff --git a/meta/common/java.py b/meta/common/java.py
new file mode 100644
index 0000000000..ec13b2a55f
--- /dev/null
+++ b/meta/common/java.py
@@ -0,0 +1,14 @@
+from os.path import join
+
+BASE_DIR = "java_runtime"
+
+RELEASE_FILE = join(BASE_DIR, "releases.json")
+ADOPTIUM_DIR = join(BASE_DIR, "adoptium")
+AZUL_DIR = join(BASE_DIR, "azul")
+
+ADOPTIUM_VERSIONS_DIR = join(ADOPTIUM_DIR, "versions")
+AZUL_VERSIONS_DIR = join(AZUL_DIR, "versions")
+
+JAVA_MINECRAFT_COMPONENT = "net.minecraft.java"
+JAVA_ADOPTIUM_COMPONENT = "net.adoptium.java"
+JAVA_AZUL_COMPONENT = "com.azul.java"
diff --git a/meta/common/mojang.py b/meta/common/mojang.py
index 5fda2e002f..fe36c3c02b 100644
--- a/meta/common/mojang.py
+++ b/meta/common/mojang.py
@@ -19,3 +19,5 @@ LIBRARY_PATCHES_FILE = join(dirname(__file__), "mojang-library-patches.json")
 MINECRAFT_COMPONENT = "net.minecraft"
 LWJGL_COMPONENT = "org.lwjgl"
 LWJGL3_COMPONENT = "org.lwjgl3"
+
+JAVA_MANIFEST_FILE = join(BASE_DIR, "java_all.json")