From e9d1b9f18ea2fca714538c3ef44af368c9a6f01b Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Sat, 8 Feb 2025 21:45:51 +0100 Subject: [PATCH] prevent Biome.CUSTOM from being resolved on <1.21.3 --- .../volmit/iris/core/nms/v1_20_R1/headless/RegionStorage.java | 1 + .../volmit/iris/core/nms/v1_20_R2/headless/RegionStorage.java | 1 + .../volmit/iris/core/nms/v1_20_R3/headless/RegionStorage.java | 1 + .../volmit/iris/core/nms/v1_20_R4/headless/RegionStorage.java | 1 + .../volmit/iris/core/nms/v1_21_R1/headless/RegionStorage.java | 1 + 5 files changed, 5 insertions(+) diff --git a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/headless/RegionStorage.java b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/headless/RegionStorage.java index aa61490b3..48da8a5a5 100644 --- a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/headless/RegionStorage.java +++ b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/headless/RegionStorage.java @@ -94,6 +94,7 @@ public class RegionStorage implements IRegionStorage, LevelHeightAccessor { Registry registry = registryAccess().registryOrThrow(Registries.BIOME); minecraftBiomes = new KMap<>(org.bukkit.Registry.BIOME.stream() + .filter(biome -> biome != org.bukkit.block.Biome.CUSTOM) .collect(Collectors.toMap(Function.identity(), b -> CraftBlock.biomeToBiomeBase(registry, b)))); minecraftBiomes.values().removeAll(customBiomes.values()); } diff --git a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/headless/RegionStorage.java b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/headless/RegionStorage.java index 094b41328..7f0c02a94 100644 --- a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/headless/RegionStorage.java +++ b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/headless/RegionStorage.java @@ -93,6 +93,7 @@ public class RegionStorage implements IRegionStorage, LevelHeightAccessor { } minecraftBiomes = new KMap<>(org.bukkit.Registry.BIOME.stream() + .filter(biome -> biome != org.bukkit.block.Biome.CUSTOM) .collect(Collectors.toMap(Function.identity(), CraftBiome::bukkitToMinecraftHolder))); minecraftBiomes.values().removeAll(customBiomes.values()); } diff --git a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/headless/RegionStorage.java b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/headless/RegionStorage.java index c009b1cc7..76b3d02c2 100644 --- a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/headless/RegionStorage.java +++ b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/headless/RegionStorage.java @@ -93,6 +93,7 @@ public class RegionStorage implements IRegionStorage, LevelHeightAccessor { } minecraftBiomes = new KMap<>(org.bukkit.Registry.BIOME.stream() + .filter(biome -> biome != org.bukkit.block.Biome.CUSTOM) .collect(Collectors.toMap(Function.identity(), CraftBiome::bukkitToMinecraftHolder))); minecraftBiomes.values().removeAll(customBiomes.values()); } diff --git a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/headless/RegionStorage.java b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/headless/RegionStorage.java index 0091d081c..c6a609fd0 100644 --- a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/headless/RegionStorage.java +++ b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/headless/RegionStorage.java @@ -93,6 +93,7 @@ public class RegionStorage implements IRegionStorage, LevelHeightAccessor { } minecraftBiomes = new KMap<>(org.bukkit.Registry.BIOME.stream() + .filter(biome -> biome != org.bukkit.block.Biome.CUSTOM) .collect(Collectors.toMap(Function.identity(), CraftBiome::bukkitToMinecraftHolder))); minecraftBiomes.values().removeAll(customBiomes.values()); } diff --git a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/headless/RegionStorage.java b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/headless/RegionStorage.java index 838848671..35237c522 100644 --- a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/headless/RegionStorage.java +++ b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/headless/RegionStorage.java @@ -89,6 +89,7 @@ public class RegionStorage implements IRegionStorage, LevelHeightAccessor { } minecraftBiomes = new KMap<>(org.bukkit.Registry.BIOME.stream() + .filter(biome -> biome != org.bukkit.block.Biome.CUSTOM) .collect(Collectors.toMap(Function.identity(), CraftBiome::bukkitToMinecraftHolder))); minecraftBiomes.values().removeAll(customBiomes.values()); }