bump exhibitionism, fix some bugs with versions with a space in their name

This commit is contained in:
Bixilon 2021-05-01 00:40:16 +02:00
parent bec7f833b0
commit 745e4ca9d6
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 5 additions and 4 deletions

View File

@ -81,4 +81,5 @@ I'd be happy. Just make a PR and ensure, it is working for most versions (And pl
- [yarn](https://github.com/FabricMC/yarn)
- [objenesis](https://github.com/easymock/objenesis)
- [Kotlin](https://kotlinlang.org/)
- [Exhibitionism](https://github.com/HeartPattern/Exhibitionism)
- [ujson](https://pypi.org/project/ujson/)

View File

@ -11,7 +11,7 @@ import ujson
# ToDo: "19w11b", "19w11a", "19w09a", "19w08b", "19w08a", "19w07a", "19w06a", "19w05a", "19w04b", "19w04a", "19w03c", "19w03b", "19w03a", "19w02a", "18w50a", "18w49a", "18w48b" "18w48a", "18w47b", "18w47a", "18w46a", "18w45a", "18w44a", "18w43c", "18w43b"
DOWNLOAD_UNTIL_VERSION = "18w43b"
SKIP_VERSIONS = []
SKIP_VERSIONS = ["1.14.2 Pre-Release 1"]
HASH_FOLDER = os.path.abspath("data/hash/") + "/"
ASSETS_HASH_INDEX_FILE = os.path.abspath("data/index")
@ -91,7 +91,7 @@ def getVersionJson(versionEntry):
def checkFile(filename, url, versionId):
if not os.path.isfile(filename):
print("Downloading %s for %s" % (filename, versionId))
urllib.request.urlretrieve(url, filename + ".tmp")
urllib.request.urlretrieve(url.replace(" ", "%20"), filename + ".tmp")
os.rename(filename + ".tmp", filename)
@ -171,7 +171,7 @@ def checkDeobfuscatedClientJar(jarBasePath, version, versionJson):
if not os.path.isfile("exhibitionism.jar"):
raise Exception("Can not find exhibitionism.jar!")
runAndWait("java -cp \"./wrapper/exhibitionism.jar\" kr.heartpattern.exhibitionism.AppKt --input %s --output %s --parallel 10000" % (yarnJarPath, exhibitionismJarPath + ".tmp"))
runAndWait("java -cp \"./wrapper/exhibitionism.jar\" kr.heartpattern.exhibitionism.AppKt --input \"%s\" --output \"%s\" --parallel 8" % (yarnJarPath, exhibitionismJarPath + ".tmp"))
os.rename(exhibitionismJarPath + ".tmp", exhibitionismJarPath)
os.remove(yarnJarPath)
@ -204,7 +204,7 @@ def compilePixLyzer():
print("PixLyzer is now compiled")
print("Checking libraries")
print("Checking libraries...")
checkFile(filename=TINY_REMAPPER_PATH, url=TINY_REMAPPER_DOWNLOAD_PATH, versionId="libraries")
checkFile(filename=OBJENSIS_PATH, url=OBJENSIS_DOWNLOAD_PATH, versionId="libraries")

Binary file not shown.