refactor: cleanup

5 files changed, 84 insertions, 84 deletions

diff --git a/meta/common/__init__.py b/meta/common/__init__.py
index d072287277..4db3c57b61 100644
--- a/meta/common/__init__.py
+++ b/meta/common/__init__.py
@@ -1,8 +1,6 @@
 import os
 import datetime
 
-DATETIME_FORMAT_HTTP = "%a, %d %b %Y %H:%M:%S %Z"
-
 
 def serialize_datetime(dt: datetime.datetime):
     if dt.tzinfo is None:
diff --git a/meta/common/fabric.py b/meta/common/fabric.py
index a306f15a16..2a35695cf1 100644
--- a/meta/common/fabric.py
+++ b/meta/common/fabric.py
@@ -8,3 +8,5 @@ META_DIR = join(BASE_DIR, "meta-v2")
 
 LOADER_COMPONENT = "net.fabricmc.fabric-loader"
 INTERMEDIARY_COMPONENT = "net.fabricmc.intermediary"
+
+DATETIME_FORMAT_HTTP = "%a, %d %b %Y %H:%M:%S %Z"
diff --git a/meta/model/fabric.py b/meta/model/fabric.py
index cd326e54c2..3ae557bf85 100644
--- a/meta/model/fabric.py
+++ b/meta/model/fabric.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Optional, List, Union, Dict
+from typing import Optional, List, Union
 
 from pydantic import Field
 
diff --git a/meta/model/forge.py b/meta/model/forge.py
index 6290cc8dff..35af76b3ad 100644
--- a/meta/model/forge.py
+++ b/meta/model/forge.py
@@ -12,17 +12,17 @@ class ForgeFile(MetaBase):
     hash: str
     extension: str
 
-    def filename(self, longversion):
-        return "%s-%s-%s.%s" % ("forge", longversion, self.classifier, self.extension)
+    def filename(self, long_version):
+        return "%s-%s-%s.%s" % ("forge", long_version, self.classifier, self.extension)
 
-    def url(self, longversion):
+    def url(self, long_version):
         return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/%s/%s" % (
-            longversion, self.filename(longversion))
+            long_version, self.filename(long_version))
 
 
 class ForgeEntry(MetaBase):
-    longversion: str
-    mcversion: str
+    long_version: str = Field(alias="longversion")
+    mc_version: str = Field(alias="mcversion")
     version: str
     build: int
     branch: Optional[str]
@@ -39,7 +39,7 @@ class ForgeMCVersionInfo(MetaBase):
 
 class DerivedForgeIndex(MetaBase):
     versions: Dict[str, ForgeEntry] = Field({})
-    by_mcversion: Dict[str, ForgeMCVersionInfo] = Field({})
+    by_mc_version: Dict[str, ForgeMCVersionInfo] = Field({}, alias="by_mcversion")
 
 
 class FMLLib(MetaBase):  # old ugly stuff. Maybe merge this with Library or MojangLibrary later
@@ -74,29 +74,29 @@ class ForgeInstallerProfileInstallSection(MetaBase):
         "modList":"none"
     },
     """
-    profileName: str
+    profile_name: str = Field(alias="profileName")
     target: str
     path: GradleSpecifier
     version: str
-    filePath: str
+    file_path: str = Field(alias="filePath")
     welcome: str
     minecraft: str
     logo: str
-    mirrorList: str
-    modList: Optional[str]
+    mirror_list: str = Field(alias="mirrorList")
+    mod_list: Optional[str] = Field(alias="modList")
 
 
 class ForgeLibrary(MojangLibrary):
     url: Optional[str]
-    serverreq: Optional[bool]
-    clientreq: Optional[bool]
+    server_req: Optional[bool] = Field(alias="serverreq")
+    client_req: Optional[bool] = Field(alias="clientreq")
     checksums: Optional[List[str]]
     comment: Optional[str]
 
 
 class ForgeVersionFile(MojangVersion):
     libraries: Optional[List[ForgeLibrary]]  # overrides Mojang libraries
-    inheritsFrom: Optional[str]
+    inherits_from: Optional[str] = Field("inheritsFrom")
     jar: Optional[str]
 
 
@@ -129,12 +129,12 @@ class ForgeOptional(MetaBase):
 
 class ForgeInstallerProfile(MetaBase):
     install: ForgeInstallerProfileInstallSection
-    versionInfo: ForgeVersionFile
+    version_info: ForgeVersionFile = Field(alias="versionInfo")
     optionals: Optional[List[ForgeOptional]]
 
 
 class ForgeLegacyInfo(MetaBase):
-    releaseTime: Optional[datetime]
+    release_time: Optional[datetime] = Field(alias="releaseTime")
     size: Optional[int]
     sha256: Optional[str]
     sha1: Optional[str]
@@ -171,8 +171,8 @@ class ForgeInstallerProfileV2(MetaBase):
     data: Optional[Dict[str, DataSpec]]
     processors: Optional[List[ProcessorSpec]]
     libraries: Optional[List[MojangLibrary]]
-    mirrorList: Optional[str]
-    serverJarPath: Optional[str]
+    mirror_list: Optional[str] = Field(alias="mirrorList")
+    server_jar_path: Optional[str] = Field(alias="serverJarPath")
 
 
 class InstallerInfo(MetaBase):
@@ -181,83 +181,28 @@ class InstallerInfo(MetaBase):
     size: Optional[int]
 
 
-def fml_libs_for_version(mc_version: str) -> List[FMLLib]:
-    argo_2_25 = FMLLib(filename="argo-2.25.jar",
-                       checksum="bb672829fde76cb163004752b86b0484bd0a7f4b",
-                       ours=False)
-    argo_small_3_2 = FMLLib(filename="argo-small-3.2.jar",
-                            checksum="58912ea2858d168c50781f956fa5b59f0f7c6b51",
-                            ours=False)
-    guava_12_0_1 = FMLLib(filename="guava-12.0.1.jar",
-                          checksum="b8e78b9af7bf45900e14c6f958486b6ca682195f",
-                          ours=False)
-    guava_14_0_rc3 = FMLLib(filename="guava-14.0-rc3.jar",
-                            checksum="931ae21fa8014c3ce686aaa621eae565fefb1a6a",
-                            ours=False)
-    asm_all_4_0 = FMLLib(filename="asm-all-4.0.jar",
-                         checksum="98308890597acb64047f7e896638e0d98753ae82",
-                         ours=False)
-    asm_all_4_1 = FMLLib(filename="asm-all-4.1.jar",
-                         checksum="054986e962b88d8660ae4566475658469595ef58",
-                         ours=False)
-    bcprov_jdk15on_147 = FMLLib(filename="bcprov-jdk15on-147.jar",
-                                checksum="b6f5d9926b0afbde9f4dbe3db88c5247be7794bb",
-                                ours=False)
-    bcprov_jdk15on_148 = FMLLib(filename="bcprov-jdk15on-148.jar",
-                                checksum="960dea7c9181ba0b17e8bab0c06a43f0a5f04e65",
-                                ours=True)
-    scala_library = FMLLib(filename="scala-library.jar",
-                           checksum="458d046151ad179c85429ed7420ffb1eaf6ddf85",
-                           ours=True)
-
-    deobfuscation_data_1_5 = FMLLib(filename="deobfuscation_data_1.5.zip",
-                                    checksum="5f7c142d53776f16304c0bbe10542014abad6af8",
-                                    ours=False)
-
-    deobfuscation_data_1_5_1 = FMLLib(filename="deobfuscation_data_1.5.1.zip",
-                                      checksum="22e221a0d89516c1f721d6cab056a7e37471d0a6",
-                                      ours=False)
-    deobfuscation_data_1_5_2 = FMLLib(filename="deobfuscation_data_1.5.2.zip",
-                                      checksum="446e55cd986582c70fcf12cb27bc00114c5adfd9",
-                                      ours=False)
-    if mc_version == "1.3.2":
-        return [argo_2_25, guava_12_0_1, asm_all_4_0]
-    elif mc_version in ["1.4", "1.4.1", "1.4.2", "1.4.3", "1.4.4", "1.4.5", "1.4.6", "1.4.7"]:
-        return [argo_2_25, guava_12_0_1, asm_all_4_0, bcprov_jdk15on_147]
-    elif mc_version == "1.5":
-        return [argo_small_3_2, guava_14_0_rc3, asm_all_4_1, bcprov_jdk15on_148, deobfuscation_data_1_5,
-                scala_library]
-    elif mc_version == "1.5.1":
-        return [argo_small_3_2, guava_14_0_rc3, asm_all_4_1, bcprov_jdk15on_148, deobfuscation_data_1_5_1,
-                scala_library]
-    elif mc_version == "1.5.2":
-        return [argo_small_3_2, guava_14_0_rc3, asm_all_4_1, bcprov_jdk15on_148, deobfuscation_data_1_5_2,
-                scala_library]
-    return []
-
-
 # A post-processed entry constructed from the reconstructed Forge version index
 class ForgeVersion:
     def __init__(self, entry: ForgeEntry):
         self.build = entry.build
         self.rawVersion = entry.version
-        self.mcversion = entry.mcversion
-        self.mcversion_sane = self.mcversion.replace("_pre", "-pre", 1)
+        self.mc_version = entry.mc_version
+        self.mc_version_sane = self.mc_version.replace("_pre", "-pre", 1)
         self.branch = entry.branch
         self.installer_filename = None
         self.installer_url = None
         self.universal_filename = None
         self.universal_url = None
         self.changelog_url = None
-        self.longVersion = "%s-%s" % (self.mcversion, self.rawVersion)
+        self.long_version = "%s-%s" % (self.mc_version, self.rawVersion)
         if self.branch is not None:
-            self.longVersion = self.longVersion + "-%s" % self.branch
+            self.long_version = self.long_version + "-%s" % self.branch
 
         # this comment's whole purpose is to say this: cringe
         for classifier, file in entry.files.items():
             extension = file.extension
-            filename = file.filename(self.longVersion)
-            url = file.url(self.longVersion)
+            filename = file.filename(self.long_version)
+            url = file.url(self.long_version)
             if (classifier == "installer") and (extension == "jar"):
                 self.installer_filename = filename
                 self.installer_url = url
@@ -273,7 +218,7 @@ class ForgeVersion:
     def uses_installer(self):
         if self.installer_url is None:
             return False
-        if self.mcversion == "1.5.2":
+        if self.mc_version == "1.5.2":
             return False
         return True
 
@@ -304,3 +249,58 @@ class ForgeVersion:
         #    return False
 
         return True
+
+
+def fml_libs_for_version(mc_version: str) -> List[FMLLib]:
+    argo_2_25 = FMLLib(filename="argo-2.25.jar",
+                       checksum="bb672829fde76cb163004752b86b0484bd0a7f4b",
+                       ours=False)
+    argo_small_3_2 = FMLLib(filename="argo-small-3.2.jar",
+                            checksum="58912ea2858d168c50781f956fa5b59f0f7c6b51",
+                            ours=False)
+    guava_12_0_1 = FMLLib(filename="guava-12.0.1.jar",
+                          checksum="b8e78b9af7bf45900e14c6f958486b6ca682195f",
+                          ours=False)
+    guava_14_0_rc3 = FMLLib(filename="guava-14.0-rc3.jar",
+                            checksum="931ae21fa8014c3ce686aaa621eae565fefb1a6a",
+                            ours=False)
+    asm_all_4_0 = FMLLib(filename="asm-all-4.0.jar",
+                         checksum="98308890597acb64047f7e896638e0d98753ae82",
+                         ours=False)
+    asm_all_4_1 = FMLLib(filename="asm-all-4.1.jar",
+                         checksum="054986e962b88d8660ae4566475658469595ef58",
+                         ours=False)
+    bcprov_jdk15on_147 = FMLLib(filename="bcprov-jdk15on-147.jar",
+                                checksum="b6f5d9926b0afbde9f4dbe3db88c5247be7794bb",
+                                ours=False)
+    bcprov_jdk15on_148 = FMLLib(filename="bcprov-jdk15on-148.jar",
+                                checksum="960dea7c9181ba0b17e8bab0c06a43f0a5f04e65",
+                                ours=True)
+    scala_library = FMLLib(filename="scala-library.jar",
+                           checksum="458d046151ad179c85429ed7420ffb1eaf6ddf85",
+                           ours=True)
+
+    deobfuscation_data_1_5 = FMLLib(filename="deobfuscation_data_1.5.zip",
+                                    checksum="5f7c142d53776f16304c0bbe10542014abad6af8",
+                                    ours=False)
+
+    deobfuscation_data_1_5_1 = FMLLib(filename="deobfuscation_data_1.5.1.zip",
+                                      checksum="22e221a0d89516c1f721d6cab056a7e37471d0a6",
+                                      ours=False)
+    deobfuscation_data_1_5_2 = FMLLib(filename="deobfuscation_data_1.5.2.zip",
+                                      checksum="446e55cd986582c70fcf12cb27bc00114c5adfd9",
+                                      ours=False)
+    if mc_version == "1.3.2":
+        return [argo_2_25, guava_12_0_1, asm_all_4_0]
+    elif mc_version in ["1.4", "1.4.1", "1.4.2", "1.4.3", "1.4.4", "1.4.5", "1.4.6", "1.4.7"]:
+        return [argo_2_25, guava_12_0_1, asm_all_4_0, bcprov_jdk15on_147]
+    elif mc_version == "1.5":
+        return [argo_small_3_2, guava_14_0_rc3, asm_all_4_1, bcprov_jdk15on_148, deobfuscation_data_1_5,
+                scala_library]
+    elif mc_version == "1.5.1":
+        return [argo_small_3_2, guava_14_0_rc3, asm_all_4_1, bcprov_jdk15on_148, deobfuscation_data_1_5_1,
+                scala_library]
+    elif mc_version == "1.5.2":
+        return [argo_small_3_2, guava_14_0_rc3, asm_all_4_1, bcprov_jdk15on_148, deobfuscation_data_1_5_2,
+                scala_library]
+    return []
diff --git a/meta/model/mojang.py b/meta/model/mojang.py
index 0df4cbcfc0..e5ea072acd 100644
--- a/meta/model/mojang.py
+++ b/meta/model/mojang.py
@@ -156,7 +156,7 @@ class MojangVersion(MetaBase):
     release_time: Optional[datetime] = Field(alias="releaseTime")
     time: Optional[datetime]
     type: Optional[str]
-    inheritsFrom: Optional[str]
+    inherits_from: Optional[str] = Field("inheritsFrom")
     logging: Optional[Dict[str, MojangLogging]]  # TODO improve this?
     compliance_level: Optional[int] = Field(alias="complianceLevel")
     javaVersion: Optional[JavaVersion]