diff --git a/src/main/java/net/coderbot/iris/shaderpack/DimensionFlatteningMap.java b/src/main/java/net/coderbot/iris/shaderpack/DimensionFlatteningMap.java new file mode 100644 index 000000000..d1aaed326 --- /dev/null +++ b/src/main/java/net/coderbot/iris/shaderpack/DimensionFlatteningMap.java @@ -0,0 +1,21 @@ +package net.coderbot.iris.shaderpack; + +import java.util.HashMap; +import java.util.Map; + +public class DimensionFlatteningMap { + private static final Map MODERN_TO_LEGACY = new HashMap<>(); + + static { + MODERN_TO_LEGACY.put("minecraft:overworld", "Overworld"); + MODERN_TO_LEGACY.put("minecraft:the_nether", "Nether"); + MODERN_TO_LEGACY.put("minecraft:the_end", "The End"); + } + + /** + * Maps a modern dimension ID to its 1.7.10 string name. + */ + public static String toLegacyName(String dimensionName) { + return MODERN_TO_LEGACY.getOrDefault(dimensionName, dimensionName); + } +} diff --git a/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java b/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java index 0ca293b0f..f0de1f1d8 100644 --- a/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java +++ b/src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java @@ -25,13 +25,10 @@ import net.coderbot.iris.shaderpack.option.values.MutableOptionValues; import net.coderbot.iris.shaderpack.option.values.OptionValues; import net.coderbot.iris.shaderpack.parsing.BooleanParser; import net.coderbot.iris.shaderpack.preprocessor.JcppProcessor; -import net.coderbot.iris.shaderpack.preprocessor.PropertiesPreprocessor; import net.coderbot.iris.shaderpack.texture.CustomTextureData; import net.coderbot.iris.shaderpack.texture.TextureFilteringData; import net.coderbot.iris.shaderpack.texture.TextureStage; import net.coderbot.iris.uniforms.custom.CustomUniforms; -import net.irisshaders.iris.api.v0.IrisApi; -import org.jetbrains.annotations.Nullable; import java.io.BufferedReader; import java.io.IOException; @@ -243,12 +240,8 @@ public class ShaderPack { List invalidFeatureFlags = invalidFlagList.stream().map(FeatureFlags::getHumanReadableName).collect(Collectors.toList()); if (!invalidFeatureFlags.isEmpty()) { - // TODO: GUI -// if (Minecraft.getMinecraft().screen instanceof ShaderPackScreen) { -// Minecraft.getMinecraft().setScreen(new FeatureMissingErrorScreen(Minecraft.getMinecraft().screen, I18n.format("iris.unsupported.pack"), I18n.format("iris.unsupported.pack.description", FeatureFlags.getInvalidStatus(invalidFlagList), invalidFeatureFlags.stream() -// .collect(Collectors.joining(", ", ": ", "."))))); -// } - IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false); + // TODO: GUI? + Iris.logger.warn("Shader pack requires unsupported feature flags, loading anyway: {}", String.join(", ", invalidFeatureFlags)); } ProfileSet profiles = ProfileSet.fromTree(shaderProperties.getProfiles(), this.shaderPackOptions.getOptionSet()); @@ -437,7 +430,8 @@ public class ShaderPack { folderNames.add(folderName); for (String dimensionName : dimensionNames) { - dimensionMap.put(dimensionName, folderName); + // Convert modern dimension IDs to 1.7.10 names + dimensionMap.put(DimensionFlatteningMap.toLegacyName(dimensionName), folderName); } }); @@ -667,6 +661,7 @@ public class ShaderPack { */ public ProgramSet getProgramSet(String dimensionName) { int dimensionId = Iris.getCurrentDimensionId(); + dimensionName = DimensionFlatteningMap.toLegacyName(dimensionName); // First, try to find an exact match in the dimension map String folderName = dimensionMap.get(dimensionName); diff --git a/src/main/java/net/coderbot/iris/uniforms/VanillaBiomeList.java b/src/main/java/net/coderbot/iris/uniforms/VanillaBiomeList.java index b13051bfa..70be50b4b 100644 --- a/src/main/java/net/coderbot/iris/uniforms/VanillaBiomeList.java +++ b/src/main/java/net/coderbot/iris/uniforms/VanillaBiomeList.java @@ -72,6 +72,11 @@ public class VanillaBiomeList { biomes.add(new BiomeEntry(BiomeGenBase.sky, "END_HIGHLANDS")); biomes.add(new BiomeEntry(BiomeGenBase.sky, "END_BARRENS")); + // Modern biome variants (1.20+) + biomes.add(new BiomeEntry(BiomeGenBase.jungle, "BIOME_SPARSE_JUNGLE")); + biomes.add(new BiomeEntry(BiomeGenBase.mushroomIsland, "BIOME_MUSHROOM_FIELDS")); + biomes.add(new BiomeEntry(BiomeGenBase.swampland, "BIOME_MANGROVE_SWAMP")); + return Collections.unmodifiableList(biomes); }