diff --git a/src/main/java/forestry/apiculture/HiveConfig.java b/src/main/java/forestry/apiculture/HiveConfig.java index beb52ccf9..e7763404c 100644 --- a/src/main/java/forestry/apiculture/HiveConfig.java +++ b/src/main/java/forestry/apiculture/HiveConfig.java @@ -22,8 +22,13 @@ public class HiveConfig { private final Set blacklistedTypes = new HashSet<>(); private final Set blacklistedBiomes = new HashSet<>(); + private static final Set blacklistedDims = new HashSet<>(); + public static void parse(LocalizedConfiguration config){ config.addCategoryCommentLocalized(CATEGORY); + for(int dimId : config.get("world.generate.beehives", "dimBlacklist", new int[0]).getIntList()){ + blacklistedDims.add(dimId); + } for(IHiveRegistry.HiveType type : IHiveRegistry.HiveType.values()){ String[] entries = config.get(CATEGORY, type.getName(), new String[0]).getStringList(); configs.put(type, new HiveConfig(entries)); @@ -56,4 +61,8 @@ public class HiveConfig { } return BiomeDictionary.getTypes(biome).stream().anyMatch(blacklistedTypes::contains); } + + public static boolean isDimBlacklisted(int dimId){ + return blacklistedDims.contains(dimId); + } } diff --git a/src/main/java/forestry/apiculture/worldgen/Hive.java b/src/main/java/forestry/apiculture/worldgen/Hive.java index c1e5c5dd6..0c3fd7da6 100644 --- a/src/main/java/forestry/apiculture/worldgen/Hive.java +++ b/src/main/java/forestry/apiculture/worldgen/Hive.java @@ -19,6 +19,7 @@ import forestry.api.apiculture.IHiveDrop; import forestry.api.apiculture.hives.IHiveDescription; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.apiculture.HiveConfig; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -66,6 +67,9 @@ public final class Hive { } public boolean isValidLocation(World world, BlockPos pos) { + if(HiveConfig.isDimBlacklisted(world.provider.getDimension())) { + return false; + } return hiveDescription.getHiveGen().isValidLocation(world, pos); }