Code Alignment for backports

Author: ferreusveritas

src/main/java/com/ferreusveritas/dynamictrees/ModItems.java

@@ -35,7 +35,7 @@ public static void registerItems(IForgeRegistry<Item> registry) {
 
 		DynamicTrees.compatProxy.registerItems(registry);
 	}
-
+	
 	public static Item makeItemBlock(Block block) {
 		return new ItemBlock(block).setRegistryName(block.getRegistryName());
 	}

src/main/java/com/ferreusveritas/dynamictrees/ModRecipes.java

@@ -5,7 +5,9 @@
 
 import net.minecraft.block.BlockSapling;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.Ingredient;
@@ -22,7 +24,10 @@ public class ModRecipes {
 	public static void registerRecipes(IForgeRegistry<IRecipe> registry) {
 
 		ModItems.dendroPotion.registerRecipes(registry);
-		ModItems.dirtBucket.registerRecipes(registry);
+		
+		//Create a dirt bucket from dirt and a bucket
+		GameRegistry.addShapelessRecipe(new ResourceLocation(ModConstants.MODID, "dirtbucket"), null, new ItemStack(ModItems.dirtBucket), 
+				new Ingredient[]{ Ingredient.fromItem(Items.BUCKET), Ingredient.fromItem(ItemBlock.getItemFromBlock(Blocks.DIRT))});
 
 		for(DynamicTree tree: ModTrees.baseTrees) {
 

src/main/java/com/ferreusveritas/dynamictrees/items/DendroPotion.java

@@ -44,7 +44,7 @@ public enum DendroPotionType {
 		BURGEONING( 3, "burgeoning",  0xa9bebe, "Quickly grow a tree"),
 		FERTILITY(  4, "fertility",   0x4ad400, "Fully fertilizes tree soil"),
 		PERSISTANCE(5, "persistance", 0x389aff, "Stops tree from changing"),
-		TRANSFORM(6, "transform", 0x7fb8a4, "Base tree potion for brewing transformations");
+		TRANSFORM(  6, "transform",   0x7fb8a4, "Base tree potion for brewing transformations");
 
 		private final int index;
 		private final String name;

src/main/java/com/ferreusveritas/dynamictrees/items/DirtBucket.java

@@ -3,32 +3,24 @@
 import javax.annotation.Nullable;
 
 import com.ferreusveritas.dynamictrees.DynamicTrees;
-import com.ferreusveritas.dynamictrees.ModConstants;
-import com.ferreusveritas.dynamictrees.ModItems;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.stats.StatList;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.registries.IForgeRegistry;
 
 public class DirtBucket extends Item {
 
@@ -99,13 +91,5 @@ public boolean tryPlaceContainedDirt(@Nullable EntityPlayer player, World world,
 
 		return false;
 	}
-
-	public DirtBucket registerRecipes(IForgeRegistry<IRecipe> registry) {
-		//Create a dirt bucket from dirt and a bucket
-		GameRegistry.addShapelessRecipe(new ResourceLocation(ModConstants.MODID, "dirtbucket"), null, new ItemStack(ModItems.dirtBucket), 
-				new Ingredient[]{ Ingredient.fromItem(Items.BUCKET), Ingredient.fromItem(ItemBlock.getItemFromBlock(Blocks.DIRT))});
-
-		return this;
-	}
 
 }

src/main/java/com/ferreusveritas/dynamictrees/proxy/ClientProxy.java

@@ -109,7 +109,7 @@ public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos,
 				return world == null || pos == null ? white : BiomeColorHelper.getGrassColorAtPos(world, pos);
 			}
 		});
-
+		
 		//Register Rootydirt Colorizer
 		ModelHelper.regColorHandler(ModBlocks.blockRootyDirtSpecies, new IBlockColor() {
 			@Override

src/main/java/com/ferreusveritas/dynamictrees/trees/DynamicTree.java

@@ -105,7 +105,7 @@ public class DynamicTree {
 	/** The primitive(vanilla) leaves are used for many purposes including rendering, drops, and some other basic behavior. */
 	private IBlockState primitiveLeaves = Blocks.AIR.getDefaultState();
 	/** cached ItemStack of primitive leaves(what is returned when leaves are sheared) */
-	private ItemStack primitiveLeavesItemStack = ItemStack.EMPTY;
+	private ItemStack primitiveLeavesItemStack = CompatHelper.emptyStack();
 	/** A CellKit for leaves automata */
 	private ICellKit cellKit = TreeRegistry.findCellKit(new ResourceLocation(ModConstants.MODID, "deciduous"));
 

src/main/java/com/ferreusveritas/dynamictrees/trees/TreeSpruce.java

@@ -11,6 +11,7 @@
 import com.ferreusveritas.dynamictrees.systems.GrowSignal;
 import com.ferreusveritas.dynamictrees.systems.featuregen.FeatureGenPodzol;
 import com.ferreusveritas.dynamictrees.systems.nodemappers.NodeFindEnds;
+import com.ferreusveritas.dynamictrees.util.CompatHelper;
 
 import net.minecraft.block.BlockPlanks;
 import net.minecraft.block.state.IBlockState;
@@ -20,7 +21,6 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
-import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeDictionary.Type;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -48,7 +48,7 @@ public class SpeciesSpruce extends Species {
 
 		@Override
 		public boolean isBiomePerfect(Biome biome) {
-			return BiomeDictionary.hasType(biome, Type.CONIFEROUS);
+			return CompatHelper.biomeHasType(biome, Type.CONIFEROUS);
 		}
 
 		@Override