diff --git a/settings.gradle.kts b/settings.gradle.kts index 0de5fe741..c24dd4880 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,5 +16,5 @@ pluginManagement { } plugins { - id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.13") + id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.18") } diff --git a/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java b/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java index 35ba286d6..6544e6b4f 100644 --- a/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java +++ b/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java @@ -203,7 +203,14 @@ public class ShaderPack { this.shaderPackOptions = new ShaderPackOptions(graph, changedConfigs); graph = this.shaderPackOptions.getIncludes(); - Iterable finalEnvironmentDefines = environmentDefines; + List finalEnvironmentDefines = new ArrayList<>(); + environmentDefines.forEach(finalEnvironmentDefines::add); + for (FeatureFlags flag : FeatureFlags.values()) { + if (flag.isUsable()) { + finalEnvironmentDefines.add(new StringPair("IRIS_FEATURE_" + flag.name(), "")); + } + } + this.shaderProperties = Optional.ofNullable(readProperties(root, "shaders.properties")) .map(source -> new ShaderProperties(source, shaderPackOptions, finalEnvironmentDefines)) .orElseGet(ShaderProperties::empty); @@ -220,15 +227,6 @@ public class ShaderPack { IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false); } - List optionalFeatureFlags = shaderProperties.getOptionalFeatureFlags().stream().filter(flag -> !FeatureFlags.isInvalid(flag)).collect(Collectors.toList()); - - if (!optionalFeatureFlags.isEmpty()) { - List newEnvDefines = new ArrayList<>(); - environmentDefines.forEach(newEnvDefines::add); - optionalFeatureFlags.forEach(flag -> newEnvDefines.add(new StringPair("IRIS_FEATURE_" + flag, ""))); - environmentDefines = ImmutableList.copyOf(newEnvDefines); - } - ProfileSet profiles = ProfileSet.fromTree(shaderProperties.getProfiles(), this.shaderPackOptions.getOptionSet()); this.profile = profiles.scan(this.shaderPackOptions.getOptionSet(), this.shaderPackOptions.getOptionValues());