diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java index eb043cfd7..15aa2de8f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java @@ -56,7 +56,6 @@ public class OrchardBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.RANDOM_SELECTOR, new MultipleRandomFeatureConfig(new Feature[]{BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F}, BOPBiomeFeatures.FLOWERING_OAK_TREE, IFeatureConfig.NO_FEATURE_CONFIG), Placement.COUNT_EXTRA_HEIGHTMAP, new AtSurfaceWithExtraConfig(2, 0.3F, 1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(BOPBiomeFeatures.MEADOW_FLOWERS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(15))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(new StandardGrassFeature(NoFeatureConfig::deserialize), IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.SWEET_BERRY_BUSH, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(2))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.ROSE_BUSH.getDefaultState()), Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.bush.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(8))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.REED, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); diff --git a/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java b/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java index 837454887..fc1ab82d3 100644 --- a/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java +++ b/src/main/java/biomesoplenty/common/item/ItemWaterPlant.java @@ -1,5 +1,6 @@ package biomesoplenty.common.item; +import biomesoplenty.api.block.BOPBlocks; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -54,11 +55,13 @@ public class ItemWaterPlant extends BlockItem BlockState blockstate = worldIn.getBlockState(blockpos); Material material = blockstate.getMaterial(); IFluidState ifluidstate = worldIn.getFluidState(blockpos); - if ((ifluidstate.getFluid() == Fluids.WATER || material == Material.ICE) && worldIn.isAirBlock(blockpos1)) { + Block ground = worldIn.getBlockState(blockpos.down()).getBlock(); + if ((ifluidstate.getFluid() == Fluids.WATER || material == Material.ICE) && worldIn.isAirBlock(blockpos1) && (ground == Blocks.DIORITE || ground == Blocks.GRANITE || ground == Blocks.ANDESITE || ground == Blocks.STONE || ground == Blocks.DIRT || ground == Blocks.COARSE_DIRT || ground == Blocks.GRASS_BLOCK || ground == Blocks.GRAVEL || ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || ground == BOPBlocks.mud || ground == BOPBlocks.dried_sand)) + { // special case for handling block placement with water lilies net.minecraftforge.common.util.BlockSnapshot blocksnapshot = net.minecraftforge.common.util.BlockSnapshot.getBlockSnapshot(worldIn, blockpos1); - worldIn.setBlockState(blockpos1, Blocks.LILY_PAD.getDefaultState(), 11); + worldIn.setBlockState(blockpos1, this.getBlock().getDefaultState(), 11); if (net.minecraftforge.event.ForgeEventFactory.onBlockPlace(playerIn, blocksnapshot, net.minecraft.util.Direction.UP)) { blocksnapshot.restore(true, false); return new ActionResult(ActionResultType.FAIL, itemstack); diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png index e38f047db..a9cfe8da8 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/dead_door.png b/src/main/resources/assets/biomesoplenty/textures/items/dead_door.png index 20a361010..4c772b01f 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/dead_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/dead_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png b/src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png index eb5b6a548..91c309df3 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png b/src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png index 0efbb7def..d1e04c550 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/jacaranda_door.png b/src/main/resources/assets/biomesoplenty/textures/items/jacaranda_door.png index 7fab327c1..272ae5e54 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/jacaranda_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/jacaranda_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png b/src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png index c19a2af6c..87f8f406a 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/palm_door.png b/src/main/resources/assets/biomesoplenty/textures/items/palm_door.png index 2a59380b5..52fc68b65 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/palm_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/palm_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png b/src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png index 16f713cdf..9820916af 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png b/src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png index abbff5963..f9177ddc4 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/willow_door.png b/src/main/resources/assets/biomesoplenty/textures/items/willow_door.png index 9ed9b1755..915121e4d 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/willow_door.png and b/src/main/resources/assets/biomesoplenty/textures/items/willow_door.png differ