diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-17 22:21:38 +0200 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-17 22:21:38 +0200 |
| commit | ca4fb33fde501d4c52af123c7b2bf25b37bd645c (patch) | |
| tree | 52bd03882ac40dc6b2a1aec7a28783f23150b325 | |
| parent | 4b91458b0a0849a48efc8a25db51297b4bba3804 (diff) | |
| download | Project-Tick-ca4fb33fde501d4c52af123c7b2bf25b37bd645c.tar.gz Project-Tick-ca4fb33fde501d4c52af123c7b2bf25b37bd645c.zip | |
fix: use same ForgeWrapper for both Forge and NeoForge
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
| -rw-r--r-- | generateNeoForge.py | 2 | ||||
| -rw-r--r-- | meta/common/forge.py | 6 | ||||
| -rw-r--r-- | meta/common/neoforge.py | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/generateNeoForge.py b/generateNeoForge.py index 0220ca739d..31df89a2cd 100644 --- a/generateNeoForge.py +++ b/generateNeoForge.py @@ -11,8 +11,8 @@ from meta.common.neoforge import ( VERSION_MANIFEST_DIR, DERIVED_INDEX_FILE, INSTALLER_INFO_DIR, - FORGEWRAPPER_LIBRARY, ) +from meta.common.forge import FORGEWRAPPER_LIBRARY from meta.common.mojang import MINECRAFT_COMPONENT from meta.model import ( MetaVersion, diff --git a/meta/common/forge.py b/meta/common/forge.py index d8828036bd..4a8afbe06f 100644 --- a/meta/common/forge.py +++ b/meta/common/forge.py @@ -16,8 +16,8 @@ STATIC_LEGACYINFO_FILE = join(BASE_DIR, "forge-legacyinfo.json") FORGE_COMPONENT = "net.minecraftforge" FORGEWRAPPER_LIBRARY = make_launcher_library( - GradleSpecifier("io.github.zekerzhayard", "ForgeWrapper", "mmc2"), - "4ee5f25cc9c7efbf54aff4c695da1054c1a1d7a3", - 34444, + GradleSpecifier("io.github.zekerzhayard", "ForgeWrapper", "1.5.6-prism"), + "b059aa8c4d2508055c6ed2a2561923a5e670a5eb", + 34860, ) BAD_VERSIONS = ["1.12.2-14.23.5.2851"] diff --git a/meta/common/neoforge.py b/meta/common/neoforge.py index 3af76b9a21..83f4890e97 100644 --- a/meta/common/neoforge.py +++ b/meta/common/neoforge.py @@ -12,9 +12,3 @@ FILE_MANIFEST_DIR = join(BASE_DIR, "files_manifests") DERIVED_INDEX_FILE = join(BASE_DIR, "derived_index.json") NEOFORGE_COMPONENT = "net.neoforged" - -FORGEWRAPPER_LIBRARY = make_launcher_library( - GradleSpecifier("io.github.zekerzhayard", "ForgeWrapper", "1.5.6-prism"), - "b059aa8c4d2508055c6ed2a2561923a5e670a5eb", - 34860, -) |