diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java index ab556a72d..0def26f5f 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java @@ -16,76 +16,83 @@ import java.util.List; public class BOPBiomes { - private static List> bopBiomes = Lists.newArrayList(); + private static List> overworldBiomes = Lists.newArrayList(); - public static final ResourceKey BAMBOO_GROVE = register("bamboo_grove"); - public static final ResourceKey BAYOU = register("bayou"); - public static final ResourceKey BOG = register("bog"); - public static final ResourceKey BOREAL_FOREST = register("boreal_forest"); - public static final ResourceKey CHERRY_BLOSSOM_GROVE = register("cherry_blossom_grove"); - public static final ResourceKey COLD_DESERT = register("cold_desert"); - public static final ResourceKey CONIFEROUS_FOREST = register("coniferous_forest"); - public static final ResourceKey CRAG = register("crag"); - public static final ResourceKey DEAD_FOREST = register("dead_forest"); - public static final ResourceKey DENSE_WOODLAND = register("dense_woodland"); - public static final ResourceKey DRY_BONEYARD = register("dry_boneyard"); - public static final ResourceKey DRYLAND = register("dryland"); - public static final ResourceKey DUNE_BEACH = register("dune_beach"); - public static final ResourceKey FIELD = register("field"); - public static final ResourceKey FIR_CLEARING = register("fir_clearing"); - public static final ResourceKey FLOODPLAIN = register("floodplain"); - public static final ResourceKey FORESTED_FIELD = register("forested_field"); - public static final ResourceKey FUNGAL_JUNGLE = register("fungal_jungle"); - public static final ResourceKey GRASSLAND = register("grassland"); - public static final ResourceKey HIGHLAND = register("highland"); - public static final ResourceKey HIGHLAND_MOOR = register("highland_moor"); - public static final ResourceKey JADE_CLIFFS = register("jade_cliffs"); - public static final ResourceKey LAVENDER_FIELD = register("lavender_field"); - public static final ResourceKey LAVENDER_FOREST = register("lavender_forest"); - public static final ResourceKey LUSH_DESERT = register("lush_desert"); - public static final ResourceKey LUSH_SAVANNA = register("lush_savanna"); - public static final ResourceKey MAPLE_FOREST = register("maple_forest"); - public static final ResourceKey MARSH = register("marsh"); - public static final ResourceKey MEDITERRANEAN_FOREST = register("mediterranean_forest"); - public static final ResourceKey MEDITERRANEAN_LAKES = register("mediterranean_lakes"); - public static final ResourceKey MUSKEG = register("muskeg"); - public static final ResourceKey MYSTIC_GROVE = register("mystic_grove"); - public static final ResourceKey OLD_GROWTH_DEAD_FOREST = register("old_growth_dead_forest"); - public static final ResourceKey OMINOUS_WOODS = register("ominous_woods"); - public static final ResourceKey ORCHARD = register("orchard"); - public static final ResourceKey ORIGIN_VALLEY = register("origin_valley"); - public static final ResourceKey PASTURE = register("pasture"); - public static final ResourceKey PRAIRIE = register("prairie"); - public static final ResourceKey PUMPKIN_PATCH = register("pumpkin_patch"); - public static final ResourceKey RAINBOW_HILLS = register("rainbow_hills"); - public static final ResourceKey RAINFOREST = register("rainforest"); - public static final ResourceKey RAINFOREST_CLIFFS = register("rainforest_cliffs"); - public static final ResourceKey REDWOOD_FOREST = register("redwood_forest"); - public static final ResourceKey ROCKY_SHRUBLAND = register("rocky_shrubland"); - public static final ResourceKey SCRUBLAND = register("scrubland"); - public static final ResourceKey SHRUBLAND = register("shrubland"); - public static final ResourceKey SEASONAL_FOREST = register("seasonal_forest"); - public static final ResourceKey SNOWY_CONIFEROUS_FOREST = register("snowy_coniferous_forest"); - public static final ResourceKey SNOWY_FIR_CLEARING = register("snowy_fir_clearing"); - public static final ResourceKey SNOWY_MAPLE_FOREST = register("snowy_maple_forest"); - public static final ResourceKey TROPICS = register("tropics"); - public static final ResourceKey TUNDRA = register("tundra"); - public static final ResourceKey VOLCANO = register("volcano"); - public static final ResourceKey VOLCANIC_PLAINS = register("volcanic_plains"); - public static final ResourceKey WASTELAND = register("wasteland"); - public static final ResourceKey WETLAND = register("wetland"); - public static final ResourceKey WOODED_SCRUBLAND = register("wooded_scrubland"); - public static final ResourceKey WOODLAND = register("woodland"); + public static final ResourceKey BAMBOO_GROVE = registerOverworld("bamboo_grove"); + public static final ResourceKey BAYOU = registerOverworld("bayou"); + public static final ResourceKey BOG = registerOverworld("bog"); + public static final ResourceKey BOREAL_FOREST = registerOverworld("boreal_forest"); + public static final ResourceKey CHERRY_BLOSSOM_GROVE = registerOverworld("cherry_blossom_grove"); + public static final ResourceKey COLD_DESERT = registerOverworld("cold_desert"); + public static final ResourceKey CONIFEROUS_FOREST = registerOverworld("coniferous_forest"); + public static final ResourceKey CRAG = registerOverworld("crag"); + public static final ResourceKey DEAD_FOREST = registerOverworld("dead_forest"); + public static final ResourceKey DENSE_WOODLAND = registerOverworld("dense_woodland"); + public static final ResourceKey DRY_BONEYARD = registerOverworld("dry_boneyard"); + public static final ResourceKey DRYLAND = registerOverworld("dryland"); + public static final ResourceKey DUNE_BEACH = registerOverworld("dune_beach"); + public static final ResourceKey FIELD = registerOverworld("field"); + public static final ResourceKey FIR_CLEARING = registerOverworld("fir_clearing"); + public static final ResourceKey FLOODPLAIN = registerOverworld("floodplain"); + public static final ResourceKey FORESTED_FIELD = registerOverworld("forested_field"); + public static final ResourceKey FUNGAL_JUNGLE = registerOverworld("fungal_jungle"); + public static final ResourceKey GRASSLAND = registerOverworld("grassland"); + public static final ResourceKey HIGHLAND = registerOverworld("highland"); + public static final ResourceKey HIGHLAND_MOOR = registerOverworld("highland_moor"); + public static final ResourceKey JADE_CLIFFS = registerOverworld("jade_cliffs"); + public static final ResourceKey LAVENDER_FIELD = registerOverworld("lavender_field"); + public static final ResourceKey LAVENDER_FOREST = registerOverworld("lavender_forest"); + public static final ResourceKey LUSH_DESERT = registerOverworld("lush_desert"); + public static final ResourceKey LUSH_SAVANNA = registerOverworld("lush_savanna"); + public static final ResourceKey MAPLE_FOREST = registerOverworld("maple_forest"); + public static final ResourceKey MARSH = registerOverworld("marsh"); + public static final ResourceKey MEDITERRANEAN_FOREST = registerOverworld("mediterranean_forest"); + public static final ResourceKey MEDITERRANEAN_LAKES = registerOverworld("mediterranean_lakes"); + public static final ResourceKey MUSKEG = registerOverworld("muskeg"); + public static final ResourceKey MYSTIC_GROVE = registerOverworld("mystic_grove"); + public static final ResourceKey OLD_GROWTH_DEAD_FOREST = registerOverworld("old_growth_dead_forest"); + public static final ResourceKey OMINOUS_WOODS = registerOverworld("ominous_woods"); + public static final ResourceKey ORCHARD = registerOverworld("orchard"); + public static final ResourceKey ORIGIN_VALLEY = registerOverworld("origin_valley"); + public static final ResourceKey PASTURE = registerOverworld("pasture"); + public static final ResourceKey PRAIRIE = registerOverworld("prairie"); + public static final ResourceKey PUMPKIN_PATCH = registerOverworld("pumpkin_patch"); + public static final ResourceKey RAINBOW_HILLS = registerOverworld("rainbow_hills"); + public static final ResourceKey RAINFOREST = registerOverworld("rainforest"); + public static final ResourceKey RAINFOREST_CLIFFS = registerOverworld("rainforest_cliffs"); + public static final ResourceKey REDWOOD_FOREST = registerOverworld("redwood_forest"); + public static final ResourceKey ROCKY_SHRUBLAND = registerOverworld("rocky_shrubland"); + public static final ResourceKey SCRUBLAND = registerOverworld("scrubland"); + public static final ResourceKey SHRUBLAND = registerOverworld("shrubland"); + public static final ResourceKey SEASONAL_FOREST = registerOverworld("seasonal_forest"); + public static final ResourceKey SNOWY_CONIFEROUS_FOREST = registerOverworld("snowy_coniferous_forest"); + public static final ResourceKey SNOWY_FIR_CLEARING = registerOverworld("snowy_fir_clearing"); + public static final ResourceKey SNOWY_MAPLE_FOREST = registerOverworld("snowy_maple_forest"); + public static final ResourceKey SPIDER_NEST = register("spider_nest"); + public static final ResourceKey TROPICS = registerOverworld("tropics"); + public static final ResourceKey TUNDRA = registerOverworld("tundra"); + public static final ResourceKey VOLCANO = registerOverworld("volcano"); + public static final ResourceKey VOLCANIC_PLAINS = registerOverworld("volcanic_plains"); + public static final ResourceKey WASTELAND = registerOverworld("wasteland"); + public static final ResourceKey WETLAND = registerOverworld("wetland"); + public static final ResourceKey WOODED_SCRUBLAND = registerOverworld("wooded_scrubland"); + public static final ResourceKey WOODLAND = registerOverworld("woodland"); - public static List> getBOPBiomes() + public static List> getBOPOverworldBiomes() { - return ImmutableList.copyOf(bopBiomes); + return ImmutableList.copyOf(overworldBiomes); + } + + private static ResourceKey registerOverworld(String name) + { + ResourceKey key = ResourceKey.create(Registry.BIOME_REGISTRY, new ResourceLocation(BiomesOPlenty.MOD_ID, name));; + overworldBiomes.add(key); + return key; } private static ResourceKey register(String name) { ResourceKey key = ResourceKey.create(Registry.BIOME_REGISTRY, new ResourceLocation(BiomesOPlenty.MOD_ID, name));; - bopBiomes.add(key); return key; } }