From b7de0f63aebe6b8dc6fc39b1b92e183d4385a334 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 5 Feb 2021 18:04:39 +0000 Subject: [PATCH] Java 15/16 support (#44) --- gradle.properties | 2 +- .../asm/mixin/MixinEnvironment.java | 28 ++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ab622968..b8e3a4f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ organization=FabricMC buildVersion=0.8.3 upstreamMixinVersion=0.8.2 buildType=RELEASE -asmVersion=7.2 +asmVersion=9.0 legacyForgeAsmVersion=5.0.3 modlauncherAsmVersion=7.2 modlauncherVersion=7.0.0 \ No newline at end of file diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 2dbe3f0d..8ecb135e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -693,7 +693,33 @@ public final class MixinEnvironment implements ITokenProvider { return JavaVersion.current() >= 14.0; } - }; + }, + + /** + * Java 16 and above + */ + JAVA_15(15, Opcodes.V15, LanguageFeature.METHODS_IN_INTERFACES | LanguageFeature.PRIVATE_METHODS_IN_INTERFACES + | LanguageFeature.NESTING | LanguageFeature.DYNAMIC_CONSTANTS) { + + @Override + boolean isSupported() { + return JavaVersion.current() >= 15.0; + } + + }, + + /** + * Java 16 and above + */ + JAVA_16(16, Opcodes.V16, LanguageFeature.METHODS_IN_INTERFACES | LanguageFeature.PRIVATE_METHODS_IN_INTERFACES + | LanguageFeature.NESTING | LanguageFeature.DYNAMIC_CONSTANTS) { + + @Override + boolean isSupported() { + return JavaVersion.current() >= 16.0; + } + + }; /** * Bitmask values for language features supported