diff --git a/.github/ISSUE_TEMPLATE/1-standalone-bug.md b/.github/ISSUE_TEMPLATE/1-standalone-bug.md index 9c218810f..6b80eec4c 100644 --- a/.github/ISSUE_TEMPLATE/1-standalone-bug.md +++ b/.github/ISSUE_TEMPLATE/1-standalone-bug.md @@ -1,6 +1,6 @@ --- -name: 1.16.1 Standalone Bug -about: For bugs that occur with Biomes O' Plenty for 1.16.1. We do not support older versions! +name: 1.16.3 Standalone Bug +about: For bugs that occur with Biomes O' Plenty for 1.16.3. We do not support older versions! title: '' labels: bug-minor assignees: '' diff --git a/.github/ISSUE_TEMPLATE/2-standalone-crash.md b/.github/ISSUE_TEMPLATE/2-standalone-crash.md index 293b0782d..399741986 100644 --- a/.github/ISSUE_TEMPLATE/2-standalone-crash.md +++ b/.github/ISSUE_TEMPLATE/2-standalone-crash.md @@ -1,6 +1,6 @@ --- -name: 1.16.1 Standalone Crash -about: For crashes that occur with Biomes O' Plenty for 1.16.1. We do not support older versions! +name: 1.16.3 Standalone Crash +about: For crashes that occur with Biomes O' Plenty for 1.16.3. We do not support older versions! title: '' labels: crash assignees: '' diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.md b/.github/ISSUE_TEMPLATE/3-feature-request.md index ea69b7910..b5a2f54a5 100644 --- a/.github/ISSUE_TEMPLATE/3-feature-request.md +++ b/.github/ISSUE_TEMPLATE/3-feature-request.md @@ -1,6 +1,6 @@ --- -name: 1.16.1 Feature Request -about: Feature requests for Biomes O' Plenty for 1.16.1. We do not support older versions! +name: 1.16.3 Feature Request +about: Feature requests for Biomes O' Plenty for 1.16.3. We do not support older versions! title: '' labels: feature assignees: '' diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java index 3d00ab64a..4e0809bce 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java @@ -22,12 +22,12 @@ public class BOPBiomes public static RegistryKey bayou = register("bayou"); public static RegistryKey bog = register("bog"); public static RegistryKey boreal_forest = register("boreal_forest"); - public static RegistryKey brushland = register("brushland"); public static RegistryKey chaparral = register("chaparral"); public static RegistryKey cherry_blossom_grove = register("cherry_blossom_grove"); public static RegistryKey cold_desert = register("cold_desert"); public static RegistryKey coniferous_forest = register("coniferous_forest"); public static RegistryKey dead_forest = register("dead_forest"); + public static RegistryKey dryland = register("dryland"); public static RegistryKey fir_clearing = register("fir_clearing"); public static RegistryKey floodplain = register("floodplain"); public static RegistryKey flower_meadow = register("flower_meadow"); @@ -39,6 +39,7 @@ public class BOPBiomes public static RegistryKey highland_moor = register("highland_moor"); public static RegistryKey jade_cliffs = register("jade_cliffs"); public static RegistryKey lavender_field = register("lavender_field"); + public static RegistryKey lush_desert = register("lush_desert"); public static RegistryKey lush_grassland = register("lush_grassland"); public static RegistryKey lush_swamp = register("lush_swamp"); public static RegistryKey mangrove = register("mangrove"); @@ -48,17 +49,16 @@ public class BOPBiomes public static RegistryKey mire = register("mire"); public static RegistryKey muskeg = register("muskeg"); public static RegistryKey mystic_grove = register("mystic_grove"); - public static RegistryKey oasis = register("oasis"); public static RegistryKey ominous_woods = register("ominous_woods"); public static RegistryKey orchard = register("orchard"); - public static RegistryKey origin_hills = register("origin_hills"); + public static RegistryKey origin_valley = register("origin_valley"); public static RegistryKey outback = register("outback"); public static RegistryKey overgrown_cliffs = register("overgrown_cliffs"); public static RegistryKey pasture = register("pasture"); public static RegistryKey poppy_field = register("poppy_field"); public static RegistryKey prairie = register("prairie"); public static RegistryKey pumpkin_patch = register("pumpkin_patch"); - public static RegistryKey rainbow_valley = register("rainbow_valley"); + public static RegistryKey rainbow_hills = register("rainbow_hills"); public static RegistryKey rainforest = register("rainforest"); public static RegistryKey redwood_forest = register("redwood_forest"); public static RegistryKey redwood_forest_edge = register("redwood_forest_edge"); @@ -82,7 +82,6 @@ public class BOPBiomes public static RegistryKey wasteland = register("wasteland"); public static RegistryKey wetland = register("wetland"); public static RegistryKey woodland = register("woodland"); - public static RegistryKey xeric_shrubland = register("xeric_shrubland"); public static RegistryKey crystalline_chasm = register("crystalline_chasm"); public static RegistryKey undergrowth = register("undergrowth"); diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index e92453402..527ea9943 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -23,6 +23,18 @@ public class BOPBlocks public static Block white_sandstone_stairs; public static Block white_sandstone_wall; + public static Block orange_sand; + public static Block orange_sandstone; + public static Block cut_orange_sandstone; + public static Block cut_orange_sandstone_slab; + public static Block chiseled_orange_sandstone; + public static Block smooth_orange_sandstone; + public static Block smooth_orange_sandstone_slab; + public static Block smooth_orange_sandstone_stairs; + public static Block orange_sandstone_slab; + public static Block orange_sandstone_stairs; + public static Block orange_sandstone_wall; + public static Block black_sand; public static Block black_sandstone; public static Block cut_black_sandstone; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java index 9248d2575..b360c16a6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java @@ -47,7 +47,7 @@ public class BogBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.WATER_LAKE_UNCOMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_UNCOMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java index 9f04b5b0d..bf9452b62 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java @@ -52,7 +52,7 @@ public class ColdDesertBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_LAVA); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_LAVA); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java index 026409556..8b7bc63bb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ConiferousForestBiome.java @@ -52,7 +52,7 @@ public class ConiferousForestBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/DrylandBiome.java similarity index 77% rename from src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java rename to src/main/java/biomesoplenty/common/biome/overworld/DrylandBiome.java index c52c86584..1abfed5f9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/DrylandBiome.java @@ -7,45 +7,52 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; +import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; +import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Features; +import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class XericShrublandBiome extends BiomeTemplate +public class DrylandBiome extends BiomeTemplate { - public XericShrublandBiome() {} + public DrylandBiome() + { + this.addWeight(BOPClimates.SAVANNA, 1); + this.setRiverBiome(null); + this.setBeachBiome(null); + } @Override protected void configureBiome(Biome.Builder builder) { - builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.SAVANNA).depth(0.0F).scale(-0.05F).temperature(1.75F).downfall(0.1F); + builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.SAVANNA).depth(0.1F).scale(0.1F).temperature(1.5F).downfall(0.1F); - builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(1.75F)).grassColorOverride(0xE5DFA9).foliageColorOverride(0xDAE0B3).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()); + builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(0x9E9DFF).grassColorOverride(0xDBBA9F).foliageColorOverride(0xD6C7A8).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()); } @Override protected void configureGeneration(BiomeGenerationSettings.Builder builder) { - builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND)); + builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)); // Structures builder.addStructureStart(StructureFeatures.VILLAGE_DESERT); builder.addStructureStart(StructureFeatures.PILLAGER_OUTPOST); - builder.addStructureStart(StructureFeatures.DESERT_PYRAMID); DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder); - builder.addStructureStart(StructureFeatures.RUINED_PORTAL_DESERT); + builder.addStructureStart(StructureFeatures.RUINED_PORTAL_STANDARD); + builder.addStructureStart(StructureFeatures.NETHER_FOSSIL); // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_LAVA); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_LAVA); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); @@ -55,19 +62,17 @@ public class XericShrublandBiome extends BiomeTemplate //////////////////////////////////////////////////////////// // Vegetation - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.XERIC_SHRUBLAND_TREES); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.XERIC_SHRUBLAND_FLOWERS); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DRYLAND_TREES); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DEAD_GRASS_2); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DESERT_GRASS_10); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DUNE_GRASS_100); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_DEAD_BUSH_2); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.BUSH_10); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DEAD_GRASS_5); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.STANDARD_GRASS_6); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_DEAD_BUSH); //////////////////////////////////////////////////////////// // Other Features DefaultBiomeFeatures.addDefaultSprings(builder); - DefaultBiomeFeatures.addDesertExtraDecoration(builder); DefaultBiomeFeatures.addSurfaceFreezing(builder); } @@ -85,6 +90,5 @@ public class XericShrublandBiome extends BiomeTemplate builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4)); builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4)); builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITCH, 5, 1, 1)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.HUSK, 80, 4, 4)); } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java index 333276e0f..913956107 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FirClearingBiome.java @@ -46,7 +46,7 @@ public class FirClearingBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java index d5ae95b28..0a1b7c343 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/FloodplainBiome.java @@ -48,7 +48,7 @@ public class FloodplainBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.WATER_LAKE_COMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_COMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java index aff1936dc..558f48cd9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/HighlandMoorBiome.java @@ -45,7 +45,7 @@ public class HighlandMoorBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.WATER_LAKE_COMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_COMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LushDesertBiome.java similarity index 79% rename from src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java rename to src/main/java/biomesoplenty/common/biome/overworld/LushDesertBiome.java index 286715bc2..2e717b3d4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LushDesertBiome.java @@ -7,6 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.biome.overworld; +import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; @@ -15,42 +16,39 @@ import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.feature.Features; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class BrushlandBiome extends BiomeTemplate +public class LushDesertBiome extends BiomeTemplate { - public BrushlandBiome() + public LushDesertBiome() { - this.addWeight(BOPClimates.SAVANNA, 5); + this.addWeight(BOPClimates.HOT_DESERT, 1); + this.setBeachBiome(null); } @Override protected void configureBiome(Biome.Builder builder) { - builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.SAVANNA).depth(0.1F).scale(0.1F).temperature(1.5F).downfall(0.1F); + builder.precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.DESERT).depth(0.6F).scale(0.6F).temperature(1.8F).downfall(0.15F); - builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(1.5F)).grassColorOverride(0xE5DFA9).foliageColorOverride(0xDAE0B3).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()); + builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4566514).waterFogColor(267827).fogColor(12638463).skyColor(calculateSkyColor(1.8F)).grassColorOverride(0xEFE182).foliageColorOverride(0xD3D156).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()); } @Override protected void configureGeneration(BiomeGenerationSettings.Builder builder) { - builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.BRUSHLAND, SurfaceBuilder.CONFIG_GRASS)); + builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.LUSH_DESERT, BOPSurfaceBuilders.ORANGE_SAND_SURFACE)); // Structures - builder.addStructureStart(StructureFeatures.VILLAGE_SAVANNA); - builder.addStructureStart(StructureFeatures.PILLAGER_OUTPOST); DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder); - builder.addStructureStart(StructureFeatures.RUINED_PORTAL_STANDARD); + builder.addStructureStart(StructureFeatures.RUINED_PORTAL_DESERT); // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_LAVA); - + DefaultBiomeFeatures.addDefaultLakes(builder); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); DefaultBiomeFeatures.addDefaultOres(builder); @@ -59,19 +57,22 @@ public class BrushlandBiome extends BiomeTemplate //////////////////////////////////////////////////////////// // Vegetation - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.BRUSHLAND_TREES); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.LUSH_DESERT_TREES); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.LUSH_DESERT_FLOWERS); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.BUSH_15); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DEAD_GRASS_5); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DEAD_GRASS_2); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DESERT_GRASS_10); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DUNE_GRASS_10); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.STANDARD_GRASS_12); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DUNE_GRASS_128); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_DEAD_BUSH_2); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_SUGAR_CANE); //////////////////////////////////////////////////////////// // Other Features DefaultBiomeFeatures.addDefaultSprings(builder); + + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.OVERGROWN_CLIFFS_SPRING); + DefaultBiomeFeatures.addSurfaceFreezing(builder); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java index ad87241b4..5bd0051e2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MangroveBiome.java @@ -48,7 +48,7 @@ public class MangroveBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.WATER_LAKE_COMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_COMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java index 7e9467389..041a7ded6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MarshBiome.java @@ -48,7 +48,7 @@ public class MarshBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.WATER_LAKE_COMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_COMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java index f730df302..ecd4df9bf 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java @@ -50,7 +50,7 @@ public class MireBiome extends BiomeTemplate DefaultBiomeFeatures.addDefaultCarvers(builder); DefaultBiomeFeatures.addDefaultLakes(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.MUD_LAKE); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.MUD_LAKE); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java index 3a97c8a29..b837a6a61 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MuskegBiome.java @@ -49,7 +49,7 @@ public class MuskegBiome extends BiomeTemplate DefaultBiomeFeatures.addDefaultCarvers(builder); DefaultBiomeFeatures.addDefaultLakes(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.WATER_LAKE_UNCOMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_UNCOMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java index 65efa0ef3..28867c5d3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java @@ -48,7 +48,7 @@ public class MysticGroveBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java deleted file mode 100644 index 9e475f6c1..000000000 --- a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright 2014-2019, the Biomes O' Plenty Team - * - * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. - * - * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. - ******************************************************************************/ -package biomesoplenty.common.biome.overworld; - -import biomesoplenty.common.biome.BiomeTemplate; -import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; -import net.minecraft.entity.EntityClassification; -import net.minecraft.entity.EntityType; -import net.minecraft.world.biome.*; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Features; -import net.minecraft.world.gen.feature.structure.StructureFeatures; -import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; -import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; - -public class OasisBiome extends BiomeTemplate -{ - public OasisBiome() {} - - @Override - protected void configureBiome(Biome.Builder builder) - { - builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.DESERT).depth(-0.275F).scale(-0.05F).temperature(2.0F).downfall(0.5F); - - builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(2.0F)).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()); - } - - @Override - protected void configureGeneration(BiomeGenerationSettings.Builder builder) - { - builder.surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_FULL_SAND)); - - // Structures - DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder); - builder.addStructureStart(StructureFeatures.RUINED_PORTAL_DESERT); - - // Underground - DefaultBiomeFeatures.addDefaultCarvers(builder); - DefaultBiomeFeatures.addDefaultLakes(builder); - DefaultBiomeFeatures.addDefaultMonsterRoom(builder); - DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); - DefaultBiomeFeatures.addDefaultOres(builder); - DefaultBiomeFeatures.addDefaultSoftDisks(builder); - - //////////////////////////////////////////////////////////// - - // Vegetation - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.OASIS_TREES); - - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DESERT_GRASS_10); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DUNE_GRASS_20); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_SUGAR_CANE); - - //////////////////////////////////////////////////////////// - - // Other Features - DefaultBiomeFeatures.addDefaultSprings(builder); - DefaultBiomeFeatures.addSurfaceFreezing(builder); - } - - @Override - protected void configureMobSpawns(MobSpawnInfo.Builder builder) - { - // Entities - builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.RABBIT, 4, 2, 3)); - builder.addSpawn(EntityClassification.AMBIENT, new MobSpawnInfo.Spawners(EntityType.BAT, 10, 8, 8)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SPIDER, 100, 4, 4)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE, 95, 4, 4)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE_VILLAGER, 5, 1, 1)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SKELETON, 100, 4, 4)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.CREEPER, 100, 4, 4)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITCH, 5, 1, 1)); - builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.HUSK, 80, 4, 4)); - } -} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java index 1f36756f5..e95e37c6c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java @@ -50,7 +50,7 @@ public class OminousWoodsBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OriginValleyBiome.java similarity index 95% rename from src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java rename to src/main/java/biomesoplenty/common/biome/overworld/OriginValleyBiome.java index bcab3eba1..f09dee770 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OriginValleyBiome.java @@ -20,9 +20,9 @@ import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; -public class OriginHillsBiome extends BiomeTemplate +public class OriginValleyBiome extends BiomeTemplate { - public OriginHillsBiome() + public OriginValleyBiome() { this.setBeachBiome(null); this.setRiverBiome(null); @@ -39,7 +39,7 @@ public class OriginHillsBiome extends BiomeTemplate @Override protected void configureGeneration(BiomeGenerationSettings.Builder builder) { - builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.ORIGIN_HILLS, BOPSurfaceBuilders.ORIGIN_GRASS_SURFACE)); + builder.surfaceBuilder(new ConfiguredSurfaceBuilder(BOPSurfaceBuilders.ORIGIN_VALLEY, BOPSurfaceBuilders.ORIGIN_GRASS_SURFACE)); // Underground builder.addCarver(GenerationStage.Carving.AIR, BOPConfiguredCarvers.ORIGIN_CAVE); @@ -58,7 +58,7 @@ public class OriginHillsBiome extends BiomeTemplate //////////////////////////////////////////////////////////// // Vegetation - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.ORIGIN_HILLS_TREES); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.ORIGIN_VALLEY_TREES); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.ORIGIN_FLOWERS); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_SUGAR_CANE); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java index f7f8fd64c..2bb3b5986 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java @@ -49,7 +49,7 @@ public class OutbackBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_LAVA); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_LAVA); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); @@ -61,7 +61,7 @@ public class OutbackBiome extends BiomeTemplate // Vegetation builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.OUTBACK_TREES); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DESERT_GRASS_5); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DESERT_GRASS_20); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_CACTUS_DESERT); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_DEAD_BUSH_2); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RainbowHillsBiome.java similarity index 96% rename from src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java rename to src/main/java/biomesoplenty/common/biome/overworld/RainbowHillsBiome.java index c0c65fc90..5e444dae1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RainbowValleyBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RainbowHillsBiome.java @@ -18,9 +18,9 @@ import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class RainbowValleyBiome extends BiomeTemplate +public class RainbowHillsBiome extends BiomeTemplate { - public RainbowValleyBiome() + public RainbowHillsBiome() { this.setBeachBiome(null); this.setGrassColorFunction(this::getGrassColor); @@ -53,8 +53,8 @@ public class RainbowValleyBiome extends BiomeTemplate //////////////////////////////////////////////////////////// // Vegetation - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.RAINBOW_VALLEY_TREES); - builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.RAINBOW_VALLEY_FLOWERS); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.RAINBOW_HILLS_TREES); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.RAINBOW_HILLS_FLOWERS); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.BLUE_HYDRANGEA_4); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.GOLDENROD_2); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java index 28b2d29b0..5f814e46c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestBiome.java @@ -46,7 +46,7 @@ public class RedwoodForestBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java index 2e418c815..13646396d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/RedwoodForestEdgeBiome.java @@ -43,7 +43,7 @@ public class RedwoodForestEdgeBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java index b3db9d42d..2a8245655 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ScrublandBiome.java @@ -10,19 +10,22 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeTemplate; import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures; +import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.world.biome.*; import net.minecraft.world.gen.GenerationStage; +import net.minecraft.world.gen.feature.Features; import net.minecraft.world.gen.feature.structure.StructureFeatures; import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; +import sun.java2d.Surface; public class ScrublandBiome extends BiomeTemplate { public ScrublandBiome() { - this.addWeight(BOPClimates.SAVANNA, 7); + this.addWeight(BOPClimates.SAVANNA, 5); } @Override @@ -50,7 +53,8 @@ public class ScrublandBiome extends BiomeTemplate DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); DefaultBiomeFeatures.addDefaultOres(builder); - DefaultBiomeFeatures.addDefaultSoftDisks(builder); + + builder.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, BOPConfiguredFeatures.ORANGE_SAND_DISK); //////////////////////////////////////////////////////////// @@ -60,6 +64,7 @@ public class ScrublandBiome extends BiomeTemplate builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.SCRUB_EXTRA); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.STANDARD_GRASS_12); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.TALL_GRASS_6); + builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_DEAD_BUSH); //////////////////////////////////////////////////////////// diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java index aeb02710d..031ab1d70 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyConiferousForestBiome.java @@ -47,7 +47,7 @@ public class SnowyConiferousForestBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java index 0a4830cc0..2008b84b2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyFirClearingBiome.java @@ -43,7 +43,7 @@ public class SnowyFirClearingBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java index 73e724ff4..3eefd2518 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java @@ -48,7 +48,7 @@ public class TemperateRainforestBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java index e15c822bf..20be4f60e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestHillsBiome.java @@ -46,7 +46,7 @@ public class TemperateRainforestHillsBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, Features.LAKE_WATER); + builder.addFeature(GenerationStage.Decoration.LAKES, Features.LAKE_WATER); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java index 69b3ac63f..b627c8eed 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java @@ -47,7 +47,7 @@ public class VolcanoBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.LAVA_LAKE_COMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.LAVA_LAKE_COMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java index e68362c40..5194526ad 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java @@ -31,7 +31,7 @@ public class WastelandBiome extends BiomeTemplate @Override protected void configureBiome(Biome.Builder builder) { - builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.DESERT).depth(-0.05F).scale(-0.05F).temperature(2.0F).downfall(0.0F); + builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.DESERT).depth(0.0F).scale(-0.1F).temperature(2.0F).downfall(0.0F); builder.specialEffects((new BiomeAmbience.Builder()).waterColor(0x433721).waterFogColor(0x0C0C03).fogColor(0xDBDDC1).skyColor(0x70ADEF).grassColorOverride(0xAD9364).foliageColorOverride(0xB5A76C).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java index 280b29a14..95c67d082 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java @@ -48,7 +48,7 @@ public class WetlandBiome extends BiomeTemplate // Underground DefaultBiomeFeatures.addDefaultCarvers(builder); - builder.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, BOPConfiguredFeatures.WATER_LAKE_UNCOMMON); + builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_UNCOMMON); DefaultBiomeFeatures.addDefaultMonsterRoom(builder); DefaultBiomeFeatures.addDefaultUndergroundVariety(builder); diff --git a/src/main/java/biomesoplenty/common/block/FlowerBlockBOP.java b/src/main/java/biomesoplenty/common/block/FlowerBlockBOP.java index d0d0cb519..8884f8e6b 100644 --- a/src/main/java/biomesoplenty/common/block/FlowerBlockBOP.java +++ b/src/main/java/biomesoplenty/common/block/FlowerBlockBOP.java @@ -66,7 +66,7 @@ public class FlowerBlockBOP extends FlowerBlock if (this == BOPBlocks.wildflower) { - return ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || super.canSurvive(state, worldIn, pos); + return ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.orange_sand || ground == BOPBlocks.black_sand || super.canSurvive(state, worldIn, pos); } if (this == BOPBlocks.burning_blossom) { diff --git a/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java b/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java index 7bd337835..a74472f11 100644 --- a/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java +++ b/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java @@ -85,11 +85,11 @@ public class FoliageBlockBOP extends BushBlock implements IPlantable } if (this == BOPBlocks.dune_grass) { - return ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.black_sand; + return ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.orange_sand || ground == BOPBlocks.black_sand; } if (this == BOPBlocks.desert_grass || this == BOPBlocks.dead_grass) { - return ground == BOPBlocks.dried_salt || ground == Blocks.GRAVEL || ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.black_sand || ground == Blocks.NETHERRACK || super.canSurvive(state, worldIn, pos); + return ground == BOPBlocks.dried_salt || ground == Blocks.GRAVEL || ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.orange_sand || ground == BOPBlocks.black_sand || ground == Blocks.NETHERRACK || super.canSurvive(state, worldIn, pos); } return super.canSurvive(state, worldIn, pos); diff --git a/src/main/java/biomesoplenty/common/block/SaplingBlockBOP.java b/src/main/java/biomesoplenty/common/block/SaplingBlockBOP.java index d740aeec3..c7c6b011d 100644 --- a/src/main/java/biomesoplenty/common/block/SaplingBlockBOP.java +++ b/src/main/java/biomesoplenty/common/block/SaplingBlockBOP.java @@ -97,7 +97,7 @@ public class SaplingBlockBOP extends SaplingBlock implements IGrowable if (this == BOPBlocks.palm_sapling) { - return ground == BOPBlocks.white_sand || ground == Blocks.RED_SAND || ground == Blocks.SAND || super.canSurvive(state, worldIn, pos); + return ground == BOPBlocks.white_sand || ground == BOPBlocks.orange_sand || ground == BOPBlocks.black_sand || ground == Blocks.RED_SAND || ground == Blocks.SAND || super.canSurvive(state, worldIn, pos); } if (this == BOPBlocks.hellbark_sapling) { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPConfiguredFeatures.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPConfiguredFeatures.java index f99bae5dc..d8c322bbc 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPConfiguredFeatures.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPConfiguredFeatures.java @@ -77,7 +77,6 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature MAHOGANY_TREE = register("mahogany_tree", BOPFeatures.MAHOGANY_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature MAPLE_TREE = register("maple_tree", BOPFeatures.MAPLE_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature MAPLE_TWIGLET_TREE = register("maple_twiglet_tree", BOPFeatures.MAPLE_TWIGLET_TREE.configured(Features.OAK.config())); - public static final ConfiguredFeature OASIS_JUNGLE_TWIGLET_TREE = register("oasis_jungle_twiglet_tree", BOPFeatures.OASIS_JUNGLE_TWIGLET_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature ORANGE_AUTUMN_TREE = register("orange_autumn_tree", BOPFeatures.ORANGE_AUTUMN_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature ORIGIN_TREE = register("origin_tree", BOPFeatures.ORIGIN_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature PALM_TREE = register("palm_tree", BOPFeatures.PALM_TREE.configured(Features.OAK.config())); @@ -91,6 +90,7 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature SILK_TREE = register("silk_tree", BOPFeatures.SILK_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature SMALL_DEAD_TREE = register("small_dead_tree", BOPFeatures.SMALL_DEAD_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature SMALL_JUNGLE_TREE = register("small_jungle_tree", BOPFeatures.SMALL_JUNGLE_TREE.configured(Features.OAK.config())); + public static final ConfiguredFeature SPARSE_ACACIA_TREE = register("sparse_acacia_tree", BOPFeatures.SPARSE_ACACIA_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature SPARSE_OAK_TREE = register("sparse_oak_tree", BOPFeatures.SPARSE_OAK_TREE.configured(Features.OAK.config())); public static final ConfiguredFeature SPRUCE_BUSH = register("spruce_bush", BOPFeatures.SPRUCE_BUSH.configured(Features.OAK.config())); public static final ConfiguredFeature SPRUCE_POPLAR = register("spruce_poplar", BOPFeatures.SPRUCE_POPLAR.configured(Features.OAK.config())); @@ -115,11 +115,11 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature BAYOU_TREES = register("bayou_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(CYPRESS_TREE_MEDIUM.weighted(0.3F)), CYPRESS_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(3, 0.6F, 1)))); public static final ConfiguredFeature BOG_TREES = register("bog_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(SPRUCE_TWIGLET_TREE.weighted(0.4F), MAPLE_TWIGLET_TREE.weighted(0.6F)), TWIGLET_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(5, 0.4F, 1)))); public static final ConfiguredFeature BOREAL_FOREST_TREES = register("boreal_forest_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BIG_OAK_TREE.weighted(0.075F), Features.OAK.weighted(0.15F), YELLOW_POPLAR_TREE.weighted(0.3F), YELLOW_AUTUMN_TREE.weighted(0.15F)), TALL_SPRUCE_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(10, 0.4F, 1)))); - public static final ConfiguredFeature BRUSHLAND_TREES = register("brushland_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(TWIGLET_TREE.weighted(0.4F), DYING_TREE.weighted(0.1F), SPARSE_OAK_TREE.weighted(0.2F)), ACACIA_TWIGLET_SMALL)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(3, 0.4F, 1)))); public static final ConfiguredFeature CHAPARRAL_TREES = register("chaparral_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(TWIGLET_TREE.weighted(0.1F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(12, 0.3F, 1)))); public static final ConfiguredFeature CHERRY_BLOSSOM_GROVE_TREES = register("cherry_blossom_grove_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(WHITE_CHERRY_TREE_BEES.weighted(0.1F), PINK_CHERRY_TREE_BEES.weighted(0.2F), BIG_WHITE_CHERRY_TREE.weighted(0.3F), FLOWERING_OAK_TREE_BEES.weighted(0.15F), FLOWERING_BUSH.weighted(0.3F)), BIG_PINK_CHERRY_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(5, 0.3F, 1)))); public static final ConfiguredFeature CONIFEROUS_FOREST_TREES = register("coniferous_forest_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(FIR_TREE.weighted(0.33333334F)), FIR_TREE_LARGE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(10, 0.1F, 1)))); public static final ConfiguredFeature DEAD_FOREST_TREES = register("dead_forest_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(DYING_TREE.weighted(0.2F), DEAD_TREE.weighted(0.1F), TALL_SPRUCE_TREE.weighted(0.3F), SMALL_DEAD_TREE.weighted(0.3F)), Features.OAK)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(2, 0.5F, 1)))); + public static final ConfiguredFeature DRYLAND_TREES = register("dry_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(TWIGLET_TREE.weighted(0.4F), DYING_TREE.weighted(0.1F), SPARSE_OAK_TREE.weighted(0.2F)), ACACIA_TWIGLET_SMALL)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(2, 0.4F, 1)))); public static final ConfiguredFeature FIR_CLEARING_TREES = register("fir_clearing_trees", FIR_TREE_SMALL.decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(1, 0.1F, 1)))); public static final ConfiguredFeature FLOODPLAIN_TREES = register("floodplain_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(SPARSE_OAK_TREE.weighted(0.3F), BIG_OAK_TREE.weighted(0.1F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(1, 0.3F, 1)))); public static final ConfiguredFeature FLOWER_MEADOW_TREES = register("flower_meadow_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(TALL_SPRUCE_TREE_BEES.weighted(0.1F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(2, 0.3F, 1)))); @@ -127,6 +127,7 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature GROVE_TREES = register("grove_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(SPARSE_OAK_TREE.weighted(0.05F), DARK_OAK_POPLAR.weighted(0.2F), SPRUCE_POPLAR.weighted(0.4F), FLOWERING_BUSH.weighted(0.1F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(3, 0.5F, 1)))); public static final ConfiguredFeature JADE_CLIFFS_TREES = register("jade_cliffs_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(TALL_SPRUCE_TREE.weighted(0.075F), Features.PINE.weighted(0.025F)), SPRUCE_BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(35, 0.1F, 1)))); public static final ConfiguredFeature LAVENDER_FIELD_TREES = register("lavender_field_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(FLOWERING_OAK_TREE_BEES.weighted(0.2F), BIG_FLOWERING_OAK_TREE.weighted(0.1F), BIG_JACARANDA_TREE.weighted(0.1F)), JACARANDA_TREE_BEES)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(1, 0.2F, 1)))); + public static final ConfiguredFeature LUSH_DESERT_TREES = register("lush_desert_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(ACACIA_BUSH.weighted(0.4F), SPARSE_ACACIA_TREE.weighted(0.2F)), ACACIA_TWIGLET_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(5, 0.4F, 1)))); public static final ConfiguredFeature LUSH_GRASSLAND_TREES = register("lush_grassland_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(SMALL_JUNGLE_TREE.weighted(0.1F), Features.OAK_BEES_0002.weighted(0.2F), PALM_TREE.weighted(0.05F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig((int)0.95F, 0.6F, 1)))); public static final ConfiguredFeature LUSH_SWAMP_TREES = register("lush_swamp_trees", TALL_SWAMP_TREE.decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(3, 0.1F, 1)))); public static final ConfiguredFeature MANGROVE_TREES = register("mangrove_trees", BUSH.decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(15, 0.3F, 1)))); @@ -135,15 +136,14 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature MIRE_TREES = register("mire_trees", DARK_OAK_TWIGLET_TREE.decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(3, 0.1F, 1)))); public static final ConfiguredFeature MUSKEG_TREES = register("muskeg_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(DARK_OAK_TWIGLET_TREE.weighted(0.4F), DEAD_TREE.weighted(0.3F), DYING_TREE.weighted(0.075F), DEAD_TWIGLET_TREE_TALL.weighted(0.1F)), DEAD_TWIGLET_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(1, 0.2F, 1)))); public static final ConfiguredFeature MYSTIC_GROVE_TREES = register("mystic_grove_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(GIANT_TREE.weighted(0.01F), TALL_SWAMP_TREE.weighted(0.1F), BIG_FLOWERING_OAK_TREE.weighted(0.2F), JACARANDA_TREE.weighted(0.3F), BIG_MAGIC_TREE.weighted(0.3F)), MAGIC_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(10, 0.5F, 1)))); - public static final ConfiguredFeature OASIS_TREES = register("oasis_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(PALM_TREE.weighted(0.3F)), OASIS_JUNGLE_TWIGLET_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(5, 0.2F, 1)))); public static final ConfiguredFeature OMINOUS_WOODS_TREES = register("ominous_woods_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(DEAD_TREE.weighted(0.05F), DYING_TREE.weighted(0.15F), WILLOW_TREE.weighted(0.15F), TALL_UMBRAN_TREE.weighted(0.7F)), UMBRAN_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(7, 0.5F, 1)))); public static final ConfiguredFeature ORCHARD_TREES = register("orchard_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BIG_FLOWERING_OAK_TREE.weighted(0.1F)), FLOWERING_OAK_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(2, 0.3F, 1)))); - public static final ConfiguredFeature ORIGIN_HILLS_TREES = register("origin_hills_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BIG_ORIGIN_TREE.weighted(0.1F)), ORIGIN_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(BOPPlacements.ALPHA_TREE.configured(NoPlacementConfig.INSTANCE))); - public static final ConfiguredFeature OUTBACK_TREES = register("outback_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(ACACIA_BUSH.weighted(0.1F)), ACACIA_TWIGLET_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig((int)0.5F, 0.3F, 1)))); + public static final ConfiguredFeature ORIGIN_VALLEY_TREES = register("origin_valley_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BIG_ORIGIN_TREE.weighted(0.1F)), ORIGIN_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(BOPPlacements.ALPHA_TREE.configured(NoPlacementConfig.INSTANCE))); + public static final ConfiguredFeature OUTBACK_TREES = register("outback_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(ACACIA_TWIGLET_TREE.weighted(0.15F)), ACACIA_TWIGLET_SMALL)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(1, 0.6F, 1)))); public static final ConfiguredFeature OVERGROWN_CLIFFS_TREES = register("overgrown_cliffs_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(JUNGLE_TWIGLET_TREE.weighted(0.3F), MAHOGANY_TREE.weighted(0.1F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(16, 0.4F, 1)))); public static final ConfiguredFeature PRAIRIE_TREES = register("prairie_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BIG_OAK_TREE.weighted(0.1F)), SPARSE_OAK_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig((int)0.85F, 0.3F, 1)))); public static final ConfiguredFeature PUMPKIN_PATCH_TREES = register("pumpkin_patch_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BUSH.weighted(0.2F)), TWIGLET_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(5, 0.5F, 1)))); - public static final ConfiguredFeature RAINBOW_VALLEY_TREES = register("rainbow_valley_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BUSH.weighted(0.2F), FIR_TREE_SMALL.weighted(0.1F), FIR_TREE.weighted(0.025F), BIG_RAINBOW_BIRCH_TREE.weighted(0.2F)), RAINBOW_BIRCH_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(15, 0.5F, 1)))); + public static final ConfiguredFeature RAINBOW_HILLS_TREES = register("rainbow_hills_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(BUSH.weighted(0.2F), FIR_TREE_SMALL.weighted(0.1F), FIR_TREE.weighted(0.025F), BIG_RAINBOW_BIRCH_TREE.weighted(0.2F)), RAINBOW_BIRCH_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(15, 0.5F, 1)))); public static final ConfiguredFeature RAINFOREST_TREES = register("rainforest_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(Features.BIRCH.weighted(0.1F), BIG_OAK_TREE.weighted(0.4F)), Features.OAK)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(10, 0.5F, 1)))); public static final ConfiguredFeature REDWOOD_FOREST_EDGE_TREES = register("redwood_forest_edge_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(REDWOOD_TREE.weighted(0.3F), REDWOOD_TREE_MEDIUM.weighted(0.1F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(5, 0.3F, 1)))); public static final ConfiguredFeature REDWOOD_FOREST_TREES = register("redwood_forest_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(REDWOOD_TREE.weighted(0.1F), REDWOOD_TREE_MEDIUM.weighted(0.3F), REDWOOD_TREE_LARGE.weighted(0.5F)), BUSH)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(18, 0.2F, 1)))); @@ -164,12 +164,12 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature WASTELAND_TREES = register("wasteland_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(DEAD_TREE_WASTELAND.weighted(0.2F)), DYING_TREE_WASTELAND)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig((int)0.75F, 0.1F, 1)))); public static final ConfiguredFeature WETLAND_TREES = register("wetland_trees", Feature.RANDOM_SELECTOR.configured(new MultipleRandomFeatureConfig(ImmutableList.of(TALL_SPRUCE_TREE.weighted(0.5F)), WILLOW_TREE)).decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(5, 0.1F, 1)))); public static final ConfiguredFeature WOODLAND_TREES = register("woodland_trees", Features.OAK.decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig(7, 0.1F, 1)))); - public static final ConfiguredFeature XERIC_SHRUBLAND_TREES = register("xeric_shrubland_trees", ACACIA_TWIGLET_SMALL.decorated(Features.Placements.HEIGHTMAP_SQUARE).decorated(Placement.COUNT_EXTRA.configured(new AtSurfaceWithExtraConfig((int)1F, 0.1F, 1)))); // Biome Flower Listings public static final ConfiguredFeature CHAPARRAL_FLOWERS = register("chaparral_flowers", BOPFeatures.CHAPARRAL_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(17))); public static final ConfiguredFeature CHERRY_BLOSSOM_GROVE_FLOWERS = register("cherry_blossom_grove_flowers", BOPFeatures.CHERRY_BLOSSOM_GROVE_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(5))); public static final ConfiguredFeature CONIFEROUS_FOREST_FLOWERS = register("coniferous_forest_flowers", BOPFeatures.CONIFEROUS_FOREST_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(4))); + public static final ConfiguredFeature LUSH_DESERT_FLOWERS = register("lush_desert_flowers", BOPFeatures.WILDFLOWER_FEATURE.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(6))); public static final ConfiguredFeature FLOWER_MEADOW_FLOWERS = register("flower_meadow_flowers", BOPFeatures.FLOWER_MEADOW_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).decorated(FeatureUtil.denseCount(150))); public static final ConfiguredFeature GROVE_FLOWERS = register("grove_flowers", BOPFeatures.EXTENDED_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(6))); public static final ConfiguredFeature JUNGLE_FLOWERS = register("jungle_flowers", BOPFeatures.JUNGLE_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(5))); @@ -185,7 +185,7 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature ORCHARD_FLOWERS = register("orchard_flowers", BOPFeatures.EXTENDED_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(15))); public static final ConfiguredFeature ORIGIN_FLOWERS = register("origin_flowers", BOPFeatures.ORIGIN_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(4))); public static final ConfiguredFeature POPPY_FIELD_FLOWERS = register("poppy_field_flowers", BOPFeatures.POPPY_FEATURE.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).decorated(FeatureUtil.denseCount(500))); - public static final ConfiguredFeature RAINBOW_VALLEY_FLOWERS = register("rainbow_valley_flowers", BOPFeatures.RAINBOW_VALLEY_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(25))); + public static final ConfiguredFeature RAINBOW_HILLS_FLOWERS = register("rainbow_hills_flowers", BOPFeatures.RAINBOW_HILLS_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(25))); public static final ConfiguredFeature RAINFOREST_FLOWERS = register("rainforest_flowers", BOPFeatures.RAINFOREST_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(6))); public static final ConfiguredFeature SHRUBLAND_FLOWERS = register("shrubland_flowers", BOPFeatures.SHRUBLAND_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(3))); public static final ConfiguredFeature SNOWY_FLOWERS = register("snowy_flowers", BOPFeatures.SNOWY_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(3))); @@ -193,7 +193,6 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature UNDERGROWTH_FLOWERS = register("undergrowth_flowers", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.burning_blossom.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(8))); public static final ConfiguredFeature WASTELAND_FLOWERS = register("wasteland_flowers", BOPFeatures.WASTELAND_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(1))); public static final ConfiguredFeature WETLAND_FLOWERS = register("wetland_flowers", BOPFeatures.WETLAND_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(3))); - public static final ConfiguredFeature XERIC_SHRUBLAND_FLOWERS = register("xeric_shrubland_flowers", BOPFeatures.WILDFLOWER_FEATURE.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(1))); ///////////////////////////////////////////////////////////////////// @@ -223,11 +222,8 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature SPROUTS_75 = register("sprouts_75", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.sprout.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(75))); public static final ConfiguredFeature SPROUTS_200 = register("sprouts_200", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.sprout.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).decorated(FeatureUtil.denseCount(200))); - public static final ConfiguredFeature DUNE_GRASS_10 = register("dune_grass_10", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.dune_grass.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(10))); - public static final ConfiguredFeature DUNE_GRASS_20 = register("dune_grass_20", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.dune_grass.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(20))); - public static final ConfiguredFeature DUNE_GRASS_100 = register("dune_grass_100", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.dune_grass.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(100))); + public static final ConfiguredFeature DUNE_GRASS_128 = register("dune_grass_128", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.dune_grass.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(128))); - public static final ConfiguredFeature DESERT_GRASS_5 = register("desert_grass_5", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.desert_grass.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(5))); public static final ConfiguredFeature DESERT_GRASS_10 = register("desert_grass_10", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.desert_grass.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(10))); public static final ConfiguredFeature DESERT_GRASS_20 = register("desert_grass_20", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.desert_grass.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(20))); @@ -298,7 +294,7 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature BIG_PUMPKIN = register("big_pumpkin", BOPFeatures.BIG_PUMPKIN.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(3))); public static final ConfiguredFeature BLACK_SANDSTONE_COLUMN = register("black_sandstone_column", BOPFeatures.BLACK_SANDSTONE_COLUMN.configured(new ColumnConfig(FeatureSpread.fixed(1), FeatureSpread.of(1, 3))).decorated(Placement.COUNT_MULTILAYER.configured(new FeatureSpreadConfig(2))).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(1))); public static final ConfiguredFeature BLACK_SAND_DISK = register("black_sand_disk", Feature.DISK.configured(new SphereReplaceConfig(BOPBlocks.black_sand.defaultBlockState(), FeatureSpread.of(4, 2), 1, ImmutableList.of(Blocks.DIRT.defaultBlockState(), Blocks.GRASS_BLOCK.defaultBlockState()))).decorated(Features.Placements.TOP_SOLID_HEIGHTMAP_SQUARE).count(4)); - public static final ConfiguredFeature BONE_SPINE = register("bone_spine", BOPFeatures.BONE_SPINE.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(6))); + public static final ConfiguredFeature BONE_SPINE = register("bone_spine", BOPFeatures.BONE_SPINE.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(3))); public static final ConfiguredFeature BRAMBLE = register("bramble", BOPFeatures.BRAMBLE.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(3))); public static final ConfiguredFeature FLESH_TENDON = register("flesh_tendon", BOPFeatures.FLESH_TENDON.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(65))); public static final ConfiguredFeature GRAVEL_DISK_EXTRA = register("gravel_disk_extra", Feature.DISK.configured(new SphereReplaceConfig(Blocks.GRAVEL.defaultBlockState(), FeatureSpread.of(4, 2), 1, ImmutableList.of(Blocks.DIRT.defaultBlockState(), Blocks.GRASS_BLOCK.defaultBlockState()))).decorated(Features.Placements.TOP_SOLID_HEIGHTMAP_SQUARE).count(6)); @@ -314,7 +310,8 @@ public class BOPConfiguredFeatures public static final ConfiguredFeature NETHER_BRAMBLE = register("nether_bramble", BOPFeatures.BRAMBLE.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(50))); public static final ConfiguredFeature NETHER_VINES = register("nether_vines", BOPFeatures.NETHER_VINES.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).decorated(FeatureUtil.denseCount(150))); public static final ConfiguredFeature OBSIDIAN_SPLATTER = register("obsidian_splatter", BOPFeatures.OBSIDIAN_SPLATTER.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(12))); - public static final ConfiguredFeature OVERGROWN_CLIFFS_SPRING = register("overgrown_cliffs_spring", Feature.SPRING.configured(BOPFeatures.OVERGROWN_CLIFFS_SPRING_CONFIG).decorated(Placement.RANGE_VERY_BIASED.configured(new TopSolidRangeConfig(8, 16, 256))).squared().decorated(FeatureUtil.denseCount(150))); + public static final ConfiguredFeature ORANGE_SAND_DISK = register("orange_sand_disk", Feature.DISK.configured(new SphereReplaceConfig(BOPBlocks.orange_sand.defaultBlockState(), FeatureSpread.of(4, 2), 1, ImmutableList.of(Blocks.DIRT.defaultBlockState(), Blocks.GRASS_BLOCK.defaultBlockState()))).decorated(Features.Placements.TOP_SOLID_HEIGHTMAP_SQUARE).count(5)); + public static final ConfiguredFeature OVERGROWN_CLIFFS_SPRING = register("overgrown_cliffs_spring", Feature.SPRING.configured(BOPFeatures.OVERGROWN_CLIFFS_SPRING_CONFIG).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).count(128)); public static final ConfiguredFeature OVERGROWN_CLIFFS_VINES = register("overgrown_cliffs_vines", BOPFeatures.OVERGROWN_CLIFFS_VINES.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE).decorated(FeatureUtil.denseCount(150))); public static final ConfiguredFeature PODZOL_SPLATTER = register("podzol_splatter", BOPFeatures.PODZOL_SPLATTER.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(14))); public static final ConfiguredFeature PUMPKIN_PATCH = register("pumpkin_patch", BOPFeatures.PUMPKIN_PATCH.configured(IFeatureConfig.NONE).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(35))); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPFeatures.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPFeatures.java index e29a3c9e2..edef8dc40 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPFeatures.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPFeatures.java @@ -8,7 +8,6 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.world.gen.carver.OriginCaveWorldCarver; import biomesoplenty.common.world.gen.feature.tree.*; import biomesoplenty.core.BiomesOPlenty; import com.google.common.collect.ImmutableSet; @@ -19,7 +18,6 @@ import net.minecraft.fluid.Fluids; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraft.world.gen.carver.WorldCarver; import net.minecraft.world.gen.feature.*; public class BOPFeatures @@ -79,6 +77,7 @@ public class BOPFeatures public static final Feature WILLOW_TREE = register("willow_tree", new BasicTreeFeature.Builder().log(BOPBlocks.willow_log.defaultBlockState()).leaves(BOPBlocks.willow_leaves.defaultBlockState()).vine(BOPBlocks.willow_vine.defaultBlockState()).minHeight(6).maxHeight(10).maxLeavesRadius(2).leavesOffset(0).create()); //Sparse Trees + public static final Feature SPARSE_ACACIA_TREE = register("sparse_acacia_tree", new BigTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == BOPBlocks.orange_sand).log(Blocks.ACACIA_LOG.defaultBlockState()).leaves(Blocks.ACACIA_LEAVES.defaultBlockState()).maxHeight(8).foliageHeight(1).create()); public static final Feature SPARSE_OAK_TREE = register("sparse_oak_tree", new BigTreeFeature.Builder().maxHeight(10).foliageHeight(2).create()); public static final Feature DYING_TREE = register("dying_tree", new BigTreeFeature.Builder().log(BOPBlocks.dead_log.defaultBlockState()).leaves(BOPBlocks.dead_leaves.defaultBlockState()).maxHeight(10).foliageHeight(2).create()); public static final Feature DYING_TREE_WASTELAND = register("dying_tree_wasteland", new BigTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == BOPBlocks.dried_salt).log(BOPBlocks.dead_log.defaultBlockState()).leaves(BOPBlocks.dead_leaves.defaultBlockState()).maxHeight(10).foliageHeight(1).create()); @@ -86,7 +85,7 @@ public class BOPFeatures //Bushes/Twiglets public static final Feature BUSH = register("bush", new BushTreeFeature.Builder().create()); public static final Feature SPRUCE_BUSH = register("spruce_bush", new BushTreeFeature.Builder().log(Blocks.SPRUCE_LOG.defaultBlockState()).leaves(Blocks.SPRUCE_LEAVES.defaultBlockState()).create()); - public static final Feature ACACIA_BUSH = register("acacia_bush", new BushTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == Blocks.RED_SAND).log(Blocks.ACACIA_LOG.defaultBlockState()).leaves(Blocks.ACACIA_LEAVES.defaultBlockState()).create()); + public static final Feature ACACIA_BUSH = register("acacia_bush", new BushTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == BOPBlocks.orange_sand).log(Blocks.ACACIA_LOG.defaultBlockState()).leaves(Blocks.ACACIA_LEAVES.defaultBlockState()).create()); public static final Feature FLOWERING_BUSH = register("flowering_bush", new BushTreeFeature.Builder().altLeaves(BOPBlocks.flowering_oak_leaves.defaultBlockState()).create()); public static final Feature COBWEB_BUSH = register("cobweb_bush", new BushTreeFeature.Builder().altLeaves(Blocks.COBWEB.defaultBlockState()).create()); public static final Feature FULL_COBWEB_BUSH = register("full_cobweb_bush", new BushTreeFeature.Builder().leaves(Blocks.COBWEB.defaultBlockState()).create()); @@ -96,10 +95,9 @@ public class BOPFeatures public static final Feature TALL_TWIGLET_TREE = register("tall_twiglet_tree", new TwigletTreeFeature.Builder().minHeight(2).maxHeight(4).create()); public static final Feature SPRUCE_TWIGLET_TREE = register("spruce_twiglet_tree", new TwigletTreeFeature.Builder().log(Blocks.SPRUCE_LOG.defaultBlockState()).leaves(Blocks.SPRUCE_LEAVES.defaultBlockState()).minHeight(1).maxHeight(2).create()); public static final Feature JUNGLE_TWIGLET_TREE = register("jungle_twiglet_tree", new TwigletTreeFeature.Builder().log(Blocks.JUNGLE_LOG.defaultBlockState()).leaves(Blocks.JUNGLE_LEAVES.defaultBlockState()).minHeight(1).maxHeight(2).trunkFruit(Blocks.COCOA.defaultBlockState()).create()); - public static final Feature OASIS_JUNGLE_TWIGLET_TREE = register("oasis_jungle_twiglet_tree", new TwigletTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == Blocks.SAND).log(Blocks.JUNGLE_LOG.defaultBlockState()).leaves(Blocks.JUNGLE_LEAVES.defaultBlockState()).minHeight(1).maxHeight(2).trunkFruit(Blocks.COCOA.defaultBlockState()).create()); public static final Feature DARK_OAK_TWIGLET_TREE = register("dark_oak_twiglet_tree", new TwigletTreeFeature.Builder().log(Blocks.DARK_OAK_LOG.defaultBlockState()).leaves(Blocks.DARK_OAK_LEAVES.defaultBlockState()).minHeight(1).maxHeight(2).create()); public static final Feature ACACIA_TWIGLET_TREE = register("acacia_twiglet_tree", new TwigletTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == Blocks.RED_SAND).log(Blocks.ACACIA_LOG.defaultBlockState()).leaves(Blocks.ACACIA_LEAVES.defaultBlockState()).create()); - public static final Feature ACACIA_TWIGLET_SMALL = register("acacia_twiglet_small", new TwigletTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == Blocks.SAND).log(Blocks.ACACIA_LOG.defaultBlockState()).leaves(Blocks.ACACIA_LEAVES.defaultBlockState()).minHeight(1).maxHeight(2).create()); + public static final Feature ACACIA_TWIGLET_SMALL = register("acacia_twiglet_small", new TwigletTreeFeature.Builder().placeOn((world, pos) -> world.getBlockState(pos).getBlock() == Blocks.SAND || world.getBlockState(pos).getBlock() == BOPBlocks.orange_sand).log(Blocks.ACACIA_LOG.defaultBlockState()).leaves(Blocks.ACACIA_LEAVES.defaultBlockState()).minHeight(1).maxHeight(2).create()); public static final Feature ACACIA_TWIGLET = register("acacia_twiglet", new TwigletTreeFeature.Builder().log(Blocks.ACACIA_LOG.defaultBlockState()).leaves(Blocks.ACACIA_LEAVES.defaultBlockState()).minHeight(1).maxHeight(2).create()); public static final Feature MAPLE_TWIGLET_TREE = register("maple_twiglet_tree", new TwigletTreeFeature.Builder().minHeight(1).maxHeight(2).leaves(BOPBlocks.maple_leaves.defaultBlockState()).create()); public static final Feature DEAD_TWIGLET_TREE_SMALL = register("dead_twiglet_tree_small", new TwigletTreeFeature.Builder().minHeight(1).maxHeight(1).leaves(BOPBlocks.dead_leaves.defaultBlockState()).log(BOPBlocks.dead_log.defaultBlockState()).create()); @@ -162,7 +160,7 @@ public class BOPFeatures public static final FlowersFeature MYSTIC_GROVE_FLOWERS = register("mystic_grove_flowers", new MysticGroveFlowersFeature()); public static final FlowersFeature OMINOUS_WOODS_FLOWERS = register("ominous_woods_flowers", new OminousWoodsFlowersFeature()); public static final FlowersFeature ORIGIN_FLOWERS = register("origin_flowers", new OriginFlowersFeature()); - public static final FlowersFeature RAINBOW_VALLEY_FLOWERS = register("rainbow_valley_flowers", new RainbowValleyFlowersFeature()); + public static final FlowersFeature RAINBOW_HILLS_FLOWERS = register("rainbow_hills_flowers", new RainbowHillsFlowersFeature()); public static final FlowersFeature RAINFOREST_FLOWERS = register("rainforest_flowers", new RainforestFlowersFeature()); public static final FlowersFeature SHRUBLAND_FLOWERS = register("shrubland_flowers", new ShrublandFlowersFeature()); public static final FlowersFeature SNOWY_FLOWERS = register("snowy_flowers", new SnowyFlowersFeature()); @@ -177,7 +175,7 @@ public class BOPFeatures //Other public static final LiquidsConfig VOLCANO_SPRING_CONFIG = new LiquidsConfig(Fluids.LAVA.defaultFluidState(), true, 4, 1, ImmutableSet.of(Blocks.BASALT, Blocks.MAGMA_BLOCK, BOPBlocks.black_sand, BOPBlocks.black_sandstone, Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE)); - public static final LiquidsConfig OVERGROWN_CLIFFS_SPRING_CONFIG = new LiquidsConfig(Fluids.WATER.defaultFluidState(), true, 4, 1, ImmutableSet.of(Blocks.DIRT, Blocks.TERRACOTTA, Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE)); + public static final LiquidsConfig OVERGROWN_CLIFFS_SPRING_CONFIG = new LiquidsConfig(Fluids.WATER.defaultFluidState(), true, 4, 1, ImmutableSet.of(Blocks.DIRT, Blocks.TERRACOTTA, Blocks.STONE, Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE, BOPBlocks.orange_sandstone)); private static > F register(String key, F value) { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java index 91ed9b271..25a5a9a44 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java @@ -5,6 +5,7 @@ import biomesoplenty.common.util.block.IBlockPosQuery; import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.material.Material; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; @@ -17,8 +18,8 @@ import java.util.Random; public class BoneSpineFeature extends Feature { - protected IBlockPosQuery placeOn = (world, pos) -> world.getBlockState(pos).getBlock() == BOPBlocks.flesh; - protected IBlockPosQuery replace = (world, pos) -> world.getBlockState(pos).isAir(world, pos); + protected IBlockPosQuery placeOn = (world, pos) -> world.getBlockState(pos).getBlock() == BOPBlocks.flesh || world.getBlockState(pos).getBlock() == Blocks.GRASS_BLOCK; + protected IBlockPosQuery replace = (world, pos) -> world.getBlockState(pos).isAir(world, pos) || world.getBlockState(pos).canBeReplacedByLeaves(world, pos) || world.getBlockState(pos).getMaterial() == Material.WATER; private int maxHeight = 3; public BoneSpineFeature(Codec deserializer) diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/RainbowValleyFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/RainbowHillsFlowersFeature.java similarity index 95% rename from src/main/java/biomesoplenty/common/world/gen/feature/RainbowValleyFlowersFeature.java rename to src/main/java/biomesoplenty/common/world/gen/feature/RainbowHillsFlowersFeature.java index eaaaddfb0..82430cef9 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/RainbowValleyFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/RainbowHillsFlowersFeature.java @@ -18,7 +18,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -public class RainbowValleyFlowersFeature extends DefaultFlowersFeatureNoConfig +public class RainbowHillsFlowersFeature extends DefaultFlowersFeatureNoConfig { private static final Block[] FLOWERS = new Block[]{BOPBlocks.pink_daffodil, BOPBlocks.orange_cosmos, Blocks.ALLIUM, Blocks.AZURE_BLUET, Blocks.ORANGE_TULIP, Blocks.PINK_TULIP, Blocks.RED_TULIP, Blocks.WHITE_TULIP, Blocks.CORNFLOWER, Blocks.LILY_OF_THE_VALLEY, Blocks.BLUE_ORCHID, Blocks.OXEYE_DAISY, Blocks.DANDELION, Blocks.POPPY}; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java deleted file mode 100644 index d49f51c52..000000000 --- a/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright 2014-2019, the Biomes O' Plenty Team - * - * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. - * - * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. - ******************************************************************************/ -package biomesoplenty.common.world.gen.feature; - -import biomesoplenty.api.block.BOPBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.NoFeatureConfig; - -import java.util.Random; - -public class XericShrublandFlowersFeature extends DefaultFlowersFeatureNoConfig -{ - private static final Block[] FLOWERS = new Block[]{BOPBlocks.wildflower}; - - @Override - public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_, NoFeatureConfig config) - { - double d0 = MathHelper.clamp((1.0D + Biome.BIOME_INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D, false)) / 2.0D, 0.0D, 0.9999D); - Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; - return block.defaultBlockState(); - } -} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BOPSurfaceBuilders.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BOPSurfaceBuilders.java index d10465026..10547665f 100644 --- a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BOPSurfaceBuilders.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BOPSurfaceBuilders.java @@ -8,7 +8,6 @@ package biomesoplenty.common.world.gen.surfacebuilders; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.world.gen.feature.*; import biomesoplenty.core.BiomesOPlenty; import net.minecraft.block.Blocks; import net.minecraft.util.ResourceLocation; @@ -27,11 +26,12 @@ public class BOPSurfaceBuilders public static final SurfaceBuilderConfig RED_SAND_SURFACE = new SurfaceBuilderConfig(Blocks.RED_SAND.defaultBlockState(), Blocks.RED_SAND.defaultBlockState(), Blocks.RED_SAND.defaultBlockState()); public static final SurfaceBuilderConfig SNOW_SNOW_GRAVEL_SURFACE = new SurfaceBuilderConfig(Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); public static final SurfaceBuilderConfig WHITE_SAND_SURFACE = new SurfaceBuilderConfig(BOPBlocks.white_sand.defaultBlockState(), BOPBlocks.white_sand.defaultBlockState(), BOPBlocks.white_sand.defaultBlockState()); + public static final SurfaceBuilderConfig ORANGE_SAND_SURFACE = new SurfaceBuilderConfig(BOPBlocks.orange_sand.defaultBlockState(), BOPBlocks.orange_sand.defaultBlockState(), BOPBlocks.orange_sand.defaultBlockState()); + public static final SurfaceBuilderConfig ORANGE_SANDSTONE_SURFACE = new SurfaceBuilderConfig(BOPBlocks.orange_sandstone.defaultBlockState(), BOPBlocks.orange_sandstone.defaultBlockState(), BOPBlocks.orange_sandstone.defaultBlockState()); public static final SurfaceBuilderConfig BLACK_SAND_SURFACE = new SurfaceBuilderConfig(BOPBlocks.black_sand.defaultBlockState(), BOPBlocks.black_sand.defaultBlockState(), BOPBlocks.black_sand.defaultBlockState()); public static final SurfaceBuilderConfig DRIED_SALT_SURFACE = new SurfaceBuilderConfig(BOPBlocks.dried_salt.defaultBlockState(), BOPBlocks.dried_salt.defaultBlockState(), BOPBlocks.dried_salt.defaultBlockState()); public static final SurfaceBuilderConfig ORIGIN_GRASS_SURFACE = new SurfaceBuilderConfig(BOPBlocks.origin_grass_block.defaultBlockState(), Blocks.DIRT.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); - - public static final SurfaceBuilder BRUSHLAND = register("brushland", new BrushlandSurfaceBuilder(SurfaceBuilderConfig.CODEC)); + public static final SurfaceBuilder CHAPARRAL = register("chaparral", new ChaparralSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder COLD_DESERT = register("cold_desert", new ColdDesertSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder TERRACOTTA = register("terracotta", new TerracottaSurfaceBuilder(SurfaceBuilderConfig.CODEC)); @@ -41,11 +41,13 @@ public class BOPSurfaceBuilders public static final SurfaceBuilder PODZOL = register("podzol", new PodzolSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder VOLCANO = register("volcano", new VolcanoSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder DEEP_TOP_LAYER = register("deep_top_layer", new DeepTopLayerSurfaceBuilder(SurfaceBuilderConfig.CODEC)); + public static final SurfaceBuilder ORANGE_SANDSTONE = register("orange_sandstone", new OrangeSandstoneSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder POPPY_FIELD = register("poppy_field", new PoppyFieldSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder WITHERED_ABYSS = register("withered_abyss", new WitheredAbyssSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder FLESH = register("flesh", new FleshSurfaceBuilder(SurfaceBuilderConfig.CODEC)); - public static final SurfaceBuilder ORIGIN_HILLS = register("origin_hills", new OriginHillsSurfaceBuilder(SurfaceBuilderConfig.CODEC)); + public static final SurfaceBuilder ORIGIN_VALLEY = register("origin_valley", new OriginValleySurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder TROPICS = register("tropics", new TropicsSurfaceBuilder(SurfaceBuilderConfig.CODEC)); + public static final SurfaceBuilder LUSH_DESERT = register("lush_desert", new LushDesertSurfaceBuilder(SurfaceBuilderConfig.CODEC)); public static final SurfaceBuilder BLACK_SAND = register("black_sand", new BlackSandSurfaceBuilder(SurfaceBuilderConfig.CODEC)); private static > F register(String key, F builder) diff --git a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BrushlandSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BrushlandSurfaceBuilder.java deleted file mode 100644 index 64c5c7759..000000000 --- a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/BrushlandSurfaceBuilder.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright 2014-2019, the Biomes O' Plenty Team - * - * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. - * - * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. - ******************************************************************************/ -package biomesoplenty.common.world.gen.surfacebuilders; - -import com.mojang.serialization.Codec; -import net.minecraft.block.BlockState; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.IChunk; -import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; - -import java.util.Random; - -public class BrushlandSurfaceBuilder extends SurfaceBuilder -{ - public BrushlandSurfaceBuilder(Codec deserializer) - { - super(deserializer); - } - - @Override - public void apply(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) - { - if (noise > 1.9D) - { - SurfaceBuilder.DEFAULT.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilder.CONFIG_FULL_SAND); - } - else - { - SurfaceBuilder.DEFAULT.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilder.CONFIG_GRASS); - } - } -} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/ChaparralSurfaceBuilder.java similarity index 96% rename from src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/surfacebuilders/ChaparralSurfaceBuilder.java index f15125de4..54ab33ffc 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/ChaparralSurfaceBuilder.java @@ -5,7 +5,7 @@ * * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. ******************************************************************************/ -package biomesoplenty.common.world.gen.feature; +package biomesoplenty.common.world.gen.surfacebuilders; import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/ColdDesertSurfaceBuilder.java similarity index 96% rename from src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/surfacebuilders/ColdDesertSurfaceBuilder.java index c5d3fae8b..d986f168f 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/ColdDesertSurfaceBuilder.java @@ -5,7 +5,7 @@ * * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. ******************************************************************************/ -package biomesoplenty.common.world.gen.feature; +package biomesoplenty.common.world.gen.surfacebuilders; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import com.mojang.serialization.Codec; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/FleshSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/FleshSurfaceBuilder.java similarity index 95% rename from src/main/java/biomesoplenty/common/world/gen/feature/FleshSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/surfacebuilders/FleshSurfaceBuilder.java index bc611d447..9033f822c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/FleshSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/FleshSurfaceBuilder.java @@ -5,7 +5,7 @@ * * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. ******************************************************************************/ -package biomesoplenty.common.world.gen.feature; +package biomesoplenty.common.world.gen.surfacebuilders; import biomesoplenty.api.block.BOPBlocks; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/LushDesertSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/LushDesertSurfaceBuilder.java new file mode 100644 index 000000000..db457106e --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/LushDesertSurfaceBuilder.java @@ -0,0 +1,32 @@ +package biomesoplenty.common.world.gen.surfacebuilders; + +import biomesoplenty.api.block.BOPBlocks; +import com.mojang.serialization.Codec; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.IChunk; +import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; +import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; + +import java.util.Random; + +public class LushDesertSurfaceBuilder extends SurfaceBuilder { + public LushDesertSurfaceBuilder(Codec p_i232124_1_) { + super(p_i232124_1_); + } + + @Override + public void apply(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) + { + if (noise > 1.9D) + { + BOPSurfaceBuilders.ORANGE_SANDSTONE.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPSurfaceBuilders.ORANGE_SANDSTONE_SURFACE); + } + else + { + BOPSurfaceBuilders.ORANGE_SANDSTONE.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPSurfaceBuilders.ORANGE_SAND_SURFACE); + } + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MangroveSurfaceBuilder.java similarity index 97% rename from src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MangroveSurfaceBuilder.java index 001873a80..ed532e34a 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MangroveSurfaceBuilder.java @@ -5,7 +5,7 @@ * * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. ******************************************************************************/ -package biomesoplenty.common.world.gen.feature; +package biomesoplenty.common.world.gen.surfacebuilders; import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MarshSurfaceBuilder.java similarity index 97% rename from src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MarshSurfaceBuilder.java index bb95ea8eb..f901294ab 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MarshSurfaceBuilder.java @@ -5,7 +5,7 @@ * * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. ******************************************************************************/ -package biomesoplenty.common.world.gen.feature; +package biomesoplenty.common.world.gen.surfacebuilders; import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MudSurfaceBuilder.java similarity index 96% rename from src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MudSurfaceBuilder.java index fb329ce7e..73079ba3a 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/MudSurfaceBuilder.java @@ -5,7 +5,7 @@ * * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. ******************************************************************************/ -package biomesoplenty.common.world.gen.feature; +package biomesoplenty.common.world.gen.surfacebuilders; import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders; import com.mojang.serialization.Codec; diff --git a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OrangeSandstoneSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OrangeSandstoneSurfaceBuilder.java new file mode 100644 index 000000000..a300c7a3e --- /dev/null +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OrangeSandstoneSurfaceBuilder.java @@ -0,0 +1,100 @@ +package biomesoplenty.common.world.gen.surfacebuilders; + +import biomesoplenty.api.block.BOPBlocks; +import com.mojang.serialization.Codec; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.IChunk; +import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; +import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; + +import java.util.Random; + +public class OrangeSandstoneSurfaceBuilder extends SurfaceBuilder { + public OrangeSandstoneSurfaceBuilder(Codec p_i232124_1_) { + super(p_i232124_1_); + } + + public void apply(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) { + this.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, config.getTopMaterial(), config.getUnderMaterial(), config.getUnderwaterMaterial(), seaLevel); + } + + protected void apply(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, BlockState defaultBlock, BlockState defaultFluid, BlockState top, BlockState middle, BlockState bottom, int sealevel) { + BlockState blockstate = top; + BlockState blockstate1 = middle; + BlockPos.Mutable blockpos$mutable = new BlockPos.Mutable(); + int i = -1; + int j = (int)(noise / 3.0D + 4.0D + random.nextDouble() * 0.25D); + int k = x & 15; + int l = z & 15; + + for(int i1 = startHeight; i1 >= 0; --i1) + { + blockpos$mutable.set(k, i1, l); + BlockState blockstate2 = chunkIn.getBlockState(blockpos$mutable); + if (blockstate2.isAir()) + { + i = -1; + } + else if (blockstate2.is(defaultBlock.getBlock())) + { + if (i == -1) + { + if (j <= 0) + { + blockstate = Blocks.AIR.defaultBlockState(); + blockstate1 = defaultBlock; + } + else if (i1 >= sealevel - 4 && i1 <= sealevel + 1) + { + blockstate = top; + blockstate1 = middle; + } + + if (i1 < sealevel && (blockstate == null || blockstate.isAir())) + { + if (biomeIn.getTemperature(blockpos$mutable.set(x, i1, z)) < 0.15F) + { + blockstate = Blocks.ICE.defaultBlockState(); + } + else + { + blockstate = defaultFluid; + } + + blockpos$mutable.set(k, i1, l); + } + + i = j; + if (i1 >= sealevel - 1) + { + chunkIn.setBlockState(blockpos$mutable, blockstate, false); + } + else if (i1 < sealevel - 7 - j) + { + blockstate = Blocks.AIR.defaultBlockState(); + blockstate1 = defaultBlock; + chunkIn.setBlockState(blockpos$mutable, bottom, false); + } + else + { + chunkIn.setBlockState(blockpos$mutable, blockstate1, false); + } + } + else if (i > 0) + { + --i; + chunkIn.setBlockState(blockpos$mutable, blockstate1, false); + if (i == 0 && blockstate1.is(BOPBlocks.orange_sand) && j > 1) + { + i = random.nextInt(4) + Math.max(0, i1 - 63); + blockstate1 = BOPBlocks.orange_sandstone.defaultBlockState(); + } + } + } + } + + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OriginHillsSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OriginValleySurfaceBuilder.java similarity index 96% rename from src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OriginHillsSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OriginValleySurfaceBuilder.java index 64f826f52..e0360ea48 100644 --- a/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OriginHillsSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/surfacebuilders/OriginValleySurfaceBuilder.java @@ -16,12 +16,12 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; import java.util.stream.IntStream; -public class OriginHillsSurfaceBuilder extends SurfaceBuilder +public class OriginValleySurfaceBuilder extends SurfaceBuilder { protected long seed; protected AlphaOctavePerlinNoise sandNoise; protected AlphaOctavePerlinNoise gravelNoise; - public OriginHillsSurfaceBuilder(Codec p_i232124_1_) + public OriginValleySurfaceBuilder(Codec p_i232124_1_) { super(p_i232124_1_); } diff --git a/src/main/java/biomesoplenty/init/ModBiomes.java b/src/main/java/biomesoplenty/init/ModBiomes.java index 26e477754..d0646a071 100644 --- a/src/main/java/biomesoplenty/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/init/ModBiomes.java @@ -7,7 +7,6 @@ ******************************************************************************/ package biomesoplenty.init; -import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.common.biome.BiomeMetadata; import biomesoplenty.common.biome.BiomeRegistry; @@ -21,16 +20,13 @@ import biomesoplenty.common.util.biome.BiomeUtil; import biomesoplenty.common.world.BOPBiomeGeneratorTypeScreen; import biomesoplenty.common.world.BOPBiomeProvider; import biomesoplenty.common.world.BOPNetherBiomeProvider; -import biomesoplenty.core.BiomesOPlenty; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.BiomeGeneratorTypeScreens; import net.minecraft.entity.villager.VillagerType; import net.minecraft.util.RegistryKey; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeColors; @@ -134,12 +130,12 @@ public class ModBiomes registerBiome(new BayouBiome(), "bayou"); registerBiome(new BogBiome(), "bog"); registerBiome(new BorealForestBiome(), "boreal_forest"); - registerBiome(new BrushlandBiome(), "brushland"); registerBiome(new ChaparralBiome(), "chaparral"); registerBiome(new CherryBlossomGroveBiome(), "cherry_blossom_grove"); registerBiome(new ColdDesertBiome(), "cold_desert"); registerBiome(new ConiferousForestBiome(), "coniferous_forest"); registerBiome(new DeadForestBiome(), "dead_forest"); + registerBiome(new DrylandBiome(), "dryland"); registerBiome(new FirClearingBiome(), "fir_clearing"); registerBiome(new FloodplainBiome(), "floodplain"); registerBiome(new FlowerMeadowBiome(), "flower_meadow"); @@ -150,6 +146,7 @@ public class ModBiomes registerBiome(new HighlandMoorBiome(), "highland_moor"); registerBiome(new JadeCliffsBiome(), "jade_cliffs"); registerBiome(new LavenderFieldBiome(), "lavender_field"); + registerBiome(new LushDesertBiome(), "lush_desert"); registerBiome(new LushGrasslandBiome(), "lush_grassland"); registerBiome(new LushSwampBiome(), "lush_swamp"); registerBiome(new MapleWoodsBiome(), "maple_woods"); @@ -158,16 +155,15 @@ public class ModBiomes registerBiome(new MireBiome(), "mire"); registerBiome(new MuskegBiome(), "muskeg"); registerBiome(new MysticGroveBiome(), "mystic_grove"); - registerBiome(new OasisBiome(), "oasis"); registerBiome(new OminousWoodsBiome(), "ominous_woods"); - registerBiome(new OriginHillsBiome(), "origin_hills"); + registerBiome(new OriginValleyBiome(), "origin_valley"); registerBiome(new OutbackBiome(), "outback"); registerBiome(new OvergrownCliffsBiome(), "overgrown_cliffs"); registerBiome(new PastureBiome(), "pasture"); registerBiome(new PoppyFieldBiome(), "poppy_field"); registerBiome(new PrairieBiome(), "prairie"); registerBiome(new PumpkinPatchBiome(), "pumpkin_patch"); - registerBiome(new RainbowValleyBiome(), "rainbow_valley"); + registerBiome(new RainbowHillsBiome(), "rainbow_hills"); registerBiome(new RainforestBiome(), "rainforest"); registerBiome(new RedwoodForestBiome(), "redwood_forest"); registerBiome(new ScrublandBiome(), "scrubland"); @@ -188,7 +184,6 @@ public class ModBiomes registerBiome(new WastelandBiome(), "wasteland"); registerBiome(new WetlandBiome(), "wetland"); registerBiome(new WoodlandBiome(), "woodland"); - registerBiome(new XericShrublandBiome(), "xeric_shrubland"); //Nether Biomes registerBiome(new CrystallineChasmBiome(), "crystalline_chasm"); @@ -200,8 +195,6 @@ public class ModBiomes BiomeRegistry.finalizeRegistrations(BiomeRegistry.RegistrationType.STANDARD_BIOME); //Sub/Island Biomes (Note: Rarity supports two decimal places) - registerSubBiome(Biomes.DESERT, oasis, 0.1F, 100); - registerSubBiome(brushland, xeric_shrubland, 1.0F, 100); registerSubBiome(coniferous_forest, fir_clearing, 0.38F, 100); registerSubBiome(highland, highland_moor, 0.75F, 100); registerSubBiome(meadow, flower_meadow, 0.5F, 100); @@ -213,17 +206,17 @@ public class ModBiomes BiomeRegistry.configureSubBiomes(); BiomeRegistry.finalizeRegistrations(BiomeRegistry.RegistrationType.SUB_BIOME); - registerIslandBiome(origin_hills, BOPClimates.COOL_TEMPERATE, 50); - registerIslandBiome(origin_hills, BOPClimates.DRY_TEMPERATE, 50); - registerIslandBiome(origin_hills, BOPClimates.WET_TEMPERATE, 75); + registerIslandBiome(origin_valley, BOPClimates.COOL_TEMPERATE, 50); + registerIslandBiome(origin_valley, BOPClimates.DRY_TEMPERATE, 50); + registerIslandBiome(origin_valley, BOPClimates.WET_TEMPERATE, 75); registerIslandBiome(volcano, BOPClimates.WARM_TEMPERATE, 75); registerIslandBiome(volcano, BOPClimates.MEDITERRANEAN, 75); registerIslandBiome(volcano, BOPClimates.SAVANNA, 50); - registerIslandBiome(rainbow_valley, BOPClimates.WET_TEMPERATE, 25); - registerIslandBiome(rainbow_valley, BOPClimates.WARM_TEMPERATE, 25); - registerIslandBiome(rainbow_valley, BOPClimates.MEDITERRANEAN, 25); + registerIslandBiome(rainbow_hills, BOPClimates.WET_TEMPERATE, 25); + registerIslandBiome(rainbow_hills, BOPClimates.WARM_TEMPERATE, 25); + registerIslandBiome(rainbow_hills, BOPClimates.MEDITERRANEAN, 25); registerIslandBiome(tropics, BOPClimates.SUBTROPICAL, 75); registerIslandBiome(tropics, BOPClimates.TROPICAL, 50); @@ -268,12 +261,12 @@ public class ModBiomes registerVillagerType(bayou, VillagerType.SWAMP); registerVillagerType(bog, VillagerType.SWAMP); registerVillagerType(boreal_forest, VillagerType.TAIGA); - registerVillagerType(brushland, VillagerType.SAVANNA); registerVillagerType(chaparral, VillagerType.PLAINS); registerVillagerType(cherry_blossom_grove, VillagerType.PLAINS); registerVillagerType(cold_desert, VillagerType.SNOW); registerVillagerType(coniferous_forest, VillagerType.TAIGA); registerVillagerType(dead_forest, VillagerType.TAIGA); + registerVillagerType(dryland, VillagerType.SAVANNA); registerVillagerType(fir_clearing, VillagerType.TAIGA); registerVillagerType(floodplain, VillagerType.JUNGLE); registerVillagerType(flower_meadow, VillagerType.TAIGA); @@ -285,6 +278,7 @@ public class ModBiomes registerVillagerType(highland_moor, VillagerType.PLAINS); registerVillagerType(jade_cliffs, VillagerType.PLAINS); registerVillagerType(lavender_field, VillagerType.PLAINS); + registerVillagerType(lush_desert, VillagerType.DESERT); registerVillagerType(lush_grassland, VillagerType.JUNGLE); registerVillagerType(lush_swamp, VillagerType.JUNGLE); registerVillagerType(mangrove, VillagerType.SWAMP); @@ -294,17 +288,16 @@ public class ModBiomes registerVillagerType(mire, VillagerType.SWAMP); registerVillagerType(muskeg, VillagerType.SNOW); registerVillagerType(mystic_grove, VillagerType.PLAINS); - registerVillagerType(oasis, VillagerType.DESERT); registerVillagerType(ominous_woods, VillagerType.SWAMP); registerVillagerType(orchard, VillagerType.PLAINS); - registerVillagerType(origin_hills, VillagerType.PLAINS); + registerVillagerType(origin_valley, VillagerType.PLAINS); registerVillagerType(outback, VillagerType.SAVANNA); registerVillagerType(overgrown_cliffs, VillagerType.JUNGLE); registerVillagerType(pasture, VillagerType.PLAINS); registerVillagerType(poppy_field, VillagerType.PLAINS); registerVillagerType(prairie, VillagerType.PLAINS); registerVillagerType(pumpkin_patch, VillagerType.PLAINS); - registerVillagerType(rainbow_valley, VillagerType.PLAINS); + registerVillagerType(rainbow_hills, VillagerType.PLAINS); registerVillagerType(rainforest, VillagerType.JUNGLE); registerVillagerType(redwood_forest, VillagerType.PLAINS); registerVillagerType(redwood_forest_edge, VillagerType.PLAINS); @@ -328,7 +321,6 @@ public class ModBiomes registerVillagerType(wasteland, VillagerType.DESERT); registerVillagerType(wetland, VillagerType.SWAMP); registerVillagerType(woodland, VillagerType.PLAINS); - registerVillagerType(xeric_shrubland, VillagerType.DESERT); } private static void registerVillagerType(RegistryKey key, VillagerType type) diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index 6300416f3..2e02e597d 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -48,6 +48,18 @@ public class ModBlocks cut_white_sandstone_slab = registerBlock(new SlabBlock(Block.Properties.copy(cut_white_sandstone)), "cut_white_sandstone_slab"); chiseled_white_sandstone = registerBlock(new Block(AbstractBlock.Properties.of(Material.STONE, MaterialColor.QUARTZ).strength(0.8F)), "chiseled_white_sandstone"); + orange_sand = registerBlock(new SandBlockBOP(0xCC9A61, AbstractBlock.Properties.of(Material.SAND, MaterialColor.COLOR_ORANGE).strength(0.5F).sound(SoundType.SAND).harvestLevel(0).harvestTool(ToolType.SHOVEL)), "orange_sand"); + orange_sandstone = registerBlock(new Block(AbstractBlock.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(0.8F)), "orange_sandstone"); + orange_sandstone_stairs = registerBlock(new StairsBlock(orange_sandstone.defaultBlockState(), Block.Properties.copy(orange_sandstone)), "orange_sandstone_stairs"); + orange_sandstone_slab = registerBlock(new SlabBlock(Block.Properties.copy(orange_sandstone)), "orange_sandstone_slab"); + orange_sandstone_wall = registerBlock(new WallBlock(Block.Properties.copy(orange_sandstone)),"orange_sandstone_wall"); + smooth_orange_sandstone = registerBlock(new Block(AbstractBlock.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(2.0F, 6.0F)), "smooth_orange_sandstone"); + smooth_orange_sandstone_stairs = registerBlock(new StairsBlock(orange_sandstone.defaultBlockState(), Block.Properties.copy(smooth_orange_sandstone)), "smooth_orange_sandstone_stairs"); + smooth_orange_sandstone_slab = registerBlock(new SlabBlock(Block.Properties.copy(smooth_orange_sandstone)), "smooth_orange_sandstone_slab"); + cut_orange_sandstone = registerBlock(new Block(AbstractBlock.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(0.8F)), "cut_orange_sandstone"); + cut_orange_sandstone_slab = registerBlock(new SlabBlock(Block.Properties.copy(cut_orange_sandstone)), "cut_orange_sandstone_slab"); + chiseled_orange_sandstone = registerBlock(new Block(AbstractBlock.Properties.of(Material.STONE, MaterialColor.COLOR_ORANGE).strength(0.8F)), "chiseled_orange_sandstone"); + black_sand = registerBlock(new SandBlockBOP(0x2D2C2F, AbstractBlock.Properties.of(Material.SAND, MaterialColor.COLOR_BLACK).strength(0.5F).sound(SoundType.SAND).harvestLevel(0).harvestTool(ToolType.SHOVEL)), "black_sand"); black_sandstone = registerBlock(new Block(AbstractBlock.Properties.of(Material.STONE, MaterialColor.COLOR_BLACK).strength(0.8F)), "black_sandstone"); black_sandstone_stairs = registerBlock(new StairsBlock(black_sandstone.defaultBlockState(), Block.Properties.copy(black_sandstone)), "black_sandstone_stairs"); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/chiseled_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/blockstates/chiseled_orange_sandstone.json new file mode 100644 index 000000000..801d89909 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/chiseled_orange_sandstone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/chiseled_orange_sandstone" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/cut_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/blockstates/cut_orange_sandstone.json new file mode 100644 index 000000000..a0a298502 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/cut_orange_sandstone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/cut_orange_sandstone" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/cut_orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/cut_orange_sandstone_slab.json new file mode 100644 index 000000000..cee840dbd --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/cut_orange_sandstone_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "type=bottom": { "model": "biomesoplenty:block/cut_orange_sandstone_slab" }, + "type=top": { "model": "biomesoplenty:block/cut_orange_sandstone_slab_top" }, + "type=double": { "model": "biomesoplenty:block/cut_orange_sandstone" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_sand.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_sand.json new file mode 100644 index 000000000..9ceebac8b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/orange_sand.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "biomesoplenty:block/orange_sand" }, + { "model": "biomesoplenty:block/orange_sand", "y": 90 }, + { "model": "biomesoplenty:block/orange_sand", "y": 180 }, + { "model": "biomesoplenty:block/orange_sand", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone.json new file mode 100644 index 000000000..b3f70b723 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/orange_sandstone" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_slab.json new file mode 100644 index 000000000..8a49a2108 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "type=bottom": { "model": "biomesoplenty:block/orange_sandstone_slab" }, + "type=top": { "model": "biomesoplenty:block/orange_sandstone_slab_top" }, + "type=double": { "model": "biomesoplenty:block/orange_sandstone" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_stairs.json new file mode 100644 index 000000000..02b4d280c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "biomesoplenty:block/orange_sandstone_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "biomesoplenty:block/orange_sandstone_stairs_inner", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_wall.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_wall.json new file mode 100644 index 000000000..dd96d6b94 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/orange_sandstone_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "biomesoplenty:block/orange_sandstone_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json b/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json index c4ac86ab2..72fe55468 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json @@ -1,8 +1,22 @@ { "variants": { - "snowy=false": { - "model": "biomesoplenty:block/origin_grass_block" - }, + "snowy=false": [ + { + "model": "biomesoplenty:block/origin_grass_block" + }, + { + "model": "biomesoplenty:block/origin_grass_block", + "y": 90 + }, + { + "model": "biomesoplenty:block/origin_grass_block", + "y": 180 + }, + { + "model": "biomesoplenty:block/origin_grass_block", + "y": 270 + } + ], "snowy=true": { "model": "biomesoplenty:block/origin_grass_block_snow" } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone.json new file mode 100644 index 000000000..7d7e3e120 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/smooth_orange_sandstone" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone_slab.json new file mode 100644 index 000000000..7c678b301 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "type=bottom": { "model": "biomesoplenty:block/smooth_orange_sandstone_slab" }, + "type=top": { "model": "biomesoplenty:block/smooth_orange_sandstone_slab_top" }, + "type=double": { "model": "biomesoplenty:block/smooth_orange_sandstone" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone_stairs.json new file mode 100644 index 000000000..59c1954af --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/smooth_orange_sandstone_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "biomesoplenty:block/smooth_orange_sandstone_stairs_inner", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/umbran_log.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_log.json index c48cb4dfe..21708c335 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/umbran_log.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_log.json @@ -1,7 +1,16 @@ { "variants": { - "axis=y": { "model": "biomesoplenty:block/umbran_log" }, - "axis=z": { "model": "biomesoplenty:block/umbran_log", "x": 90 }, - "axis=x": { "model": "biomesoplenty:block/umbran_log", "x": 90, "y": 90 } + "axis=y": [ + { "model": "biomesoplenty:block/umbran_log" }, + { "model": "biomesoplenty:block/umbran_log_holes" } + ], + "axis=z": [ + { "model": "biomesoplenty:block/umbran_log", "x": 90 }, + { "model": "biomesoplenty:block/umbran_log_holes", "x": 90 } + ], + "axis=x": [ + { "model": "biomesoplenty:block/umbran_log", "x": 90, "y": 90 }, + { "model": "biomesoplenty:block/umbran_log_holes", "x": 90, "y": 90 } + ] } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/umbran_wood.json b/src/main/resources/assets/biomesoplenty/blockstates/umbran_wood.json index 0bccb9837..93f78323e 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/umbran_wood.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/umbran_wood.json @@ -1,7 +1,16 @@ { "variants": { - "axis=y": { "model": "biomesoplenty:block/umbran_wood" }, - "axis=z": { "model": "biomesoplenty:block/umbran_wood", "x": 90 }, - "axis=x": { "model": "biomesoplenty:block/umbran_wood", "x": 90, "y": 90 } + "axis=y": [ + { "model": "biomesoplenty:block/umbran_wood" }, + { "model": "biomesoplenty:block/umbran_wood_holes" } + ], + "axis=z": [ + { "model": "biomesoplenty:block/umbran_wood", "x": 90 }, + { "model": "biomesoplenty:block/umbran_wood_holes", "x": 90 } + ], + "axis=x": [ + { "model": "biomesoplenty:block/umbran_wood", "x": 90, "y": 90 }, + { "model": "biomesoplenty:block/umbran_wood_holes", "x": 90, "y": 90 } + ] } } diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 320694d43..d97463dd7 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -12,13 +12,13 @@ "biome.biomesoplenty.bayou": "Bayou", "biome.biomesoplenty.bog": "Bog", "biome.biomesoplenty.boreal_forest": "Boreal Forest", - "biome.biomesoplenty.brushland": "Brushland", "biome.biomesoplenty.chaparral": "Chaparral", "biome.biomesoplenty.cherry_blossom_grove": "Cherry Blossom Grove", "biome.biomesoplenty.cold_desert": "Cold Desert", "biome.biomesoplenty.coniferous_forest": "Coniferous Forest", "biome.biomesoplenty.crystalline_chasm": "Crystalline Chasm", "biome.biomesoplenty.dead_forest": "Dead Forest", + "biome.biomesoplenty.dryland": "Dryland", "biome.biomesoplenty.fir_clearing": "Fir Clearing", "biome.biomesoplenty.floodplain": "Floodplain", "biome.biomesoplenty.flower_meadow": "Flower Meadow", @@ -30,6 +30,7 @@ "biome.biomesoplenty.highland_moor": "Highland Moor", "biome.biomesoplenty.jade_cliffs": "Jade Cliffs", "biome.biomesoplenty.lavender_field": "Lavender Field", + "biome.biomesoplenty.lush_desert": "Lush Desert", "biome.biomesoplenty.lush_grassland": "Lush Grassland", "biome.biomesoplenty.lush_swamp": "Lush Swamp", "biome.biomesoplenty.mangrove": "Mangrove", @@ -39,17 +40,16 @@ "biome.biomesoplenty.mire": "Mire", "biome.biomesoplenty.muskeg": "Muskeg", "biome.biomesoplenty.mystic_grove": "Mystic Grove", - "biome.biomesoplenty.oasis": "Oasis", "biome.biomesoplenty.ominous_woods": "Ominous Woods", "biome.biomesoplenty.orchard": "Orchard", - "biome.biomesoplenty.origin_hills": "Origin Hills", + "biome.biomesoplenty.origin_valley": "Origin Valley", "biome.biomesoplenty.outback": "Outback", "biome.biomesoplenty.overgrown_cliffs": "Overgrown Cliffs", "biome.biomesoplenty.pasture": "Pasture", "biome.biomesoplenty.poppy_field": "Poppy Field", "biome.biomesoplenty.prairie": "Prairie", "biome.biomesoplenty.pumpkin_patch": "Pumpkin Patch", - "biome.biomesoplenty.rainbow_valley": "Rainbow Valley", + "biome.biomesoplenty.rainbow_hills": "Rainbow Hills", "biome.biomesoplenty.rainforest": "Rainforest", "biome.biomesoplenty.redwood_forest": "Redwood Forest", "biome.biomesoplenty.redwood_forest_edge": "Redwood Forest Edge", @@ -76,7 +76,6 @@ "biome.biomesoplenty.wetland": "Wetland", "biome.biomesoplenty.withered_abyss": "Withered Abyss", "biome.biomesoplenty.woodland": "Woodland", - "biome.biomesoplenty.xeric_shrubland": "Xeric Shrubland", "item.biomesoplenty.bop_icon": "BOP Icon", "item.biomesoplenty.cherry_boat": "Cherry Boat", @@ -121,6 +120,9 @@ "block.biomesoplenty.chiseled_black_sandstone": "Chiseled Black Sandstone", "block.biomesoplenty.cut_black_sandstone": "Cut Black Sandstone", "block.biomesoplenty.cut_black_sandstone_slab": "Cut Black Sandstone Slab", + "block.biomesoplenty.chiseled_orange_sandstone": "Chiseled Orange Sandstone", + "block.biomesoplenty.cut_orange_sandstone": "Cut Orange Sandstone", + "block.biomesoplenty.cut_orange_sandstone_slab": "Cut Orange Sandstone Slab", "block.biomesoplenty.chiseled_white_sandstone": "Chiseled White Sandstone", "block.biomesoplenty.cut_white_sandstone": "Cut White Sandstone", "block.biomesoplenty.cut_white_sandstone_slab": "Cut White Sandstone Slab", @@ -240,6 +242,11 @@ "block.biomesoplenty.orange_autumn_leaves": "Orange Autumn Leaves", "block.biomesoplenty.orange_autumn_sapling": "Orange Autumn Sapling", "block.biomesoplenty.orange_cosmos": "Orange Cosmos", + "block.biomesoplenty.orange_sand": "Orange Sand", + "block.biomesoplenty.orange_sandstone": "Orange Sandstone", + "block.biomesoplenty.orange_sandstone_slab": "Orange Sandstone Slab", + "block.biomesoplenty.orange_sandstone_stairs": "Orange Sandstone Stairs", + "block.biomesoplenty.orange_sandstone_wall": "Orange Sandstone Wall", "block.biomesoplenty.origin_grass_block": "Origin Grass Block", "block.biomesoplenty.origin_leaves": "Origin Leaves", "block.biomesoplenty.origin_sapling": "Origin Sapling", @@ -315,6 +322,9 @@ "block.biomesoplenty.smooth_black_sandstone": "Smooth Black Sandstone", "block.biomesoplenty.smooth_black_sandstone_slab": "Smooth Black Sandstone Slab", "block.biomesoplenty.smooth_black_sandstone_stairs": "Smooth Black Sandstone Stairs", + "block.biomesoplenty.smooth_orange_sandstone": "Smooth Orange Sandstone", + "block.biomesoplenty.smooth_orange_sandstone_slab": "Smooth Orange Sandstone Slab", + "block.biomesoplenty.smooth_orange_sandstone_stairs": "Smooth Orange Sandstone Stairs", "block.biomesoplenty.smooth_white_sandstone": "Smooth White Sandstone", "block.biomesoplenty.smooth_white_sandstone_slab": "Smooth White Sandstone Slab", "block.biomesoplenty.smooth_white_sandstone_stairs": "Smooth White Sandstone Stairs", diff --git a/src/main/resources/assets/biomesoplenty/models/block/chiseled_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/chiseled_orange_sandstone.json new file mode 100644 index 000000000..b30247501 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/chiseled_orange_sandstone.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/chiseled_orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone.json new file mode 100644 index 000000000..b2da47739 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/cut_orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone_slab.json new file mode 100644 index 000000000..9e5d450d8 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_top", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/cut_orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone_slab_top.json new file mode 100644 index 000000000..6c729c304 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/cut_orange_sandstone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_top", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/cut_orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sand.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sand.json new file mode 100644 index 000000000..dc5bd6084 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sand.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:block/orange_sand" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone.json new file mode 100644 index 000000000..384a219ba --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_bottom", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_slab.json new file mode 100644 index 000000000..5bdae15d2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_bottom", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_slab_top.json new file mode 100644 index 000000000..fa090bfac --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_bottom", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs.json new file mode 100644 index 000000000..ad8006bf2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_bottom", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs_inner.json new file mode 100644 index 000000000..f832cc1f8 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_bottom", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs_outer.json new file mode 100644 index 000000000..503712b3d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_bottom", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_inventory.json new file mode 100644 index 000000000..702344a76 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "biomesoplenty:block/orange_sandstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_post.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_post.json new file mode 100644 index 000000000..d6f748b4b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "biomesoplenty:block/orange_sandstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_side.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_side.json new file mode 100644 index 000000000..92dfe74b6 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "biomesoplenty:block/orange_sandstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_side_tall.json b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_side_tall.json new file mode 100644 index 000000000..202275fba --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_sandstone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "biomesoplenty:block/orange_sandstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json b/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json index ed6bd5acc..b7846792e 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json +++ b/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json @@ -3,7 +3,7 @@ "textures": { "top": "biomesoplenty:block/origin_grass_block_top", "bottom": "minecraft:block/dirt", - "side": "biomesoplenty:block/origin_grass_block_snow", + "side": "minecraft:block/grass_block_snow", "particle": "minecraft:block/dirt" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone.json new file mode 100644 index 000000000..8fb8f5060 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:block/orange_sandstone_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_slab.json new file mode 100644 index 000000000..a145f0035 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_top", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_slab_top.json new file mode 100644 index 000000000..f6d6d8cf5 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_top", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs.json new file mode 100644 index 000000000..9acb61d19 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_top", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs_inner.json new file mode 100644 index 000000000..b9dda3576 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_top", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs_outer.json new file mode 100644 index 000000000..14c556569 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_orange_sandstone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "biomesoplenty:block/orange_sandstone_top", + "top": "biomesoplenty:block/orange_sandstone_top", + "side": "biomesoplenty:block/orange_sandstone_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_log_holes.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_log_holes.json new file mode 100644 index 000000000..70af6923f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_log_holes.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/umbran_log_top", + "side": "biomesoplenty:block/umbran_log_holes" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_wood_holes.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_wood_holes.json new file mode 100644 index 000000000..f5d273854 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_wood_holes.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/umbran_log_holes", + "side": "biomesoplenty:block/umbran_log_holes" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/chiseled_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/item/chiseled_orange_sandstone.json new file mode 100644 index 000000000..85514370d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/chiseled_orange_sandstone.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/chiseled_orange_sandstone" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/cut_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/item/cut_orange_sandstone.json new file mode 100644 index 000000000..b638a29bd --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/cut_orange_sandstone.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/cut_orange_sandstone" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/cut_orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/item/cut_orange_sandstone_slab.json new file mode 100644 index 000000000..3e98c6567 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/cut_orange_sandstone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/cut_orange_sandstone_slab" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_sand.json b/src/main/resources/assets/biomesoplenty/models/item/orange_sand.json new file mode 100644 index 000000000..125120f27 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_sand.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/orange_sand" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone.json new file mode 100644 index 000000000..c8f1a1b76 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/orange_sandstone" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_slab.json new file mode 100644 index 000000000..5fc762d79 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/orange_sandstone_slab" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_stairs.json new file mode 100644 index 000000000..1cbb92beb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/orange_sandstone_stairs" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_wall.json b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_wall.json new file mode 100644 index 000000000..acb7fdd4f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_sandstone_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/orange_sandstone_wall_inventory" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone.json b/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone.json new file mode 100644 index 000000000..763a0511b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/smooth_orange_sandstone" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone_slab.json new file mode 100644 index 000000000..eb335c25b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/smooth_orange_sandstone_slab" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone_stairs.json new file mode 100644 index 000000000..5540c9430 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/smooth_orange_sandstone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/smooth_orange_sandstone_stairs" +} diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cattail_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/cattail_bottom.png index 07dc1f0eb..8bd26640f 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/cattail_bottom.png and b/src/main/resources/assets/biomesoplenty/textures/block/cattail_bottom.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cattail_top.png b/src/main/resources/assets/biomesoplenty/textures/block/cattail_top.png index 63fbd58ee..96771085e 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/cattail_top.png and b/src/main/resources/assets/biomesoplenty/textures/block/cattail_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/chiseled_orange_sandstone.png b/src/main/resources/assets/biomesoplenty/textures/block/chiseled_orange_sandstone.png new file mode 100644 index 000000000..7425106ef Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/chiseled_orange_sandstone.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cut_orange_sandstone.png b/src/main/resources/assets/biomesoplenty/textures/block/cut_orange_sandstone.png new file mode 100644 index 000000000..281afc4c0 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/cut_orange_sandstone.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dune_grass.png b/src/main/resources/assets/biomesoplenty/textures/block/dune_grass.png index f6a3b5107..1120db639 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/dune_grass.png and b/src/main/resources/assets/biomesoplenty/textures/block/dune_grass.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_sand.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_sand.png new file mode 100644 index 000000000..a2628dc33 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/orange_sand.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone.png new file mode 100644 index 000000000..c3c130401 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone_bottom.png new file mode 100644 index 000000000..d71731aed Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone_bottom.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone_top.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone_top.png new file mode 100644 index 000000000..6d1358da9 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/orange_sandstone_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_side.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_side.png index 82a9a9cfd..fe3c32edf 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_side.png and b/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_side.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_snow.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_snow.png deleted file mode 100644 index ab1886ccf..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_snow.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_top.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_top.png index 5502b4685..d3e7868c4 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_top.png and b/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/origin_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_leaves.png index aa055d4e4..b50dee4ce 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/origin_leaves.png and b/src/main/resources/assets/biomesoplenty/textures/block/origin_leaves.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/origin_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_sapling.png index f2edc9c71..13c54d7a1 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/origin_sapling.png and b/src/main/resources/assets/biomesoplenty/textures/block/origin_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png index 6f00c1e72..9b7fb8313 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png and b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png index 73ccf3c17..e3d20171b 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png and b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_sapling.png index ea28c3e36..0aed7d93e 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/redwood_sapling.png and b/src/main/resources/assets/biomesoplenty/textures/block/redwood_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/rose.png b/src/main/resources/assets/biomesoplenty/textures/block/rose.png index a75c3e946..ea6a84e88 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/rose.png and b/src/main/resources/assets/biomesoplenty/textures/block/rose.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png index 6b40eb467..1d5352ec3 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png and b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/umbran_log_holes.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log_holes.png new file mode 100644 index 000000000..2aa9b70c6 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log_holes.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/cattail.png b/src/main/resources/assets/biomesoplenty/textures/item/cattail.png index af4c35de9..dcb844024 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/item/cattail.png and b/src/main/resources/assets/biomesoplenty/textures/item/cattail.png differ diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json index b625c65f0..aa37951e5 100644 --- a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json +++ b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json @@ -44,12 +44,6 @@ "conditions": { "biome": "biomesoplenty:boreal_forest" } - }, - "brushland": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:brushland" - } }, "chaparral": { "trigger": "minecraft:location", @@ -86,6 +80,12 @@ "conditions": { "biome": "biomesoplenty:dead_forest" } + }, + "dryland": { + "trigger": "minecraft:location", + "conditions": { + "biome": "biomesoplenty:dryland" + } }, "fir_clearing": { "trigger": "minecraft:location", @@ -152,6 +152,12 @@ "conditions": { "biome": "biomesoplenty:lavender_field" } + }, + "lush_desert": { + "trigger": "minecraft:location", + "conditions": { + "biome": "biomesoplenty:lush_desert" + } }, "lush_grassland": { "trigger": "minecraft:location", @@ -206,12 +212,6 @@ "conditions": { "biome": "biomesoplenty:mystic_grove" } - }, - "oasis": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:oasis" - } }, "ominous_woods": { "trigger": "minecraft:location", @@ -225,10 +225,10 @@ "biome": "biomesoplenty:orchard" } }, - "origin_hills": { + "origin_valley": { "trigger": "minecraft:location", "conditions": { - "biome": "biomesoplenty:origin_hills" + "biome": "biomesoplenty:origin_valley" } }, "outback": { @@ -267,10 +267,10 @@ "biome": "biomesoplenty:pumpkin_patch" } }, - "rainbow_valley": { + "rainbow_hills": { "trigger": "minecraft:location", "conditions": { - "biome": "biomesoplenty:rainbow_valley" + "biome": "biomesoplenty:rainbow_hills" } }, "rainforest": { @@ -428,12 +428,6 @@ "conditions": { "biome": "biomesoplenty:woodland" } - }, - "xeric_shrubland": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:xeric_shrubland" - } } }, "rewards": { diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json index 9748bd325..3bb3c6df2 100644 --- a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json +++ b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json @@ -43,12 +43,6 @@ "conditions": { "biome": "biomesoplenty:boreal_forest" } - }, - "brushland": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:brushland" - } }, "chaparral": { "trigger": "minecraft:location", @@ -85,6 +79,12 @@ "conditions": { "biome": "biomesoplenty:dead_forest" } + }, + "dryland": { + "trigger": "minecraft:location", + "conditions": { + "biome": "biomesoplenty:dryland" + } }, "fir_clearing": { "trigger": "minecraft:location", @@ -151,6 +151,12 @@ "conditions": { "biome": "biomesoplenty:lavender_field" } + }, + "lush_desert": { + "trigger": "minecraft:location", + "conditions": { + "biome": "biomesoplenty:lush_desert" + } }, "lush_grassland": { "trigger": "minecraft:location", @@ -205,12 +211,6 @@ "conditions": { "biome": "biomesoplenty:mystic_grove" } - }, - "oasis": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:oasis" - } }, "ominous_woods": { "trigger": "minecraft:location", @@ -224,10 +224,10 @@ "biome": "biomesoplenty:orchard" } }, - "origin_hills": { + "origin_valley": { "trigger": "minecraft:location", "conditions": { - "biome": "biomesoplenty:origin_hills" + "biome": "biomesoplenty:origin_valley" } }, "outback": { @@ -266,10 +266,10 @@ "biome": "biomesoplenty:pumpkin_patch" } }, - "rainbow_valley": { + "rainbow_hills": { "trigger": "minecraft:location", "conditions": { - "biome": "biomesoplenty:rainbow_valley" + "biome": "biomesoplenty:rainbow_hills" } }, "rainforest": { @@ -427,12 +427,6 @@ "conditions": { "biome": "biomesoplenty:woodland" } - }, - "xeric_shrubland": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:xeric_shrubland" - } } }, "requirements": [ @@ -442,13 +436,13 @@ "bayou", "bog", "boreal_forest", - "brushland", "chaparral", "cherry_blossom_grove", "cold_desert", "coniferous_forest", "crystalline_chasm", "dead_forest", + "dryland", "fir_clearing", "floodplain", "flower_meadow", @@ -460,6 +454,7 @@ "highland_moor", "jade_cliffs", "lavender_field", + "lush_desert", "lush_grassland", "lush_swamp", "mangrove", @@ -469,17 +464,16 @@ "mire", "muskeg", "mystic_grove", - "oasis", "ominous_woods", "orchard", - "origin_hills", + "origin_valley", "outback", "overgrown_cliffs", "pasture", "poppy_field", "prairie", "pumpkin_patch", - "rainbow_valley", + "rainbow_hills", "rainforest", "redwood_forest", "redwood_forest_edge", @@ -505,8 +499,7 @@ "wasteland", "wetland", "withered_abyss", - "woodland", - "xeric_shrubland" + "woodland" ] ] } \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/chiseled_orange_sandstone.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/chiseled_orange_sandstone.json new file mode 100644 index 000000000..fa4afb5d9 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/chiseled_orange_sandstone.json @@ -0,0 +1,53 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:chiseled_orange_sandstone" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_chiseled_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:chiseled_orange_sandstone" + } + ] + } + }, + "has_cut_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:cut_orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:chiseled_orange_sandstone" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_chiseled_orange_sandstone", + "has_cut_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/chiseled_orange_sandstone_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/chiseled_orange_sandstone_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..8d478207c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/chiseled_orange_sandstone_from_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:chiseled_orange_sandstone_from_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:chiseled_orange_sandstone_from_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..9087dd63c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_from_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:cut_orange_sandstone_from_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:cut_orange_sandstone_from_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab.json new file mode 100644 index 000000000..46b79576d --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:cut_orange_sandstone_slab" + ] + }, + "criteria": { + "has_cut_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:cut_orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:cut_orange_sandstone_slab" + } + } + }, + "requirements": [ + [ + "has_cut_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..145314064 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_cut_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_cut_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..4f2015a66 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/cut_orange_sandstone_slab_from_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:cut_orange_sandstone_slab_from_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:cut_orange_sandstone_slab_from_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone.json new file mode 100644 index 000000000..65eeddd5d --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:orange_sandstone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:orange_sandstone" + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_sand" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_slab.json new file mode 100644 index 000000000..8b5a18f0a --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_slab.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:orange_sandstone_slab" + ] + }, + "criteria": { + "has_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:orange_sandstone_slab" + } + } + }, + "requirements": [ + [ + "has_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_slab_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_slab_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..3b70f8831 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_slab_from_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:orange_sandstone_slab_from_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:orange_sandstone_slab_from_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_stairs.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_stairs.json new file mode 100644 index 000000000..dbda82f93 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_stairs.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:orange_sandstone_stairs" + ] + }, + "criteria": { + "has_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:orange_sandstone_stairs" + } + } + }, + "requirements": [ + [ + "has_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_stairs_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_stairs_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..28884ed79 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/orange_sandstone_stairs_from_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:orange_sandstone_stairs_from_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:orange_sandstone_stairs_from_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone.json new file mode 100644 index 000000000..865d0a32a --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:smooth_orange_sandstone" + ] + }, + "criteria": { + "has_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:smooth_orange_sandstone" + } + } + }, + "requirements": [ + [ + "has_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_slab.json new file mode 100644 index 000000000..73b3b50ce --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_slab.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:smooth_orange_sandstone_slab" + ] + }, + "criteria": { + "has_smooth_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:smooth_orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:smooth_orange_sandstone_slab" + } + } + }, + "requirements": [ + [ + "has_smooth_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..bdc6077c3 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_smooth_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:smooth_orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_smooth_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_stairs.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_stairs.json new file mode 100644 index 000000000..39d117837 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_stairs.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:smooth_orange_sandstone_stairs" + ] + }, + "criteria": { + "has_smooth_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:smooth_orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:smooth_orange_sandstone_stairs" + } + } + }, + "requirements": [ + [ + "has_smooth_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..004128b7d --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_smooth_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:smooth_orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_smooth_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/orange_sandstone_wall.json b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/orange_sandstone_wall.json new file mode 100644 index 000000000..f2745ce27 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/orange_sandstone_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:orange_sandstone_wall" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:orange_sandstone_wall" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/orange_sandstone_wall_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/orange_sandstone_wall_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..d62820c20 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/orange_sandstone_wall_from_orange_sandstone_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:orange_sandstone_wall_from_orange_sandstone_stonecutting" + ] + }, + "criteria": { + "has_orange_sandstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:orange_sandstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:orange_sandstone_wall_from_orange_sandstone_stonecutting" + } + } + }, + "requirements": [ + [ + "has_orange_sandstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/chiseled_orange_sandstone.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/chiseled_orange_sandstone.json new file mode 100644 index 000000000..f0ecc5cbf --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/chiseled_orange_sandstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:chiseled_orange_sandstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/cut_orange_sandstone.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/cut_orange_sandstone.json new file mode 100644 index 000000000..246a5a9db --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/cut_orange_sandstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:cut_orange_sandstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/cut_orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/cut_orange_sandstone_slab.json new file mode 100644 index 000000000..6d44d269c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/cut_orange_sandstone_slab.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "biomesoplenty:cut_orange_sandstone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "biomesoplenty:cut_orange_sandstone_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sand.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sand.json new file mode 100644 index 000000000..4303d02fd --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sand.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:orange_sand" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone.json new file mode 100644 index 000000000..2e1440ddd --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:orange_sandstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_slab.json new file mode 100644 index 000000000..00b72e08d --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_slab.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "biomesoplenty:orange_sandstone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "biomesoplenty:orange_sandstone_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_stairs.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_stairs.json new file mode 100644 index 000000000..6e641e08c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:orange_sandstone_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_wall.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_wall.json new file mode 100644 index 000000000..7420ae3b4 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_sandstone_wall.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:orange_sandstone_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone.json new file mode 100644 index 000000000..3c98de71c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:smooth_orange_sandstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone_slab.json new file mode 100644 index 000000000..b5b5e0719 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone_slab.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "biomesoplenty:smooth_orange_sandstone_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "biomesoplenty:smooth_orange_sandstone_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone_stairs.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone_stairs.json new file mode 100644 index 000000000..debde3c4b --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/smooth_orange_sandstone_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:smooth_orange_sandstone_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/chiseled_orange_sandstone.json b/src/main/resources/data/biomesoplenty/recipes/chiseled_orange_sandstone.json new file mode 100644 index 000000000..97a661d82 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/chiseled_orange_sandstone.json @@ -0,0 +1,15 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "#", + "#" + ], + "key": { + "#": { + "item": "biomesoplenty:orange_sandstone_slab" + } + }, + "result": { + "item": "biomesoplenty:chiseled_orange_sandstone" + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/chiseled_orange_sandstone_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/chiseled_orange_sandstone_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..e5b399421 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/chiseled_orange_sandstone_from_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:orange_sandstone" + }, + "result": "biomesoplenty:chiseled_orange_sandstone", + "count": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone.json b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone.json new file mode 100644 index 000000000..bfc4f1715 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone.json @@ -0,0 +1,16 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:orange_sandstone" + } + }, + "result": { + "item": "biomesoplenty:cut_orange_sandstone", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..c375da47f --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_from_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:orange_sandstone" + }, + "result": "biomesoplenty:cut_orange_sandstone", + "count": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab.json new file mode 100644 index 000000000..2c1d59183 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:cut_orange_sandstone" + } + }, + "result": { + "item": "biomesoplenty:cut_orange_sandstone_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..b9d6f9f59 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab_from_cut_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:cut_orange_sandstone" + }, + "result": "biomesoplenty:cut_orange_sandstone_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..530822b5f --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/cut_orange_sandstone_slab_from_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:orange_sandstone" + }, + "result": "biomesoplenty:cut_orange_sandstone_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/orange_sandstone.json b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone.json new file mode 100644 index 000000000..ce178b29b --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone.json @@ -0,0 +1,15 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:orange_sand" + } + }, + "result": { + "item": "biomesoplenty:orange_sandstone" + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_orange_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_orange_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..0e0826373 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_orange_from_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:orange_sandstone" + }, + "result": "biomesoplenty:orange_sandstone_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_slab.json new file mode 100644 index 000000000..230e3732d --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_slab.json @@ -0,0 +1,23 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": [ + { + "item": "biomesoplenty:orange_sandstone" + }, + { + "item": "biomesoplenty:chiseled_orange_sandstone" + }, + { + "item": "biomesoplenty:cut_orange_sandstone" + } + ] + }, + "result": { + "item": "biomesoplenty:orange_sandstone_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_stairs.json b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_stairs.json new file mode 100644 index 000000000..9b3c6cc9f --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_stairs.json @@ -0,0 +1,25 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "# ", + "## ", + "###" + ], + "key": { + "#": [ + { + "item": "biomesoplenty:orange_sandstone" + }, + { + "item": "biomesoplenty:chiseled_orange_sandstone" + }, + { + "item": "biomesoplenty:cut_orange_sandstone" + } + ] + }, + "result": { + "item": "biomesoplenty:orange_sandstone_stairs", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_stairs_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_stairs_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..301475a6b --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_stairs_from_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:orange_sandstone" + }, + "result": "biomesoplenty:orange_sandstone_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_wall.json b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_wall.json new file mode 100644 index 000000000..c344eafce --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_wall.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:orange_sandstone" + } + }, + "result": { + "item": "biomesoplenty:orange_sandstone_wall", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_wall_from_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_wall_from_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..82ed717d4 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/orange_sandstone_wall_from_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:orange_sandstone" + }, + "result": "biomesoplenty:orange_sandstone_wall", + "count": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone.json b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone.json new file mode 100644 index 000000000..708c75f3e --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "biomesoplenty:orange_sandstone" + }, + "result": "biomesoplenty:smooth_orange_sandstone", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_slab.json b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_slab.json new file mode 100644 index 000000000..e0fc86b07 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_slab.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:smooth_orange_sandstone" + } + }, + "result": { + "item": "biomesoplenty:smooth_orange_sandstone_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..ecee73d05 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_slab_from_smooth_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:smooth_orange_sandstone" + }, + "result": "biomesoplenty:smooth_orange_sandstone_slab", + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_stairs.json b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_stairs.json new file mode 100644 index 000000000..9287026c6 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_stairs.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "# ", + "## ", + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:smooth_orange_sandstone" + } + }, + "result": { + "item": "biomesoplenty:smooth_orange_sandstone_stairs", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting.json b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting.json new file mode 100644 index 000000000..694f9bec0 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/smooth_orange_sandstone_stairs_from_smooth_orange_sandstone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "biomesoplenty:smooth_orange_sandstone" + }, + "result": "biomesoplenty:smooth_orange_sandstone_stairs", + "count": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/sand.json b/src/main/resources/data/forge/tags/blocks/sand.json index 48b64bd56..da8c33dbe 100644 --- a/src/main/resources/data/forge/tags/blocks/sand.json +++ b/src/main/resources/data/forge/tags/blocks/sand.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "biomesoplenty:black_sand", + "biomesoplenty:orange_sand", "biomesoplenty:white_sand" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/sandstone.json b/src/main/resources/data/forge/tags/blocks/sandstone.json index 145c84ca5..bc519b3c7 100644 --- a/src/main/resources/data/forge/tags/blocks/sandstone.json +++ b/src/main/resources/data/forge/tags/blocks/sandstone.json @@ -5,6 +5,10 @@ "biomesoplenty:cut_black_sandstone", "biomesoplenty:chiseled_black_sandstone", "biomesoplenty:smooth_black_sandstone", + "biomesoplenty:orange_sandstone", + "biomesoplenty:cut_orange_sandstone", + "biomesoplenty:chiseled_orange_sandstone", + "biomesoplenty:smooth_orange_sandstone", "biomesoplenty:white_sandstone", "biomesoplenty:cut_white_sandstone", "biomesoplenty:chiseled_white_sandstone", diff --git a/src/main/resources/data/forge/tags/items/sand.json b/src/main/resources/data/forge/tags/items/sand.json index 4d9c36a32..3b3a56b19 100644 --- a/src/main/resources/data/forge/tags/items/sand.json +++ b/src/main/resources/data/forge/tags/items/sand.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "biomesoplenty:black_sand", + "biomesoplenty:orange_sand", "biomesoplenty:white_sand" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/sandstone.json b/src/main/resources/data/forge/tags/items/sandstone.json index 145c84ca5..bc519b3c7 100644 --- a/src/main/resources/data/forge/tags/items/sandstone.json +++ b/src/main/resources/data/forge/tags/items/sandstone.json @@ -5,6 +5,10 @@ "biomesoplenty:cut_black_sandstone", "biomesoplenty:chiseled_black_sandstone", "biomesoplenty:smooth_black_sandstone", + "biomesoplenty:orange_sandstone", + "biomesoplenty:cut_orange_sandstone", + "biomesoplenty:chiseled_orange_sandstone", + "biomesoplenty:smooth_orange_sandstone", "biomesoplenty:white_sandstone", "biomesoplenty:cut_white_sandstone", "biomesoplenty:chiseled_white_sandstone", diff --git a/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json b/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json index 2fb2a8bce..a8c9d4c72 100644 --- a/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json +++ b/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "biomesoplenty:black_sand", + "biomesoplenty:orange_sand", "biomesoplenty:white_sand", "biomesoplenty:toadstool", "biomesoplenty:glowshroom", diff --git a/src/main/resources/data/minecraft/tags/blocks/sand.json b/src/main/resources/data/minecraft/tags/blocks/sand.json index 48b64bd56..da8c33dbe 100644 --- a/src/main/resources/data/minecraft/tags/blocks/sand.json +++ b/src/main/resources/data/minecraft/tags/blocks/sand.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "biomesoplenty:black_sand", + "biomesoplenty:orange_sand", "biomesoplenty:white_sand" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 8b8e5e9e4..33a42adc3 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -4,6 +4,9 @@ "biomesoplenty:black_sandstone_slab", "biomesoplenty:cut_black_sandstone_slab", "biomesoplenty:smooth_black_sandstone_slab", + "biomesoplenty:orange_sandstone_slab", + "biomesoplenty:cut_orange_sandstone_slab", + "biomesoplenty:smooth_orange_sandstone_slab", "biomesoplenty:white_sandstone_slab", "biomesoplenty:cut_white_sandstone_slab", "biomesoplenty:smooth_white_sandstone_slab", diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index a58ff667b..fb5505c6c 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -3,6 +3,8 @@ "values": [ "biomesoplenty:black_sandstone_stairs", "biomesoplenty:smooth_black_sandstone_stairs", + "biomesoplenty:orange_sandstone_stairs", + "biomesoplenty:smooth_orange_sandstone_stairs", "biomesoplenty:white_sandstone_stairs", "biomesoplenty:smooth_white_sandstone_stairs", "biomesoplenty:mud_brick_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index b5b4992bc..d35f03f6b 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -2,7 +2,8 @@ "replace": false, "values": [ "biomesoplenty:black_sandstone_wall", - "biomesoplenty:mud_brick_wall", - "biomesoplenty:white_sandstone_wall" + "biomesoplenty:orange_sandstone_wall", + "biomesoplenty:white_sandstone_wall", + "biomesoplenty:mud_brick_wall" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/sand.json b/src/main/resources/data/minecraft/tags/items/sand.json index 48b64bd56..da8c33dbe 100644 --- a/src/main/resources/data/minecraft/tags/items/sand.json +++ b/src/main/resources/data/minecraft/tags/items/sand.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "biomesoplenty:black_sand", + "biomesoplenty:orange_sand", "biomesoplenty:white_sand" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index eaa3477d9..d6047b530 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -4,6 +4,9 @@ "biomesoplenty:black_sandstone_slab", "biomesoplenty:cut_black_sandstone_slab", "biomesoplenty:smooth_black_sandstone_slab", + "biomesoplenty:orange_sandstone_slab", + "biomesoplenty:cut_orange_sandstone_slab", + "biomesoplenty:smooth_orange_sandstone_slab", "biomesoplenty:white_sandstone_slab", "biomesoplenty:cut_white_sandstone_slab", "biomesoplenty:smooth_white_sandstone_slab", diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json index a58ff667b..fb5505c6c 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -3,6 +3,8 @@ "values": [ "biomesoplenty:black_sandstone_stairs", "biomesoplenty:smooth_black_sandstone_stairs", + "biomesoplenty:orange_sandstone_stairs", + "biomesoplenty:smooth_orange_sandstone_stairs", "biomesoplenty:white_sandstone_stairs", "biomesoplenty:smooth_white_sandstone_stairs", "biomesoplenty:mud_brick_stairs", diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json index b5b4992bc..96668b14e 100644 --- a/src/main/resources/data/minecraft/tags/items/walls.json +++ b/src/main/resources/data/minecraft/tags/items/walls.json @@ -2,7 +2,8 @@ "replace": false, "values": [ "biomesoplenty:black_sandstone_wall", - "biomesoplenty:mud_brick_wall", - "biomesoplenty:white_sandstone_wall" + "biomesoplenty:orange_sandstone_wall", + "biomesoplenty:white_sandstone_wall", + "biomesoplenty:mud_brick_wall" ] } \ No newline at end of file