diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java index a49af8505..9f075c4a5 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java @@ -33,6 +33,7 @@ public class BOPBiomes public static Optional prairie = Optional.empty(); public static Optional redwood_forest = Optional.empty(); public static Optional seasonal_forest = Optional.empty(); + public static Optional shield = Optional.empty(); public static Optional shrubland = Optional.empty(); public static Optional snowy_coniferous_forest = Optional.empty(); public static Optional snowy_forest = Optional.empty(); diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 6d253bc22..13d6b4c78 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -246,7 +246,6 @@ public class BOPBlocks public static Block wilted_lily; public static Block burning_blossom; - public static Block ivy; public static Block willow_vine; public static Block short_grass; @@ -257,7 +256,6 @@ public class BOPBlocks public static Block dead_grass; public static Block spectral_fern; - public static Block thorn; public static Block tiny_cactus; public static Block cattail; public static Block tall_cattail; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java index ba956c244..440a344a0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java @@ -83,10 +83,10 @@ public class CherryBlossomGroveBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.GRAVEL, 6, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(1))); // Vegetation - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.LILAC.getDefaultState()), SURFACE_PLUS_32, new FrequencyConfig(4))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.WHITE_CHERRY_TREE, BOPBiomeFeatures.PINK_CHERRY_TREE, BOPBiomeFeatures.BIG_WHITE_CHERRY_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F, 0.2F, 0.3F}, BOPBiomeFeatures.BIG_PINK_CHERRY_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(5, 0.2F, 1))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.CHERRY_BLOSSOM_GROVE_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(25))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(8))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.LILAC.getDefaultState()), SURFACE_PLUS_32, new FrequencyConfig(5))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.WHITE_CHERRY_TREE, BOPBiomeFeatures.PINK_CHERRY_TREE, BOPBiomeFeatures.BIG_WHITE_CHERRY_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F, 0.2F, 0.3F}, BOPBiomeFeatures.BIG_PINK_CHERRY_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(4, 0.2F, 1))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.CHERRY_BLOSSOM_GROVE_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(30))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(10))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.BROWN_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(2))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.RED_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(4))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.REED, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(10))); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java index 141beac79..63ec27dea 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/LushSwampBiome.java @@ -48,7 +48,7 @@ public class LushSwampBiome extends BiomeBOP { public LushSwampBiome() { - super((new Biome.BiomeBuilder()).surfaceBuilder(new CompositeSurfaceBuilder(DEFAULT_SURFACE_BUILDER, GRASS_DIRT_GRAVEL_SURFACE)).precipitation(Biome.RainType.RAIN).category(Biome.Category.SWAMP).depth(0.0F).scale(0.1F).temperature(0.7F).downfall(1.0F).waterColor(4159204).waterFogColor(329011).parent((String)null)); + super((new Biome.BiomeBuilder()).surfaceBuilder(new CompositeSurfaceBuilder(DEFAULT_SURFACE_BUILDER, GRASS_DIRT_GRAVEL_SURFACE)).precipitation(Biome.RainType.RAIN).category(Biome.Category.SWAMP).depth(-0.05F).scale(0.1F).temperature(0.7F).downfall(1.0F).waterColor(4159204).waterFogColor(329011).parent((String)null)); // Mineshafts and Strongholds this.addStructure(Feature.SWAMP_HUT, new SwampHutConfig()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java index 985af432b..a5e0ad3d4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java @@ -81,11 +81,11 @@ public class MysticGroveBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.LAPIS_ORE.getDefaultState(), 7), DEPTH_AVERAGE, new DepthAverageConfig(1, 16, 16))); // Vegetation - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.IVY_TREE, BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE, BOPBiomeFeatures.JACARANDA_TREE, BOPBiomeFeatures.BIG_MAGIC_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F, 0.1F, 0.5F, 0.5F}, BOPBiomeFeatures.MAGIC_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(10, 0.7F, 1))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.MYSTIC_GROVE_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(14))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.SWAMP_TREE, BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE, BOPBiomeFeatures.JACARANDA_TREE, BOPBiomeFeatures.BIG_MAGIC_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F, 0.1F, 0.5F, 0.5F}, BOPBiomeFeatures.MAGIC_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(10, 0.7F, 1))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.MYSTIC_GROVE_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(16))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BIG_RED_MUSHROOM, IFeatureConfig.NO_FEATURE_CONFIG, AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(1, 0.1F, 1))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.LILAC.getDefaultState()), SURFACE_PLUS_32, new FrequencyConfig(4))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(8))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.LILAC.getDefaultState()), SURFACE_PLUS_32, new FrequencyConfig(5))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(10))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.BROWN_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(5))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.RED_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(10))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.glowshroom), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(10))); @@ -115,6 +115,12 @@ public class MysticGroveBiome extends BiomeBOP this.addWeight(BOPClimates.WET_TEMPERATE, 1); } + @OnlyIn(Dist.CLIENT) + public int getSkyColorByTemp(float currentTemperature) + { + return 0x88E8D0; + } + @OnlyIn(Dist.CLIENT) public int getGrassColor(BlockPos pos) { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java index 6b821a9de..2b526ee6e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java @@ -84,10 +84,10 @@ public class OminousWoodsBiome extends BiomeBOP // Vegetation this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.DEAD_TREE, BOPBiomeFeatures.DYING_TREE, BOPBiomeFeatures.WILLOW_TREE, BOPBiomeFeatures.TALL_UMBRAN_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F, 0.2F, 0.4F, 0.6F}, BOPBiomeFeatures.UMBRAN_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(9, 0.5F, 1))); //this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.MYSTIC_GROVE_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(10))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(5))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(4))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.BROWN_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(4))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.RED_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(8))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.thorn), TWICE_SURFACE, new FrequencyConfig(5))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.dead_grass), TWICE_SURFACE, new FrequencyConfig(6))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.PUMPKIN, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(32))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.WATER), HEIGHT_BIASED_RANGE, new CountRangeConfig(50, 8, 8, 256))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.LAVA), HEIGHT_VERY_BIASED_RANGE, new CountRangeConfig(20, 8, 16, 256))); @@ -107,15 +107,21 @@ public class OminousWoodsBiome extends BiomeBOP this.addWeight(BOPClimates.COLD_SWAMP, 1); } + @OnlyIn(Dist.CLIENT) + public int getSkyColorByTemp(float currentTemperature) + { + return 0x384460; + } + @OnlyIn(Dist.CLIENT) public int getGrassColor(BlockPos pos) { - return 0x43415B; + return 0x4C4A70; } @OnlyIn(Dist.CLIENT) public int getFoliageColor(BlockPos pos) { - return 0x5A4166; + return 0x6B487C; } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java index 599dbf090..543e46e62 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java @@ -83,7 +83,7 @@ public class OrchardBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.GRAVEL, 6, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(1))); // Vegetation - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.FLOWERING_OAK_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.2F}, BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(2, 0.1F, 1))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.FLOWERING_OAK_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.2F}, BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(1, 0.1F, 1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.MEADOW_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(5))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(10))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.PUMPKIN, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(32))); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java index 0409e1751..61b02eb1e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java @@ -74,9 +74,6 @@ public class PastureBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.REDSTONE_ORE.getDefaultState(), 8), COUNT_RANGE, new CountRangeConfig(8, 0, 0, 16))); this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.DIAMOND_ORE.getDefaultState(), 8), COUNT_RANGE, new CountRangeConfig(1, 0, 0, 16))); this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.LAPIS_ORE.getDefaultState(), 7), DEPTH_AVERAGE, new DepthAverageConfig(1, 16, 16))); - this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.SAND, 7, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(3))); - this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.CLAY, 4, 1, Lists.newArrayList(Blocks.DIRT, Blocks.CLAY)), TOP_SOLID, new FrequencyConfig(1))); - this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.GRAVEL, 6, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(1))); // Vegetation this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(12))); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java index 8e471527e..fe1bceb70 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java @@ -78,9 +78,6 @@ public class PrairieBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.REDSTONE_ORE.getDefaultState(), 8), COUNT_RANGE, new CountRangeConfig(8, 0, 0, 16))); this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.DIAMOND_ORE.getDefaultState(), 8), COUNT_RANGE, new CountRangeConfig(1, 0, 0, 16))); this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.LAPIS_ORE.getDefaultState(), 7), DEPTH_AVERAGE, new DepthAverageConfig(1, 16, 16))); - this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.SAND, 7, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(3))); - this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.CLAY, 4, 1, Lists.newArrayList(Blocks.DIRT, Blocks.CLAY)), TOP_SOLID, new FrequencyConfig(1))); - this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.GRAVEL, 6, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(1))); // Vegetation this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(BOPBiomeFeatures.SPARSE_OAK_TREE, IFeatureConfig.NO_FEATURE_CONFIG, AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig((int)0.95F, 0.2F, 1))); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java new file mode 100644 index 000000000..7c357b29d --- /dev/null +++ b/src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java @@ -0,0 +1,128 @@ +/******************************************************************************* + * 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 com.google.common.collect.Lists; + +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.api.enums.BOPClimates; +import biomesoplenty.common.biome.BiomeBOP; +import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures; +import biomesoplenty.common.world.gen.feature.StandardGrassFeature; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.init.Blocks; +import net.minecraft.init.Fluids; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.GenerationStage; +import net.minecraft.world.gen.feature.BushConfig; +import net.minecraft.world.gen.feature.DoublePlantConfig; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.IFeatureConfig; +import net.minecraft.world.gen.feature.LakesConfig; +import net.minecraft.world.gen.feature.LiquidsConfig; +import net.minecraft.world.gen.feature.MinableConfig; +import net.minecraft.world.gen.feature.ProbabilityConfig; +import net.minecraft.world.gen.feature.RandomDefaultFeatureListConfig; +import net.minecraft.world.gen.feature.SeaGrassConfig; +import net.minecraft.world.gen.feature.SphereReplaceConfig; +import net.minecraft.world.gen.feature.structure.MineshaftConfig; +import net.minecraft.world.gen.feature.structure.MineshaftStructure; +import net.minecraft.world.gen.feature.structure.StrongholdConfig; +import net.minecraft.world.gen.placement.AtSurfaceWithExtraConfig; +import net.minecraft.world.gen.placement.ChanceConfig; +import net.minecraft.world.gen.placement.CountRangeConfig; +import net.minecraft.world.gen.placement.DepthAverageConfig; +import net.minecraft.world.gen.placement.DungeonRoomConfig; +import net.minecraft.world.gen.placement.FrequencyConfig; +import net.minecraft.world.gen.placement.IPlacementConfig; +import net.minecraft.world.gen.placement.LakeChanceConfig; +import net.minecraft.world.gen.surfacebuilders.CompositeSurfaceBuilder; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +public class ShieldBiome extends BiomeBOP +{ + public ShieldBiome() + { + super((new Biome.BiomeBuilder()).surfaceBuilder(new CompositeSurfaceBuilder(BOPBiomeFeatures.CHAPARRAL_SURFACE_BUILDER, GRASS_DIRT_GRAVEL_SURFACE)).precipitation(Biome.RainType.RAIN).category(Biome.Category.TAIGA).depth(-0.2F).scale(0.15F).temperature(0.4F).downfall(0.8F).waterColor(4159204).waterFogColor(329011).parent((String)null)); + + // Mineshafts and Strongholds + this.addStructure(Feature.MINESHAFT, new MineshaftConfig(0.004D, MineshaftStructure.Type.NORMAL)); + this.addStructure(Feature.STRONGHOLD, new StrongholdConfig()); + + this.addCarver(GenerationStage.Carving.AIR, createWorldCarverWrapper(CAVE_WORLD_CARVER, new ProbabilityConfig(0.14285715F))); + this.addCarver(GenerationStage.Carving.AIR, createWorldCarverWrapper(CANYON_WORLD_CARVER, new ProbabilityConfig(0.02F))); + + this.addStructureFeatures(); + + // Lakes + this.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, createCompositeFeature(Feature.LAKES, new LakesConfig(Blocks.WATER), LAKE_WATER, new LakeChanceConfig(4))); + this.addFeature(GenerationStage.Decoration.LOCAL_MODIFICATIONS, createCompositeFeature(Feature.LAKES, new LakesConfig(Blocks.LAVA), LAVA_LAKE, new LakeChanceConfig(80))); + + // Underground + this.addFeature(GenerationStage.Decoration.UNDERGROUND_STRUCTURES, createCompositeFeature(Feature.DUNGEONS, IFeatureConfig.NO_FEATURE_CONFIG, DUNGEON_ROOM, new DungeonRoomConfig(8))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.DIRT.getDefaultState(), 33), COUNT_RANGE, new CountRangeConfig(10, 0, 0, 256))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.GRAVEL.getDefaultState(), 33), COUNT_RANGE, new CountRangeConfig(8, 0, 0, 256))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.GRANITE.getDefaultState(), 33), COUNT_RANGE, new CountRangeConfig(10, 0, 0, 80))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.DIORITE.getDefaultState(), 33), COUNT_RANGE, new CountRangeConfig(10, 0, 0, 80))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.ANDESITE.getDefaultState(), 33), COUNT_RANGE, new CountRangeConfig(10, 0, 0, 80))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.COAL_ORE.getDefaultState(), 17), COUNT_RANGE, new CountRangeConfig(20, 0, 0, 128))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.IRON_ORE.getDefaultState(), 9), COUNT_RANGE, new CountRangeConfig(20, 0, 0, 64))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.GOLD_ORE.getDefaultState(), 9), COUNT_RANGE, new CountRangeConfig(2, 0, 0, 32))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.REDSTONE_ORE.getDefaultState(), 8), COUNT_RANGE, new CountRangeConfig(8, 0, 0, 16))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.DIAMOND_ORE.getDefaultState(), 8), COUNT_RANGE, new CountRangeConfig(1, 0, 0, 16))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.LAPIS_ORE.getDefaultState(), 7), DEPTH_AVERAGE, new DepthAverageConfig(1, 16, 16))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.CLAY, 4, 1, Lists.newArrayList(Blocks.DIRT, Blocks.CLAY)), TOP_SOLID, new FrequencyConfig(1))); + this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.GRAVEL, 8, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(1))); + + // Vegetation + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.BUSH}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.3F}, BOPBiomeFeatures.TALL_SPRUCE_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(6, 0.1F, 1))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(Feature.DEFAULT_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(3))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(8))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.BROWN_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(4))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(Blocks.RED_MUSHROOM), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(8))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.toadstool), TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(3))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.WATER), HEIGHT_BIASED_RANGE, new CountRangeConfig(50, 8, 8, 256))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.LAVA), HEIGHT_VERY_BIASED_RANGE, new CountRangeConfig(20, 8, 16, 256))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.SEA_GRASS, new SeaGrassConfig(64, 0.6D), TOP_SOLID_ONCE, IPlacementConfig.NO_PLACEMENT_CONFIG)); + this.addFeature(GenerationStage.Decoration.TOP_LAYER_MODIFICATION, createCompositeFeature(Feature.ICE_AND_SNOW, IFeatureConfig.NO_FEATURE_CONFIG, PASSTHROUGH, IPlacementConfig.NO_PLACEMENT_CONFIG)); + + // Entity spawning + this.addSpawn(EnumCreatureType.CREATURE, new Biome.SpawnListEntry(EntityType.SHEEP, 12, 4, 4)); + this.addSpawn(EnumCreatureType.CREATURE, new Biome.SpawnListEntry(EntityType.PIG, 10, 4, 4)); + this.addSpawn(EnumCreatureType.CREATURE, new Biome.SpawnListEntry(EntityType.CHICKEN, 10, 4, 4)); + this.addSpawn(EnumCreatureType.CREATURE, new Biome.SpawnListEntry(EntityType.COW, 8, 4, 4)); + this.addSpawn(EnumCreatureType.WATER_CREATURE, new Biome.SpawnListEntry(EntityType.SALMON, 5, 1, 5)); + this.addSpawn(EnumCreatureType.WATER_CREATURE, new Biome.SpawnListEntry(EntityType.SQUID, 10, 1, 2)); + this.addSpawn(EnumCreatureType.AMBIENT, new Biome.SpawnListEntry(EntityType.BAT, 10, 8, 8)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.SPIDER, 100, 4, 4)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.ZOMBIE, 95, 4, 4)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.ZOMBIE_VILLAGER, 5, 1, 1)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.SKELETON, 100, 4, 4)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.CREEPER, 100, 4, 4)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.SLIME, 100, 4, 4)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.ENDERMAN, 10, 1, 4)); + this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.WITCH, 5, 1, 1)); + + this.addWeight(BOPClimates.BOREAL, 5); + } + + @OnlyIn(Dist.CLIENT) + public int getGrassColor(BlockPos pos) + { + return 0x7C9B45; + } + + @OnlyIn(Dist.CLIENT) + public int getFoliageColor(BlockPos pos) + { + return 0x8EAF4F; + } +} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java index 9110abf9a..c1b8ce1bb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java @@ -83,7 +83,7 @@ public class SnowyForestBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.SPHERE_REPLACE, new SphereReplaceConfig(Blocks.GRAVEL, 6, 2, Lists.newArrayList(Blocks.DIRT, Blocks.GRASS_BLOCK)), TOP_SOLID, new FrequencyConfig(1))); // Vegetation - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.OAK_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F}, BOPBiomeFeatures.DYING_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(5, 0.1F, 1))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.DYING_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.2F}, BOPBiomeFeatures.OAK_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(5, 0.2F, 1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(4))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.SNOWY_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(4))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.PUMPKIN, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE_WITH_CHANCE, new ChanceConfig(32))); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java index 004431a29..f6e50e48d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java @@ -84,11 +84,12 @@ public class XericShrublandBiome extends BiomeBOP // Vegetation this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(BOPBiomeFeatures.ACACIA_TWIGLET_SMALL, IFeatureConfig.NO_FEATURE_CONFIG, AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(1, 0.1F, 1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.XERIC_SHRUBLAND_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(7))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.DEAD_BUSH, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(5))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.DEAD_BUSH, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(7))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.CACTUS, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(5))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.tiny_cactus), TWICE_SURFACE, new FrequencyConfig(3))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.dune_grass), TWICE_SURFACE, new FrequencyConfig(250))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.desert_grass), TWICE_SURFACE, new FrequencyConfig(25))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.tiny_cactus), TWICE_SURFACE, new FrequencyConfig(4))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.dune_grass), TWICE_SURFACE, new FrequencyConfig(275))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.desert_grass), TWICE_SURFACE, new FrequencyConfig(30))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.dead_grass), TWICE_SURFACE, new FrequencyConfig(5))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.WATER), HEIGHT_BIASED_RANGE, new CountRangeConfig(50, 8, 8, 256))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.LAVA), HEIGHT_VERY_BIASED_RANGE, new CountRangeConfig(20, 8, 16, 256))); this.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, createCompositeFeature(Feature.FOSSILS, IFeatureConfig.NO_FEATURE_CONFIG, WITH_CHANCE, new ChanceConfig(64))); diff --git a/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java b/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java index 2984f72e3..6181159cd 100644 --- a/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java +++ b/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java @@ -82,10 +82,6 @@ public class BlockPlantBOP extends BlockBush implements IPlantable { Block block = stateIn.getBlock(); - if (block == BOPBlocks.thorn) - { - entityIn.attackEntityFrom(DamageSource.CACTUS, 1.0F); - } if (block == BOPBlocks.tiny_cactus) { entityIn.attackEntityFrom(DamageSource.CACTUS, 1.0F); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java index 091de66d2..1917310da 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java @@ -66,7 +66,6 @@ public class BOPBiomeFeatures public static final AbstractTreeFeature MAHOGANY_TREE = new MahoganyTreeFeature.Builder().create(); public static final AbstractTreeFeature TALL_SPRUCE_TREE = new TaigaTreeFeature.Builder().log(Blocks.SPRUCE_LOG.getDefaultState()).leaves(Blocks.SPRUCE_LEAVES.getDefaultState()).maxHeight(13).create(); public static final AbstractTreeFeature SWAMP_TREE = new BasicTreeFeature.Builder().vine(Blocks.VINE.getDefaultState()).minHeight(8).maxHeight(12).maxLeavesRadius(2).leavesOffset(0).create(); - public static final AbstractTreeFeature IVY_TREE = new BasicTreeFeature.Builder().vine(BOPBlocks.ivy.getDefaultState()).minHeight(5).maxHeight(9).maxLeavesRadius(2).leavesOffset(0).create(); public static final AbstractTreeFeature WILLOW_TREE = new BasicTreeFeature.Builder().log(BOPBlocks.willow_log.getDefaultState()).leaves(BOPBlocks.willow_leaves.getDefaultState()).vine(BOPBlocks.willow_vine.getDefaultState()).minHeight(8).maxHeight(12).maxLeavesRadius(2).leavesOffset(0).create(); public static final AbstractTreeFeature BUSH = new BushTreeFeature.Builder().maxHeight(2).create(); public static final AbstractTreeFeature REDWOOD_TREE = new RedwoodTreeFeature.Builder().create(); diff --git a/src/main/java/biomesoplenty/core/ClientProxy.java b/src/main/java/biomesoplenty/core/ClientProxy.java index 3c925506f..4780b30e5 100644 --- a/src/main/java/biomesoplenty/core/ClientProxy.java +++ b/src/main/java/biomesoplenty/core/ClientProxy.java @@ -57,15 +57,15 @@ public class ClientProxy extends CommonProxy //Foliage Coloring blockColors.register((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefault(), - BOPBlocks.bush, BOPBlocks.flowering_oak_leaves, BOPBlocks.mahogany_leaves, BOPBlocks.palm_leaves, BOPBlocks.willow_leaves, - BOPBlocks.ivy, BOPBlocks.willow_vine); + BOPBlocks.bush, BOPBlocks.flowering_oak_leaves, BOPBlocks.mahogany_leaves, BOPBlocks.palm_leaves, + BOPBlocks.willow_leaves, BOPBlocks.willow_vine); //Item Coloring itemColors.register((stack, tintIndex) -> { IBlockState iblockstate = ((ItemBlock)stack.getItem()).getBlock().getDefaultState(); return blockColors.getColor(iblockstate, null, null, tintIndex); }, BOPBlocks.short_grass, BOPBlocks.bush, BOPBlocks.flowering_oak_leaves, BOPBlocks.mahogany_leaves, - BOPBlocks.palm_leaves, BOPBlocks.willow_leaves, BOPBlocks.ivy, BOPBlocks.willow_vine); + BOPBlocks.palm_leaves, BOPBlocks.willow_leaves, BOPBlocks.willow_vine); } @Override diff --git a/src/main/java/biomesoplenty/init/ModBiomes.java b/src/main/java/biomesoplenty/init/ModBiomes.java index 5fdd31172..74b4a35f5 100644 --- a/src/main/java/biomesoplenty/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/init/ModBiomes.java @@ -31,6 +31,7 @@ import biomesoplenty.common.biome.overworld.PastureBiome; import biomesoplenty.common.biome.overworld.PrairieBiome; import biomesoplenty.common.biome.overworld.RedwoodForestBiome; import biomesoplenty.common.biome.overworld.SeasonalForestBiome; +import biomesoplenty.common.biome.overworld.ShieldBiome; import biomesoplenty.common.biome.overworld.ShrublandBiome; import biomesoplenty.common.biome.overworld.SnowyConiferousForestBiome; import biomesoplenty.common.biome.overworld.SnowyForestBiome; @@ -82,6 +83,7 @@ public class ModBiomes prairie = registerBiome(new PrairieBiome(), "prairie"); redwood_forest = registerBiome(new RedwoodForestBiome(), "redwood_forest"); seasonal_forest = registerBiome(new SeasonalForestBiome(), "seasonal_forest"); + shield = registerBiome(new ShieldBiome(), "shield"); shrubland = registerBiome(new ShrublandBiome(), "shrubland"); snowy_coniferous_forest = registerBiome(new SnowyConiferousForestBiome(), "snowy_coniferous_forest"); snowy_forest = registerBiome(new SnowyForestBiome(), "snowy_forest"); diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index 48e7eb83c..043eebf59 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -272,7 +272,6 @@ public class ModBlocks wilted_lily = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "wilted_lily"); burning_blossom = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT).lightValue(8)), "burning_blossom"); - ivy = registerBlock(new BlockVine(Block.Properties.create(Material.VINE).doesNotBlockMovement().needsRandomTick().hardnessAndResistance(0.2F).sound(SoundType.PLANT)), "ivy"); willow_vine = registerBlock(new BlockVine(Block.Properties.create(Material.VINE).doesNotBlockMovement().needsRandomTick().hardnessAndResistance(0.2F).sound(SoundType.PLANT)), "willow_vine"); short_grass = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "short_grass"); @@ -283,7 +282,6 @@ public class ModBlocks dead_grass = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE, MaterialColor.WOOD).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "dead_grass"); spectral_fern = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE, MaterialColor.RED).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "spectral_fern"); - thorn = registerBlock(new BlockPlantBOP(Block.Properties.create(Material.PLANTS, MaterialColor.LIGHT_GRAY_TERRACOTTA).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "thorn"); tiny_cactus = registerBlock(new BlockPlantBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "tiny_cactus"); cattail = registerBlock(new BlockWaterPlant(Block.Properties.create(Material.PLANTS, MaterialColor.DIRT).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "cattail"); tall_cattail = registerBlock(new BlockDoubleWaterPlant(cattail, Block.Properties.create(Material.PLANTS, MaterialColor.DIRT).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "tall_cattail"); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/ivy.json b/src/main/resources/assets/biomesoplenty/blockstates/ivy.json deleted file mode 100644 index c65a3029e..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/ivy.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "east=false,north=false,south=false,up=false,west=false": { "model": "biomesoplenty:block/ivy_1" }, - "east=false,north=false,south=true,up=false,west=false": { "model": "biomesoplenty:block/ivy_1" }, - "east=false,north=false,south=false,up=false,west=true": { "model": "biomesoplenty:block/ivy_1", "y": 90 }, - "east=false,north=true,south=false,up=false,west=false": { "model": "biomesoplenty:block/ivy_1", "y": 180 }, - "east=true,north=false,south=false,up=false,west=false": { "model": "biomesoplenty:block/ivy_1", "y": 270 }, - "east=true,north=true,south=false,up=false,west=false": { "model": "biomesoplenty:block/ivy_2" }, - "east=true,north=false,south=true,up=false,west=false": { "model": "biomesoplenty:block/ivy_2", "y": 90 }, - "east=false,north=false,south=true,up=false,west=true": { "model": "biomesoplenty:block/ivy_2", "y": 180 }, - "east=false,north=true,south=false,up=false,west=true": { "model": "biomesoplenty:block/ivy_2", "y": 270 }, - "east=true,north=false,south=false,up=false,west=true": { "model": "biomesoplenty:block/ivy_2_opposite" }, - "east=false,north=true,south=true,up=false,west=false": { "model": "biomesoplenty:block/ivy_2_opposite", "y": 90 }, - "east=true,north=true,south=true,up=false,west=false": { "model": "biomesoplenty:block/ivy_3" }, - "east=true,north=false,south=true,up=false,west=true": { "model": "biomesoplenty:block/ivy_3", "y": 90 }, - "east=false,north=true,south=true,up=false,west=true": { "model": "biomesoplenty:block/ivy_3", "y": 180 }, - "east=true,north=true,south=false,up=false,west=true": { "model": "biomesoplenty:block/ivy_3", "y": 270 }, - "east=true,north=true,south=true,up=false,west=true": { "model": "biomesoplenty:block/ivy_4" }, - "east=false,north=false,south=false,up=true,west=false": { "model": "biomesoplenty:block/ivy_u" }, - "east=false,north=false,south=true,up=true,west=false": { "model": "biomesoplenty:block/ivy_1u" }, - "east=false,north=false,south=false,up=true,west=true": { "model": "biomesoplenty:block/ivy_1u", "y": 90 }, - "east=false,north=true,south=false,up=true,west=false": { "model": "biomesoplenty:block/ivy_1u", "y": 180 }, - "east=true,north=false,south=false,up=true,west=false": { "model": "biomesoplenty:block/ivy_1u", "y": 270 }, - "east=true,north=true,south=false,up=true,west=false": { "model": "biomesoplenty:block/ivy_2u" }, - "east=true,north=false,south=true,up=true,west=false": { "model": "biomesoplenty:block/ivy_2u", "y": 90 }, - "east=false,north=false,south=true,up=true,west=true": { "model": "biomesoplenty:block/ivy_2u", "y": 180 }, - "east=false,north=true,south=false,up=true,west=true": { "model": "biomesoplenty:block/ivy_2u", "y": 270 }, - "east=true,north=false,south=false,up=true,west=true": { "model": "biomesoplenty:block/ivy_2u_opposite" }, - "east=false,north=true,south=true,up=true,west=false": { "model": "biomesoplenty:block/ivy_2u_opposite", "y": 90 }, - "east=true,north=true,south=true,up=true,west=false": { "model": "biomesoplenty:block/ivy_3u" }, - "east=true,north=false,south=true,up=true,west=true": { "model": "biomesoplenty:block/ivy_3u", "y": 90 }, - "east=false,north=true,south=true,up=true,west=true": { "model": "biomesoplenty:block/ivy_3u", "y": 180 }, - "east=true,north=true,south=false,up=true,west=true": { "model": "biomesoplenty:block/ivy_3u", "y": 270 }, - "east=true,north=true,south=true,up=true,west=true": { "model": "biomesoplenty:block/ivy_4u" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/thorn.json b/src/main/resources/assets/biomesoplenty/blockstates/thorn.json deleted file mode 100644 index b65a06b10..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/thorn.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/thorn" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 8c05f638b..50cd98992 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -191,7 +191,6 @@ "block.biomesoplenty.hellbark_trapdoor": "Hellbark Trapdoor", "block.biomesoplenty.hellbark_wood": "Hellbark Wood", "block.biomesoplenty.hellbark_wood_slab": "Hellbark Slab", - "block.biomesoplenty.ivy": "Ivy", "block.biomesoplenty.jacaranda_button": "Jacaranda Button", "block.biomesoplenty.jacaranda_door": "Jacaranda Door", "block.biomesoplenty.jacaranda_fence": "Jacaranda Fence", @@ -307,7 +306,6 @@ "block.biomesoplenty.stripped_willow_log": "Stripped Willow Log", "block.biomesoplenty.stripped_willow_wood": "Stripped Willow Wood", "block.biomesoplenty.tall_cattail": "Tall Cattail", - "block.biomesoplenty.thorn": "Thorns", "block.biomesoplenty.tiny_cactus": "Tiny Cactus", "block.biomesoplenty.toadstool": "Toadstool", "block.biomesoplenty.umbran_button": "Umbran Button", diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_1.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_1.json deleted file mode 100644 index aabe0ac24..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 0, 15.2 ], - "to": [ 16, 16, 15.2 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_1u.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_1u.json deleted file mode 100644 index 472fa3983..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_1u.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 15.2, 0 ], - "to": [ 16, 15.2, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 15.2 ], - "to": [ 16, 16, 15.2 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} - diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_2.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_2.json deleted file mode 100644 index 9e0c2fd02..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_2.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 0, 0.8 ], - "to": [ 16, 16, 0.8 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_2_opposite.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_2_opposite.json deleted file mode 100644 index 0af764ee1..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_2_opposite.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0.8, 0, 0 ], - "to": [ 0.8, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_2u.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_2u.json deleted file mode 100644 index d10f11deb..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_2u.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 15.2, 0 ], - "to": [ 16, 15.2, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 0.8 ], - "to": [ 16, 16, 0.8 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} - diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_2u_opposite.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_2u_opposite.json deleted file mode 100644 index 1531a4554..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_2u_opposite.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 15.2, 0 ], - "to": [ 16, 15.2, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0.8, 0, 0 ], - "to": [ 0.8, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} - diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_3.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_3.json deleted file mode 100644 index 2c18de489..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_3.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 15.2 ], - "to": [ 16, 16, 15.2 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 0.8 ], - "to": [ 16, 16, 0.8 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} - diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_3u.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_3u.json deleted file mode 100644 index aed1a7b46..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_3u.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 15.2, 0 ], - "to": [ 16, 15.2, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 15.2 ], - "to": [ 16, 16, 15.2 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 0.8 ], - "to": [ 16, 16, 0.8 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_4.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_4.json deleted file mode 100644 index 23f849976..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_4.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0.8, 0, 0 ], - "to": [ 0.8, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 15.2 ], - "to": [ 16, 16, 15.2 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 0.8 ], - "to": [ 16, 16, 0.8 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_4u.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_4u.json deleted file mode 100644 index b2e18a307..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_4u.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 15.2, 0 ], - "to": [ 16, 15.2, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0.8, 0, 0 ], - "to": [ 0.8, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 15.2, 0, 0 ], - "to": [ 15.2, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 15.2 ], - "to": [ 16, 16, 15.2 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - }, - { "from": [ 0, 0, 0.8 ], - "to": [ 16, 16, 0.8 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ivy_u.json b/src/main/resources/assets/biomesoplenty/models/block/ivy_u.json deleted file mode 100644 index 6a078891e..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ivy_u.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:blocks/ivy", - "vine": "biomesoplenty:blocks/ivy" - }, - "elements": [ - { "from": [ 0, 15.2, 0 ], - "to": [ 16, 15.2, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#vine", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/thorn.json b/src/main/resources/assets/biomesoplenty/models/block/thorn.json deleted file mode 100644 index ea3f48b2f..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/thorn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/thorn" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/ivy.json b/src/main/resources/assets/biomesoplenty/models/item/ivy.json deleted file mode 100644 index 2c93f6632..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/ivy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/ivy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/thorn.json b/src/main/resources/assets/biomesoplenty/models/item/thorn.json deleted file mode 100644 index 3a5054d15..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/thorn.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/thorn" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png index 3d95d3833..3484be74b 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ivy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ivy.png deleted file mode 100644 index da6565ec9..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/ivy.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/thorn.png b/src/main/resources/assets/biomesoplenty/textures/blocks/thorn.png deleted file mode 100644 index 8b7653f97..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/thorn.png and /dev/null differ