summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorDioEgizio <83089242+DioEgizio@users.noreply.github.com>2025-12-09 21:09:33 +0100
committerDioEgizio <83089242+DioEgizio@users.noreply.github.com>2025-12-09 21:09:33 +0100
commit064c55aedd6ccf99e510614fc083c021e4e03c1a (patch)
tree7bae1beda0346d4bb12e8a247ea74901da69ce85 /meta
parent94a2ce0d61498dec6e284bf1b242093c9858450f (diff)
downloadProject-Tick-064c55aedd6ccf99e510614fc083c021e4e03c1a.tar.gz
Project-Tick-064c55aedd6ccf99e510614fc083c021e4e03c1a.zip
Revert "feat: add workarounds for unobfuscated versions"
completely unnecessary as fabric fixed their unobfuscated versions This reverts commit 9d751238a566464df8a184755718bf1ac2f485e4.
Diffstat (limited to 'meta')
-rw-r--r--meta/common/fabric.py7
-rw-r--r--meta/model/fabric.py4
-rwxr-xr-xmeta/run/generate_fabric.py9
-rwxr-xr-xmeta/run/update_fabric.py28
4 files changed, 11 insertions, 37 deletions
diff --git a/meta/common/fabric.py b/meta/common/fabric.py
index 667c38482f..2a35695cf1 100644
--- a/meta/common/fabric.py
+++ b/meta/common/fabric.py
@@ -10,10 +10,3 @@ LOADER_COMPONENT = "net.fabricmc.fabric-loader"
INTERMEDIARY_COMPONENT = "net.fabricmc.intermediary"
DATETIME_FORMAT_HTTP = "%a, %d %b %Y %H:%M:%S %Z"
-
-# version -> releaseTime
-BROKEN_INTERMEDIARIES = {
- "1.21.11-pre1_unobfuscated": "2025-11-19T11:03:07+00:00" # releaseTime of 1.21.11 intermediary
-}
-EARLY_UNOBFUSCATED_SUFFIX = "_unobfuscated"
-NOOP_INTERMEDIARY_VERSION = "net.fabricmc:intermediary:0.0.0"
diff --git a/meta/model/fabric.py b/meta/model/fabric.py
index 7acd7c8756..5cb0e9caab 100644
--- a/meta/model/fabric.py
+++ b/meta/model/fabric.py
@@ -6,10 +6,6 @@ from pydantic import Field
from . import Library, MetaBase
-EARLY_UNOBFUSCATED_SUFFIX = "_unobfuscated"
-NOOP_INTERMEDIARY_VERSION = "net.fabricmc:intermediary:0.0.0"
-
-
class FabricInstallerArguments(MetaBase):
client: Optional[List[str]]
common: Optional[List[str]]
diff --git a/meta/run/generate_fabric.py b/meta/run/generate_fabric.py
index 9d1f96263b..7ca50dd6aa 100755
--- a/meta/run/generate_fabric.py
+++ b/meta/run/generate_fabric.py
@@ -8,13 +8,11 @@ from meta.common import (
transform_maven_key,
)
from meta.common.fabric import (
- EARLY_UNOBFUSCATED_SUFFIX,
JARS_DIR,
INSTALLER_INFO_DIR,
META_DIR,
INTERMEDIARY_COMPONENT,
LOADER_COMPONENT,
- NOOP_INTERMEDIARY_VERSION,
)
from meta.model import MetaVersion, Dependency, Library, MetaPackage, GradleSpecifier
from meta.model.fabric import FabricJarInfo, FabricInstallerDataV1, FabricMainClasses
@@ -78,13 +76,8 @@ def process_intermediary_version(entry) -> MetaVersion:
v.type = "release"
v.libraries = []
v.volatile = True
-
- maven = entry["maven"]
- if EARLY_UNOBFUSCATED_SUFFIX in entry["version"]:
- maven = NOOP_INTERMEDIARY_VERSION
-
intermediary_lib = Library(
- name=GradleSpecifier.from_string(maven),
+ name=GradleSpecifier.from_string(entry["maven"]),
url="https://maven.fabricmc.net",
)
v.libraries.append(intermediary_lib)
diff --git a/meta/run/update_fabric.py b/meta/run/update_fabric.py
index 43a27e146c..e0c1d819c9 100755
--- a/meta/run/update_fabric.py
+++ b/meta/run/update_fabric.py
@@ -14,7 +14,6 @@ from meta.common import (
default_session,
)
from meta.common.fabric import (
- BROKEN_INTERMEDIARIES,
JARS_DIR,
INSTALLER_INFO_DIR,
META_DIR,
@@ -71,7 +70,7 @@ def get_binary_file(path, url):
f.write(chunk)
-def fetch_release_time(path, url):
+def compute_jar_file(path, url):
# These two approaches should result in the same metadata, except for the timestamp which might be a few minutes
# off for the fallback method
try:
@@ -92,25 +91,18 @@ def fetch_release_time(path, url):
if tstamp_new > tstamp:
tstamp = tstamp_new
- return tstamp
+ data = FabricJarInfo(release_time=tstamp)
+ data.write(path + ".json")
def compute_jar_file_concurrent(it):
- print(f"Processing {it['maven']} ")
- path = os.path.join(UPSTREAM_DIR, JARS_DIR, transform_maven_key(it["maven"]))
- tstamp = BROKEN_INTERMEDIARIES.get(it["version"])
- if not tstamp:
- jar_maven_url = get_maven_url(
- it["maven"], "https://maven.fabricmc.net/", ".jar"
- )
- tstamp = fetch_release_time(
- path,
- jar_maven_url,
- )
-
- data = FabricJarInfo(release_time=tstamp)
- data.write(f"{path}.json")
- print(f"Processing {it['maven']} Done")
+ print(f"Processing {it['version']} ")
+ jar_maven_url = get_maven_url(it["maven"], "https://maven.fabricmc.net/", ".jar")
+ compute_jar_file(
+ os.path.join(UPSTREAM_DIR, JARS_DIR, transform_maven_key(it["maven"])),
+ jar_maven_url,
+ )
+ print(f"Processing {it['version']} Done")
def get_json_file_concurrent(it):