From ff0b7010989122f34e02119be860de831b7eb6aa Mon Sep 17 00:00:00 2001 From: Forstride Date: Sat, 25 May 2019 05:28:12 -0400 Subject: [PATCH] Fixed willow vine flammability, beaches in Cold Deserts, and various grass/foliage colors --- .../biome/overworld/ColdDesertBiome.java | 5 ++-- .../biome/overworld/SnowyForestBiome.java | 4 +-- .../common/biome/overworld/TundraBiome.java | 4 +-- .../common/biome/overworld/VolcanoBiome.java | 15 ++++++++++ .../biome/overworld/VolcanoEdgeBiome.java | 15 ++++++++++ .../biome/overworld/WastelandBiome.java | 4 +-- .../common/block/BlockVineBOP.java | 29 +++++++++++++++++++ .../java/biomesoplenty/init/ModBlocks.java | 4 +-- 8 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 src/main/java/biomesoplenty/common/block/BlockVineBOP.java diff --git a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java index 31e6622d9..d2b50e7bc 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java @@ -99,6 +99,7 @@ public class ColdDesertBiome extends BiomeBOP this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.WITCH, 5, 1, 1)); this.addWeight(BOPClimates.ICE_CAP, 10); + this.setBeachBiome(Biomes.SNOWY_BEACH); this.setRiverBiome(Biomes.FROZEN_RIVER); this.canSpawnInBiome = false; } @@ -106,12 +107,12 @@ public class ColdDesertBiome extends BiomeBOP @OnlyIn(Dist.CLIENT) public int getGrassColor(BlockPos pos) { - return 0xB78658; + return 0xAD9364; } @OnlyIn(Dist.CLIENT) public int getFoliageColor(BlockPos pos) { - return 0xC1954D; + return 0xB7B763; } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java index e0330cd3b..6c5136f93 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java @@ -114,12 +114,12 @@ public class SnowyForestBiome extends BiomeBOP @OnlyIn(Dist.CLIENT) public int getGrassColor(BlockPos pos) { - return 0xBCA165; + return 0xAD9364; } @OnlyIn(Dist.CLIENT) public int getFoliageColor(BlockPos pos) { - return 0xBCA165; + return 0xB7B763; } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java index eb4685ec6..82e9047a0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java @@ -89,7 +89,7 @@ public class TundraBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.DEAD_TWIGLET_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F}, BOPBiomeFeatures.MAPLE_TWIGLET_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(4, 0.3F, 1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(new StandardGrassFeature(), IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(6))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.reed), TWICE_SURFACE, new FrequencyConfig(5))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.bush), TWICE_SURFACE, new FrequencyConfig(10))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BUSH, new BushConfig(BOPBlocks.bush), TWICE_SURFACE, new FrequencyConfig(12))); 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.TOP_LAYER_MODIFICATION, createCompositeFeature(Feature.ICE_AND_SNOW, IFeatureConfig.NO_FEATURE_CONFIG, PASSTHROUGH, IPlacementConfig.NO_PLACEMENT_CONFIG)); @@ -114,7 +114,7 @@ public class TundraBiome extends BiomeBOP @OnlyIn(Dist.CLIENT) public int getGrassColor(BlockPos pos) { - return 0xB78658; + return 0xAD9364; } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java index cada3aebb..95b7aa679 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java @@ -19,6 +19,7 @@ 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.Feature; @@ -39,6 +40,8 @@ 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 VolcanoBiome extends BiomeBOP { @@ -95,4 +98,16 @@ public class VolcanoBiome extends BiomeBOP this.setRiverBiome((Biome)null); this.setBeachBiome(BOPBiomes.volcano_edge); } + + @OnlyIn(Dist.CLIENT) + public int getGrassColor(BlockPos pos) + { + return 0xAD9364; + } + + @OnlyIn(Dist.CLIENT) + public int getFoliageColor(BlockPos pos) + { + return 0xB7B763; + } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoEdgeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoEdgeBiome.java index 175559480..4fc0bfef0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoEdgeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoEdgeBiome.java @@ -18,6 +18,7 @@ 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.Feature; @@ -38,6 +39,8 @@ 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 VolcanoEdgeBiome extends BiomeBOP { @@ -93,4 +96,16 @@ public class VolcanoEdgeBiome extends BiomeBOP this.setRiverBiome((Biome)null); this.setBeachBiome((Biome)null); } + + @OnlyIn(Dist.CLIENT) + public int getGrassColor(BlockPos pos) + { + return 0xAD9364; + } + + @OnlyIn(Dist.CLIENT) + public int getFoliageColor(BlockPos pos) + { + return 0xB7B763; + } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java index 207ef367a..fb22c931b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java @@ -101,12 +101,12 @@ public class WastelandBiome extends BiomeBOP @OnlyIn(Dist.CLIENT) public int getGrassColor(BlockPos pos) { - return 0x9DA078; + return 0xAD9364; } @OnlyIn(Dist.CLIENT) public int getFoliageColor(BlockPos pos) { - return 0x999E55; + return 0xB7B763; } } diff --git a/src/main/java/biomesoplenty/common/block/BlockVineBOP.java b/src/main/java/biomesoplenty/common/block/BlockVineBOP.java new file mode 100644 index 000000000..596aab550 --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockVineBOP.java @@ -0,0 +1,29 @@ +package biomesoplenty.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockVine; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; + +public class BlockVineBOP extends BlockVine +{ + public BlockVineBOP(Block.Properties p_i48367_2_) + { + super(p_i48367_2_); + } + + @Override + public int getFlammability(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing face) + { + return Blocks.VINE.getFlammability(state, world, pos, face); + } + + @Override + public int getFireSpreadSpeed(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing face) + { + return Blocks.VINE.getFireSpreadSpeed(state,world, pos, face); + } +} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index 5eeed1dda..e75b663dd 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -28,6 +28,7 @@ import biomesoplenty.common.block.BlockPlantBOP; import biomesoplenty.common.block.BlockSaplingBOP; import biomesoplenty.common.block.BlockSlabBOP; import biomesoplenty.common.block.BlockStairsBOP; +import biomesoplenty.common.block.BlockVineBOP; import biomesoplenty.common.block.BlockWaterPlant; import biomesoplenty.common.block.BlockWatersidePlant; import biomesoplenty.common.block.BlockWoodBOP; @@ -57,7 +58,6 @@ import net.minecraft.block.BlockDoor; import net.minecraft.block.BlockPressurePlate; import net.minecraft.block.BlockSand; import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.BlockVine; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialColor; @@ -304,7 +304,7 @@ 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"); - willow_vine = registerBlock(new BlockVine(Block.Properties.create(Material.VINE).doesNotBlockMovement().needsRandomTick().hardnessAndResistance(0.2F).sound(SoundType.PLANT)), "willow_vine"); + willow_vine = registerBlock(new BlockVineBOP(Block.Properties.create(Material.VINE).doesNotBlockMovement().needsRandomTick().hardnessAndResistance(0.2F).sound(SoundType.PLANT)), "willow_vine"); bush = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "bush"); barley = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE, MaterialColor.YELLOW_TERRACOTTA).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "barley");