AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-11 16:36:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

improve mappings generator performance

Browse Source
This commit is contained in:
Bixilon 2021-01-06 18:45:43 +01:00
parent 1924e8d69b
commit 895715488c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/bixilon/minosoft/util/Util.java
View File

@ -265,8 +265,9 @@ public final class Util {
output.close(); output.close();
} }
public static BufferedInputStream getInputStreamByURL(String url) throws IOException { public static InputStream getInputStreamByURL(String url) throws IOException {
return new BufferedInputStream(new URL(url).openStream()); return new URL(url).openConnection().getInputStream();
// return new BufferedInputStream(new URL(url).openStream());
} }
public static ThreadFactory getThreadFactory(String threadName) { public static ThreadFactory getThreadFactory(String threadName) {

12
util/version_mappings_generator.py
View File

@ -16,6 +16,7 @@ import shutil
import subprocess import subprocess
import tarfile import tarfile
import traceback import traceback
import urllib.request
import requests import requests
import ujson import ujson
@ -30,7 +31,7 @@ FILES_PER_VERSION = ["blocks.json", "registries.json", "block_models.json"] + OP
DOWNLOAD_BASE_URL = "https://apimon.de/mcdata/" DOWNLOAD_BASE_URL = "https://apimon.de/mcdata/"
RESOURCE_MAPPINGS_INDEX = ujson.load(open("../src/main/resources/assets/mapping/resources.json")) RESOURCE_MAPPINGS_INDEX = ujson.load(open("../src/main/resources/assets/mapping/resources.json"))
MOJANG_MINOSOFT_FIELD_MAPPINGS = ujson.load(open("entitiesFieldMojangMinosoftMappings.json")) MOJANG_MINOSOFT_FIELD_MAPPINGS = ujson.load(open("entitiesFieldMojangMinosoftMappings.json"))
VERSION_MANIFEST = requests.get('https://launchermeta.mojang.com/mc/game/version_manifest.json').json() VERSION_MANIFEST = ujson.loads(urllib.request.urlopen('https://launchermeta.mojang.com/mc/game/version_manifest.json').read().decode("utf-8"))
VERBOSE_LOG = False VERBOSE_LOG = False
DEFAULT_MAPPINGS = ujson.load(open("mappingsDefaults.json")) DEFAULT_MAPPINGS = ujson.load(open("mappingsDefaults.json"))
failedVersionIds = [] failedVersionIds = []
@ -135,6 +136,7 @@ if not os.path.isdir(TEMP_FOLDER):
def generateJarAssets(versionId): def generateJarAssets(versionId):
print("Generating jar asset hash: %s" % versionId)
generateProcess = "" generateProcess = ""
try: try:
generateProcess = subprocess.run(r'mvn exec:java -Dexec.mainClass="de.bixilon.minosoft.generator.JarHashGenerator" -Dexec.args="%s"' % versionId, cwd=r'../', shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) generateProcess = subprocess.run(r'mvn exec:java -Dexec.mainClass="de.bixilon.minosoft.generator.JarHashGenerator" -Dexec.args="%s"' % versionId, cwd=r'../', shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -180,9 +182,11 @@ for version in VERSION_MANIFEST["versions"]:
if not os.path.isdir(versionTempBaseFolder): if not os.path.isdir(versionTempBaseFolder):
os.mkdir(versionTempBaseFolder) os.mkdir(versionTempBaseFolder)
versionJson = requests.get(version["url"]).json() print("DEBUG: Downloading versions json...")
versionJson = ujson.loads(urllib.request.urlopen(version["url"]).read().decode("utf-8"))
burger = requests.get("https://pokechu22.github.io/Burger/%s.json" % version["id"]).json()[0] print("DEBUG: Downloading burger data")
burger = ujson.loads(urllib.request.urlopen("https://pokechu22.github.io/Burger/%s.json" % version["id"]).read().decode("utf-8"))[0]
for fileName in FILES_PER_VERSION: for fileName in FILES_PER_VERSION:
if os.path.isfile(versionTempBaseFolder + fileName): if os.path.isfile(versionTempBaseFolder + fileName):
@ -223,7 +227,7 @@ for version in VERSION_MANIFEST["versions"]:
print("WARN: Can not generate entities.json for %s (missing deobfuscation map)" % version["id"]) print("WARN: Can not generate entities.json for %s (missing deobfuscation map)" % version["id"])
continue continue
# download obfuscation map ToDo: make this much more efficient (aka no line looping, parsing!) # download obfuscation map ToDo: make this much more efficient (aka no line looping, parsing!)
obfuscationMapLines = requests.get(versionJson["downloads"]["client_mappings"]["url"]).content.decode("utf-8").splitlines() obfuscationMapLines = urllib.request.urlopen(versionJson["downloads"]["client_mappings"]["url"]).read().decode("utf-8").splitlines()
# entities # entities
entities = {} entities = {}