diff --git a/src/main/java/forestry/api/arboriculture/ITreeGenerator.java b/src/main/java/forestry/api/arboriculture/ITreeGenerator.java index 4ddecfc16..149909832 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeGenerator.java +++ b/src/main/java/forestry/api/arboriculture/ITreeGenerator.java @@ -10,6 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.util.ForgeDirection; import com.mojang.authlib.GameProfile; + import forestry.api.world.ITreeGenData; /** diff --git a/src/main/java/forestry/api/genetics/IAlleleRegistry.java b/src/main/java/forestry/api/genetics/IAlleleRegistry.java index 50ea033d1..96e040d19 100644 --- a/src/main/java/forestry/api/genetics/IAlleleRegistry.java +++ b/src/main/java/forestry/api/genetics/IAlleleRegistry.java @@ -11,6 +11,7 @@ import java.util.Map; import net.minecraft.item.ItemStack; import com.mojang.authlib.GameProfile; + import forestry.api.genetics.IClassification.EnumClassLevel; /** diff --git a/src/main/java/forestry/api/mail/IMailAddress.java b/src/main/java/forestry/api/mail/IMailAddress.java index e86d2a54b..e740df31f 100644 --- a/src/main/java/forestry/api/mail/IMailAddress.java +++ b/src/main/java/forestry/api/mail/IMailAddress.java @@ -6,6 +6,7 @@ package forestry.api.mail; import com.mojang.authlib.GameProfile; + import forestry.api.core.INBTTagable; public interface IMailAddress extends INBTTagable { diff --git a/src/main/java/forestry/api/world/ITreeGenData.java b/src/main/java/forestry/api/world/ITreeGenData.java index 394e846ea..01d38d952 100644 --- a/src/main/java/forestry/api/world/ITreeGenData.java +++ b/src/main/java/forestry/api/world/ITreeGenData.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.mojang.authlib.GameProfile; + import forestry.api.arboriculture.ITreeGenome; public interface ITreeGenData { diff --git a/src/main/java/forestry/apiculture/flowers/Flower.java b/src/main/java/forestry/apiculture/flowers/Flower.java index 78d2478c8..244550442 100644 --- a/src/main/java/forestry/apiculture/flowers/Flower.java +++ b/src/main/java/forestry/apiculture/flowers/Flower.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraftforge.oredict.OreDictionary; import com.google.common.base.Objects; + import forestry.api.genetics.IFlower; final class Flower implements IFlower { diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java b/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java index f3bd5b02f..43a76086b 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeBlockTypeLeaf.java @@ -12,6 +12,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.mojang.authlib.GameProfile; + import forestry.api.world.ITreeGenData; public class TreeBlockTypeLeaf implements ITreeBlockType { diff --git a/src/main/java/forestry/core/items/ItemRegistryFluids.java b/src/main/java/forestry/core/items/ItemRegistryFluids.java index 3b00a11ec..30500623d 100644 --- a/src/main/java/forestry/core/items/ItemRegistryFluids.java +++ b/src/main/java/forestry/core/items/ItemRegistryFluids.java @@ -12,6 +12,7 @@ import net.minecraft.init.Blocks; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; + import forestry.core.fluids.Fluids; public class ItemRegistryFluids extends ItemRegistry { diff --git a/src/main/java/forestry/core/recipes/craftguide/CraftGuideCustomRecipes.java b/src/main/java/forestry/core/recipes/craftguide/CraftGuideCustomRecipes.java index 76e26f2f8..0fc5448e6 100644 --- a/src/main/java/forestry/core/recipes/craftguide/CraftGuideCustomRecipes.java +++ b/src/main/java/forestry/core/recipes/craftguide/CraftGuideCustomRecipes.java @@ -12,13 +12,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import forestry.api.recipes.IDescriptiveRecipe; +import forestry.core.recipes.RecipeUtil; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.recipes.IDescriptiveRecipe; -import forestry.core.recipes.RecipeUtil; public class CraftGuideCustomRecipes implements RecipeProvider { diff --git a/src/main/java/forestry/core/tiles/EscritoireTextSource.java b/src/main/java/forestry/core/tiles/EscritoireTextSource.java index 6cc6e3c94..276e56e08 100644 --- a/src/main/java/forestry/core/tiles/EscritoireTextSource.java +++ b/src/main/java/forestry/core/tiles/EscritoireTextSource.java @@ -14,6 +14,7 @@ import java.util.Random; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; + import forestry.core.utils.StringUtil; public class EscritoireTextSource { diff --git a/src/main/java/forestry/core/utils/NBTUtil.java b/src/main/java/forestry/core/utils/NBTUtil.java index 895bfc404..e773c5c29 100644 --- a/src/main/java/forestry/core/utils/NBTUtil.java +++ b/src/main/java/forestry/core/utils/NBTUtil.java @@ -26,6 +26,7 @@ import net.minecraft.nbt.NBTTagShort; import net.minecraft.nbt.NBTTagString; import com.google.common.collect.ForwardingList; + import cpw.mods.fml.common.ObfuscationReflectionHelper; /** diff --git a/src/main/java/forestry/core/utils/PlayerUtil.java b/src/main/java/forestry/core/utils/PlayerUtil.java index 7c6bb427a..f30f20456 100644 --- a/src/main/java/forestry/core/utils/PlayerUtil.java +++ b/src/main/java/forestry/core/utils/PlayerUtil.java @@ -16,6 +16,7 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayerFactory; import com.mojang.authlib.GameProfile; + import forestry.core.access.IOwnable; public abstract class PlayerUtil { diff --git a/src/main/java/forestry/factory/recipes/CentrifugeRecipe.java b/src/main/java/forestry/factory/recipes/CentrifugeRecipe.java index 2cb699b70..e12fcf3b8 100644 --- a/src/main/java/forestry/factory/recipes/CentrifugeRecipe.java +++ b/src/main/java/forestry/factory/recipes/CentrifugeRecipe.java @@ -17,6 +17,7 @@ import java.util.Random; import net.minecraft.item.ItemStack; import com.google.common.collect.ImmutableMap; + import forestry.api.recipes.ICentrifugeRecipe; public class CentrifugeRecipe implements ICentrifugeRecipe { diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideBottler.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideBottler.java index 15876a58d..e55010049 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideBottler.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideBottler.java @@ -11,6 +11,9 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; +import forestry.factory.blocks.BlockFactoryTesrType; +import forestry.factory.recipes.BottlerRecipe; +import forestry.plugins.PluginFactory; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -18,9 +21,6 @@ import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.factory.blocks.BlockFactoryTesrType; -import forestry.factory.recipes.BottlerRecipe; -import forestry.plugins.PluginFactory; public class CraftGuideBottler implements RecipeProvider { diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCarpenter.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCarpenter.java index 1940facd8..a5bbebda0 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCarpenter.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCarpenter.java @@ -10,6 +10,11 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; +import forestry.api.recipes.ICarpenterRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.core.recipes.RecipeUtil; +import forestry.factory.blocks.BlockFactoryTesrType; +import forestry.plugins.PluginFactory; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -17,11 +22,6 @@ import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.recipes.ICarpenterRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.recipes.RecipeUtil; -import forestry.factory.blocks.BlockFactoryTesrType; -import forestry.plugins.PluginFactory; public class CraftGuideCarpenter implements RecipeProvider { diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCentrifuge.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCentrifuge.java index d68bb97ec..5da6ca708 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCentrifuge.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideCentrifuge.java @@ -14,6 +14,10 @@ import java.util.Map.Entry; import net.minecraft.item.ItemStack; +import forestry.api.recipes.ICentrifugeRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.factory.blocks.BlockFactoryTesrType; +import forestry.plugins.PluginFactory; import uristqwerty.CraftGuide.api.ChanceSlot; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -21,10 +25,6 @@ import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.recipes.ICentrifugeRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.factory.blocks.BlockFactoryTesrType; -import forestry.plugins.PluginFactory; public class CraftGuideCentrifuge implements RecipeProvider { diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java index 2d5f3f5fd..3c73dd3bc 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFabricator.java @@ -10,6 +10,10 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; +import forestry.api.recipes.IFabricatorRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.factory.blocks.BlockFactoryPlainType; +import forestry.plugins.PluginFactory; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -17,10 +21,6 @@ import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.recipes.IFabricatorRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.factory.blocks.BlockFactoryPlainType; -import forestry.plugins.PluginFactory; public class CraftGuideFabricator implements RecipeProvider { diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java index 73295ab3b..7a76adcf6 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideFermenter.java @@ -14,6 +14,11 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import forestry.api.fuels.FuelManager; +import forestry.api.recipes.IFermenterRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.factory.blocks.BlockFactoryTesrType; +import forestry.plugins.PluginFactory; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -21,11 +26,6 @@ import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.fuels.FuelManager; -import forestry.api.recipes.IFermenterRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.factory.blocks.BlockFactoryTesrType; -import forestry.plugins.PluginFactory; public class CraftGuideFermenter implements RecipeProvider { diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java index 7ed366b5c..5fb3d11ac 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideSqueezer.java @@ -10,6 +10,10 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; +import forestry.api.recipes.ISqueezerRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.factory.blocks.BlockFactoryTesrType; +import forestry.plugins.PluginFactory; import uristqwerty.CraftGuide.api.ChanceSlot; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; @@ -18,10 +22,6 @@ import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.recipes.ISqueezerRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.factory.blocks.BlockFactoryTesrType; -import forestry.plugins.PluginFactory; public class CraftGuideSqueezer implements RecipeProvider { diff --git a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java index b5918c8d0..13fb0f93f 100644 --- a/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java +++ b/src/main/java/forestry/factory/recipes/craftguide/CraftGuideStill.java @@ -10,6 +10,10 @@ package forestry.factory.recipes.craftguide; import net.minecraft.item.ItemStack; +import forestry.api.recipes.IStillRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.factory.blocks.BlockFactoryTesrType; +import forestry.plugins.PluginFactory; import uristqwerty.CraftGuide.api.ItemSlot; import uristqwerty.CraftGuide.api.LiquidSlot; import uristqwerty.CraftGuide.api.RecipeGenerator; @@ -17,10 +21,6 @@ import uristqwerty.CraftGuide.api.RecipeProvider; import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import forestry.api.recipes.IStillRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.factory.blocks.BlockFactoryTesrType; -import forestry.plugins.PluginFactory; public class CraftGuideStill implements RecipeProvider { diff --git a/src/main/java/forestry/mail/tiles/TileMailbox.java b/src/main/java/forestry/mail/tiles/TileMailbox.java index 966e10521..67b58d301 100644 --- a/src/main/java/forestry/mail/tiles/TileMailbox.java +++ b/src/main/java/forestry/mail/tiles/TileMailbox.java @@ -19,10 +19,9 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.statements.ITriggerExternal; - import com.mojang.authlib.GameProfile; +import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress;