From 0c97c19c1d25c0209d4e2247df5fe8b9ff133cd3 Mon Sep 17 00:00:00 2001 From: Forstride Date: Wed, 22 May 2019 16:04:48 -0400 Subject: [PATCH] Tweaked sub-biome rarity --- .../biomesoplenty/api/biome/BOPBiomes.java | 4 ++-- ...dplainsBiome.java => FloodplainBiome.java} | 4 ++-- ...eldsBiome.java => LavenderFieldBiome.java} | 4 ++-- .../java/biomesoplenty/init/ModBiomes.java | 19 ++++++++++--------- .../assets/biomesoplenty/lang/en_us.json | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) rename src/main/java/biomesoplenty/common/biome/overworld/{FloodplainsBiome.java => FloodplainBiome.java} (99%) rename src/main/java/biomesoplenty/common/biome/overworld/{LavenderFieldsBiome.java => LavenderFieldBiome.java} (99%) diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java index 5893f1937..349e09657 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java @@ -25,7 +25,7 @@ public class BOPBiomes public static Optional cold_desert = Optional.empty(); public static Optional coniferous_forest = Optional.empty(); public static Optional dead_forest = Optional.empty(); - public static Optional floodplains = Optional.empty(); + public static Optional floodplain = Optional.empty(); public static Optional flower_meadow = Optional.empty(); public static Optional grassland = Optional.empty(); public static Optional gravel_beach = Optional.empty(); @@ -33,7 +33,7 @@ public class BOPBiomes public static Optional grove_orchard = Optional.empty(); public static Optional highland = Optional.empty(); public static Optional highland_moor = Optional.empty(); - public static Optional lavender_fields = Optional.empty(); + public static Optional lavender_field = Optional.empty(); public static Optional lush_swamp = Optional.empty(); public static Optional maple_woods = Optional.empty(); public static Optional marsh = Optional.empty(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java similarity index 99% rename from src/main/java/biomesoplenty/common/biome/overworld/FloodplainsBiome.java rename to src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java index 78b4f72e8..afa9bf69e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java @@ -39,9 +39,9 @@ import net.minecraft.world.gen.placement.IPlacementConfig; import net.minecraft.world.gen.placement.LakeChanceConfig; import net.minecraft.world.gen.surfacebuilders.CompositeSurfaceBuilder; -public class FloodplainsBiome extends BiomeBOP +public class FloodplainBiome extends BiomeBOP { - public FloodplainsBiome() + public FloodplainBiome() { super((new Biome.BiomeBuilder()).surfaceBuilder(new CompositeSurfaceBuilder(SWAMP_SURFACE_BUILDER, GRASS_DIRT_GRAVEL_SURFACE)).precipitation(Biome.RainType.RAIN).category(Biome.Category.SWAMP).depth(-0.225F).scale(-0.025F).temperature(0.85F).downfall(1.2F).waterColor(4566514).waterFogColor(267827).parent((String)null)); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java similarity index 99% rename from src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldsBiome.java rename to src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java index 3b17ba624..e17aa2507 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java @@ -42,9 +42,9 @@ import net.minecraft.world.gen.surfacebuilders.CompositeSurfaceBuilder; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class LavenderFieldsBiome extends BiomeBOP +public class LavenderFieldBiome extends BiomeBOP { - public LavenderFieldsBiome() + public LavenderFieldBiome() { super((new Biome.BiomeBuilder()).surfaceBuilder(new CompositeSurfaceBuilder(DEFAULT_SURFACE_BUILDER, GRASS_DIRT_GRAVEL_SURFACE)).precipitation(Biome.RainType.RAIN).category(Biome.Category.PLAINS).depth(0.0F).scale(0.05F).temperature(0.8F).downfall(0.7F).waterColor(4159204).waterFogColor(329011).parent((String)null)); diff --git a/src/main/java/biomesoplenty/init/ModBiomes.java b/src/main/java/biomesoplenty/init/ModBiomes.java index 81dee33b0..aa9c5cdc7 100644 --- a/src/main/java/biomesoplenty/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/init/ModBiomes.java @@ -19,7 +19,7 @@ import biomesoplenty.common.biome.overworld.CherryBlossomGroveBiome; import biomesoplenty.common.biome.overworld.ColdDesertBiome; import biomesoplenty.common.biome.overworld.ConiferousForestBiome; import biomesoplenty.common.biome.overworld.DeadForestBiome; -import biomesoplenty.common.biome.overworld.FloodplainsBiome; +import biomesoplenty.common.biome.overworld.FloodplainBiome; import biomesoplenty.common.biome.overworld.FlowerMeadowBiome; import biomesoplenty.common.biome.overworld.BogBiome; import biomesoplenty.common.biome.overworld.BogMireBiome; @@ -29,7 +29,7 @@ import biomesoplenty.common.biome.overworld.ChaparralBiome; import biomesoplenty.common.biome.overworld.GrasslandBiome; import biomesoplenty.common.biome.overworld.GravelBeachBiome; import biomesoplenty.common.biome.overworld.GroveBiome; -import biomesoplenty.common.biome.overworld.LavenderFieldsBiome; +import biomesoplenty.common.biome.overworld.LavenderFieldBiome; import biomesoplenty.common.biome.overworld.LushSwampBiome; import biomesoplenty.common.biome.overworld.MapleWoodsBiome; import biomesoplenty.common.biome.overworld.MarshBiome; @@ -93,6 +93,7 @@ public class ModBiomes worldType = new WorldTypeBOP(); registerBiomes(); + registerBiomeDictionaryTags(); } private static void registerBiomes() @@ -109,7 +110,7 @@ public class ModBiomes cold_desert = registerBiome(new ColdDesertBiome(), "cold_desert"); coniferous_forest = registerBiome(new ConiferousForestBiome(), "coniferous_forest"); dead_forest = registerBiome(new DeadForestBiome(), "dead_forest"); - floodplains = registerBiome(new FloodplainsBiome(), "floodplains"); + floodplain = registerBiome(new FloodplainBiome(), "floodplain"); flower_meadow = registerBiome(new FlowerMeadowBiome(), "flower_meadow"); grassland = registerBiome(new GrasslandBiome(), "grassland"); gravel_beach = registerBiome(new GravelBeachBiome(), "gravel_beach"); @@ -117,7 +118,7 @@ public class ModBiomes grove_orchard = registerBiome(new GroveOrchardBiome(), "grove_orchard"); highland = registerBiome(new HighlandBiome(), "highland"); highland_moor = registerBiome(new HighlandMoorBiome(), "highland_moor"); - lavender_fields = registerBiome(new LavenderFieldsBiome(), "lavender_fields"); + lavender_field = registerBiome(new LavenderFieldBiome(), "lavender_field"); lush_swamp = registerBiome(new LushSwampBiome(), "lush_swamp"); maple_woods = registerBiome(new MapleWoodsBiome(), "maple_woods"); marsh = registerBiome(new MarshBiome(), "marsh"); @@ -154,12 +155,12 @@ public class ModBiomes xeric_shrubland = registerBiome(new XericShrublandBiome(), "xeric_shrubland"); // Note: Rarity supports two decimal places - registerSubBiome(Biomes.DESERT, oasis, 0.25F, 100); + registerSubBiome(Biomes.DESERT, oasis, 0.1F, 100); registerSubBiome(bog, bog_mire, 0.5F, 100); registerSubBiome(brushland, xeric_shrubland, 1.0F, 100); registerSubBiome(grove, grove_orchard, 0.75F, 100); - registerSubBiome(highland, highland_moor, 1.0F, 100); - registerSubBiome(meadow, flower_meadow, 0.75F, 100); + registerSubBiome(highland, highland_moor, 0.75F, 100); + registerSubBiome(meadow, flower_meadow, 0.5F, 100); registerSubBiome(prairie, pasture, 1.0F, 100); } @@ -177,7 +178,7 @@ public class ModBiomes registerBiomeToDictionary(BOPBiomes.cold_desert, Type.SNOWY, Type.DRY, Type.COLD); registerBiomeToDictionary(BOPBiomes.coniferous_forest, Type.CONIFEROUS, Type.FOREST, Type.COLD, Type.DENSE); registerBiomeToDictionary(BOPBiomes.dead_forest, Type.FOREST, Type.DEAD, Type.COLD, Type.DRY, Type.SPARSE); - registerBiomeToDictionary(BOPBiomes.floodplains, Type.JUNGLE, Type.WATER, Type.HOT, Type.WET); + registerBiomeToDictionary(BOPBiomes.floodplain, Type.JUNGLE, Type.WATER, Type.HOT, Type.WET); registerBiomeToDictionary(BOPBiomes.flower_meadow, Type.PLAINS, Type.LUSH); registerBiomeToDictionary(BOPBiomes.grassland, Type.PLAINS, Type.HILLS, Type.WET); registerBiomeToDictionary(BOPBiomes.gravel_beach, Type.BEACH); @@ -185,7 +186,7 @@ public class ModBiomes registerBiomeToDictionary(BOPBiomes.grove_orchard, Type.FOREST, Type.PLAINS, Type.DENSE, Type.LUSH); registerBiomeToDictionary(BOPBiomes.highland, Type.MOUNTAIN, Type.HILLS, Type.WET); registerBiomeToDictionary(BOPBiomes.highland_moor, Type.HILLS, Type.WET); - registerBiomeToDictionary(BOPBiomes.lavender_fields, Type.PLAINS, Type.MAGICAL, Type.LUSH); + registerBiomeToDictionary(BOPBiomes.lavender_field, Type.PLAINS, Type.MAGICAL, Type.LUSH); registerBiomeToDictionary(BOPBiomes.lush_swamp, Type.SWAMP, Type.LUSH, Type.WET, Type.DENSE); registerBiomeToDictionary(BOPBiomes.maple_woods, Type.FOREST, Type.CONIFEROUS, Type.COLD, Type.DENSE); registerBiomeToDictionary(BOPBiomes.marsh, Type.WATER, Type.WET, Type.LUSH); diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 450464cf5..3471c1703 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -33,7 +33,7 @@ "biome.biomesoplenty.coniferous_forest": "Coniferous Forest", "biome.biomesoplenty.corrupted_sands": "Corrupted Sands", "biome.biomesoplenty.dead_forest": "Dead Forest", - "biome.biomesoplenty.floodplains": "Floodplains", + "biome.biomesoplenty.floodplain": "Floodplain", "biome.biomesoplenty.flower_meadow": "Flower Meadow", "biome.biomesoplenty.fungi_forest": "Fungi Forest", "biome.biomesoplenty.grassland": "Grassland", @@ -42,7 +42,7 @@ "biome.biomesoplenty.grove_orchard": "Grove Orchard", "biome.biomesoplenty.highland": "Highland", "biome.biomesoplenty.highland_moor": "Highland Moor", - "biome.biomesoplenty.lavender_fields": "Lavender Fields", + "biome.biomesoplenty.lavender_field": "Lavender Field", "biome.biomesoplenty.lush_swamp": "Lush Swamp", "biome.biomesoplenty.mangrove": "Mangrove", "biome.biomesoplenty.maple_woods": "Maple Woods",