summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-04-04 20:49:27 +0200
committerGitHub <noreply@github.com>2022-04-04 20:49:27 +0200
commit0731956adc560616fcbe8ea24d6dc3a49e3ad0c6 (patch)
tree67df62ad89fd47200047c5bba5911bd9d256f04c
parent3b5304a70769a556637088fd330b420af1a4db83 (diff)
parent2d395660c293a6319ab253598279b735ed75f550 (diff)
downloadProject-Tick-0731956adc560616fcbe8ea24d6dc3a49e3ad0c6.tar.gz
Project-Tick-0731956adc560616fcbe8ea24d6dc3a49e3ad0c6.zip
Merge pull request #7 from Scrumplex/handle-incompatible-java
-rw-r--r--metautil.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/metautil.py b/metautil.py
index 8666e98acb..95fa4a7590 100644
--- a/metautil.py
+++ b/metautil.py
@@ -302,6 +302,7 @@ class PolyMCVersionFile(VersionedJsonObject):
minecraftArguments = StringProperty(exclude_if_none=True, default=None)
releaseTime = ISOTimestampProperty(exclude_if_none=True, default=None)
type = StringProperty(exclude_if_none=True, default=None)
+ compatibleJavaMajors = ListProperty(int, exclude_if_none=True, default=None)
addTraits = ListProperty(StringProperty, name="+traits", exclude_if_none=True, default=None)
addTweakers = ListProperty(StringProperty, name="+tweakers", exclude_if_none=True, default=None)
order = IntegerProperty(exclude_if_none=True, default=None)
@@ -349,6 +350,13 @@ def MojangToPolyMC(file, name, uid, version):
pmcFile.releaseTime = file.releaseTime
# time should not be set.
pmcFile.type = file.type
+
+ if file.javaVersion is not None: # some versions don't have this. TODO: maybe maintain manual overrides
+ major = file.javaVersion.majorVersion
+ pmcFile.compatibleJavaMajors = [major]
+ if major == 16: # TODO: deal with this somewhere else
+ pmcFile.compatibleJavaMajors.append(17)
+
maxSupportedLevel = 1
if file.complianceLevel:
if file.complianceLevel == 0: