diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index b7888c74..acd95e7a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -406,7 +406,7 @@ public final class MixinEnvironment implements ITokenProvider { /** * Default value for string properties */ - final String defaultStringValue; + final String defaultValue; /** * Whether this property is boolean or not @@ -445,7 +445,7 @@ public final class MixinEnvironment implements ITokenProvider { private Option(Option parent, String property, boolean flag, String defaultStringValue) { this.parent = parent; this.property = (parent != null ? parent.property : Option.PREFIX) + "." + property; - this.defaultStringValue = defaultStringValue; + this.defaultValue = defaultStringValue; this.flag = flag; int depth = 0; for (; parent != null; depth++) { @@ -480,7 +480,7 @@ public final class MixinEnvironment implements ITokenProvider { } String getStringValue() { - return (this.parent == null || this.parent.getBooleanValue()) ? System.getProperty(this.property) : this.defaultStringValue; + return (this.parent == null || this.parent.getBooleanValue()) ? System.getProperty(this.property, this.defaultValue) : this.defaultValue; } @SuppressWarnings("unchecked") diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java index 754b0d4a..fac67f44 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -828,6 +828,9 @@ public class MixinApplicatorStandard { private InitialiserInjectionMode getInitialiserInjectionMode(MixinEnvironment environment) { String strMode = environment.getOptionValue(Option.INITIALISER_INJECTION_MODE); + if (strMode == null) { + return InitialiserInjectionMode.DEFAULT; + } try { return InitialiserInjectionMode.valueOf(strMode.toUpperCase()); } catch (Exception ex) {