Skip to content

Commit 8dd23c9

Browse files
thecatcorethecatcore
committed
woops, it works better this way
1 parent 25b878b commit 8dd23c9

File tree

3 files changed

+23
-74
lines changed

3 files changed

+23
-74
lines changed

‎generate.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
loader: str = "0.14.21"
66
legacy_fixes: str = "legacy-fixes-1.0.0.jar"
77
lwjgl3: str = "3.1.6"
8-
lwjgl2: str = "2.9.4+legacyfabric.5"
8+
lwjgl2: str = "2.9.4-nightly-20150209"
9+
lwjgl2_patch: str = "2.9.4+legacyfabric.5"
910

1011

1112
def mkdir_if_not_exists(path: str):
@@ -14,16 +15,18 @@ def mkdir_if_not_exists(path: str):
1415

1516

1617
class Generator:
17-
def __init__(self, loader_version: str, minecraft_version: str, lwjgl_version: str, path: str = "temp"):
18+
def __init__(self, loader_version: str, minecraft_version: str, lwjgl_version: str, lwjgl_patch: str, path: str = "temp"):
1819
self.lwjgl_version: str = lwjgl_version
1920
self.minecraft_version: str = minecraft_version
2021
self.loader_version: str = loader_version
22+
self.lwjgl_patch: str = lwjgl_patch
2123
self.path: str = path
2224

2325
def process(self, subject: str) -> str:
2426
subject = subject.replace("${loader_version}", self.loader_version)
2527
subject = subject.replace("${minecraft_version}", self.minecraft_version)
2628
subject = subject.replace("${lwjgl_version}", self.lwjgl_version)
29+
subject = subject.replace("${lwjgl_patch}", self.lwjgl_patch)
2730
subject = subject.replace("${lwjgl_name}",
2831
"LWJGL 3" if self.lwjgl_version.startswith(
2932
"3") else "LWJGL 2")
@@ -80,7 +83,7 @@ def create_zip(self):
8083

8184
if not self.lwjgl_version.startswith("3"):
8285
z.write("temp/patches/org.lwjgl.lwjgl.json",
83-
"patches/org.lwjgl.lwjgl.json")
86+
"patches/org.lwjgl.json")
8487

8588
if self.minecraft_version == "1.8.9" or self.minecraft_version == "1.7.10" or self.minecraft_version == "1.6.4" or self.minecraft_version == "1.5.2" or self.minecraft_version == "1.4.7" or self.minecraft_version == "1.3.2":
8689
z.write(f"temp/.minecraft/mods/{legacy_fixes}", f".minecraft/mods/{legacy_fixes}")
@@ -115,8 +118,9 @@ def cleanup(self):
115118
mkdir_if_not_exists("out")
116119
for version, lwjgl in versions:
117120
lwjgl_version = lwjgl3 if lwjgl == 3 else lwjgl2
118-
print(f"generating {version} with LWJGL {lwjgl_version}...")
119-
g = Generator(loader, version, lwjgl_version)
121+
lwjgl_patch = lwjgl3 if lwjgl == 3 else lwjgl2_patch
122+
print(f"generating {version} with LWJGL {lwjgl_patch}...")
123+
g = Generator(loader, version, lwjgl_version, lwjgl_patch)
120124
g.prepare_skeleton()
121125
g.create_zip()
122126

‎skel/mmc-pack.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"components": [
33
{
44
"cachedName": "${lwjgl_name}",
5-
"cachedVersion": "${lwjgl_version}",
5+
"cachedVersion": "${lwjgl_patch}",
66
"cachedVolatile": true,
77
"dependencyOnly": true,
88
"uid": "${lwjgl_uid}",
@@ -12,7 +12,6 @@
1212
"cachedName": "Minecraft",
1313
"cachedRequires": [
1414
{
15-
"equals": "${lwjgl_version}",
1615
"suggests": "${lwjgl_version}",
1716
"uid": "${lwjgl_uid}"
1817
}

‎skel/patches/org.lwjgl.lwjgl.json

+13-67
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
2-
"conflicts": [
3-
{
4-
"uid": "org.lwjgl3"
5-
}
6-
],
72
"formatVersion": 1,
8-
"+libraries": [
3+
"libraries": [
94
{
105
"downloads": {
116
"classifiers": {
@@ -77,83 +72,34 @@
7772
"name": "net.java.jutils:jutils:1.0.0"
7873
},
7974
{
80-
"downloads": {
81-
"artifact": {
82-
"sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
83-
"size": 22,
84-
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
85-
},
86-
"classifiers": {
87-
"natives-linux": {
88-
"sha1": "db2772377839a443f7652d11f978f33f52f5cde4",
89-
"size": 1222833,
90-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4+legacyfabric.5/lwjgl-platform-2.9.4+legacyfabric.5-natives-linux.jar"
91-
},
92-
"natives-linux-arm32": {
93-
"sha1": "db2772377839a443f7652d11f978f33f52f5cde4",
94-
"size": 1222833,
95-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4+legacyfabric.5/lwjgl-platform-2.9.4+legacyfabric.5-natives-linux.jar"
96-
},
97-
"natives-linux-arm64": {
98-
"sha1": "db2772377839a443f7652d11f978f33f52f5cde4",
99-
"size": 1222833,
100-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4+legacyfabric.5/lwjgl-platform-2.9.4+legacyfabric.5-natives-linux.jar"
101-
},
102-
"natives-osx": {
103-
"sha1": "46eec11c8d523ca839b1cca78282f1b2ae8ade03",
104-
"size": 506793,
105-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4+legacyfabric.5/lwjgl-platform-2.9.4+legacyfabric.5-natives-osx.jar"
106-
},
107-
"natives-osx-arm64": {
108-
"sha1": "46eec11c8d523ca839b1cca78282f1b2ae8ade03",
109-
"size": 506793,
110-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4+legacyfabric.5/lwjgl-platform-2.9.4+legacyfabric.5-natives-osx.jar"
111-
},
112-
"natives-windows": {
113-
"sha1": "afc977245f65fa3c0784a6cf0a3ce76a6fb89036",
114-
"size": 790272,
115-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4+legacyfabric.5/lwjgl-platform-2.9.4+legacyfabric.5-natives-windows.jar"
116-
}
117-
}
118-
},
11975
"extract": {
12076
"exclude": [
12177
"META-INF/"
12278
]
12379
},
124-
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4+legacyfabric.5",
80+
"name": "org.lwjgl.lwjgl:lwjgl-platform:${lwjgl_patch}",
81+
"url": "https://maven.legacyfabric.net/",
12582
"natives": {
12683
"linux": "natives-linux",
127-
"linux-arm32": "natives-linux-arm32",
128-
"linux-arm64": "natives-linux-arm64",
84+
"linux-arm32": "natives-linux",
85+
"linux-arm64": "natives-linux",
12986
"osx": "natives-osx",
130-
"osx-arm64": "natives-osx-arm64",
87+
"osx-arm64": "natives-osx",
13188
"windows": "natives-windows"
13289
}
13390
},
13491
{
135-
"downloads": {
136-
"artifact": {
137-
"sha1": "5798a05cfe50960621a8838b55eb8cff5fa6a907",
138-
"size": 1080231,
139-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl/2.9.4+legacyfabric.5/lwjgl-2.9.4+legacyfabric.5.jar"
140-
}
141-
},
142-
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4+legacyfabric.5"
92+
"name": "org.lwjgl.lwjgl:lwjgl:${lwjgl_patch}",
93+
"url": "https://maven.legacyfabric.net/"
14394
},
14495
{
145-
"downloads": {
146-
"artifact": {
147-
"sha1": "83ea583644bb707e195e13077006f8b443575d47",
148-
"size": 180574,
149-
"url": "https://maven.legacyfabric.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4+legacyfabric.5/lwjgl_util-2.9.4+legacyfabric.5.jar"
150-
}
151-
},
152-
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4+legacyfabric.5"
96+
"name": "org.lwjgl.lwjgl:lwjgl_util:${lwjgl_patch}",
97+
"url": "https://maven.legacyfabric.net/"
15398
}
15499
],
155100
"name": "LWJGL 2",
101+
"type": "release",
156102
"uid": "org.lwjgl",
157-
"version": "2.9.4+legacyfabric.5",
158-
"releaseTime":"2023-06-20T07:55:11.567-07:00"
103+
"version": "${lwjgl_patch}",
104+
"volatile": true
159105
}

0 commit comments

Comments
 (0)