Changed Cold Desert to not have snow, added missing override annotations

src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java

@@ -124,12 +124,14 @@ public class BayouBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x6FAA50;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x8BDB67;

src/main/java/biomesoplenty/common/biome/overworld/BogBiome.java

@@ -115,12 +115,14 @@ public class BogBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xA89557;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xC67F5B;

src/main/java/biomesoplenty/common/biome/overworld/BorealForestBiome.java

@@ -116,12 +116,14 @@ public class BorealForestBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x9FB771;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xC9CE65;

src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java

@@ -117,12 +117,14 @@ public class BrushlandBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xE5DFA9;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xDAE0B3;

src/main/java/biomesoplenty/common/biome/overworld/CherryBlossomGroveBiome.java

@@ -111,12 +111,14 @@ public class CherryBlossomGroveBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x8DC87B;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x69B866;

src/main/java/biomesoplenty/common/biome/overworld/ColdDesertBiome.java

@@ -47,7 +47,7 @@ public class ColdDesertBiome extends BiomeBOP
 {
     public ColdDesertBiome()
     {
-        super((new Biome.BiomeBuilder()).surfaceBuilder(new CompositeSurfaceBuilder(BOPBiomeFeatures.COLD_DESERT_SURFACE_BUILDER, GRAVEL_SURFACE)).precipitation(Biome.RainType.NONE).category(Biome.Category.ICY).depth(0.0F).scale(0.0F).temperature(-0.25F).downfall(0.0F).waterColor(4159204).waterFogColor(329011).parent((String)null));
+        super((new Biome.BiomeBuilder()).surfaceBuilder(new CompositeSurfaceBuilder(BOPBiomeFeatures.COLD_DESERT_SURFACE_BUILDER, GRAVEL_SURFACE)).precipitation(Biome.RainType.NONE).category(Biome.Category.ICY).depth(0.05F).scale(0.0F).temperature(0.2F).downfall(0.0F).waterColor(4159204).waterFogColor(329011).parent((String)null));
 
         // Mineshafts and Strongholds
         this.addStructure(Feature.IGLOO, new IglooConfig());
@@ -100,18 +100,20 @@ public class ColdDesertBiome extends BiomeBOP
         this.addSpawn(EnumCreatureType.MONSTER, new Biome.SpawnListEntry(EntityType.STRAY, 80, 4, 4));
         
         this.addWeight(BOPClimates.ICE_CAP, 10);
-        this.setBeachBiome(Biomes.SNOWY_BEACH);
-        this.setRiverBiome(Biomes.FROZEN_RIVER);
+        this.setBeachBiome((Biome)null);
+        this.setRiverBiome((Biome)null);
         this.canSpawnInBiome = false;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xAD9364;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB5A76C;

src/main/java/biomesoplenty/common/biome/overworld/DeadForestBiome.java

@@ -111,12 +111,14 @@ public class DeadForestBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xBAAD64;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB7B763;

src/main/java/biomesoplenty/common/biome/overworld/DryPlainsBiome.java

@@ -109,12 +109,14 @@ public class DryPlainsBiome extends BiomeBOP
     
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xBAAD64;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB7B763;

src/main/java/biomesoplenty/common/biome/overworld/FlowerMeadowBiome.java

@@ -93,12 +93,14 @@ public class FlowerMeadowBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x63B26D;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x63B26D;

src/main/java/biomesoplenty/common/biome/overworld/GrasslandBiome.java

@@ -112,12 +112,14 @@ public class GrasslandBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x88C57F;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x6AB66F;

src/main/java/biomesoplenty/common/biome/overworld/LavenderFieldBiome.java

@@ -101,12 +101,14 @@ public class LavenderFieldBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xA1C36D;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xA1C36D;

src/main/java/biomesoplenty/common/biome/overworld/MeadowBiome.java

@@ -121,12 +121,14 @@ public class MeadowBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x63B26D;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x63B26D;

src/main/java/biomesoplenty/common/biome/overworld/MireBiome.java

@@ -118,12 +118,14 @@ public class MireBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x66704C;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x878E61;

src/main/java/biomesoplenty/common/biome/overworld/MoorBiome.java

@@ -119,12 +119,14 @@ public class MoorBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x71AA70;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x78C46D;

src/main/java/biomesoplenty/common/biome/overworld/MysticGroveBiome.java

@@ -103,18 +103,21 @@ public class MysticGroveBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x66DBFF;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x69CFDB;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x70E0B5;

src/main/java/biomesoplenty/common/biome/overworld/OminousWoodsBiome.java

@@ -109,18 +109,21 @@ public class OminousWoodsBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x84A1CC;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x4C4A70;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x6B487C;

src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java

@@ -111,6 +111,7 @@ public class OrchardBiome extends BiomeBOP
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xC9F75D;

src/main/java/biomesoplenty/common/biome/overworld/OriginBeachBiome.java

@@ -81,18 +81,21 @@ public class OriginBeachBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x80CCFE;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xA2FF5F;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x3AFF00;

src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java

@@ -87,18 +87,21 @@ public class OriginHillsBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x80CCFE;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xA2FF5F;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x3AFF00;

src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java

@@ -88,12 +88,14 @@ public class PastureBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xC8E580;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xADE07B;

src/main/java/biomesoplenty/common/biome/overworld/PrairieBiome.java

@@ -105,12 +105,14 @@ public class PrairieBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xC8E580;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xADE07B;

src/main/java/biomesoplenty/common/biome/overworld/PumpkinPatchBiome.java

@@ -112,12 +112,14 @@ public class PumpkinPatchBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xA6B952;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x91A627;

src/main/java/biomesoplenty/common/biome/overworld/RainforestBiome.java

@@ -124,12 +124,14 @@ public class RainforestBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x40B45F;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x3FBF6A;

src/main/java/biomesoplenty/common/biome/overworld/SeasonalForestBiome.java

@@ -121,12 +121,14 @@ public class SeasonalForestBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xB5B952;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xA3A627;

src/main/java/biomesoplenty/common/biome/overworld/ShieldBiome.java

@@ -121,12 +121,14 @@ public class ShieldBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x7C9B45;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x8EAF4F;

src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java

@@ -108,12 +108,14 @@ public class SilkgladeBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos) {
        double d0 = INFO_NOISE.getValue((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D);
        return d0 < -0.1D ? 0xB2B39F : 0x939F76;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
         double d0 = INFO_NOISE.getValue((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D);

src/main/java/biomesoplenty/common/biome/overworld/SnowyForestBiome.java

@@ -112,12 +112,14 @@ public class SnowyForestBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xAD9364;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB7B763;

src/main/java/biomesoplenty/common/biome/overworld/TemperateRainforestBiome.java

@@ -121,12 +121,14 @@ public class TemperateRainforestBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xB6D367;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x95D660;

src/main/java/biomesoplenty/common/biome/overworld/TropicalRainforestBiome.java

@@ -125,12 +125,14 @@ public class TropicalRainforestBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xA7E140;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x88E140;

src/main/java/biomesoplenty/common/biome/overworld/TropicsBiome.java

@@ -103,6 +103,7 @@ public class TropicsBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x66BCFF;

src/main/java/biomesoplenty/common/biome/overworld/TundraBiome.java

@@ -111,12 +111,14 @@ public class TundraBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xAD9364;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB5A76C;

src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java

@@ -101,18 +101,21 @@ public class VolcanoBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x96A8CA;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xAD9364;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB7B763;

src/main/java/biomesoplenty/common/biome/overworld/VolcanoEdgeBiome.java

@@ -102,18 +102,21 @@ public class VolcanoEdgeBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x96A8CA;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xAD9364;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB7B763;

src/main/java/biomesoplenty/common/biome/overworld/WastelandBiome.java

@@ -100,18 +100,21 @@ public class WastelandBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x70ADEF;
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xAD9364;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xB5A76C;

src/main/java/biomesoplenty/common/biome/overworld/WetlandBiome.java

@@ -127,12 +127,14 @@ public class WetlandBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x5A935F;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x4F9657;

src/main/java/biomesoplenty/common/biome/overworld/WhiteBeachBiome.java

@@ -88,6 +88,7 @@ public class WhiteBeachBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getSkyColorByTemp(float currentTemperature)
     {
        return 0x66BCFF;

src/main/java/biomesoplenty/common/biome/overworld/WoodlandBiome.java

@@ -118,12 +118,14 @@ public class WoodlandBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0x85C047;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0x68AF1A;

src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java

@@ -111,12 +111,14 @@ public class XericShrublandBiome extends BiomeBOP
     }
     
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getGrassColor(BlockPos pos)
     {
     	return 0xE5DFA9;
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public int getFoliageColor(BlockPos pos)
     {
     	return 0xDAE0B3;

src/main/java/biomesoplenty/common/block/BlockDoublePlantBOP.java

@@ -35,11 +35,13 @@ public class BlockDoublePlantBOP extends BlockDoublePlant implements IPlantable
         this.field_196392_b = p_i48335_1_;
     }
     
+    @Override
     public boolean isReplaceable(IBlockState state, BlockItemUseContext useContext) {
         boolean flag = super.isReplaceable(state, useContext);
         return flag && useContext.getItem().getItem() == this.asItem() ? false : flag;
      }
 
+    @Override
      protected void harvest(IBlockState p_196391_1_, World p_196391_2_, BlockPos p_196391_3_, ItemStack p_196391_4_) {
         {
            super.harvest(p_196391_1_, p_196391_2_, p_196391_3_, p_196391_4_);
@@ -47,6 +49,7 @@ public class BlockDoublePlantBOP extends BlockDoublePlant implements IPlantable
 
      }
 
+    @Override
      public IItemProvider getItemDropped(IBlockState state, World worldIn, BlockPos pos, int fortune) {
         return state.get(field_208063_b) == DoubleBlockHalf.LOWER && this == Blocks.TALL_GRASS && worldIn.rand.nextInt(8) == 0 ? Items.WHEAT_SEEDS : Items.AIR;
      }

src/main/java/biomesoplenty/common/block/BlockLogBOP.java

@@ -24,6 +24,7 @@ public class BlockLogBOP extends BlockLog
     * @deprecated call via {@link IBlockState#getMapColor(IBlockAccess,BlockPos)} whenever possible.
     * Implementing/overriding is fine.
     */
+   @Override
    public MaterialColor getMapColor(IBlockState state, IBlockReader worldIn, BlockPos pos)
    {
       return state.get(AXIS) == EnumFacing.Axis.Y ? this.field_196504_b : this.materialColor;

src/main/java/biomesoplenty/common/block/trees/DeadTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class DeadTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return (AbstractTreeFeature<NoFeatureConfig>)(random.nextInt(10) == 0 ? BOPBiomeFeatures.DYING_TREE : BOPBiomeFeatures.SMALL_DEAD_TREE);

src/main/java/biomesoplenty/common/block/trees/EtherealTree.java

@@ -11,6 +11,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class EtherealTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return null;

src/main/java/biomesoplenty/common/block/trees/FirTree.java

@@ -5,19 +5,21 @@ import java.util.Random;
 import javax.annotation.Nullable;
 
 import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures;
-import net.minecraft.block.trees.AbstractTree;
+import net.minecraft.block.trees.AbstractBigTree;
 import net.minecraft.world.gen.feature.AbstractTreeFeature;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
 
-public class FirTree extends AbstractTree
+public class FirTree extends AbstractBigTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.FIR_TREE;
    }
 
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getBigTreeFeature(Random random)
    {
 	   return BOPBiomeFeatures.FIR_TREE_LARGE;

src/main/java/biomesoplenty/common/block/trees/FloweringOakTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class FloweringOakTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return (AbstractTreeFeature<NoFeatureConfig>)(random.nextInt(10) == 0 ? BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE : BOPBiomeFeatures.FLOWERING_OAK_TREE);

src/main/java/biomesoplenty/common/block/trees/HellbarkTree.java

@@ -11,6 +11,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class HellbarkTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return null;

src/main/java/biomesoplenty/common/block/trees/JacarandaTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class JacarandaTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.JACARANDA_TREE;

src/main/java/biomesoplenty/common/block/trees/MagicTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class MagicTree extends AbstractTree
 {
 	   @Nullable
+	   @Override
 	   protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
 	   {
 	      return (AbstractTreeFeature<NoFeatureConfig>)(random.nextInt(10) == 0 ? BOPBiomeFeatures.BIG_MAGIC_TREE : BOPBiomeFeatures.MAGIC_TREE);

src/main/java/biomesoplenty/common/block/trees/MahoganyTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class MahoganyTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.MAHOGANY_TREE;

src/main/java/biomesoplenty/common/block/trees/MapleTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class MapleTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.MAPLE_TREE;

src/main/java/biomesoplenty/common/block/trees/OrangeAutumnTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class OrangeAutumnTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.ORANGE_AUTUMN_TREE;

src/main/java/biomesoplenty/common/block/trees/OriginTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class OriginTree extends AbstractTree
 {
 	   @Nullable
+	   @Override
 	   protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
 	   {
 	      return (AbstractTreeFeature<NoFeatureConfig>)(random.nextInt(10) == 0 ? BOPBiomeFeatures.BIG_ORIGIN_TREE : BOPBiomeFeatures.ORIGIN_TREE);

src/main/java/biomesoplenty/common/block/trees/PalmTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class PalmTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.PALM_TREE;

src/main/java/biomesoplenty/common/block/trees/PinkCherryTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class PinkCherryTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return (AbstractTreeFeature<NoFeatureConfig>)(random.nextInt(10) == 0 ? BOPBiomeFeatures.BIG_PINK_CHERRY_TREE : BOPBiomeFeatures.PINK_CHERRY_TREE);

src/main/java/biomesoplenty/common/block/trees/RedwoodTree.java

@@ -5,19 +5,21 @@ import java.util.Random;
 import javax.annotation.Nullable;
 
 import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures;
-import net.minecraft.block.trees.AbstractTree;
+import net.minecraft.block.trees.AbstractBigTree;
 import net.minecraft.world.gen.feature.AbstractTreeFeature;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
 
-public class RedwoodTree extends AbstractTree
+public class RedwoodTree extends AbstractBigTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.REDWOOD_TREE;
    }
 
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getBigTreeFeature(Random random)
    {
 	   return BOPBiomeFeatures.REDWOOD_TREE_MEDIUM;

src/main/java/biomesoplenty/common/block/trees/UmbranTree.java

@@ -5,19 +5,21 @@ import java.util.Random;
 import javax.annotation.Nullable;
 
 import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures;
-import net.minecraft.block.trees.AbstractTree;
+import net.minecraft.block.trees.AbstractBigTree;
 import net.minecraft.world.gen.feature.AbstractTreeFeature;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
 
-public class UmbranTree extends AbstractTree
+public class UmbranTree extends AbstractBigTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.UMBRAN_TREE;
    }
 
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getBigTreeFeature(Random random)
    {
 	   return BOPBiomeFeatures.TALL_UMBRAN_TREE;

src/main/java/biomesoplenty/common/block/trees/WhiteCherryTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class WhiteCherryTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return (AbstractTreeFeature<NoFeatureConfig>)(random.nextInt(10) == 0 ? BOPBiomeFeatures.BIG_WHITE_CHERRY_TREE : BOPBiomeFeatures.WHITE_CHERRY_TREE);

src/main/java/biomesoplenty/common/block/trees/WillowTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class WillowTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.WILLOW_TREE;

src/main/java/biomesoplenty/common/block/trees/YellowAutumnTree.java

@@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 public class YellowAutumnTree extends AbstractTree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.YELLOW_AUTUMN_TREE;

src/main/java/biomesoplenty/common/item/ItemBoatBOP.java

@@ -41,6 +41,7 @@ public class ItemBoatBOP extends Item
 	    * Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see
 	    * {@link #onItemUse}.
 	    */
+	   @Override
 	   public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
 	      ItemStack itemstack = playerIn.getHeldItem(handIn);
 	      float f = 1.0F;

src/main/java/biomesoplenty/common/world/BOPEndBiomeProvider.java

@@ -35,6 +35,7 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	   }
 
 	   @Nullable
+	   @Override
 	   public Biome getBiome(BlockPos pos, @Nullable Biome defaultBiome) {
 	      return this.func_201545_a(pos.getX() >> 4, pos.getZ() >> 4);
 	   }
@@ -71,10 +72,12 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	      }
 	   }
 
+	   @Override
 	   public Biome[] getBiomes(int startX, int startZ, int xSize, int zSize) {
 	      return this.getBiomeBlock(startX, startZ, xSize, zSize);
 	   }
 
+	   @Override
 	   public Biome[] getBiomes(int x, int z, int width, int length, boolean cacheFlag) {
 	      Biome[] abiome = new Biome[width * length];
 	      Long2ObjectMap<Biome> long2objectmap = new Long2ObjectOpenHashMap<>();
@@ -97,6 +100,7 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	      return abiome;
 	   }
 
+	   @Override
 	   public Set<Biome> getBiomesInSquare(int centerX, int centerZ, int sideLength) {
 	      int i = centerX - sideLength >> 2;
 	      int j = centerZ - sideLength >> 2;
@@ -108,6 +112,7 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	   }
 
 	   @Nullable
+	   @Override
 	   public BlockPos findBiomePosition(int x, int z, int range, List<Biome> biomes, Random random) {
 	      int i = x - range >> 2;
 	      int j = z - range >> 2;
@@ -134,6 +139,7 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	      return blockpos;
 	   }
 
+	   @Override
 	   public float getHeightValue(int p_201536_1_, int p_201536_2_, int p_201536_3_, int p_201536_4_) {
 	      float f = (float)(p_201536_1_ * 2 + p_201536_3_);
 	      float f1 = (float)(p_201536_2_ * 2 + p_201536_4_);
@@ -158,6 +164,7 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	      return f2;
 	   }
 
+	   @Override
 	   public boolean hasStructure(Structure<?> structureIn) {
 	      return this.hasStructureCache.computeIfAbsent(structureIn, (p_205008_1_) -> {
 	         for(Biome biome : this.field_205009_d) {
@@ -170,6 +177,7 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	      });
 	   }
 
+	   @Override
 	   public Set<IBlockState> getSurfaceBlocks() {
 	      if (this.topBlocksCache.isEmpty()) {
 	         for(Biome biome : this.field_205009_d) {

src/main/java/biomesoplenty/common/world/gen/feature/BigPumpkinFeature.java

@@ -18,6 +18,7 @@ public class BigPumpkinFeature extends Feature<NoFeatureConfig>
    protected IBlockPosQuery placeOn = (world, pos) -> world.getBlockState(pos).getBlock() == Blocks.GRASS_BLOCK;
    protected IBlockPosQuery replace = (world, pos) -> world.getBlockState(pos).canBeReplacedByLeaves(world, pos);
 	
+   @Override
    public boolean place(IWorld world, IChunkGenerator<? extends IChunkGenSettings> p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_)
    {
        while (startPos.getY() > 1 && this.replace.matches(world, startPos)) {startPos = startPos.down();}

src/main/java/biomesoplenty/common/world/gen/feature/BogSurfaceBuilder.java

@@ -19,6 +19,7 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class BogSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig>
 {
+   @Override
    public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config)
    {
       double d0 = Biome.INFO_NOISE.getValue((double)x * 0.25D, (double)z * 0.25D);

src/main/java/biomesoplenty/common/world/gen/feature/BrushlandSurfaceBuilder.java

@@ -15,13 +15,15 @@ import net.minecraft.world.chunk.IChunk;
 import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
-public class BrushlandSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
-	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
-	      if (noise > 1.9D) {
-	         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, Biome.SAND_SURFACE);
-	      } else {
-	         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, Biome.GRASS_DIRT_GRAVEL_SURFACE);
-	      }
+public class BrushlandSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig>
+{
+   @Override
+   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
+      if (noise > 1.9D) {
+         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, Biome.SAND_SURFACE);
+      } else {
+         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, Biome.GRASS_DIRT_GRAVEL_SURFACE);
+      }
 
-	   }
-	}
+   }
+}

src/main/java/biomesoplenty/common/world/gen/feature/ChaparralFlowersFeature.java

@@ -22,6 +22,7 @@ public class ChaparralFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.wildflower, Blocks.AZURE_BLUET, Blocks.DANDELION, Blocks.POPPY};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class ChaparralSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	   @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 	      if (noise > 1.7D) {
 	         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, Biome.STONE_STONE_GRAVEL_SURFACE);

src/main/java/biomesoplenty/common/world/gen/feature/CherryBlossomGroveFlowersFeature.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.feature.AbstractFlowersFeature;
 
 public class CherryBlossomGroveFlowersFeature extends AbstractFlowersFeature
 {
+	@Override
 	public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	{
          int j = p_202355_1_.nextInt(2);

src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java

@@ -17,11 +17,12 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class ColdDesertSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig>
 {
+	 @Override
 	 public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config)
 	 {
 	      if (noise > 2.6D)
 	      {
-	         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPBiomeFeatures.PACKED_ICE_SURFACE);
+	         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPBiomeFeatures.SNOW_SNOW_GRAVEL_SURFACE);
 	      }
 	      else
 	      {

src/main/java/biomesoplenty/common/world/gen/feature/ExtendedFlowersFeature.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.feature.AbstractFlowersFeature;
 
 public class ExtendedFlowersFeature extends AbstractFlowersFeature
 {
+	@Override
 	public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	{
          int j = p_202355_1_.nextInt(3);

src/main/java/biomesoplenty/common/world/gen/feature/FlowerMeadowFlowersFeature.java

@@ -21,6 +21,7 @@ public class FlowerMeadowFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{Blocks.ORANGE_TULIP, Blocks.WHITE_TULIP, Blocks.PINK_TULIP, Blocks.RED_TULIP};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/GraniteSurfaceBuilder.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class GraniteSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	   @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 	      if (noise > 1.9D) {
 	         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPBiomeFeatures.GRANITE_SURFACE);

src/main/java/biomesoplenty/common/world/gen/feature/HeathFeature.java

@@ -14,6 +14,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 
 public class HeathFeature extends Feature<NoFeatureConfig>
 {
+   @Override
    public boolean place(IWorld p_212245_1_, IChunkGenerator<? extends IChunkGenSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
    {
       int i = 0;

src/main/java/biomesoplenty/common/world/gen/feature/JungleFlowersFeature.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.feature.AbstractFlowersFeature;
 
 public class JungleFlowersFeature extends AbstractFlowersFeature
 {
+	@Override
 	public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	{
          int j = p_202355_1_.nextInt(3);

src/main/java/biomesoplenty/common/world/gen/feature/LavenderFlowersFeature.java

@@ -21,6 +21,7 @@ public class LavenderFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.lavender};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/LushGrasslandFlowersFeature.java

@@ -20,6 +20,7 @@ import net.minecraft.world.gen.feature.AbstractFlowersFeature;
 
 public class LushGrasslandFlowersFeature extends AbstractFlowersFeature
 {
+	@Override
 	public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	{
          int j = p_202355_1_.nextInt(2);

src/main/java/biomesoplenty/common/world/gen/feature/LushSwampFlowersFeature.java

@@ -22,6 +22,7 @@ public class LushSwampFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.blue_hydrangea, Blocks.BLUE_ORCHID, Blocks.AZURE_BLUET, Blocks.DANDELION, Blocks.POPPY};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/MangroveFeature.java

@@ -14,6 +14,7 @@ import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
 
 public class MangroveFeature extends Feature<NoFeatureConfig> {
+	   @Override
 	   public boolean place(IWorld p_212245_1_, IChunkGenerator<? extends IChunkGenSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_) {
 	      int i = 0;
 	      IBlockState iblockstate = BOPBlocks.mangrove_root.getDefaultState();

src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class MangroveSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	  @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 	      double d0 = Biome.INFO_NOISE.getValue((double)x * 0.25D, (double)z * 0.25D);
 	      if (d0 > 0.2D) {

src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class MarshSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	   @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 	      double d0 = Biome.INFO_NOISE.getValue((double)x * 0.25D, (double)z * 0.25D);
 	      if (d0 > 0.0D) {

src/main/java/biomesoplenty/common/world/gen/feature/MeadowFlowersFeature.java

@@ -21,6 +21,7 @@ public class MeadowFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{Blocks.OXEYE_DAISY, Blocks.AZURE_BLUET, Blocks.DANDELION, Blocks.POPPY};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/MoorFlowersFeature.java

@@ -17,6 +17,7 @@ import net.minecraft.world.gen.feature.AbstractFlowersFeature;
 
 public class MoorFlowersFeature extends AbstractFlowersFeature
 {
+	@Override
 	public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	{
          int j = p_202355_1_.nextInt(2);

src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class MudSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	   @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 		  if (noise > 1.7D)
 		  {

src/main/java/biomesoplenty/common/world/gen/feature/MysticGroveFlowersFeature.java

@@ -22,6 +22,7 @@ public class MysticGroveFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.blue_hydrangea, BOPBlocks.glowflower, BOPBlocks.pink_daffodil, Blocks.OXEYE_DAISY, Blocks.ALLIUM};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/OriginFlowersFeature.java

@@ -17,8 +17,9 @@ import net.minecraft.world.gen.feature.AbstractFlowersFeature;
 
 public class OriginFlowersFeature extends AbstractFlowersFeature
 {
-	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
-	   {
-	      return p_202355_1_.nextFloat() > 0.6666667F ? Blocks.DANDELION.getDefaultState() : BOPBlocks.rose.getDefaultState();
-	   }
-	}
+	@Override
+	public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
+	{
+	    return p_202355_1_.nextFloat() > 0.6666667F ? Blocks.DANDELION.getDefaultState() : BOPBlocks.rose.getDefaultState();
+	}
+}

src/main/java/biomesoplenty/common/world/gen/feature/PodzolSurfaceBuilder.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class PodzolSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	   @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 	      if (noise > 1.9D) {
 	         Biome.DEFAULT_SURFACE_BUILDER.buildSurface(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, Biome.PODZOL_DIRT_GRAVEL_SURFACE);

src/main/java/biomesoplenty/common/world/gen/feature/PrairieFlowersFeature.java

@@ -21,6 +21,7 @@ public class PrairieFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.goldenrod};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/PumpkinPatchFeature.java

@@ -15,6 +15,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 
 public class PumpkinPatchFeature extends Feature<NoFeatureConfig>
 {
+   @Override
    public boolean place(IWorld p_212245_1_, IChunkGenerator<? extends IChunkGenSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
    {
       int i = 0;

src/main/java/biomesoplenty/common/world/gen/feature/RainforestFlowersFeature.java

@@ -22,6 +22,7 @@ public class RainforestFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.pink_daffodil, BOPBlocks.blue_hydrangea, Blocks.BLUE_ORCHID, Blocks.OXEYE_DAISY, Blocks.DANDELION, Blocks.POPPY};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/ScrubFeature.java

@@ -13,6 +13,7 @@ import net.minecraft.world.gen.feature.NoFeatureConfig;
 
 public class ScrubFeature extends Feature<NoFeatureConfig>
 {
+   @Override
    public boolean place(IWorld p_212245_1_, IChunkGenerator<? extends IChunkGenSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
    {
       int i = 0;

src/main/java/biomesoplenty/common/world/gen/feature/ShrublandFlowersFeature.java

@@ -21,6 +21,7 @@ public class ShrublandFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{Blocks.ALLIUM};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/SnowyFlowersFeature.java

@@ -20,6 +20,7 @@ import net.minecraft.world.gen.feature.AbstractFlowersFeature;
 
 public class SnowyFlowersFeature extends AbstractFlowersFeature
 {
+	@Override
 	public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	{
          int j = p_202355_1_.nextInt(3);

src/main/java/biomesoplenty/common/world/gen/feature/SplotchFeature.java

@@ -11,6 +11,7 @@ import net.minecraft.world.gen.feature.Feature;
 
 public class SplotchFeature extends Feature<SplotchConfig>
 {
+   @Override
    public boolean place(IWorld p_212245_1_, IChunkGenerator<? extends IChunkGenSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, SplotchConfig p_212245_5_)
    {
      int i = 0;

src/main/java/biomesoplenty/common/world/gen/feature/TropicsFlowersFeature.java

@@ -22,6 +22,7 @@ public class TropicsFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.pink_hibiscus, BOPBlocks.blue_hydrangea, Blocks.DANDELION, Blocks.POPPY};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class VolcanoEdgeSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	   @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 	      if (noise > 2.6D)
 	      {

src/main/java/biomesoplenty/common/world/gen/feature/VolcanoSurfaceBuilder.java

@@ -16,6 +16,7 @@ import net.minecraft.world.gen.surfacebuilders.ISurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
 
 public class VolcanoSurfaceBuilder implements ISurfaceBuilder<SurfaceBuilderConfig> {
+	   @Override
 	   public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, IBlockState defaultBlock, IBlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) {
 		  if (noise > 2.7F)
 	      {

src/main/java/biomesoplenty/common/world/gen/feature/WastelandFlowersFeature.java

@@ -21,6 +21,7 @@ public class WastelandFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.wilted_lily};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/WetlandFlowersFeature.java

@@ -21,6 +21,7 @@ public class WetlandFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{Blocks.BLUE_ORCHID, Blocks.DANDELION, Blocks.POPPY};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);

src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java

@@ -21,6 +21,7 @@ public class XericShrublandFlowersFeature extends AbstractFlowersFeature
 {
 	   private static final Block[] FLOWERS = new Block[]{BOPBlocks.wildflower};
 
+	   @Override
 	   public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
 	   {
 	      double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D);