Merge branch 'BOP-1.13-8.x.x' of https://github.com/Glitchfiend/BiomesOPlenty into BOP-1.14.x-9.x.x

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

@@ -108,12 +108,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

@@ -101,12 +101,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

@@ -103,12 +103,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

@@ -99,12 +99,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

@@ -94,12 +94,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/DeadForestBiome.java

@@ -95,12 +95,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

@@ -95,12 +95,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

@@ -82,12 +82,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

@@ -98,12 +98,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

@@ -88,12 +88,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

@@ -103,12 +103,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

@@ -99,12 +99,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

@@ -104,12 +104,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

@@ -89,18 +89,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

@@ -93,18 +93,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

@@ -92,6 +92,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

@@ -70,18 +70,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

@@ -74,18 +74,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

@@ -78,12 +78,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

@@ -95,12 +95,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

@@ -97,12 +97,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

@@ -104,12 +104,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

@@ -104,12 +104,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

@@ -102,12 +102,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

@@ -90,12 +90,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

@@ -96,12 +96,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

@@ -102,12 +102,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

@@ -106,12 +106,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

@@ -87,6 +87,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

@@ -94,12 +94,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

@@ -87,18 +87,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

@@ -85,18 +85,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

@@ -86,18 +86,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

@@ -107,12 +107,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

@@ -75,6 +75,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

@@ -101,12 +101,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

@@ -91,12 +91,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/trees/DeadTree.java

@@ -11,6 +11,7 @@ import java.util.Random;
 public class DeadTree extends Tree
 {
    @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

@@ -10,6 +10,7 @@ import java.util.Random;
 public class EtherealTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return null;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class FloweringOakTree extends Tree
 {
    @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

@@ -10,6 +10,7 @@ import java.util.Random;
 public class HellbarkTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return null;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class JacarandaTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.JACARANDA_TREE;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class MagicTree extends Tree
 {
 	   @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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class MahoganyTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.MAHOGANY_TREE;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class MapleTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.MAPLE_TREE;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class OrangeAutumnTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.ORANGE_AUTUMN_TREE;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class OriginTree extends Tree
 {
 	   @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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class PalmTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.PALM_TREE;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class PinkCherryTree extends Tree
 {
    @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/WhiteCherryTree.java

@@ -11,6 +11,7 @@ import java.util.Random;
 public class WhiteCherryTree extends Tree
 {
    @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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class WillowTree extends Tree
 {
    @Nullable
+   @Override
    protected AbstractTreeFeature<NoFeatureConfig> getTreeFeature(Random random)
    {
       return BOPBiomeFeatures.WILLOW_TREE;

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

@@ -11,6 +11,7 @@ import java.util.Random;
 public class YellowAutumnTree extends Tree
 {
    @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,7 +177,12 @@ public class BOPEndBiomeProvider extends BiomeProvider {
 	      });
 	   }
 
+<<<<<<< HEAD
 	   public Set<BlockState> getSurfaceBlocks() {
+=======
+	   @Override
+	   public Set<IBlockState> getSurfaceBlocks() {
+>>>>>>> 23ad4b22dd4f1d9f81ff5efa7bc6b9519d4d41af
 	      if (this.topBlocksCache.isEmpty()) {
 	         for(Biome biome : this.field_205009_d) {
 	            this.topBlocksCache.add(biome.getSurfaceBuilderConfig().getTop());

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();}