diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index 2fe4960c..e957459f 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -1,5 +1,8 @@ package binnie; +import java.util.ArrayList; +import java.util.List; + import binnie.core.ManagerBase; import binnie.core.genetics.ManagerGenetics; import binnie.core.language.ManagerLanguage; @@ -8,9 +11,6 @@ import binnie.core.machines.ManagerMachine; import binnie.core.mod.config.ManagerConfig; import binnie.core.resource.ManagerResource; -import java.util.ArrayList; -import java.util.List; - public final class Binnie { public static final List MANAGERS = new ArrayList<>(); public static final ManagerLanguage LANGUAGE = new ManagerLanguage(); diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 51652490..f089c9de 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -1,5 +1,26 @@ package binnie.botany; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.world.BlockEvent; + +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + import binnie.Constants; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumSoilType; @@ -35,24 +56,6 @@ import binnie.core.item.ItemMisc; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class Botany extends AbstractMod { diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/src/main/java/binnie/botany/CreativeTabBotany.java index 9ca1f3e9..092497aa 100644 --- a/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/src/main/java/binnie/botany/CreativeTabBotany.java @@ -3,6 +3,7 @@ package binnie.botany; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/api/EnumAcidity.java b/src/main/java/binnie/botany/api/EnumAcidity.java index 22716fd8..14c67a85 100644 --- a/src/main/java/binnie/botany/api/EnumAcidity.java +++ b/src/main/java/binnie/botany/api/EnumAcidity.java @@ -1,11 +1,11 @@ package binnie.botany.api; +import javax.annotation.Nullable; + import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; -import javax.annotation.Nullable; - public enum EnumAcidity implements IStringSerializable { ACID(TextFormatting.RED), NEUTRAL(null), diff --git a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java index 41e89ae0..c90de665 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java +++ b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java @@ -1,5 +1,7 @@ package binnie.botany.api; +import java.util.Locale; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleArea; @@ -9,8 +11,6 @@ import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import java.util.Locale; - public enum EnumFlowerChromosome implements IChromosomeType { SPECIES(IAlleleFlowerSpecies.class), PRIMARY(IAlleleInteger.class), diff --git a/src/main/java/binnie/botany/api/EnumMoisture.java b/src/main/java/binnie/botany/api/EnumMoisture.java index 8c4500a1..649d1082 100644 --- a/src/main/java/binnie/botany/api/EnumMoisture.java +++ b/src/main/java/binnie/botany/api/EnumMoisture.java @@ -1,11 +1,11 @@ package binnie.botany.api; +import javax.annotation.Nullable; + import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; -import javax.annotation.Nullable; - public enum EnumMoisture implements IStringSerializable { DRY(TextFormatting.YELLOW), NORMAL(null), diff --git a/src/main/java/binnie/botany/api/EnumSoilType.java b/src/main/java/binnie/botany/api/EnumSoilType.java index 5c8dc239..6153fa3d 100644 --- a/src/main/java/binnie/botany/api/EnumSoilType.java +++ b/src/main/java/binnie/botany/api/EnumSoilType.java @@ -1,12 +1,12 @@ package binnie.botany.api; +import javax.annotation.Nullable; +import java.util.Locale; + import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; -import javax.annotation.Nullable; -import java.util.Locale; - public enum EnumSoilType implements IStringSerializable { SOIL(TextFormatting.DARK_GRAY), LOAM(TextFormatting.GOLD), diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java b/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java index e6e6adbd..5b83c151 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java @@ -1,8 +1,9 @@ package binnie.botany.api; +import net.minecraft.world.World; + import forestry.api.genetics.IAlleleEffect; import forestry.api.genetics.IEffectData; -import net.minecraft.world.World; public interface IAlleleFlowerEffect extends IAlleleEffect { IEffectData doEffect(final IFlowerGenome p0, final IEffectData p1, final World p2, final int p3, final int p4, final int p5); diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index c9d9da92..47e9c65e 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -1,12 +1,14 @@ package binnie.botany.api; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IModelManager; import forestry.api.genetics.IAlleleProperty; import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty { IFlowerType getType(); diff --git a/src/main/java/binnie/botany/api/IFlower.java b/src/main/java/binnie/botany/api/IFlower.java index 56bbcecd..21b8e099 100644 --- a/src/main/java/binnie/botany/api/IFlower.java +++ b/src/main/java/binnie/botany/api/IFlower.java @@ -1,10 +1,11 @@ package binnie.botany.api; -import forestry.api.genetics.IIndividual; +import javax.annotation.Nullable; + import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; +import forestry.api.genetics.IIndividual; public interface IFlower extends IIndividual { @Override diff --git a/src/main/java/binnie/botany/api/IFlowerDefinition.java b/src/main/java/binnie/botany/api/IFlowerDefinition.java index 87632611..4b9cdab4 100644 --- a/src/main/java/binnie/botany/api/IFlowerDefinition.java +++ b/src/main/java/binnie/botany/api/IFlowerDefinition.java @@ -1,8 +1,9 @@ package binnie.botany.api; -import forestry.core.genetics.IGeneticDefinition; import net.minecraft.item.ItemStack; +import forestry.core.genetics.IGeneticDefinition; + public interface IFlowerDefinition extends IGeneticDefinition { @Override IFlowerGenome getGenome(); diff --git a/src/main/java/binnie/botany/api/IFlowerMutation.java b/src/main/java/binnie/botany/api/IFlowerMutation.java index 00ad55bf..28e3d6b3 100644 --- a/src/main/java/binnie/botany/api/IFlowerMutation.java +++ b/src/main/java/binnie/botany/api/IFlowerMutation.java @@ -1,9 +1,10 @@ package binnie.botany.api; -import forestry.api.genetics.IMutation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.genetics.IMutation; + public interface IFlowerMutation extends IMutation { @Override IFlowerRoot getRoot(); diff --git a/src/main/java/binnie/botany/api/IFlowerRoot.java b/src/main/java/binnie/botany/api/IFlowerRoot.java index 01504c8e..b45df289 100644 --- a/src/main/java/binnie/botany/api/IFlowerRoot.java +++ b/src/main/java/binnie/botany/api/IFlowerRoot.java @@ -1,15 +1,17 @@ package binnie.botany.api; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import javax.annotation.Nullable; import java.util.Collection; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.ISpeciesRoot; + public interface IFlowerRoot extends ISpeciesRoot { @Override @Nullable diff --git a/src/main/java/binnie/botany/api/IFlowerType.java b/src/main/java/binnie/botany/api/IFlowerType.java index 644bc31b..fb53071b 100644 --- a/src/main/java/binnie/botany/api/IFlowerType.java +++ b/src/main/java/binnie/botany/api/IFlowerType.java @@ -1,11 +1,13 @@ package binnie.botany.api; -import forestry.api.core.IModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; + public interface IFlowerType> extends Comparable { @SideOnly(Side.CLIENT) void registerModels(Item item, IModelManager manager, EnumFlowerStage type); diff --git a/src/main/java/binnie/botany/api/package-info.java b/src/main/java/binnie/botany/api/package-info.java index d93958b7..25288c28 100644 --- a/src/main/java/binnie/botany/api/package-info.java +++ b/src/main/java/binnie/botany/api/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package binnie.botany.api; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 25f04b9e..b11ba105 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -1,12 +1,10 @@ package binnie.botany.ceramic; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.BinnieCore; -import binnie.core.util.TileUtil; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.blocks.IColoredBlock; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -21,13 +19,18 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.blocks.IColoredBlock; + +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.BinnieCore; +import binnie.core.util.TileUtil; public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegister { public BlockCeramic() { diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java index 2c70f1ff..e831e66f 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java @@ -1,13 +1,14 @@ package binnie.botany.ceramic; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; + import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.extratrees.api.IDesign; import binnie.extratrees.carpentry.BlockDesign; import binnie.extratrees.carpentry.DesignBlock; import binnie.extratrees.carpentry.ModuleCarpentry; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; public class BlockCeramicPatterned extends BlockDesign { public BlockCeramicPatterned() { diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 1cd5d7c5..792b16db 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -1,16 +1,11 @@ package binnie.botany.ceramic; -import binnie.Binnie; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.BinnieCore; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.TileUtil; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.blocks.IColoredBlock; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -27,14 +22,22 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.blocks.IColoredBlock; + +import binnie.Binnie; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.BinnieCore; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.TileUtil; public class BlockStainedGlass extends Block implements IBlockMetadata, IColoredBlock, IItemModelRegister { public BlockStainedGlass() { diff --git a/src/main/java/binnie/botany/ceramic/CeramicColor.java b/src/main/java/binnie/botany/ceramic/CeramicColor.java index 6403e694..330a7c77 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicColor.java +++ b/src/main/java/binnie/botany/ceramic/CeramicColor.java @@ -1,13 +1,14 @@ package binnie.botany.ceramic; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.item.ItemStack; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; -import net.minecraft.item.ItemStack; - -import java.util.LinkedHashMap; -import java.util.Map; public class CeramicColor implements IDesignMaterial { private final static Map map = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index 2e96adda..46f3852e 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -1,5 +1,19 @@ package binnie.botany.ceramic; +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; @@ -9,18 +23,6 @@ import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.carpentry.DesignerManager; import binnie.extratrees.carpentry.EnumPattern; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.Map; public class CeramicDesignSystem implements IDesignSystem { public static CeramicDesignSystem instance = new CeramicDesignSystem(); diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index c022f144..21035f5a 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -1,17 +1,19 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; -import binnie.botany.ceramic.brick.CeramicBrickType; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.common.ForgeHooks; -import java.util.ArrayList; -import java.util.List; +import binnie.botany.Botany; +import binnie.botany.ceramic.brick.CeramicBrickType; public class CeramicTileRecipe implements IRecipe { private ItemStack cached = ItemStack.EMPTY; diff --git a/src/main/java/binnie/botany/ceramic/ItemCeramic.java b/src/main/java/binnie/botany/ceramic/ItemCeramic.java index 78b3f893..35795166 100644 --- a/src/main/java/binnie/botany/ceramic/ItemCeramic.java +++ b/src/main/java/binnie/botany/ceramic/ItemCeramic.java @@ -1,13 +1,16 @@ package binnie.botany.ceramic; -import binnie.botany.genetics.EnumFlowerColor; -import forestry.core.items.IColoredItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.items.IColoredItem; + +import binnie.botany.genetics.EnumFlowerColor; + public class ItemCeramic extends ItemBlock implements IColoredItem { public ItemCeramic(BlockCeramic block) { super(block); diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 90d0b7a0..c300138d 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -1,15 +1,17 @@ package binnie.botany.ceramic; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.IFlower; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.common.ForgeHooks; +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.api.IFlower; + public class PigmentRecipe implements IRecipe { @Override public boolean matches(final InventoryCrafting crafting, final World world) { diff --git a/src/main/java/binnie/botany/ceramic/TileCeramic.java b/src/main/java/binnie/botany/ceramic/TileCeramic.java index ec29cfbd..20e01c12 100644 --- a/src/main/java/binnie/botany/ceramic/TileCeramic.java +++ b/src/main/java/binnie/botany/ceramic/TileCeramic.java @@ -1,11 +1,12 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; -import binnie.botany.genetics.EnumFlowerColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import binnie.botany.Botany; +import binnie.botany.genetics.EnumFlowerColor; + public class TileCeramic extends TileEntity { protected EnumFlowerColor color = EnumFlowerColor.Black; diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index 7ea20521..ea778d7d 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -1,24 +1,10 @@ package binnie.botany.ceramic.brick; -import binnie.Constants; -import binnie.botany.CreativeTabBotany; -import binnie.botany.ceramic.TileCeramic; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.BinnieCore; -import binnie.core.block.IMultipassBlock; -import binnie.core.models.DefaultStateMapper; -import binnie.core.models.ModelManager; -import binnie.core.models.ModelMutlipass; -import binnie.core.util.TileUtil; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.ISpriteRegister; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.ITextureManager; -import forestry.core.blocks.IColoredBlock; -import forestry.core.blocks.properties.UnlistedBlockAccess; -import forestry.core.blocks.properties.UnlistedBlockPos; -import forestry.core.models.BlockModelEntry; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -45,17 +31,35 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.ISpriteRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.ITextureManager; +import forestry.core.blocks.IColoredBlock; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; +import forestry.core.models.BlockModelEntry; + +import binnie.Constants; +import binnie.botany.CreativeTabBotany; +import binnie.botany.ceramic.TileCeramic; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.BinnieCore; +import binnie.core.block.IMultipassBlock; +import binnie.core.models.DefaultStateMapper; +import binnie.core.models.ModelManager; +import binnie.core.models.ModelMutlipass; +import binnie.core.util.TileUtil; public class BlockCeramicBrick extends Block implements IMultipassBlock, IColoredBlock, ISpriteRegister, IStateMapperRegister, IItemModelRegister { private static final PropertyEnum TYPE = PropertyEnum.create("type", CeramicBrickType.class); diff --git a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java index 857f2240..557a0769 100644 --- a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java +++ b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java @@ -1,13 +1,16 @@ package binnie.botany.ceramic.brick; +import com.google.common.base.Preconditions; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; -import com.google.common.base.Preconditions; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class CeramicBrickPair { EnumFlowerColor colorFirst; diff --git a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java index cc140b24..0c750cae 100644 --- a/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java +++ b/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java @@ -1,19 +1,21 @@ package binnie.botany.ceramic.brick; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Locale; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IStringSerializable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; import binnie.core.block.TileEntityMetadata; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IStringSerializable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Locale; public enum CeramicBrickType implements IStringSerializable { Tile("tile", "Ceramic Tile") { diff --git a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java index 1ad190c0..9c2146c7 100644 --- a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java @@ -1,11 +1,13 @@ package binnie.botany.ceramic.brick; -import forestry.core.items.IColoredItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.items.IColoredItem; + public class ItemCeramicBrick extends ItemBlock implements IColoredItem { public ItemCeramicBrick(BlockCeramicBrick block) { super(block); diff --git a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java index fc6f7d2e..2f8663db 100644 --- a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java @@ -1,11 +1,12 @@ package binnie.botany.ceramic.brick; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; public class TileCeramicBrick extends TileEntity { private EnumFlowerColor colorFirst = EnumFlowerColor.Black; diff --git a/src/main/java/binnie/botany/ceramic/brick/package-info.java b/src/main/java/binnie/botany/ceramic/brick/package-info.java index e1007c1a..e04e545f 100644 --- a/src/main/java/binnie/botany/ceramic/brick/package-info.java +++ b/src/main/java/binnie/botany/ceramic/brick/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.ceramic.brick; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/ceramic/package-info.java b/src/main/java/binnie/botany/ceramic/package-info.java index e33c02d5..1cefab5c 100644 --- a/src/main/java/binnie/botany/ceramic/package-info.java +++ b/src/main/java/binnie/botany/ceramic/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.ceramic; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/core/BotanyGUI.java b/src/main/java/binnie/botany/core/BotanyGUI.java index e2476726..aeef3fae 100644 --- a/src/main/java/binnie/botany/core/BotanyGUI.java +++ b/src/main/java/binnie/botany/core/BotanyGUI.java @@ -1,15 +1,17 @@ package binnie.botany.core; -import binnie.botany.craftgui.WindowBotanistDatabase; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.gui.IBinnieGUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; +import binnie.botany.craftgui.WindowBotanistDatabase; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.IBinnieGUID; + public enum BotanyGUI implements IBinnieGUID { Database, DatabaseNEI; diff --git a/src/main/java/binnie/botany/core/BotanyTexture.java b/src/main/java/binnie/botany/core/BotanyTexture.java index b5463cbe..c2782eb5 100644 --- a/src/main/java/binnie/botany/core/BotanyTexture.java +++ b/src/main/java/binnie/botany/core/BotanyTexture.java @@ -1,14 +1,15 @@ package binnie.botany.core; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.botany.Botany; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public enum BotanyTexture implements IBinnieTexture { ; diff --git a/src/main/java/binnie/botany/core/package-info.java b/src/main/java/binnie/botany/core/package-info.java index b80d61cc..8dbc8aec 100644 --- a/src/main/java/binnie/botany/core/package-info.java +++ b/src/main/java/binnie/botany/core/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.core; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java index 0437a9ec..773eb41b 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java @@ -1,5 +1,8 @@ package binnie.botany.craftgui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.botany.api.IFlowerColour; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; @@ -8,8 +11,6 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlColourDisplay extends Control implements IControlValue, ITooltip { private IFlowerColour value; diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index 272cbed3..7e1a0cf8 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -1,5 +1,8 @@ package binnie.botany.craftgui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.botany.api.IColourMix; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; @@ -11,8 +14,6 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlColourMixSymbol extends Control implements ITooltip { static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); diff --git a/src/main/java/binnie/botany/craftgui/ControlColourOption.java b/src/main/java/binnie/botany/craftgui/ControlColourOption.java index 5a50b8cf..4ff59808 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourOption.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourOption.java @@ -1,5 +1,8 @@ package binnie.botany.craftgui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.botany.api.IFlowerColour; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; @@ -7,8 +10,6 @@ import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlTextOption; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Point; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ControlColourOption extends ControlTextOption { diff --git a/src/main/java/binnie/botany/craftgui/PageColourMix.java b/src/main/java/binnie/botany/craftgui/PageColourMix.java index b13ec9ed..381c8392 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMix.java @@ -1,5 +1,8 @@ package binnie.botany.craftgui; +import java.util.ArrayList; +import java.util.List; + import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColour; import binnie.botany.core.BotanyCore; @@ -9,9 +12,6 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; -import java.util.ArrayList; -import java.util.List; - public class PageColourMix extends PageAbstract { ControlText pageSpeciesFurther_Title; ControlColourMixBox pageSpeciesFurther_List; diff --git a/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java index 82ac65c2..d9f32703 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java @@ -1,5 +1,8 @@ package binnie.botany.craftgui; +import java.util.ArrayList; +import java.util.List; + import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColour; import binnie.botany.core.BotanyCore; @@ -9,9 +12,6 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; -import java.util.ArrayList; -import java.util.List; - public class PageColourMixResultant extends PageAbstract { ControlText pageSpeciesFurther_Title; ControlColourMixBox pageSpeciesFurther_List; diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index b64c30dd..019a5bef 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -1,5 +1,11 @@ package binnie.botany.craftgui; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; + import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; @@ -17,10 +23,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; public class PageSpeciesFlowerGenome extends PageSpecies { public PageSpeciesFlowerGenome(final IWidget parent, final DatabaseTab tab) { diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index b91669c3..6e016340 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -1,5 +1,14 @@ package binnie.botany.craftgui; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.IFlowerColour; @@ -19,15 +28,6 @@ import binnie.core.craftgui.database.PageSpeciesResultant; import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; public class WindowBotanistDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxColors; diff --git a/src/main/java/binnie/botany/craftgui/package-info.java b/src/main/java/binnie/botany/craftgui/package-info.java index 8494b341..768029f8 100644 --- a/src/main/java/binnie/botany/craftgui/package-info.java +++ b/src/main/java/binnie/botany/craftgui/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.craftgui; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index bf4f43da..cc663cee 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -1,18 +1,21 @@ package binnie.botany.farm; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import forestry.api.circuits.ChipsetManager; +import forestry.api.circuits.ICircuitLayout; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.IFarmHousing; + import binnie.Binnie; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.core.circuits.BinnieCircuit; -import com.google.common.base.Preconditions; -import forestry.api.circuits.ChipsetManager; -import forestry.api.circuits.ICircuitLayout; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.IFarmHousing; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; - -import javax.annotation.Nullable; public class CircuitGarden extends BinnieCircuit { private boolean isManual; diff --git a/src/main/java/binnie/botany/farm/FarmLogic.java b/src/main/java/binnie/botany/farm/FarmLogic.java index b3f81d66..4d30b8f4 100644 --- a/src/main/java/binnie/botany/farm/FarmLogic.java +++ b/src/main/java/binnie/botany/farm/FarmLogic.java @@ -1,6 +1,5 @@ package binnie.botany.farm; -import forestry.api.farming.IFarmLogic; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -8,6 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.IFarmLogic; + public abstract class FarmLogic implements IFarmLogic { boolean isManual; diff --git a/src/main/java/binnie/botany/farm/FarmableFlower.java b/src/main/java/binnie/botany/farm/FarmableFlower.java index 05c3a2bc..cef34fcd 100644 --- a/src/main/java/binnie/botany/farm/FarmableFlower.java +++ b/src/main/java/binnie/botany/farm/FarmableFlower.java @@ -1,13 +1,7 @@ package binnie.botany.farm; -import binnie.botany.Botany; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IFlower; -import binnie.botany.core.BotanyCore; -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.gardening.Gardening; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmable; +import javax.annotation.Nullable; + import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -15,7 +9,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmable; + +import binnie.botany.Botany; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IFlower; +import binnie.botany.core.BotanyCore; +import binnie.botany.flower.TileEntityFlower; +import binnie.botany.gardening.Gardening; public class FarmableFlower implements IFarmable { @Override diff --git a/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java b/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java index 48aca87a..9a0b144c 100644 --- a/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java +++ b/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java @@ -1,13 +1,14 @@ package binnie.botany.farm; -import binnie.botany.api.IFlower; -import binnie.botany.core.BotanyCore; -import binnie.botany.gardening.Gardening; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import binnie.botany.api.IFlower; +import binnie.botany.core.BotanyCore; +import binnie.botany.gardening.Gardening; + public class FarmableVanillaFlower extends FarmableFlower { @Override public boolean isGermling(final ItemStack itemstack) { diff --git a/src/main/java/binnie/botany/farm/FlowerCrop.java b/src/main/java/binnie/botany/farm/FlowerCrop.java index 211848ba..8a046551 100644 --- a/src/main/java/binnie/botany/farm/FlowerCrop.java +++ b/src/main/java/binnie/botany/farm/FlowerCrop.java @@ -1,12 +1,13 @@ package binnie.botany.farm; -import forestry.api.farming.ICrop; +import javax.annotation.Nullable; +import java.util.Arrays; + import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import javax.annotation.Nullable; -import java.util.Arrays; +import forestry.api.farming.ICrop; public class FlowerCrop implements ICrop { NonNullList drops = NonNullList.create(); diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index ad4cfb76..6f7b0b6e 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -1,20 +1,13 @@ package binnie.botany.farm; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.gardening.Gardening; -import binnie.core.liquid.ManagerLiquid; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.owner.IOwnedTile; -import forestry.core.utils.BlockUtil; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; @@ -26,15 +19,25 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.owner.IOwnedTile; +import forestry.core.utils.BlockUtil; + +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; +import binnie.botany.flower.TileEntityFlower; +import binnie.botany.gardening.Gardening; +import binnie.core.liquid.ManagerLiquid; public class GardenLogic extends FarmLogic { List farmables; diff --git a/src/main/java/binnie/botany/farm/package-info.java b/src/main/java/binnie/botany/farm/package-info.java index 67737cee..2e32d7e1 100644 --- a/src/main/java/binnie/botany/farm/package-info.java +++ b/src/main/java/binnie/botany/farm/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.farm; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 275d1136..a5f0cf4b 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -1,20 +1,9 @@ package binnie.botany.flower; -import binnie.botany.Botany; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerType; -import binnie.botany.core.BotanyCore; -import binnie.botany.gardening.Gardening; -import binnie.botany.genetics.EnumFlowerType; -import binnie.botany.genetics.FlowerDefinition; -import binnie.botany.network.PacketID; -import binnie.core.BinnieCore; -import binnie.core.network.packet.MessageNBT; -import binnie.core.util.TileUtil; -import com.mojang.authlib.GameProfile; -import forestry.api.core.IStateMapperRegister; -import forestry.core.blocks.IColoredBlock; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.SoundType; @@ -38,13 +27,29 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import com.mojang.authlib.GameProfile; + import net.minecraftforge.client.model.ModelLoader; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Random; +import forestry.api.core.IStateMapperRegister; +import forestry.core.blocks.IColoredBlock; + +import binnie.botany.Botany; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerType; +import binnie.botany.core.BotanyCore; +import binnie.botany.gardening.Gardening; +import binnie.botany.genetics.EnumFlowerType; +import binnie.botany.genetics.FlowerDefinition; +import binnie.botany.network.PacketID; +import binnie.core.BinnieCore; +import binnie.core.network.packet.MessageNBT; +import binnie.core.util.TileUtil; public class BlockFlower extends BlockContainer implements IColoredBlock, IStateMapperRegister { public static final AxisAlignedBB FLOWER_BLOCK_AABB = new AxisAlignedBB(0.3D, 0.0D, 0.3D, 0.7D, 0.6D, 0.7D); diff --git a/src/main/java/binnie/botany/flower/FlowerSpriteManager.java b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java index 03e3cf6e..5858f068 100644 --- a/src/main/java/binnie/botany/flower/FlowerSpriteManager.java +++ b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java @@ -1,16 +1,18 @@ package binnie.botany.flower; +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.IFlowerType; import binnie.core.resource.BinnieSprite; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.Map; public class FlowerSpriteManager { private static final Map flowerSprites = new HashMap<>(); diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 927f264e..9704fccc 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -1,23 +1,10 @@ package binnie.botany.flower; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerType; -import binnie.botany.core.BotanyCore; -import binnie.botany.genetics.Flower; import com.google.common.base.Preconditions; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IPollinatable; -import forestry.core.config.Config; -import forestry.core.items.IColoredItem; + +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; @@ -39,11 +26,28 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IPollinatable; +import forestry.core.config.Config; +import forestry.core.items.IColoredItem; + +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerType; +import binnie.botany.core.BotanyCore; +import binnie.botany.genetics.Flower; public class ItemBotany extends Item implements IColoredItem, IItemModelRegister { private EnumFlowerStage type; diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 8c26fe23..1abded92 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -1,16 +1,11 @@ package binnie.botany.flower; -import binnie.botany.CreativeTabBotany; -import binnie.core.item.ItemCore; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import forestry.api.circuits.ChipsetManager; -import forestry.api.circuits.ICircuit; -import forestry.api.circuits.ICircuitLayout; -import forestry.api.core.IModelManager; -import forestry.core.circuits.SolderManager; -import forestry.core.items.IColoredItem; -import forestry.core.utils.Translator; + +import java.util.Collection; +import java.util.List; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -18,11 +13,20 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Collection; -import java.util.List; +import forestry.api.circuits.ChipsetManager; +import forestry.api.circuits.ICircuit; +import forestry.api.circuits.ICircuitLayout; +import forestry.api.core.IModelManager; +import forestry.core.circuits.SolderManager; +import forestry.core.items.IColoredItem; +import forestry.core.utils.Translator; + +import binnie.botany.CreativeTabBotany; +import binnie.core.item.ItemCore; public class ItemInsulatedTube extends ItemCore implements IColoredItem { public ItemInsulatedTube() { diff --git a/src/main/java/binnie/botany/flower/PropertyFlower.java b/src/main/java/binnie/botany/flower/PropertyFlower.java index 06b2b5ea..fd13ac7b 100644 --- a/src/main/java/binnie/botany/flower/PropertyFlower.java +++ b/src/main/java/binnie/botany/flower/PropertyFlower.java @@ -1,16 +1,19 @@ package binnie.botany.flower; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlowerType; import com.google.common.base.Optional; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import net.minecraft.block.properties.PropertyHelper; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import net.minecraft.block.properties.PropertyHelper; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; + +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IFlowerType; + public class PropertyFlower> extends PropertyHelper { public PropertyFlower(String name, Class flowerTypeClass) { super(name, flowerTypeClass); diff --git a/src/main/java/binnie/botany/flower/StateMapperFlower.java b/src/main/java/binnie/botany/flower/StateMapperFlower.java index 6ae95d4b..d902785d 100644 --- a/src/main/java/binnie/botany/flower/StateMapperFlower.java +++ b/src/main/java/binnie/botany/flower/StateMapperFlower.java @@ -1,16 +1,19 @@ package binnie.botany.flower; -import binnie.Constants; -import binnie.botany.api.IFlowerType; import com.google.common.collect.Maps; + +import java.util.Map; + import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Map; +import binnie.Constants; +import binnie.botany.api.IFlowerType; @SideOnly(Side.CLIENT) public class StateMapperFlower extends StateMapperBase { diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index 23481188..b2f513f5 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -1,5 +1,35 @@ package binnie.botany.flower; +import javax.annotation.Nullable; +import java.util.HashSet; +import java.util.Random; +import java.util.Set; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + +import com.mojang.authlib.GameProfile; + +import net.minecraftforge.common.EnumPlantType; + +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IPollinatable; +import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyNursery; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; @@ -15,34 +45,7 @@ import binnie.botany.gardening.Gardening; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.genetics.EnumFlowerType; import binnie.botany.genetics.Flower; -import binnie.botany.network.PacketFlowerUpdate; import binnie.core.BinnieCore; -import com.mojang.authlib.GameProfile; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.IErrorState; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IPollinatable; -import forestry.api.lepidopterology.IButterfly; -import forestry.api.lepidopterology.IButterflyNursery; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.EnumPlantType; - -import javax.annotation.Nullable; -import java.util.HashSet; -import java.util.Random; -import java.util.Set; public class TileEntityFlower extends TileEntity implements IPollinatable, IButterflyNursery { @Nullable diff --git a/src/main/java/binnie/botany/flower/package-info.java b/src/main/java/binnie/botany/flower/package-info.java index bf13bbc3..9e2c985e 100644 --- a/src/main/java/binnie/botany/flower/package-info.java +++ b/src/main/java/binnie/botany/flower/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.flower; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 1289ba48..28871fef 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -1,11 +1,9 @@ package binnie.botany.gardening; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.SoundType; @@ -20,12 +18,17 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; public class BlockPlant extends BlockBush implements IItemModelRegister { public static final PropertyEnum PLANT_TYPE = PropertyEnum.create("plant_type", Type.class); diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 0a89a9bb..50fa5a76 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -1,14 +1,8 @@ package binnie.botany.gardening; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; +import javax.annotation.Nullable; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -26,12 +20,22 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.common.IPlantable; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.Random; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { public static final PropertyEnum MOISTURE = PropertyEnum.create("moisture", EnumMoisture.class); diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 7a8cb9bc..530080ac 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -1,18 +1,10 @@ package binnie.botany.gardening; -import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import binnie.botany.api.IFlower; -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.items.BotanyItems; -import binnie.core.BinnieCore; -import com.mojang.authlib.GameProfile; -import forestry.api.climate.IClimateInfo; -import forestry.api.core.EnumTemperature; -import forestry.api.core.ForestryAPI; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -24,10 +16,21 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; +import com.mojang.authlib.GameProfile; + +import forestry.api.climate.IClimateInfo; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; + +import binnie.botany.Botany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; +import binnie.botany.api.IFlower; +import binnie.botany.flower.TileEntityFlower; +import binnie.botany.items.BotanyItems; +import binnie.core.BinnieCore; public class Gardening { public static final Map fertiliserAcid = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index ce93ef14..3ca82a32 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -1,15 +1,17 @@ package binnie.botany.gardening; -import binnie.Binnie; -import binnie.botany.api.EnumSoilType; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import binnie.Binnie; +import binnie.botany.api.EnumSoilType; public class ItemSoil extends ItemBlock { private final EnumSoilType type; diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index a7750eac..60115e15 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -1,13 +1,5 @@ package binnie.botany.gardening; -import binnie.Binnie; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.IBlockSoil; -import binnie.core.BinnieCore; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -20,9 +12,20 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.Binnie; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.IBlockSoil; +import binnie.core.BinnieCore; + public class ItemSoilMeter extends Item implements IItemModelRegister { public ItemSoilMeter() { this.setCreativeTab(CreativeTabBotany.instance); diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index a8d23f62..090a342f 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -1,14 +1,7 @@ package binnie.botany.gardening; -import binnie.Constants; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; import com.google.common.collect.Multimap; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; + import net.minecraft.block.Block; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; @@ -28,9 +21,20 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.Constants; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; + public class ItemTrowel extends Item implements IItemModelRegister { protected final ToolMaterial theToolMaterial; protected final String locName; diff --git a/src/main/java/binnie/botany/gardening/ItemWeed.java b/src/main/java/binnie/botany/gardening/ItemWeed.java index 2c8798c9..ae18e362 100644 --- a/src/main/java/binnie/botany/gardening/ItemWeed.java +++ b/src/main/java/binnie/botany/gardening/ItemWeed.java @@ -1,10 +1,11 @@ package binnie.botany.gardening; -import binnie.Binnie; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import binnie.Binnie; + public class ItemWeed extends ItemBlock { public ItemWeed(Block block) { super(block); diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index bfbcea45..376abfbd 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -1,5 +1,20 @@ package binnie.botany.gardening; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +import net.minecraftforge.fml.common.registry.GameRegistry; + import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; @@ -28,18 +43,6 @@ import binnie.core.Mods; import binnie.core.block.TileEntityMetadata; import binnie.core.item.ItemMisc; import binnie.extratrees.carpentry.ItemDesign; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -import java.util.HashMap; -import java.util.Map; public class ModuleGardening implements IInitializable { public static final HashMap queuedAcidFertilisers = new HashMap<>(); diff --git a/src/main/java/binnie/botany/gardening/package-info.java b/src/main/java/binnie/botany/gardening/package-info.java index 4168ff23..3d85af70 100644 --- a/src/main/java/binnie/botany/gardening/package-info.java +++ b/src/main/java/binnie/botany/gardening/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.gardening; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java index 95774d71..d44016e3 100644 --- a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java +++ b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java @@ -1,9 +1,11 @@ package binnie.botany.genetics; +import net.minecraft.world.World; + +import forestry.api.genetics.IEffectData; + import binnie.botany.api.IAlleleFlowerEffect; import binnie.botany.api.IFlowerGenome; -import forestry.api.genetics.IEffectData; -import net.minecraft.world.World; public class AlleleEffectNone implements IAlleleFlowerEffect { @Override diff --git a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java index 32747234..70fff790 100644 --- a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java @@ -1,5 +1,17 @@ package binnie.botany.genetics; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.IModelManager; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IClassification; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.genetics.alleles.AlleleSpecies; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; @@ -8,15 +20,6 @@ import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IAlleleFlowerSpeciesBuilder; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; -import forestry.api.core.IModelManager; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IClassification; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.genetics.alleles.AlleleSpecies; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerSpecies, IAlleleFlowerSpeciesBuilder { private final IFlowerType flowerType; diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/src/main/java/binnie/botany/genetics/BotanistTracker.java index cefe698a..822a67c8 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -1,11 +1,13 @@ package binnie.botany.genetics; -import binnie.Binnie; -import binnie.botany.api.IBotanistTracker; +import net.minecraft.entity.player.EntityPlayer; + import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; -import net.minecraft.entity.player.EntityPlayer; + +import binnie.Binnie; +import binnie.botany.api.IBotanistTracker; public class BotanistTracker extends BreedingTracker implements IBotanistTracker { public BotanistTracker(final String s) { diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index fd987cca..bf3d568f 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -1,9 +1,11 @@ package binnie.botany.genetics; -import binnie.botany.core.BotanyCore; -import forestry.api.genetics.AlleleManager; import net.minecraft.util.IStringSerializable; +import forestry.api.genetics.AlleleManager; + +import binnie.botany.core.BotanyCore; + public enum EnumFlowerColor implements IStringSerializable { Aquamarine("aquamarine", 8388564), Black("black", 2631720), diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/src/main/java/binnie/botany/genetics/EnumFlowerType.java index 15c86d0e..6841e9bb 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -1,16 +1,19 @@ package binnie.botany.genetics; +import java.util.Locale; + +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.IModelManager; + import binnie.Constants; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IFlowerType; -import forestry.api.core.IModelManager; -import net.minecraft.client.renderer.block.model.ModelBakery; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Locale; public enum EnumFlowerType implements IFlowerType { Dandelion, diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index af1628de..9b0c35a8 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -1,5 +1,20 @@ package binnie.botany.genetics; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Random; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosome; +import forestry.core.genetics.Chromosome; +import forestry.core.genetics.Individual; + import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IColourMix; @@ -8,19 +23,6 @@ import binnie.botany.api.IFlowerColour; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerMutation; import binnie.botany.core.BotanyCore; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; -import forestry.core.genetics.Chromosome; -import forestry.core.genetics.Individual; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Random; public class Flower extends Individual implements IFlower { public IFlowerGenome genome; diff --git a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java index 697de160..7059931a 100644 --- a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java +++ b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java @@ -1,24 +1,31 @@ package binnie.botany.genetics; -import binnie.Binnie; -import binnie.botany.api.*; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.renderer.RenderUtil; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlyzerPlugin; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.StringUtils; - import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.RenderItem; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlyzerPlugin; + +import binnie.Binnie; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.FlowerManager; +import binnie.botany.api.IFlower; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.renderer.RenderUtil; + // TODO write flower alyzer plugin public class FlowerAlyzerPlugin implements IAlyzerPlugin { public static final FlowerAlyzerPlugin INSTANCE = new FlowerAlyzerPlugin(); diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 12076932..ad50a6b8 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -1,5 +1,19 @@ package binnie.botany.genetics; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; + import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; @@ -9,18 +23,6 @@ import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.genetics.Tolerance; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import java.util.TreeSet; public class FlowerBreedingSystem extends BreedingSystem { public FlowerBreedingSystem() { diff --git a/src/main/java/binnie/botany/genetics/FlowerColorAllele.java b/src/main/java/binnie/botany/genetics/FlowerColorAllele.java index 08358c48..1cefc212 100644 --- a/src/main/java/binnie/botany/genetics/FlowerColorAllele.java +++ b/src/main/java/binnie/botany/genetics/FlowerColorAllele.java @@ -1,8 +1,9 @@ package binnie.botany.genetics; +import forestry.api.genetics.IAlleleInteger; + import binnie.botany.Botany; import binnie.botany.api.IFlowerColour; -import forestry.api.genetics.IAlleleInteger; /** * Created by Marcin on 03.06.2017. diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index c78745f7..93258b88 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -1,5 +1,28 @@ package binnie.botany.genetics; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.common.MinecraftForge; + +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.core.EnumTemperature; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.AlleleSpeciesRegisterEvent; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleRegistry; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IClassification; +import forestry.core.genetics.alleles.AlleleHelper; +import forestry.core.genetics.alleles.EnumAllele; + import binnie.Constants; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumFlowerChromosome; @@ -15,26 +38,6 @@ import binnie.botany.api.IFlowerMutationBuilder; import binnie.botany.api.IFlowerRoot; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.AlleleSpeciesRegisterEvent; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IClassification; -import forestry.core.genetics.alleles.AlleleHelper; -import forestry.core.genetics.alleles.EnumAllele; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; public enum FlowerDefinition implements IFlowerDefinition { Dandelion("Dandelion", "taraxacum", "officinale", EnumFlowerType.Dandelion, EnumFlowerColor.Yellow) { diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/src/main/java/binnie/botany/genetics/FlowerFactory.java index c23dc743..754b61ed 100644 --- a/src/main/java/binnie/botany/genetics/FlowerFactory.java +++ b/src/main/java/binnie/botany/genetics/FlowerFactory.java @@ -1,5 +1,8 @@ package binnie.botany.genetics; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IClassification; + import binnie.botany.api.FlowerManager; import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IAlleleFlowerSpeciesBuilder; @@ -7,8 +10,6 @@ import binnie.botany.api.IFlowerFactory; import binnie.botany.api.IFlowerMutationBuilder; import binnie.botany.api.IFlowerType; import binnie.botany.flower.FlowerSpriteManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IClassification; public class FlowerFactory implements IFlowerFactory { @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index 01f2525e..5a7a3c32 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -1,5 +1,20 @@ package binnie.botany.genetics; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import forestry.api.core.EnumTemperature; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAlleleFloat; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IChromosome; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.genetics.Genome; + import binnie.Binnie; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumFlowerChromosome; @@ -9,19 +24,6 @@ import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IChromosome; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.genetics.Genome; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import javax.annotation.Nullable; public class FlowerGenome extends Genome implements IFlowerGenome { public FlowerGenome(final NBTTagCompound nbttagcompound) { diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/src/main/java/binnie/botany/genetics/FlowerMutation.java index 8755e41e..120dc957 100644 --- a/src/main/java/binnie/botany/genetics/FlowerMutation.java +++ b/src/main/java/binnie/botany/genetics/FlowerMutation.java @@ -1,17 +1,19 @@ package binnie.botany.genetics; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import forestry.api.core.ForestryAPI; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IMutation; +import forestry.core.genetics.mutations.Mutation; + import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerMutation; import binnie.botany.api.IFlowerMutationBuilder; import binnie.botany.api.IFlowerRoot; import binnie.botany.core.BotanyCore; -import forestry.api.core.ForestryAPI; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IMutation; -import forestry.core.genetics.mutations.Mutation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class FlowerMutation extends Mutation implements IFlowerMutation, IFlowerMutationBuilder { public FlowerMutation(final IAlleleFlowerSpecies allele0, final IAlleleFlowerSpecies allele1, final IAllele[] template, final int chance) { diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/src/main/java/binnie/botany/genetics/FlowerRoot.java index a63d207b..23519cbc 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -1,5 +1,29 @@ package binnie.botany.genetics; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlyzerPlugin; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesType; +import forestry.core.genetics.SpeciesRoot; + import binnie.botany.Botany; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; @@ -10,27 +34,6 @@ import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerMutation; import binnie.botany.api.IFlowerRoot; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlyzerPlugin; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesType; -import forestry.core.genetics.SpeciesRoot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { static final String UID = "rootFlowers"; diff --git a/src/main/java/binnie/botany/genetics/FlowerTemplates.java b/src/main/java/binnie/botany/genetics/FlowerTemplates.java index eb8e9204..198ab52b 100644 --- a/src/main/java/binnie/botany/genetics/FlowerTemplates.java +++ b/src/main/java/binnie/botany/genetics/FlowerTemplates.java @@ -1,10 +1,11 @@ package binnie.botany.genetics; -import binnie.botany.api.EnumFlowerChromosome; import forestry.api.genetics.IAllele; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; +import binnie.botany.api.EnumFlowerChromosome; + public class FlowerTemplates { public static IAllele[] getDefaultTemplate() { final IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length]; diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 7a122484..1fec5ebf 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -1,10 +1,5 @@ package binnie.botany.genetics; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.core.BotanyGUI; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -13,9 +8,17 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.core.BotanyGUI; + public class ItemDictionary extends Item implements IItemModelRegister { public ItemDictionary() { this.setCreativeTab(CreativeTabBotany.instance); diff --git a/src/main/java/binnie/botany/genetics/package-info.java b/src/main/java/binnie/botany/genetics/package-info.java index 079e14ec..a413a22c 100644 --- a/src/main/java/binnie/botany/genetics/package-info.java +++ b/src/main/java/binnie/botany/genetics/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.genetics; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index 635c09a3..b32e8c2d 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -1,10 +1,11 @@ package binnie.botany.items; +import java.util.List; + +import net.minecraft.item.ItemStack; + import binnie.botany.Botany; import binnie.core.item.IItemMiscProvider; -import net.minecraft.item.ItemStack; - -import java.util.List; public enum BotanyItems implements IItemMiscProvider { AshPowder("Ash Powder", "powder_ash"), diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index 2d79fd62..179b11b2 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -1,17 +1,20 @@ package binnie.botany.items; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.items.IColoredItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.items.IColoredItem; + +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; + public class ItemClay extends Item implements IColoredItem, IItemModelRegister { public ItemClay() { this.setUnlocalizedName("clay"); diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index 8d82abd0..aab82f7e 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -1,17 +1,20 @@ package binnie.botany.items; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.items.IColoredItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.items.IColoredItem; + +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; + public class ItemPigment extends Item implements IItemModelRegister, IColoredItem { public ItemPigment() { this.setUnlocalizedName("pigment"); diff --git a/src/main/java/binnie/botany/items/package-info.java b/src/main/java/binnie/botany/items/package-info.java index e65b0b82..8574fdd9 100644 --- a/src/main/java/binnie/botany/items/package-info.java +++ b/src/main/java/binnie/botany/items/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.items; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/network/PacketFlowerUpdate.java b/src/main/java/binnie/botany/network/PacketFlowerUpdate.java index 201744b3..cb6a6f9b 100644 --- a/src/main/java/binnie/botany/network/PacketFlowerUpdate.java +++ b/src/main/java/binnie/botany/network/PacketFlowerUpdate.java @@ -1,14 +1,15 @@ package binnie.botany.network; -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.botany.genetics.EnumFlowerType; +import java.io.IOException; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.math.BlockPos; -import java.io.IOException; +import binnie.botany.flower.TileEntityFlower; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.genetics.EnumFlowerType; public class PacketFlowerUpdate extends SPacketUpdateTileEntity { public TileEntityFlower.RenderInfo render; diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 9dacd1b0..93f52ba6 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -1,5 +1,14 @@ package binnie.botany.network; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextComponentString; + +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; + +import forestry.api.genetics.AlleleManager; + import binnie.Binnie; import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.genetics.EnumFlowerColor; @@ -7,12 +16,6 @@ import binnie.core.BinnieCore; import binnie.core.network.IPacketID; import binnie.core.network.packet.MessageBinnie; import binnie.core.network.packet.MessageNBT; -import forestry.api.genetics.AlleleManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.TextComponentString; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; public enum PacketID implements IPacketID { FIELDKIT; diff --git a/src/main/java/binnie/botany/network/package-info.java b/src/main/java/binnie/botany/network/package-info.java index 7fb44fd5..68a5eb01 100644 --- a/src/main/java/binnie/botany/network/package-info.java +++ b/src/main/java/binnie/botany/network/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.network; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/package-info.java b/src/main/java/binnie/botany/package-info.java index 319ffc61..c751fc64 100644 --- a/src/main/java/binnie/botany/package-info.java +++ b/src/main/java/binnie/botany/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/proxy/ProxyClient.java b/src/main/java/binnie/botany/proxy/ProxyClient.java index 4fac2107..95ac5ddf 100644 --- a/src/main/java/binnie/botany/proxy/ProxyClient.java +++ b/src/main/java/binnie/botany/proxy/ProxyClient.java @@ -1,11 +1,13 @@ package binnie.botany.proxy; +import net.minecraft.block.Block; +import net.minecraft.item.Item; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Constants; import binnie.core.models.ModelManager; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IBotanyProxy { diff --git a/src/main/java/binnie/botany/proxy/package-info.java b/src/main/java/binnie/botany/proxy/package-info.java index 4e28bc7d..9eb2e7be 100644 --- a/src/main/java/binnie/botany/proxy/package-info.java +++ b/src/main/java/binnie/botany/proxy/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.botany.proxy; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index fb321e29..d299e5ae 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -1,5 +1,17 @@ package binnie.core; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import net.minecraftforge.common.MinecraftForge; + +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; + import binnie.Binnie; import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; @@ -7,15 +19,6 @@ import binnie.core.network.IPacketID; import binnie.core.network.IPacketProvider; import binnie.core.network.packet.MessageBinnie; import binnie.core.proxy.IProxyCore; -import com.google.common.base.Preconditions; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public abstract class AbstractMod implements IPacketProvider, IInitializable { protected List modules; diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 4cf0244a..c322fde7 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,5 +1,32 @@ package binnie.core; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.Item; + +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidRegistry; + +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.plugins.PluginManager; + import binnie.Binnie; import binnie.Constants; import binnie.core.block.TileEntityMetadata; @@ -24,32 +51,6 @@ import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; -import com.google.common.base.Preconditions; -import forestry.api.core.ForestryEvent; -import forestry.plugins.PluginManager; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; @Mod( modid = Constants.CORE_MOD_ID, diff --git a/src/main/java/binnie/core/ExtraBeeTexture.java b/src/main/java/binnie/core/ExtraBeeTexture.java index c71010c8..d7a5e499 100644 --- a/src/main/java/binnie/core/ExtraBeeTexture.java +++ b/src/main/java/binnie/core/ExtraBeeTexture.java @@ -1,13 +1,14 @@ package binnie.core; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public enum ExtraBeeTexture implements IBinnieTexture { AlvearyMutator(ResourceType.Tile, "alveary/AlvearyMutator"), diff --git a/src/main/java/binnie/core/block/BaseBakedModel.java b/src/main/java/binnie/core/block/BaseBakedModel.java index 6d21b816..fc97c8ce 100644 --- a/src/main/java/binnie/core/block/BaseBakedModel.java +++ b/src/main/java/binnie/core/block/BaseBakedModel.java @@ -16,6 +16,14 @@ package binnie.core.block; * limitations under the License. */ +import javax.annotation.Nullable; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import java.util.EnumMap; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -23,17 +31,12 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.common.model.TRSRTransformation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import java.util.EnumMap; @SideOnly(Side.CLIENT) public abstract class BaseBakedModel implements IPerspectiveAwareModel { diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index bc393b52..6689eebe 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -1,6 +1,9 @@ package binnie.core.block; -import binnie.core.BinnieCore; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -15,9 +18,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; +import binnie.core.BinnieCore; public class BlockMetadata extends BlockContainer implements IBlockMetadata { static int temporyMeta = -1; diff --git a/src/main/java/binnie/core/block/IMultipassBlock.java b/src/main/java/binnie/core/block/IMultipassBlock.java index 8ed490e5..a8e85baf 100644 --- a/src/main/java/binnie/core/block/IMultipassBlock.java +++ b/src/main/java/binnie/core/block/IMultipassBlock.java @@ -1,16 +1,17 @@ package binnie.core.block; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; - public interface IMultipassBlock { default AxisAlignedBB getItemBoundingBox() { return Block.FULL_BLOCK_AABB; diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index b4512f0b..a85a6ca9 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index b8d5913a..9be053ee 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -1,6 +1,9 @@ package binnie.core.block; import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; @@ -12,8 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import javax.annotation.Nullable; - public class TileEntityMetadata extends TileEntity { private int meta; private boolean droppedBlock; diff --git a/src/main/java/binnie/core/block/package-info.java b/src/main/java/binnie/core/block/package-info.java index ca45c4a6..0485ae3e 100644 --- a/src/main/java/binnie/core/block/package-info.java +++ b/src/main/java/binnie/core/block/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.block; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/src/main/java/binnie/core/circuits/BinnieCircuit.java index 46c447ec..28db4073 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -1,13 +1,14 @@ package binnie.core.circuits; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; -import java.util.List; public class BinnieCircuit implements ICircuit { private String uid; diff --git a/src/main/java/binnie/core/circuits/package-info.java b/src/main/java/binnie/core/circuits/package-info.java index a95770ed..a0732c08 100644 --- a/src/main/java/binnie/core/circuits/package-info.java +++ b/src/main/java/binnie/core/circuits/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.circuits; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/CraftGUI.java b/src/main/java/binnie/core/craftgui/CraftGUI.java index f2bf7890..570b36c7 100644 --- a/src/main/java/binnie/core/craftgui/CraftGUI.java +++ b/src/main/java/binnie/core/craftgui/CraftGUI.java @@ -1,9 +1,10 @@ package binnie.core.craftgui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.renderer.TextureRenderer; import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class CraftGUI { diff --git a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java index 67db59d4..d42373f8 100644 --- a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java @@ -1,9 +1,9 @@ package binnie.core.craftgui; -import binnie.core.craftgui.geometry.Point; - import javax.annotation.Nullable; +import binnie.core.craftgui.geometry.Point; + public interface ITopLevelWidget extends IWidget { void setMousePosition(final int p0, final int p1); diff --git a/src/main/java/binnie/core/craftgui/IWidget.java b/src/main/java/binnie/core/craftgui/IWidget.java index 6ea366b0..8cab1663 100644 --- a/src/main/java/binnie/core/craftgui/IWidget.java +++ b/src/main/java/binnie/core/craftgui/IWidget.java @@ -1,14 +1,15 @@ package binnie.core.craftgui; +import javax.annotation.Nullable; +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.events.Event; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; public interface IWidget { @Nullable diff --git a/src/main/java/binnie/core/craftgui/Tooltip.java b/src/main/java/binnie/core/craftgui/Tooltip.java index f5417be3..0e08d67a 100644 --- a/src/main/java/binnie/core/craftgui/Tooltip.java +++ b/src/main/java/binnie/core/craftgui/Tooltip.java @@ -1,12 +1,13 @@ package binnie.core.craftgui; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; - import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fluids.FluidStack; + public class Tooltip { public int maxWidth; List tooltip; diff --git a/src/main/java/binnie/core/craftgui/TopLevelWidget.java b/src/main/java/binnie/core/craftgui/TopLevelWidget.java index 8f321721..163c0248 100644 --- a/src/main/java/binnie/core/craftgui/TopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/TopLevelWidget.java @@ -1,11 +1,5 @@ package binnie.core.craftgui; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import org.lwjgl.input.Mouse; - import javax.annotation.Nullable; import java.util.ArrayDeque; import java.util.ArrayList; @@ -14,6 +8,13 @@ import java.util.Deque; import java.util.List; import java.util.ListIterator; +import org.lwjgl.input.Mouse; + +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; + public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { protected Point mousePosition; @Nullable diff --git a/src/main/java/binnie/core/craftgui/Widget.java b/src/main/java/binnie/core/craftgui/Widget.java index 0d755226..90aa3f71 100644 --- a/src/main/java/binnie/core/craftgui/Widget.java +++ b/src/main/java/binnie/core/craftgui/Widget.java @@ -1,17 +1,18 @@ package binnie.core.craftgui; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.events.Event; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; public class Widget implements IWidget { @Nullable diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java index c5eef0ff..3447b431 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -1,5 +1,25 @@ package binnie.core.craftgui; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -21,23 +41,6 @@ import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.gui.ControlGenesisOption; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; public class WindowGenesis extends Window { private ISpeciesRoot root; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java index 07679be5..4fc1d366 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.controls; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -12,8 +15,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlCheckbox extends Control implements IControlValue { private boolean value; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlText.java b/src/main/java/binnie/core/craftgui/controls/ControlText.java index c4fbe844..13f65103 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlText.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.controls; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; @@ -7,8 +10,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlText extends Control implements IControlValue { private String text; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index 01c0d2fd..da50d8f8 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.controls; +import net.minecraft.client.gui.GuiTextField; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -11,9 +16,6 @@ import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.events.EventTextEdit; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraft.client.gui.GuiTextField; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ControlTextEdit extends Control implements IControlValue { diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java index 0d897e4f..8c0e054c 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.controls.button; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -10,10 +15,6 @@ import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ControlButton extends Control { @Nullable diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java index 34e67a98..1f11b779 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java @@ -1,15 +1,16 @@ package binnie.core.craftgui.controls.button; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventValueChanged; import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventValueChanged; + public class ControlEnumButton extends ControlButton implements IControlValue { public static final String eventEnumChanged = "eventEnumButtonChanged"; private T currentSelection; diff --git a/src/main/java/binnie/core/craftgui/controls/button/package-info.java b/src/main/java/binnie/core/craftgui/controls/button/package-info.java index 0075f383..7d074098 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/button/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.controls.button; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java index 3a8c9cc8..da7de380 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -1,5 +1,12 @@ package binnie.core.craftgui.controls.core; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.ITooltipHelp; @@ -9,12 +16,6 @@ import binnie.core.craftgui.Widget; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; public class Control extends Widget implements ITooltipHelp, ITooltip { public int extraLevel; diff --git a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java index 96b83fc2..6669e1b4 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java +++ b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java @@ -1,9 +1,9 @@ package binnie.core.craftgui.controls.core; -import binnie.core.craftgui.IWidget; - import javax.annotation.Nullable; +import binnie.core.craftgui.IWidget; + public interface IControlValue extends IWidget { @Nullable T getValue(); diff --git a/src/main/java/binnie/core/craftgui/controls/core/package-info.java b/src/main/java/binnie/core/craftgui/controls/core/package-info.java index 68863256..1dcda81a 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/core/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.controls.core; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java index 6f26a3de..717d2748 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.controls.listbox; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; @@ -7,11 +12,6 @@ import binnie.core.craftgui.events.EventValueChanged; import binnie.core.craftgui.geometry.Point; import binnie.core.util.IValidator; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; - public class ControlList extends Control implements IControlValue { ControlListBox parent; Map allOptions; diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java index 8f6abc3e..99cb2966 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java @@ -1,13 +1,13 @@ package binnie.core.craftgui.controls.listbox; +import java.util.Collection; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.controls.scroll.ControlScrollableContent; import binnie.core.craftgui.events.EventKey; import binnie.core.util.IValidator; -import java.util.Collection; - public class ControlListBox extends ControlScrollableContent> implements IControlValue { public ControlListBox(final IWidget parent, final int x, final int y, final int w, final int h, final int scrollBarSize) { super(parent, x, y, w, h, scrollBarSize); diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java index 0e97e817..e1686ae1 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java @@ -1,13 +1,14 @@ package binnie.core.craftgui.controls.listbox; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlOption extends Control implements IControlValue { private T value; diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java b/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java index e907e22a..e0b8674d 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.controls.listbox; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/package-info.java b/src/main/java/binnie/core/craftgui/controls/package-info.java index 19d4d1df..2b80cca7 100644 --- a/src/main/java/binnie/core/craftgui/controls/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.controls; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java index 7767f2af..b50c681b 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java @@ -1,15 +1,15 @@ package binnie.core.craftgui.controls.page; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.controls.core.IControlValues; import binnie.core.craftgui.events.EventValueChanged; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - public class ControlPages extends Control implements IControlValues, IControlValue { T value; diff --git a/src/main/java/binnie/core/craftgui/controls/page/package-info.java b/src/main/java/binnie/core/craftgui/controls/page/package-info.java index 53a3184c..876efc86 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/page/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.controls.page; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java index cc656bdf..5e6c8b62 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.controls.scroll; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -7,8 +10,6 @@ import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlScrollBar extends Control { protected final IControlScrollable scrollable; diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java index 78c952a0..6eb42f65 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.controls.scroll; +import javax.annotation.Nullable; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventMouse; @@ -7,8 +9,6 @@ import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; -import javax.annotation.Nullable; - public class ControlScrollableContent extends Control implements IControlScrollable { @Nullable protected T controlChild; diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java b/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java index a7fe2fcc..a6d4d984 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.controls.scroll; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java index 190e2d22..a959b0c4 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.controls.tab; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -16,8 +19,6 @@ import binnie.core.craftgui.minecraft.control.ControlTabIcon; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlTab extends Control implements ITooltip, IControlValue { protected T value; diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java index 4c8ab1ee..bcd9bd2f 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java @@ -1,14 +1,15 @@ package binnie.core.craftgui.controls.tab; +import com.google.common.collect.Iterables; + +import java.util.Collection; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventValueChanged; import binnie.core.craftgui.geometry.Position; -import com.google.common.collect.Iterables; - -import java.util.Collection; public class ControlTabBar extends Control implements IControlValue { private T value; diff --git a/src/main/java/binnie/core/craftgui/controls/tab/package-info.java b/src/main/java/binnie/core/craftgui/controls/tab/package-info.java index e067d135..97e5a599 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.controls.tab; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java index 98b68707..6c3ff68f 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java @@ -1,8 +1,9 @@ package binnie.core.craftgui.database; +import forestry.api.genetics.IClassification; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; -import forestry.api.genetics.IClassification; class ControlBranchBox extends ControlListBox { public ControlBranchBox(final IWidget parent, final int x, final int y, final int width, final int height) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java index 7f59516b..66efb04c 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java @@ -1,8 +1,9 @@ package binnie.core.craftgui.database; +import forestry.api.genetics.IClassification; + import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlTextOption; -import forestry.api.genetics.IClassification; class ControlBranchBoxOption extends ControlTextOption { public ControlBranchBoxOption(final ControlList controlList, final IClassification option, final int y) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java index 11c3a49c..22bb8eae 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.database; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; @@ -11,8 +14,6 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; class ControlBreedingProgress extends Control { private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2); diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index 3e5cb76e..85857aae 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -1,5 +1,19 @@ package binnie.core.craftgui.database; +import javax.annotation.Nullable; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; @@ -11,16 +25,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.BreedingSystem; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ControlDatabaseIndividualDisplay extends ControlItemDisplay implements ITooltip { EnumDiscoveryState discovered; diff --git a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java index c53a1fab..7b14cfb5 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.database; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.controls.listbox.ControlList; @@ -7,9 +12,6 @@ import binnie.core.craftgui.controls.listbox.ControlTextOption; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ControlItemStackOption extends ControlTextOption { diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java index 3083a0df..bb9be862 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java @@ -1,13 +1,14 @@ package binnie.core.craftgui.database; +import java.util.List; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IMutation; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IMutation; - -import java.util.List; class ControlMutationBox extends ControlListBox { private int index; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java index 093fa127..25ee789b 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java @@ -1,11 +1,12 @@ package binnie.core.craftgui.database; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IMutation; + import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlOption; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IMutation; class ControlMutationItem extends ControlOption { private ControlDatabaseIndividualDisplay itemWidget1; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java index 9557fc7a..0780b2a0 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java @@ -1,5 +1,11 @@ package binnie.core.craftgui.database; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IMutation; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -12,10 +18,6 @@ import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IMutation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; class ControlMutationSymbol extends Control implements ITooltip { private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java index 38a1bf0a..5eab60d9 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java @@ -1,18 +1,21 @@ package binnie.core.craftgui.database; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.minecraft.Window; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IClassification; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IClassification; + +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.minecraft.Window; + @SideOnly(Side.CLIENT) public class ControlSpeciesBox extends ControlListBox { private IClassification branch; diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java index 8eace00d..f81bc4a3 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java @@ -1,14 +1,16 @@ package binnie.core.craftgui.database; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlTextOption; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Point; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) class ControlSpeciesBoxOption extends ControlTextOption { diff --git a/src/main/java/binnie/core/craftgui/database/PageBranch.java b/src/main/java/binnie/core/craftgui/database/PageBranch.java index 56401a56..c3d0107f 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranch.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranch.java @@ -1,8 +1,9 @@ package binnie.core.craftgui.database; -import binnie.core.craftgui.IWidget; import forestry.api.genetics.IClassification; +import binnie.core.craftgui.IWidget; + abstract class PageBranch extends PageAbstract { public PageBranch(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index 179224d9..b03c4482 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -1,18 +1,21 @@ package binnie.core.craftgui.database; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IClassification; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.renderer.RenderUtil; -import forestry.api.genetics.IClassification; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; @SideOnly(Side.CLIENT) public class PageBranchOverview extends PageBranch { diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index 920ea044..ee77cff5 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -1,14 +1,16 @@ package binnie.core.craftgui.database; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IClassification; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.events.EventValueChanged; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IClassification; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class PageBranchSpecies extends PageBranch { diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java index 73af4a23..6318ccad 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -1,13 +1,15 @@ package binnie.core.craftgui.database; +import net.minecraft.util.text.TextFormatting; + +import com.mojang.authlib.GameProfile; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.page.ControlPage; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; -import com.mojang.authlib.GameProfile; -import net.minecraft.util.text.TextFormatting; public class PageBreeder extends ControlPage { private GameProfile player; diff --git a/src/main/java/binnie/core/craftgui/database/PageBreederStats.java b/src/main/java/binnie/core/craftgui/database/PageBreederStats.java index eb8701c4..2b298310 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreederStats.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreederStats.java @@ -1,12 +1,13 @@ package binnie.core.craftgui.database; +import net.minecraft.util.text.TextFormatting; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.core.Control; import binnie.core.genetics.BreedingSystem; -import net.minecraft.util.text.TextFormatting; public class PageBreederStats extends Control { String player; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpecies.java b/src/main/java/binnie/core/craftgui/database/PageSpecies.java index 58c76c6d..ac28d711 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpecies.java @@ -1,8 +1,9 @@ package binnie.core.craftgui.database; -import binnie.core.craftgui.IWidget; import forestry.api.genetics.IAlleleSpecies; +import binnie.core.craftgui.IWidget; + public abstract class PageSpecies extends PageAbstract { public PageSpecies(final IWidget parent, final DatabaseTab tab) { super(parent, tab); diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java index a75ee8f9..013b7872 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java @@ -1,13 +1,14 @@ package binnie.core.craftgui.database; +import java.util.LinkedHashMap; +import java.util.Map; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IClassification; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IClassification; - -import java.util.LinkedHashMap; -import java.util.Map; public class PageSpeciesClassification extends PageSpecies { private Map levels; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java index 455e1e55..3a7beafa 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java @@ -1,10 +1,11 @@ package binnie.core.craftgui.database; +import forestry.api.genetics.IAlleleSpecies; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; -import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesMutations extends PageSpecies { private ControlText pageSpeciesFurther_Title; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index bb6795cd..c721e97e 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -1,5 +1,14 @@ package binnie.core.craftgui.database; +import java.util.Objects; + +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; + import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -8,12 +17,6 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Objects; @SideOnly(Side.CLIENT) public class PageSpeciesOverview extends PageSpecies { diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java index 9e4d18f3..0c9873f4 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java @@ -1,10 +1,11 @@ package binnie.core.craftgui.database; +import forestry.api.genetics.IAlleleSpecies; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; -import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesResultant extends PageSpecies { private ControlText pageSpeciesResultant_Title; diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index e640ab3a..dfed1a55 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -1,5 +1,22 @@ package binnie.core.craftgui.database; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +import net.minecraft.entity.player.EntityPlayer; + +import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IClassification; + import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextEdit; @@ -21,19 +38,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlHelp; import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IClassification; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; public abstract class WindowAbstractDatabase extends Window { private final int infoBoxWidth = 144; diff --git a/src/main/java/binnie/core/craftgui/database/package-info.java b/src/main/java/binnie/core/craftgui/database/package-info.java index 85232368..f3bed8b5 100644 --- a/src/main/java/binnie/core/craftgui/database/package-info.java +++ b/src/main/java/binnie/core/craftgui/database/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.database; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java index 9f1c4fb3..8a4c2979 100644 --- a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java @@ -1,9 +1,9 @@ package binnie.core.craftgui.events; -import binnie.core.craftgui.IWidget; - import javax.annotation.Nullable; +import binnie.core.craftgui.IWidget; + public class EventValueChanged extends Event { @Nullable public T value; diff --git a/src/main/java/binnie/core/craftgui/events/package-info.java b/src/main/java/binnie/core/craftgui/events/package-info.java index 2ffe8613..3e67d746 100644 --- a/src/main/java/binnie/core/craftgui/events/package-info.java +++ b/src/main/java/binnie/core/craftgui/events/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.events; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/geometry/package-info.java b/src/main/java/binnie/core/craftgui/geometry/package-info.java index b9e65f97..6649fdd6 100644 --- a/src/main/java/binnie/core/craftgui/geometry/package-info.java +++ b/src/main/java/binnie/core/craftgui/geometry/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.geometry; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java index b33cfded..523512b1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java @@ -1,15 +1,16 @@ package binnie.core.craftgui.minecraft; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.IInventorySlots; -import binnie.core.machines.inventory.InventorySlot; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ClickType; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.IInventorySlots; +import binnie.core.machines.inventory.InventorySlot; public class CustomSlot extends Slot { public CustomSlot(final IInventory inventory, final int index) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java index a7dc44e9..41803004 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.minecraft; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -9,8 +12,6 @@ import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public abstract class Dialog extends Control { diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index c894d692..94b83121 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -1,11 +1,9 @@ package binnie.core.craftgui.minecraft; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.events.EventKey; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.renderer.RenderUtil; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; @@ -17,15 +15,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; + import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.events.EventKey; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; @SideOnly(Side.CLIENT) public class GuiCraftGUI extends GuiContainer { diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java index 70774c44..e94721a3 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java @@ -1,8 +1,9 @@ package binnie.core.craftgui.minecraft; -import binnie.core.craftgui.Tooltip; import net.minecraft.util.text.TextFormatting; +import binnie.core.craftgui.Tooltip; + public class MinecraftTooltip extends Tooltip { public static int getOutline(final ITooltipType type) { return TypeColour.valueOf(type.toString()).getOutline(); diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java index a6460d7b..84d375a1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -1,5 +1,22 @@ package binnie.core.craftgui.minecraft; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Deque; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -33,19 +50,6 @@ import binnie.core.network.packet.MessageCraftGUI; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import com.google.common.base.Preconditions; -import com.mojang.authlib.GameProfile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Deque; public abstract class Window extends TopLevelWidget implements INetwork.ReceiveGuiNBT { private final Side side; diff --git a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java index ef70df6c..1af9ee66 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java @@ -1,18 +1,19 @@ package binnie.core.craftgui.minecraft; -import binnie.core.machines.inventory.SlotValidator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; + +import binnie.core.machines.inventory.SlotValidator; + public class WindowInventory implements IInventory { private Window window; private Map inventory; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 760ee0c1..b187069f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,5 +1,13 @@ package binnie.core.craftgui.minecraft.control; +import javax.annotation.Nullable; + +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -17,12 +25,6 @@ import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.IProcess; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ControlEnergyBar extends Control implements ITooltip { public static boolean isError; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java index 89957d61..19f85eb3 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java @@ -1,5 +1,12 @@ package binnie.core.craftgui.minecraft.control; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.InventoryPlayer; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -12,11 +19,6 @@ import binnie.core.craftgui.minecraft.MinecraftTooltip; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.ErrorState; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ControlErrorState extends Control implements ITooltip { @Nullable diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java index 7595eaeb..ce026a87 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -7,8 +10,6 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlHelp extends Control implements ITooltip { public ControlHelp(final IWidget parent, final int x, final int y) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java index 05f0c884..cb634c76 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java @@ -1,15 +1,17 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.resource.BinnieSprite; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ControlIconDisplay extends Control { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java index 09187991..d7e40e6e 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java @@ -1,12 +1,13 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlImage extends Control { private Object key; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index 879b0bc2..9180ebb7 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -7,8 +10,6 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlInfo extends Control implements ITooltip { private String info; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java index 737a9ab1..e33148da 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java @@ -1,5 +1,14 @@ package binnie.core.craftgui.minecraft.control; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -8,13 +17,6 @@ import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; public class ControlItemDisplay extends Control implements ITooltip { public boolean hastooltip; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index 3335aed6..7aebf2c1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -1,5 +1,21 @@ package binnie.core.craftgui.minecraft.control; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fluids.Fluid; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; @@ -20,18 +36,6 @@ import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.TankInfo; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public class ControlLiquidTank extends Control implements ITooltip { public static List tankError = new ArrayList<>(); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java index 6a46ad6a..8eac35d9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java @@ -1,15 +1,16 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.minecraft.InventoryType; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.minecraft.InventoryType; + public class ControlPlayerInventory extends Control { private final List slots; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index 5d1a1924..d343f4a3 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -8,8 +11,6 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.PowerSystem; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlPowerSystem extends Control implements ITooltip { private PowerSystem system; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java index 9e036537..8ae38143 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java @@ -1,11 +1,12 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.resource.Texture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlProgress extends ControlProgressBase { private Texture progressBlank; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index bf78b956..65ee8cd2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.client.renderer.GlStateManager; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -12,9 +17,6 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSlide extends Control { private Area expanded; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index ced5a484..9ffb32ac 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -1,5 +1,24 @@ package binnie.core.craftgui.minecraft.control; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.multiplayer.PlayerControllerMP; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ClickType; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; @@ -16,23 +35,6 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.SlotValidator; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.multiplayer.PlayerControllerMP; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; public class ControlSlot extends ControlSlotBase { public static final Map> highlighting = new EnumMap<>(EnumHighlighting.class); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java index 0ddce79b..0c124407 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java @@ -1,15 +1,16 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.minecraft.InventoryType; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.minecraft.InventoryType; + public class ControlSlotArray extends Control implements Iterable { private List slots = new ArrayList<>(); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java index 4ccbff91..e7a60034 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -12,9 +17,6 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class ControlSlotBase extends Control implements ITooltip { private ControlItemDisplay itemDisplay; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java index 97487f97..0a0baa23 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; @@ -9,8 +12,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSlotCharge extends Control { private int slot; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java index 1d3b6c78..c30d5023 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java @@ -1,12 +1,14 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.controls.tab.ControlTab; import binnie.core.craftgui.controls.tab.ControlTabBar; import binnie.core.craftgui.geometry.Point; import binnie.core.genetics.IItemStackRepresentitive; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlTabIcon extends ControlTab { private ControlItemDisplay item; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index cf1d2793..dbe6eec6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.minecraft.control; +import java.util.Objects; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -7,10 +12,6 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Objects; public class ControlUser extends Control implements ITooltip { String team; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java b/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java index 3b2a01ef..f9cdd8bb 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.minecraft.control; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/minecraft/package-info.java b/src/main/java/binnie/core/craftgui/minecraft/package-info.java index bc44d7b5..b3bf6802 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/package-info.java +++ b/src/main/java/binnie/core/craftgui/minecraft/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.minecraft; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java b/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java index 5ed67910..362ab967 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java +++ b/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.minecraft.render; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/package-info.java b/src/main/java/binnie/core/craftgui/package-info.java index 5c0e6344..7b862349 100644 --- a/src/main/java/binnie/core/craftgui/package-info.java +++ b/src/main/java/binnie/core/craftgui/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java index a10c706a..ab5d8fd9 100644 --- a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java +++ b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java @@ -1,11 +1,10 @@ package binnie.core.craftgui.renderer; -import binnie.core.BinnieCore; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; import com.google.common.base.Preconditions; -import forestry.api.core.ForestryAPI; + +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -16,14 +15,20 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; + import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import forestry.api.core.ForestryAPI; + +import binnie.core.BinnieCore; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; @SideOnly(Side.CLIENT) public class RenderUtil { diff --git a/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java b/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java index 1a2d318c..ca02f5cd 100644 --- a/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java +++ b/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java @@ -1,5 +1,17 @@ package binnie.core.craftgui.renderer; +import javax.annotation.Nullable; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; + +import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.geometry.Area; @@ -8,15 +20,6 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.resource.IStyleSheet; import binnie.core.craftgui.resource.Texture; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraftforge.fml.client.config.GuiUtils; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - -import javax.annotation.Nullable; @SideOnly(Side.CLIENT) public class TextureRenderer { diff --git a/src/main/java/binnie/core/craftgui/renderer/package-info.java b/src/main/java/binnie/core/craftgui/renderer/package-info.java index c7d39b20..eb8e3536 100644 --- a/src/main/java/binnie/core/craftgui/renderer/package-info.java +++ b/src/main/java/binnie/core/craftgui/renderer/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.renderer; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheet.java b/src/main/java/binnie/core/craftgui/resource/StyleSheet.java index 7a29b8e4..509bdd75 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheet.java @@ -1,11 +1,11 @@ package binnie.core.craftgui.resource; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.HashMap; import java.util.Map; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + public class StyleSheet implements IStyleSheet { protected Map textures; diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java index e1a0e7c1..1fd5ba0b 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java @@ -1,9 +1,10 @@ package binnie.core.craftgui.resource; -import binnie.core.craftgui.CraftGUI; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.craftgui.CraftGUI; + public class StyleSheetManager { static IStyleSheet defaultSS = new DefaultStyleSheet(); diff --git a/src/main/java/binnie/core/craftgui/resource/Texture.java b/src/main/java/binnie/core/craftgui/resource/Texture.java index b3c40e37..a49fb014 100644 --- a/src/main/java/binnie/core/craftgui/resource/Texture.java +++ b/src/main/java/binnie/core/craftgui/resource/Texture.java @@ -1,12 +1,13 @@ package binnie.core.craftgui.resource; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Border; import binnie.core.craftgui.geometry.Position; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class Texture { private final Area area; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java index d3c13376..7ec67d34 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -1,22 +1,10 @@ package binnie.core.craftgui.resource.minecraft; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Border; -import binnie.core.craftgui.resource.Texture; -import binnie.core.resource.IBinnieTexture; import com.google.common.base.Charsets; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonParser; -import net.minecraft.client.resources.IResource; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.io.IOUtils; import java.io.BufferedReader; import java.io.IOException; @@ -26,6 +14,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.io.IOUtils; + +import net.minecraft.client.resources.IResource; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.resource.Texture; +import binnie.core.resource.IBinnieTexture; + @SideOnly(Side.CLIENT) public class CraftGUIResourceManager implements IResourceManagerReloadListener { private Map textureSheets; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java index 65274f02..7afde46b 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java @@ -1,12 +1,13 @@ package binnie.core.craftgui.resource.minecraft; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public enum CraftGUITextureSheet implements IBinnieTexture { Controls2("controls"), diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java index 1677e8bb..3fefde93 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java @@ -1,12 +1,13 @@ package binnie.core.craftgui.resource.minecraft; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; class ParsedTextureSheet implements IBinnieTexture { private String name; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java index 6bdc7743..04bfc280 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java @@ -1,12 +1,13 @@ package binnie.core.craftgui.resource.minecraft; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Border; import binnie.core.craftgui.resource.Texture; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class StandardTexture extends Texture { public StandardTexture(final int u, final int v, final int w, final int h, final IBinnieTexture textureFile) { diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java b/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java index 9109369b..b5c0a914 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.resource.minecraft; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/resource/package-info.java b/src/main/java/binnie/core/craftgui/resource/package-info.java index 806c524c..27700f54 100644 --- a/src/main/java/binnie/core/craftgui/resource/package-info.java +++ b/src/main/java/binnie/core/craftgui/resource/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.resource; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/window/Panel.java b/src/main/java/binnie/core/craftgui/window/Panel.java index 89f120b6..0074bcb3 100644 --- a/src/main/java/binnie/core/craftgui/window/Panel.java +++ b/src/main/java/binnie/core/craftgui/window/Panel.java @@ -1,13 +1,14 @@ package binnie.core.craftgui.window; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.MinecraftGUI; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class Panel extends Control { IPanelType type; diff --git a/src/main/java/binnie/core/craftgui/window/package-info.java b/src/main/java/binnie/core/craftgui/window/package-info.java index 0396a574..7d967598 100644 --- a/src/main/java/binnie/core/craftgui/window/package-info.java +++ b/src/main/java/binnie/core/craftgui/window/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.craftgui.window; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index bf27f7bc..a196ab2b 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -1,7 +1,11 @@ package binnie.core.genetics; -import binnie.Binnie; -import binnie.core.BinnieCore; +import javax.annotation.Nullable; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -15,11 +19,9 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; -import java.util.TreeSet; +import binnie.Binnie; +import binnie.core.BinnieCore; class BeeBreedingSystem extends BreedingSystem { diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index c44f1091..40446542 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -1,9 +1,29 @@ package binnie.core.genetics; -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.resource.BinnieSprite; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.common.MinecraftForge; + +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.ForestryEvent; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -17,25 +37,10 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.resource.BinnieSprite; public abstract class BreedingSystem implements IItemStackRepresentitive { public float discoveredSpeciesPercentage; diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/src/main/java/binnie/core/genetics/ForestryAllele.java index f38ff2eb..3fcd3df0 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -1,10 +1,11 @@ package binnie.core.genetics; -import binnie.Binnie; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; +import binnie.Binnie; + public class ForestryAllele { public enum Lifespan { Shortest, diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index fcc6bf71..1cf98074 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -1,13 +1,16 @@ package binnie.core.genetics; -import binnie.Binnie; -import binnie.genetics.api.IGene; import com.google.common.base.Preconditions; + +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.nbt.NBTTagCompound; + +import binnie.Binnie; +import binnie.genetics.api.IGene; public class Gene implements IGene { private IAllele allele; diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java index 83cb9b8f..2e47d55c 100644 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ b/src/main/java/binnie/core/genetics/IBreedingMessage.java @@ -1,13 +1,15 @@ package binnie.core.genetics; -import binnie.Binnie; -import binnie.core.BinnieCore; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeType; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; + +import binnie.Binnie; +import binnie.core.BinnieCore; interface IBreedingMessage { String getTitle(); diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 8970c62a..08cd9eb6 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -1,13 +1,23 @@ package binnie.core.genetics; -import binnie.Binnie; -import binnie.botany.api.IFlowerRoot; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.botany.genetics.FlowerBreedingSystem; -import binnie.botany.genetics.FlowerColorAllele; -import binnie.core.BinnieCore; -import binnie.core.ManagerBase; import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; + +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import net.minecraftforge.event.world.WorldEvent; + +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeRoot; import forestry.api.arboriculture.ITreeRoot; @@ -24,19 +34,13 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterflyRoot; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; +import binnie.Binnie; +import binnie.botany.api.IFlowerRoot; +import binnie.botany.genetics.FlowerBreedingSystem; +import binnie.botany.genetics.FlowerColorAllele; +import binnie.core.BinnieCore; +import binnie.core.ManagerBase; public class ManagerGenetics extends ManagerBase { private final Map BREEDING_SYSTEMS; diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 5c06a3de..d48eec6d 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -1,8 +1,10 @@ package binnie.core.genetics; -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.extratrees.ExtraTrees; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleSpecies; @@ -14,10 +16,10 @@ import forestry.api.genetics.ISpeciesType; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.ILepidopteristTracker; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import java.util.TreeSet; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.extratrees.ExtraTrees; class MothBreedingSystem extends BreedingSystem { public MothBreedingSystem() { diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index eba40a7a..60b9c15a 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -1,11 +1,19 @@ package binnie.core.genetics; -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.util.UniqueItemStackSet; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.machines.lumbermill.LumbermillRecipes; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -25,17 +33,12 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.util.UniqueItemStackSet; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.machines.lumbermill.LumbermillRecipes; public class TreeBreedingSystem extends BreedingSystem { public UniqueItemStackSet allFruits; diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 74dd39f9..31f2d762 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -1,6 +1,17 @@ package binnie.core.genetics; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Biomes; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -13,15 +24,6 @@ import forestry.api.genetics.IIndividual; import forestry.apiculture.FakeBeekeepingLogic; import forestry.apiculture.InventoryBeeHousing; import forestry.core.errors.FakeErrorLogic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Biomes; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier { ArrayList beeModifier = new ArrayList<>(); diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/src/main/java/binnie/core/genetics/VirtualHousing.java index 5b1bb781..92a3ba79 100644 --- a/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -1,18 +1,20 @@ package binnie.core.genetics; -import com.mojang.authlib.GameProfile; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.IErrorState; -import forestry.api.genetics.IHousing; +import java.util.Collections; +import java.util.Set; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import java.util.Collections; -import java.util.Set; +import com.mojang.authlib.GameProfile; + +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IHousing; class VirtualHousing implements IHousing { private EntityPlayer player; diff --git a/src/main/java/binnie/core/genetics/VirtualMothHousing.java b/src/main/java/binnie/core/genetics/VirtualMothHousing.java index d3dad2ab..a69de6b8 100644 --- a/src/main/java/binnie/core/genetics/VirtualMothHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualMothHousing.java @@ -1,12 +1,13 @@ package binnie.core.genetics; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import javax.annotation.Nullable; public class VirtualMothHousing extends VirtualHousing implements IButterflyNursery { public VirtualMothHousing(final EntityPlayer player) { diff --git a/src/main/java/binnie/core/genetics/package-info.java b/src/main/java/binnie/core/genetics/package-info.java index d3d29577..b2cd6719 100644 --- a/src/main/java/binnie/core/genetics/package-info.java +++ b/src/main/java/binnie/core/genetics/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.genetics; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/src/main/java/binnie/core/gui/BinnieCoreGUI.java index 616b1f76..dcb04bf0 100644 --- a/src/main/java/binnie/core/gui/BinnieCoreGUI.java +++ b/src/main/java/binnie/core/gui/BinnieCoreGUI.java @@ -1,17 +1,19 @@ package binnie.core.gui; -import binnie.core.craftgui.WindowFieldKit; -import binnie.core.craftgui.WindowGenesis; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.machines.storage.WindowCompartment; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; -import javax.annotation.Nullable; +import binnie.core.craftgui.WindowFieldKit; +import binnie.core.craftgui.WindowGenesis; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.machines.storage.WindowCompartment; public enum BinnieCoreGUI implements IBinnieGUID { Compartment, diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index 4ec9fca6..7b2c0111 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -1,15 +1,17 @@ package binnie.core.gui; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.craftgui.minecraft.Window; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; + import net.minecraftforge.fml.common.network.IGuiHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.craftgui.minecraft.Window; public final class BinnieGUIHandler implements IGuiHandler { private AbstractMod mod; diff --git a/src/main/java/binnie/core/gui/IBinnieGUID.java b/src/main/java/binnie/core/gui/IBinnieGUID.java index 973ca580..464bfc8c 100644 --- a/src/main/java/binnie/core/gui/IBinnieGUID.java +++ b/src/main/java/binnie/core/gui/IBinnieGUID.java @@ -1,12 +1,14 @@ package binnie.core.gui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.craftgui.minecraft.Window; import binnie.core.network.IOrdinaled; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public interface IBinnieGUID extends IOrdinaled { @Nullable diff --git a/src/main/java/binnie/core/gui/package-info.java b/src/main/java/binnie/core/gui/package-info.java index 9fda53c8..ec3a20ee 100644 --- a/src/main/java/binnie/core/gui/package-info.java +++ b/src/main/java/binnie/core/gui/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.gui; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java index 3479fa07..fd62bdfe 100644 --- a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java +++ b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java @@ -1,15 +1,19 @@ package binnie.core.integration.extrabees; -import binnie.core.IInitializable; import com.google.common.base.Preconditions; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.genetics.AlleleManager; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.ForgeRegistries; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.genetics.AlleleManager; + +import binnie.core.IInitializable; + public class ExtraBeesIntegration implements IInitializable { private static final boolean loaded; diff --git a/src/main/java/binnie/core/integration/jei/Drawables.java b/src/main/java/binnie/core/integration/jei/Drawables.java index 51f5b891..dc9f7cbb 100644 --- a/src/main/java/binnie/core/integration/jei/Drawables.java +++ b/src/main/java/binnie/core/integration/jei/Drawables.java @@ -1,12 +1,13 @@ package binnie.core.integration.jei; +import javax.annotation.Nullable; + +import net.minecraft.util.ResourceLocation; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nullable; public class Drawables { public static final ResourceLocation guiTank = new ResourceLocation("binniecore:textures/gui/craftgui-slots.png"); diff --git a/src/main/java/binnie/core/integration/jei/package-info.java b/src/main/java/binnie/core/integration/jei/package-info.java index ea2e1a1c..23d0c6ea 100644 --- a/src/main/java/binnie/core/integration/jei/package-info.java +++ b/src/main/java/binnie/core/integration/jei/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.integration.jei; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/item/ItemCore.java b/src/main/java/binnie/core/item/ItemCore.java index 7a58ef23..bcccacc3 100644 --- a/src/main/java/binnie/core/item/ItemCore.java +++ b/src/main/java/binnie/core/item/ItemCore.java @@ -1,10 +1,12 @@ package binnie.core.item; +import net.minecraft.item.Item; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import net.minecraft.item.Item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCore extends Item implements IItemModelRegister { diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index 8b6575e4..8cf8d67f 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -1,9 +1,7 @@ package binnie.core.item; -import binnie.Constants; -import binnie.core.BinnieCore; -import binnie.core.gui.BinnieCoreGUI; -import forestry.api.core.IModelManager; +import java.util.List; + import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -14,10 +12,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import forestry.api.core.IModelManager; + +import binnie.Constants; +import binnie.core.BinnieCore; +import binnie.core.gui.BinnieCoreGUI; public class ItemFieldKit extends ItemCore { private ModelResourceLocation fieldKit; diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index b182629e..460f7baa 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -1,8 +1,5 @@ package binnie.core.item; -import binnie.core.BinnieCore; -import binnie.core.gui.BinnieCoreGUI; -import forestry.api.core.Tabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -10,6 +7,11 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import forestry.api.core.Tabs; + +import binnie.core.BinnieCore; +import binnie.core.gui.BinnieCoreGUI; + public class ItemGenesis extends ItemCore { public ItemGenesis() { diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 7c830ba6..14ebd028 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,15 +1,17 @@ package binnie.core.item; -import forestry.api.core.IModelManager; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import forestry.api.core.IModelManager; public class ItemMisc extends ItemCore { private IItemMiscProvider[] items; diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 0b157aeb..477940d3 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -1,12 +1,14 @@ package binnie.core.item; -import binnie.core.BinnieCore; -import binnie.core.IInitializable; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.common.registry.GameRegistry; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; + public class ModuleItems implements IInitializable { @Override public void preInit() { diff --git a/src/main/java/binnie/core/item/package-info.java b/src/main/java/binnie/core/item/package-info.java index 50a2ccf6..e405030a 100644 --- a/src/main/java/binnie/core/item/package-info.java +++ b/src/main/java/binnie/core/item/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.item; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/language/ManagerLanguage.java b/src/main/java/binnie/core/language/ManagerLanguage.java index 53e9d086..30595a44 100644 --- a/src/main/java/binnie/core/language/ManagerLanguage.java +++ b/src/main/java/binnie/core/language/ManagerLanguage.java @@ -1,12 +1,13 @@ package binnie.core.language; -import binnie.core.AbstractMod; -import binnie.core.ManagerBase; -import net.minecraft.util.text.translation.I18n; - import java.util.HashMap; import java.util.Map; +import net.minecraft.util.text.translation.I18n; + +import binnie.core.AbstractMod; +import binnie.core.ManagerBase; + public class ManagerLanguage extends ManagerBase { private Map objNames; diff --git a/src/main/java/binnie/core/language/package-info.java b/src/main/java/binnie/core/language/package-info.java index 1a387e7e..f2228565 100644 --- a/src/main/java/binnie/core/language/package-info.java +++ b/src/main/java/binnie/core/language/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.language; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/src/main/java/binnie/core/liquid/BinnieFluid.java index b5ef3577..3b598a34 100644 --- a/src/main/java/binnie/core/liquid/BinnieFluid.java +++ b/src/main/java/binnie/core/liquid/BinnieFluid.java @@ -1,10 +1,10 @@ package binnie.core.liquid; +import java.awt.Color; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import java.awt.Color; - class BinnieFluid extends Fluid { private final String name; private final IFluidType fluidType; diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/src/main/java/binnie/core/liquid/FluidContainerType.java index a4aa99a4..7572b9b3 100644 --- a/src/main/java/binnie/core/liquid/FluidContainerType.java +++ b/src/main/java/binnie/core/liquid/FluidContainerType.java @@ -1,14 +1,16 @@ package binnie.core.liquid; -import binnie.core.BinnieCore; -import binnie.core.Mods; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; -import javax.annotation.Nullable; +import binnie.core.BinnieCore; +import binnie.core.Mods; public enum FluidContainerType { CAPSULE, diff --git a/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java b/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java index ef67a562..ec3c75df 100644 --- a/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java +++ b/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java @@ -1,6 +1,7 @@ package binnie.core.liquid; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; diff --git a/src/main/java/binnie/core/liquid/IFluidType.java b/src/main/java/binnie/core/liquid/IFluidType.java index 1b224709..8713a4ab 100644 --- a/src/main/java/binnie/core/liquid/IFluidType.java +++ b/src/main/java/binnie/core/liquid/IFluidType.java @@ -1,6 +1,7 @@ package binnie.core.liquid; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fluids.FluidStack; public interface IFluidType { diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 1f1478e0..9bddb5e3 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -1,11 +1,7 @@ package binnie.core.liquid; -import binnie.Binnie; -import binnie.extratrees.alcohol.AlcoholEffect; -import binnie.extratrees.alcohol.drink.DrinkManager; -import binnie.extratrees.alcohol.drink.IDrinkLiquid; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; +import javax.annotation.Nullable; + import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -25,15 +21,23 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; + import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.Binnie; +import binnie.extratrees.alcohol.AlcoholEffect; +import binnie.extratrees.alcohol.drink.DrinkManager; +import binnie.extratrees.alcohol.drink.IDrinkLiquid; public class ItemFluidContainer extends ItemFood implements IItemModelRegister { private final FluidContainerType container; diff --git a/src/main/java/binnie/core/liquid/package-info.java b/src/main/java/binnie/core/liquid/package-info.java index a8e21ded..37a1ed09 100644 --- a/src/main/java/binnie/core/liquid/package-info.java +++ b/src/main/java/binnie/core/liquid/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.liquid; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 75d4aa21..7734634a 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -1,11 +1,11 @@ package binnie.core.machines; -import binnie.core.BinnieCore; -import binnie.core.machines.component.IRender; -import binnie.core.util.TileUtil; import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.Random; + import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -23,19 +23,19 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fluids.FluidActionResult; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; +import binnie.core.BinnieCore; +import binnie.core.machines.component.IRender; +import binnie.core.util.TileUtil; class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { public static final PropertyInteger MACHINE_TYPE = PropertyInteger.create("machine_type", 0, 15); diff --git a/src/main/java/binnie/core/machines/IMachine.java b/src/main/java/binnie/core/machines/IMachine.java index 37b6061b..4daebf6b 100644 --- a/src/main/java/binnie/core/machines/IMachine.java +++ b/src/main/java/binnie/core/machines/IMachine.java @@ -1,11 +1,11 @@ package binnie.core.machines; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import javax.annotation.Nullable; import java.util.Collection; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + public interface IMachine extends IOwnable { void addComponent(MachineComponent component); diff --git a/src/main/java/binnie/core/machines/IMachineType.java b/src/main/java/binnie/core/machines/IMachineType.java index 6e9144d3..fbd58f68 100644 --- a/src/main/java/binnie/core/machines/IMachineType.java +++ b/src/main/java/binnie/core/machines/IMachineType.java @@ -1,9 +1,9 @@ package binnie.core.machines; -import binnie.core.network.IOrdinaled; - import javax.annotation.Nullable; +import binnie.core.network.IOrdinaled; + public interface IMachineType extends IOrdinaled { @Nullable Class getPackageClass(); diff --git a/src/main/java/binnie/core/machines/IOwnable.java b/src/main/java/binnie/core/machines/IOwnable.java index b3b44161..16fce1d8 100644 --- a/src/main/java/binnie/core/machines/IOwnable.java +++ b/src/main/java/binnie/core/machines/IOwnable.java @@ -1,9 +1,9 @@ package binnie.core.machines; -import com.mojang.authlib.GameProfile; - import javax.annotation.Nullable; +import com.mojang.authlib.GameProfile; + interface IOwnable { @Nullable GameProfile getOwner(); diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index 19f79fbf..4819a480 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -1,5 +1,31 @@ package binnie.core.machines; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; + import binnie.core.BinnieCore; import binnie.core.machines.component.IInteraction; import binnie.core.machines.component.IRender; @@ -9,27 +35,6 @@ import binnie.core.network.BinnieCorePacketID; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.MessageTileNBT; import binnie.core.network.packet.PacketPayload; -import com.google.common.base.Preconditions; -import com.mojang.authlib.GameProfile; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { private MachinePackage machinePackage; diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index d4640d35..cf3b4993 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -1,11 +1,13 @@ package binnie.core.machines; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; + +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; + import binnie.Binnie; import binnie.core.network.packet.MachinePayload; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; public class MachineComponent implements INbtReadable, INbtWritable { private IMachine machine; diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index c0430d68..a7ff8c64 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -1,17 +1,18 @@ package binnie.core.machines; -import binnie.Binnie; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - import javax.annotation.Nullable; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +import binnie.Binnie; +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; + public class MachineGroup { public boolean customRenderer; private AbstractMod mod; diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 7148c480..f65d96b7 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -1,10 +1,12 @@ package binnie.core.machines; -import binnie.Binnie; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.Binnie; + public abstract class MachinePackage { boolean powered; private String uid; diff --git a/src/main/java/binnie/core/machines/MachineRendererBlock.java b/src/main/java/binnie/core/machines/MachineRendererBlock.java index 234a34a7..3ace60e5 100644 --- a/src/main/java/binnie/core/machines/MachineRendererBlock.java +++ b/src/main/java/binnie/core/machines/MachineRendererBlock.java @@ -1,10 +1,12 @@ package binnie.core.machines; +import net.minecraft.client.renderer.GlStateManager; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRendererBlock { diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index cf424988..1c68f116 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -1,5 +1,17 @@ package binnie.core.machines; +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.List; +import java.util.Random; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; + import binnie.core.BinnieCore; import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.IPoweredMachine; @@ -7,16 +19,6 @@ import binnie.core.machines.power.IProcess; import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.PowerSystem; import binnie.core.util.ItemStackSet; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; -import java.util.Random; public class MachineUtil { private IMachine machine; diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 1db30741..fc39af41 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -1,18 +1,19 @@ package binnie.core.machines; -import binnie.core.BinnieCore; -import binnie.core.ManagerBase; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.ValidatorSprite; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; + +import binnie.core.BinnieCore; +import binnie.core.ManagerBase; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.ValidatorSprite; + public class ManagerMachine extends ManagerBase { private Map, Class[]> componentInterfaceMap; private Map machineGroups; diff --git a/src/main/java/binnie/core/machines/ModelBlock.java b/src/main/java/binnie/core/machines/ModelBlock.java index 8c3d3e68..4ededba1 100644 --- a/src/main/java/binnie/core/machines/ModelBlock.java +++ b/src/main/java/binnie/core/machines/ModelBlock.java @@ -2,6 +2,7 @@ package binnie.core.machines; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/machines/TileEntityMachine.java b/src/main/java/binnie/core/machines/TileEntityMachine.java index 45273325..b518acbf 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachine.java +++ b/src/main/java/binnie/core/machines/TileEntityMachine.java @@ -1,11 +1,12 @@ package binnie.core.machines; +import net.minecraft.nbt.NBTTagCompound; + import binnie.Binnie; import binnie.core.machines.base.TileEntityMachineBase; import binnie.core.machines.component.IInteraction; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.PacketPayload; -import net.minecraft.nbt.NBTTagCompound; public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity { private Machine machine; diff --git a/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java b/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java index a0614b8f..2db5444d 100644 --- a/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java @@ -1,6 +1,5 @@ package binnie.core.machines.base; -import binnie.core.machines.inventory.IInventoryMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -8,6 +7,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; +import binnie.core.machines.inventory.IInventoryMachine; + class DefaultMachineInventory implements IInventoryMachine { private final DefaultInventory inventory; diff --git a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java index 72682a5c..d9f99316 100644 --- a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java +++ b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java @@ -1,14 +1,16 @@ package binnie.core.machines.base; -import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.power.ITankMachine; -import binnie.core.machines.power.TankInfo; +import javax.annotation.Nullable; + import net.minecraft.util.EnumFacing; + import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.IFluidHandler; -import javax.annotation.Nullable; +import binnie.core.machines.inventory.TankSlot; +import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.TankInfo; class DefaultTankContainer implements ITankMachine { @Override diff --git a/src/main/java/binnie/core/machines/base/package-info.java b/src/main/java/binnie/core/machines/base/package-info.java index e5d58519..0faebba6 100644 --- a/src/main/java/binnie/core/machines/base/package-info.java +++ b/src/main/java/binnie/core/machines/base/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines.base; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/component/IBuildcraft.java b/src/main/java/binnie/core/machines/component/IBuildcraft.java index ad360096..f9d709fd 100644 --- a/src/main/java/binnie/core/machines/component/IBuildcraft.java +++ b/src/main/java/binnie/core/machines/component/IBuildcraft.java @@ -1,9 +1,9 @@ package binnie.core.machines.component; -import binnie.core.triggers.TriggerData; - import java.util.List; +import binnie.core.triggers.TriggerData; + public interface IBuildcraft { interface TriggerProvider { void getTriggers(final List p0); diff --git a/src/main/java/binnie/core/machines/component/IRender.java b/src/main/java/binnie/core/machines/component/IRender.java index a51de08b..b3ffcb62 100644 --- a/src/main/java/binnie/core/machines/component/IRender.java +++ b/src/main/java/binnie/core/machines/component/IRender.java @@ -1,12 +1,13 @@ package binnie.core.machines.component; +import java.util.Random; + import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; - public interface IRender { interface DisplayTick { @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/core/machines/component/package-info.java b/src/main/java/binnie/core/machines/component/package-info.java index 8e31b23d..823622da 100644 --- a/src/main/java/binnie/core/machines/component/package-info.java +++ b/src/main/java/binnie/core/machines/component/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines.component; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index 8f7684e5..f9f6a208 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -1,14 +1,16 @@ package binnie.core.machines.inventory; -import binnie.core.util.IValidator; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; -import net.minecraft.util.EnumFacing; - import javax.annotation.Nullable; import java.util.Collection; import java.util.EnumSet; +import net.minecraft.util.EnumFacing; + +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; + +import binnie.core.util.IValidator; + public abstract class BaseSlot implements INbtWritable, INbtReadable, IValidator { protected String unlocName; @Nullable diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index 2d9f8cf3..388e109d 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -1,14 +1,15 @@ package binnie.core.machines.inventory; -import binnie.core.machines.Machine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.network.INetwork; +import java.util.HashMap; +import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import java.util.HashMap; -import java.util.Map; +import binnie.core.machines.Machine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.network.INetwork; public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots { private Map charges; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventory.java b/src/main/java/binnie/core/machines/inventory/ComponentInventory.java index 0dff943c..d2f0d5e9 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventory.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventory.java @@ -1,8 +1,9 @@ package binnie.core.machines.inventory; +import net.minecraft.inventory.IInventory; + import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; -import net.minecraft.inventory.IInventory; public abstract class ComponentInventory extends MachineComponent implements IInventory { public ComponentInventory(final IMachine machine) { diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index 16446b9c..15032bcc 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -1,6 +1,11 @@ package binnie.core.machines.inventory; -import binnie.core.machines.IMachine; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -10,11 +15,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import binnie.core.machines.IMachine; public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots { private Map inventory; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index be60b589..e6dc67ee 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -1,15 +1,16 @@ package binnie.core.machines.inventory; -import binnie.core.machines.IMachine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.transfer.TransferRequest; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.transfer.TransferRequest; + public class ComponentInventoryTransfer extends MachineComponent { private List transfers; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 35fd011c..a4b34ad1 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -1,19 +1,5 @@ package binnie.core.machines.inventory; -import binnie.core.machines.IMachine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.power.ITankMachine; -import binnie.core.machines.power.TankInfo; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; -import net.minecraftforge.fluids.capability.FluidTankProperties; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidTankProperties; -import net.minecraftforge.fluids.capability.templates.FluidHandlerConcatenate; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.EnumMap; @@ -21,6 +7,22 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.FluidTankProperties; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; +import net.minecraftforge.fluids.capability.templates.FluidHandlerConcatenate; + +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.TankInfo; + public class ComponentTankContainer extends MachineComponent implements ITankMachine { private Map tanks; private EnumMap handlers; diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 1bbb0fa6..96521609 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -1,11 +1,12 @@ package binnie.core.machines.inventory; -import binnie.Binnie; -import binnie.core.BinnieCore; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import javax.annotation.Nullable; +import binnie.Binnie; +import binnie.core.BinnieCore; public class InventorySlot extends BaseSlot { private ItemStack itemStack; diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/src/main/java/binnie/core/machines/inventory/MachineSide.java index d4501bb5..c14a9ca6 100644 --- a/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -1,10 +1,10 @@ package binnie.core.machines.inventory; -import net.minecraft.util.EnumFacing; - import java.util.Collection; import java.util.EnumSet; +import net.minecraft.util.EnumFacing; + public class MachineSide { public static EnumSet TopAndBottom = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN); public static EnumSet None = EnumSet.noneOf(EnumFacing.class); diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index 35af77cd..29195b8c 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -1,13 +1,13 @@ package binnie.core.machines.inventory; -import net.minecraft.util.EnumFacing; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.util.EnumFacing; + class SidedAccess { private Map accesses; private AccessDirection base; diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index cb175188..696f9064 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -1,12 +1,14 @@ package binnie.core.machines.inventory; -import forestry.api.genetics.AlleleManager; +import javax.annotation.Nullable; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import forestry.api.genetics.AlleleManager; public abstract class SlotValidator extends Validator { public static ValidatorSprite spriteBee; diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index a4725633..8851fd2a 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -1,12 +1,14 @@ package binnie.core.machines.inventory; -import binnie.Binnie; -import binnie.core.BinnieCore; import net.minecraft.nbt.NBTTagCompound; + import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidTank; +import binnie.Binnie; +import binnie.core.BinnieCore; + public class TankSlot extends BaseSlot { public static final String NameJuice = "Juice Tank"; public static final String NameWater = "Water Tank"; diff --git a/src/main/java/binnie/core/machines/inventory/TankValidator.java b/src/main/java/binnie/core/machines/inventory/TankValidator.java index ed977610..240823ec 100644 --- a/src/main/java/binnie/core/machines/inventory/TankValidator.java +++ b/src/main/java/binnie/core/machines/inventory/TankValidator.java @@ -1,9 +1,10 @@ package binnie.core.machines.inventory; -import binnie.Binnie; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import binnie.Binnie; + public abstract class TankValidator extends Validator { @Override public abstract boolean isValid(final FluidStack p0); diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java index f635a94c..4528c371 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java @@ -1,12 +1,12 @@ package binnie.core.machines.inventory; +import java.util.ArrayList; +import java.util.List; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.resource.BinnieSprite; -import java.util.ArrayList; -import java.util.List; - public class ValidatorSprite { private List spritesInput; diff --git a/src/main/java/binnie/core/machines/inventory/package-info.java b/src/main/java/binnie/core/machines/inventory/package-info.java index 54e57f6c..434e6e7d 100644 --- a/src/main/java/binnie/core/machines/inventory/package-info.java +++ b/src/main/java/binnie/core/machines/inventory/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines.inventory; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/network/INetwork.java b/src/main/java/binnie/core/machines/network/INetwork.java index 3ca69663..63689716 100644 --- a/src/main/java/binnie/core/machines/network/INetwork.java +++ b/src/main/java/binnie/core/machines/network/INetwork.java @@ -1,12 +1,13 @@ package binnie.core.machines.network; +import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Map; - public interface INetwork { interface SendGuiNBT { void sendGuiNBTToClient(final Map p0); diff --git a/src/main/java/binnie/core/machines/network/package-info.java b/src/main/java/binnie/core/machines/network/package-info.java index d01cefe2..0eb729b8 100644 --- a/src/main/java/binnie/core/machines/network/package-info.java +++ b/src/main/java/binnie/core/machines/network/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines.network; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/package-info.java b/src/main/java/binnie/core/machines/package-info.java index 1856471d..937c1146 100644 --- a/src/main/java/binnie/core/machines/package-info.java +++ b/src/main/java/binnie/core/machines/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/power/ComponentProcess.java b/src/main/java/binnie/core/machines/power/ComponentProcess.java index e82e6cd4..fcf8995e 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcess.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcess.java @@ -1,8 +1,9 @@ package binnie.core.machines.power; -import binnie.core.machines.IMachine; import net.minecraft.nbt.NBTTagCompound; +import binnie.core.machines.IMachine; + public abstract class ComponentProcess extends ComponentProcessIndefinate implements IProcessTimed { private float progressAmount; diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index 0568eb61..d8a90d34 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -1,12 +1,13 @@ package binnie.core.machines.power; +import javax.annotation.Nullable; + +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.network.INetwork; -import net.minecraft.nbt.NBTTagCompound; - -import javax.annotation.Nullable; public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync { int clientEnergyPerSecond; diff --git a/src/main/java/binnie/core/machines/power/ErrorState.java b/src/main/java/binnie/core/machines/power/ErrorState.java index 7de1526b..65c59772 100644 --- a/src/main/java/binnie/core/machines/power/ErrorState.java +++ b/src/main/java/binnie/core/machines/power/ErrorState.java @@ -1,8 +1,9 @@ package binnie.core.machines.power; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import net.minecraft.nbt.NBTTagCompound; public class ErrorState implements INbtReadable, INbtWritable { private String name; diff --git a/src/main/java/binnie/core/machines/power/IPoweredMachine.java b/src/main/java/binnie/core/machines/power/IPoweredMachine.java index ba166eb4..2752175f 100644 --- a/src/main/java/binnie/core/machines/power/IPoweredMachine.java +++ b/src/main/java/binnie/core/machines/power/IPoweredMachine.java @@ -1,6 +1,7 @@ package binnie.core.machines.power; import net.minecraftforge.energy.IEnergyStorage; + import net.minecraftforge.fml.common.Optional; import ic2.api.energy.tile.IEnergySink; diff --git a/src/main/java/binnie/core/machines/power/ITankMachine.java b/src/main/java/binnie/core/machines/power/ITankMachine.java index 172d2609..4cf43624 100644 --- a/src/main/java/binnie/core/machines/power/ITankMachine.java +++ b/src/main/java/binnie/core/machines/power/ITankMachine.java @@ -1,12 +1,14 @@ package binnie.core.machines.power; -import binnie.core.machines.inventory.IValidatedTankContainer; -import binnie.core.machines.inventory.TankSlot; +import javax.annotation.Nullable; + import net.minecraft.util.EnumFacing; + import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.IFluidHandler; -import javax.annotation.Nullable; +import binnie.core.machines.inventory.IValidatedTankContainer; +import binnie.core.machines.inventory.TankSlot; public interface ITankMachine extends IValidatedTankContainer { TankInfo[] getTankInfos(); diff --git a/src/main/java/binnie/core/machines/power/PowerInfo.java b/src/main/java/binnie/core/machines/power/PowerInfo.java index 788f044c..0e503cc4 100644 --- a/src/main/java/binnie/core/machines/power/PowerInfo.java +++ b/src/main/java/binnie/core/machines/power/PowerInfo.java @@ -1,8 +1,9 @@ package binnie.core.machines.power; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import net.minecraft.nbt.NBTTagCompound; public class PowerInfo implements INbtReadable, INbtWritable { private float currentEnergy; diff --git a/src/main/java/binnie/core/machines/power/PowerInterface.java b/src/main/java/binnie/core/machines/power/PowerInterface.java index 8d70fa25..b92e3b26 100644 --- a/src/main/java/binnie/core/machines/power/PowerInterface.java +++ b/src/main/java/binnie/core/machines/power/PowerInterface.java @@ -1,8 +1,9 @@ package binnie.core.machines.power; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import net.minecraft.nbt.NBTTagCompound; public class PowerInterface implements INbtReadable, INbtWritable { private int capacity; diff --git a/src/main/java/binnie/core/machines/power/ProcessInfo.java b/src/main/java/binnie/core/machines/power/ProcessInfo.java index 04bf6269..864324d7 100644 --- a/src/main/java/binnie/core/machines/power/ProcessInfo.java +++ b/src/main/java/binnie/core/machines/power/ProcessInfo.java @@ -1,8 +1,9 @@ package binnie.core.machines.power; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import net.minecraft.nbt.NBTTagCompound; public class ProcessInfo implements INbtReadable, INbtWritable { private float currentProgress; diff --git a/src/main/java/binnie/core/machines/power/TankInfo.java b/src/main/java/binnie/core/machines/power/TankInfo.java index 78e43ba4..fead5e6a 100644 --- a/src/main/java/binnie/core/machines/power/TankInfo.java +++ b/src/main/java/binnie/core/machines/power/TankInfo.java @@ -1,12 +1,14 @@ package binnie.core.machines.power; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; +import javax.annotation.Nullable; + import net.minecraft.nbt.NBTTagCompound; + import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; -import javax.annotation.Nullable; +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; public class TankInfo implements INbtReadable, INbtWritable { @Nullable diff --git a/src/main/java/binnie/core/machines/power/package-info.java b/src/main/java/binnie/core/machines/power/package-info.java index 4a56b5cd..ca54811d 100644 --- a/src/main/java/binnie/core/machines/power/package-info.java +++ b/src/main/java/binnie/core/machines/power/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines.power; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index d1a7e7d7..f3228305 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -1,15 +1,17 @@ package binnie.core.machines.storage; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; import binnie.core.machines.MachinePackage; import binnie.core.machines.TileEntityMachine; import binnie.core.resource.IBinnieTexture; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; enum Compartment implements IMachineType { Compartment(StandardCompartment.PackageCompartment.class), diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index 6e625fe4..944f58b8 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -1,12 +1,14 @@ package binnie.core.machines.storage; -import binnie.core.craftgui.minecraft.EnumColor; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; + +import binnie.core.craftgui.minecraft.EnumColor; + class CompartmentTab implements INbtWritable, INbtReadable { private String name; private ItemStack icon; diff --git a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java index 55586cc7..7ac10a3e 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java +++ b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java @@ -1,13 +1,14 @@ package binnie.core.machines.storage; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.RightClick { private BinnieCoreGUI id; diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index 41684834..d661927b 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -1,14 +1,15 @@ package binnie.core.machines.storage; -import binnie.core.machines.IMachine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.network.INetwork; +import java.util.HashMap; +import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import java.util.HashMap; -import java.util.Map; +import binnie.core.machines.IMachine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.network.INetwork; class ComponentCompartmentInventory extends ComponentInventorySlots implements INetwork.GuiNBT { private int numberOfTabs; diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index 0b6aaed1..8ab8731d 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -1,5 +1,8 @@ package binnie.core.machines.storage; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -8,8 +11,6 @@ import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.minecraft.EnumColor; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; class ControlColourSelector extends Control implements ITooltip, IControlValue { private EnumColor value; diff --git a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java index f4eab677..71cda14c 100644 --- a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java +++ b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java @@ -1,11 +1,13 @@ package binnie.core.machines.storage; +import net.minecraft.client.renderer.GlStateManager; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.Machine; import binnie.core.resource.BinnieResource; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) class MachineRendererCompartment { diff --git a/src/main/java/binnie/core/machines/storage/ModuleStorage.java b/src/main/java/binnie/core/machines/storage/ModuleStorage.java index 95974bad..465ea0cb 100644 --- a/src/main/java/binnie/core/machines/storage/ModuleStorage.java +++ b/src/main/java/binnie/core/machines/storage/ModuleStorage.java @@ -1,14 +1,17 @@ package binnie.core.machines.storage; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; + +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import net.minecraftforge.fml.common.registry.GameRegistry; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.machines.MachineGroup; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleStorage implements IInitializable { @Override diff --git a/src/main/java/binnie/core/machines/storage/StandardCompartment.java b/src/main/java/binnie/core/machines/storage/StandardCompartment.java index 166e9410..9f7060ce 100644 --- a/src/main/java/binnie/core/machines/storage/StandardCompartment.java +++ b/src/main/java/binnie/core/machines/storage/StandardCompartment.java @@ -1,10 +1,11 @@ package binnie.core.machines.storage; +import net.minecraft.tileentity.TileEntity; + import binnie.core.gui.BinnieCoreGUI; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.texture.BinnieCoreTexture; -import net.minecraft.tileentity.TileEntity; class StandardCompartment { public static class PackageCompartment extends Compartment.PackageCompartment { diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index e8d5cccb..6d20f5ba 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -1,5 +1,25 @@ package binnie.core.machines.storage; +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.craftgui.Attribute; @@ -41,24 +61,6 @@ import binnie.core.craftgui.window.Panel; import binnie.core.machines.Machine; import binnie.core.machines.transfer.TransferRequest; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick { private final Map panels; diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java index ba7cccdf..cf528689 100644 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ b/src/main/java/binnie/core/machines/storage/WindowTest.java @@ -1,12 +1,14 @@ package binnie.core.machines.storage; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.craftgui.minecraft.Window; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; public class WindowTest extends WindowMachine { public WindowTest(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/core/machines/storage/package-info.java b/src/main/java/binnie/core/machines/storage/package-info.java index 056f0aa0..3c8e505d 100644 --- a/src/main/java/binnie/core/machines/storage/package-info.java +++ b/src/main/java/binnie/core/machines/storage/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines.storage; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index d9046b14..345b75f0 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -1,22 +1,25 @@ package binnie.core.machines.transfer; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; + import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventorySlots; import binnie.core.machines.inventory.IValidatedTankContainer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.power.ITankMachine; -import com.google.common.base.Preconditions; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.IFluidTank; -import net.minecraftforge.fluids.capability.IFluidHandlerItem; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public class TransferRequest { private ItemStack itemToTransfer; diff --git a/src/main/java/binnie/core/machines/transfer/package-info.java b/src/main/java/binnie/core/machines/transfer/package-info.java index e77f773d..efdd95c7 100644 --- a/src/main/java/binnie/core/machines/transfer/package-info.java +++ b/src/main/java/binnie/core/machines/transfer/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.machines.transfer; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java index bf600a32..5c9a997e 100644 --- a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java +++ b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java @@ -1,10 +1,11 @@ package binnie.core.mod.config; +import java.io.File; + +import net.minecraftforge.common.config.Configuration; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import net.minecraftforge.common.config.Configuration; - -import java.io.File; class BinnieConfiguration extends Configuration { public AbstractMod mod; diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/src/main/java/binnie/core/mod/config/ManagerConfig.java index 5ebbb787..8e4c709e 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/src/main/java/binnie/core/mod/config/ManagerConfig.java @@ -1,9 +1,5 @@ package binnie.core.mod.config; -import binnie.core.AbstractMod; -import binnie.core.ManagerBase; -import net.minecraftforge.common.config.Configuration; - import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -13,6 +9,11 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.minecraftforge.common.config.Configuration; + +import binnie.core.AbstractMod; +import binnie.core.ManagerBase; + public class ManagerConfig extends ManagerBase { private Map, Configuration> configurations; private Map> itemIDs; diff --git a/src/main/java/binnie/core/mod/config/PropBoolean.java b/src/main/java/binnie/core/mod/config/PropBoolean.java index bc0871fa..1676e6a5 100644 --- a/src/main/java/binnie/core/mod/config/PropBoolean.java +++ b/src/main/java/binnie/core/mod/config/PropBoolean.java @@ -1,11 +1,11 @@ package binnie.core.mod.config; -import net.minecraftforge.common.config.Property; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; +import net.minecraftforge.common.config.Property; + @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropBoolean.PropertyBoolean.class) public @interface PropBoolean { diff --git a/src/main/java/binnie/core/mod/config/PropDouble.java b/src/main/java/binnie/core/mod/config/PropDouble.java index 769896b8..28db9a2d 100644 --- a/src/main/java/binnie/core/mod/config/PropDouble.java +++ b/src/main/java/binnie/core/mod/config/PropDouble.java @@ -1,11 +1,11 @@ package binnie.core.mod.config; -import net.minecraftforge.common.config.Property; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; +import net.minecraftforge.common.config.Property; + @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropDouble.PropertyDouble.class) public @interface PropDouble { diff --git a/src/main/java/binnie/core/mod/config/PropInteger.java b/src/main/java/binnie/core/mod/config/PropInteger.java index 7dc7707d..f8d99dfb 100644 --- a/src/main/java/binnie/core/mod/config/PropInteger.java +++ b/src/main/java/binnie/core/mod/config/PropInteger.java @@ -1,11 +1,11 @@ package binnie.core.mod.config; -import net.minecraftforge.common.config.Property; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; +import net.minecraftforge.common.config.Property; + @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropInteger.PropertyInteger.class) public @interface PropInteger { diff --git a/src/main/java/binnie/core/mod/config/PropPercentage.java b/src/main/java/binnie/core/mod/config/PropPercentage.java index 9d08a271..80a89e9d 100644 --- a/src/main/java/binnie/core/mod/config/PropPercentage.java +++ b/src/main/java/binnie/core/mod/config/PropPercentage.java @@ -1,11 +1,11 @@ package binnie.core.mod.config; -import net.minecraftforge.common.config.Property; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; +import net.minecraftforge.common.config.Property; + @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropPercentage.PropertyPercentage.class) public @interface PropPercentage { diff --git a/src/main/java/binnie/core/mod/config/PropertyBase.java b/src/main/java/binnie/core/mod/config/PropertyBase.java index f0bb8bb8..01228996 100644 --- a/src/main/java/binnie/core/mod/config/PropertyBase.java +++ b/src/main/java/binnie/core/mod/config/PropertyBase.java @@ -1,13 +1,13 @@ package binnie.core.mod.config; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; - import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + abstract class PropertyBase { Configuration file; Property property; diff --git a/src/main/java/binnie/core/mod/config/package-info.java b/src/main/java/binnie/core/mod/config/package-info.java index de8f5aa6..25b26b17 100644 --- a/src/main/java/binnie/core/mod/config/package-info.java +++ b/src/main/java/binnie/core/mod/config/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.mod.config; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/models/AABBModelBaker.java b/src/main/java/binnie/core/models/AABBModelBaker.java index 27497b7e..999f7492 100644 --- a/src/main/java/binnie/core/models/AABBModelBaker.java +++ b/src/main/java/binnie/core/models/AABBModelBaker.java @@ -1,10 +1,11 @@ package binnie.core.models; -import forestry.api.core.IModelBaker; -import forestry.api.core.IModelBakerModel; -import forestry.core.models.ModelManager; -import forestry.core.models.baker.ModelBakerFace; -import forestry.core.models.baker.ModelBakerModel; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -19,15 +20,19 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.common.model.IModelState; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; + import org.lwjgl.util.vector.Vector3f; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; +import forestry.api.core.IModelBaker; +import forestry.api.core.IModelBakerModel; +import forestry.core.models.ModelManager; +import forestry.core.models.baker.ModelBakerFace; +import forestry.core.models.baker.ModelBakerModel; //AABB = AxisAlignedBoundingBox @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/core/models/DoublePassBakedModel.java b/src/main/java/binnie/core/models/DoublePassBakedModel.java index 7d0600bc..c44967a6 100644 --- a/src/main/java/binnie/core/models/DoublePassBakedModel.java +++ b/src/main/java/binnie/core/models/DoublePassBakedModel.java @@ -1,5 +1,9 @@ package binnie.core.models; +import javax.annotation.Nullable; +import java.util.LinkedList; +import java.util.List; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -8,13 +12,10 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.EnumFacing; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.LinkedList; -import java.util.List; - @SideOnly(Side.CLIENT) public class DoublePassBakedModel implements IBakedModel { private static final int c = DefaultVertexFormats.ITEM.getColorOffset() / 4; diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index 8f6f5ed0..a70768ef 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -3,16 +3,12 @@ package binnie.core.models; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import forestry.api.core.ForestryAPI; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.ISpriteRegister; -import forestry.api.core.IStateMapperRegister; -import forestry.core.blocks.IColoredBlock; -import forestry.core.items.IColoredItem; -import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; -import forestry.core.utils.ModelUtil; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -30,19 +26,27 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.IRegistry; import net.minecraft.world.IBlockAccess; + import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import forestry.api.core.ForestryAPI; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.ISpriteRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.core.blocks.IColoredBlock; +import forestry.core.items.IColoredItem; +import forestry.core.models.BlockModelEntry; +import forestry.core.models.ModelEntry; +import forestry.core.utils.ModelUtil; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { diff --git a/src/main/java/binnie/core/models/ModelMutlipass.java b/src/main/java/binnie/core/models/ModelMutlipass.java index 9a96aa0f..d2034dff 100644 --- a/src/main/java/binnie/core/models/ModelMutlipass.java +++ b/src/main/java/binnie/core/models/ModelMutlipass.java @@ -1,10 +1,5 @@ package binnie.core.models; -import binnie.core.block.IMultipassBlock; -import forestry.api.core.IModelBaker; -import forestry.core.blocks.properties.UnlistedBlockAccess; -import forestry.core.blocks.properties.UnlistedBlockPos; -import forestry.core.models.ModelBlockCached; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -14,10 +9,19 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.common.property.IExtendedBlockState; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelBaker; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; +import forestry.core.models.ModelBlockCached; + +import binnie.core.block.IMultipassBlock; + @SideOnly(Side.CLIENT) public class ModelMutlipass, K> extends ModelBlockCached { diff --git a/src/main/java/binnie/core/models/package-info.java b/src/main/java/binnie/core/models/package-info.java index 28cdb7ea..774ab327 100644 --- a/src/main/java/binnie/core/models/package-info.java +++ b/src/main/java/binnie/core/models/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.models; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java index ccd1d031..32b88116 100644 --- a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java +++ b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java @@ -1,10 +1,11 @@ package binnie.core.multiblock; +import javax.annotation.Nullable; + +import net.minecraft.tileentity.TileEntity; + import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; - -import javax.annotation.Nullable; class TileEntityMultiblockMachine extends TileEntity { private boolean inStructure; diff --git a/src/main/java/binnie/core/multiblock/package-info.java b/src/main/java/binnie/core/multiblock/package-info.java index 8723cd31..50062ab2 100644 --- a/src/main/java/binnie/core/multiblock/package-info.java +++ b/src/main/java/binnie/core/multiblock/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.multiblock; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 705cd59b..6dc31a1e 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -1,5 +1,12 @@ package binnie.core.network; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.BinnieCore; import binnie.core.block.TileEntityMetadata; import binnie.core.craftgui.minecraft.ContainerCraftGUI; @@ -11,11 +18,6 @@ import binnie.core.network.packet.MessageCraftGUI; import binnie.core.network.packet.MessageMetadata; import binnie.core.network.packet.MessageTileNBT; import binnie.core.network.packet.MessageUpdate; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; public enum BinnieCorePacketID implements IPacketID { NetworkEntityUpdate, diff --git a/src/main/java/binnie/core/network/BinniePacketHandler.java b/src/main/java/binnie/core/network/BinniePacketHandler.java index eae99986..7767a405 100644 --- a/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -1,12 +1,13 @@ package binnie.core.network; -import binnie.Constants; -import binnie.core.AbstractMod; -import binnie.core.network.packet.MessageBinnie; import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.IThreadListener; + import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -14,7 +15,9 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import binnie.Constants; +import binnie.core.AbstractMod; +import binnie.core.network.packet.MessageBinnie; public abstract class BinniePacketHandler implements IMessageHandler { @SuppressWarnings({"unused", "NullableProblems"}) diff --git a/src/main/java/binnie/core/network/IPacketID.java b/src/main/java/binnie/core/network/IPacketID.java index 3085175a..7510293b 100644 --- a/src/main/java/binnie/core/network/IPacketID.java +++ b/src/main/java/binnie/core/network/IPacketID.java @@ -1,8 +1,9 @@ package binnie.core.network; -import binnie.core.network.packet.MessageBinnie; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import binnie.core.network.packet.MessageBinnie; + public interface IPacketID extends IOrdinaled { void onMessage(final MessageBinnie p0, final MessageContext p1); } diff --git a/src/main/java/binnie/core/network/package-info.java b/src/main/java/binnie/core/network/package-info.java index c0bcc1f0..ceeea809 100644 --- a/src/main/java/binnie/core/network/package-info.java +++ b/src/main/java/binnie/core/network/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.network; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/network/packet/IPacketLocation.java b/src/main/java/binnie/core/network/packet/IPacketLocation.java index 181cf7f2..40216bbf 100644 --- a/src/main/java/binnie/core/network/packet/IPacketLocation.java +++ b/src/main/java/binnie/core/network/packet/IPacketLocation.java @@ -1,10 +1,10 @@ package binnie.core.network.packet; +import javax.annotation.Nullable; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import javax.annotation.Nullable; - interface IPacketLocation { @Nullable TileEntity getTarget(final World world); diff --git a/src/main/java/binnie/core/network/packet/MessageBase.java b/src/main/java/binnie/core/network/packet/MessageBase.java index b55d4482..baa84226 100644 --- a/src/main/java/binnie/core/network/packet/MessageBase.java +++ b/src/main/java/binnie/core/network/packet/MessageBase.java @@ -1,14 +1,15 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; - import javax.annotation.Nullable; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; + +import io.netty.buffer.ByteBuf; + public class MessageBase { private int id; diff --git a/src/main/java/binnie/core/network/packet/MessageBinnie.java b/src/main/java/binnie/core/network/packet/MessageBinnie.java index 123d6161..73655d9e 100644 --- a/src/main/java/binnie/core/network/packet/MessageBinnie.java +++ b/src/main/java/binnie/core/network/packet/MessageBinnie.java @@ -1,9 +1,10 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; +import java.io.IOException; + import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import java.io.IOException; +import io.netty.buffer.ByteBuf; public final class MessageBinnie implements IMessage { public int id; diff --git a/src/main/java/binnie/core/network/packet/MessageCoordinates.java b/src/main/java/binnie/core/network/packet/MessageCoordinates.java index 39639dcf..97418291 100644 --- a/src/main/java/binnie/core/network/packet/MessageCoordinates.java +++ b/src/main/java/binnie/core/network/packet/MessageCoordinates.java @@ -1,12 +1,13 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; +import javax.annotation.Nullable; +import java.io.IOException; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.io.IOException; +import io.netty.buffer.ByteBuf; public class MessageCoordinates extends MessageBase { public int posX; diff --git a/src/main/java/binnie/core/network/packet/MessageCraftGUI.java b/src/main/java/binnie/core/network/packet/MessageCraftGUI.java index 092ce700..2f11f260 100644 --- a/src/main/java/binnie/core/network/packet/MessageCraftGUI.java +++ b/src/main/java/binnie/core/network/packet/MessageCraftGUI.java @@ -1,8 +1,9 @@ package binnie.core.network.packet; -import binnie.core.network.BinnieCorePacketID; import net.minecraft.nbt.NBTTagCompound; +import binnie.core.network.BinnieCorePacketID; + public class MessageCraftGUI extends MessageNBT { public MessageCraftGUI(final MessageBinnie message) { super(message); diff --git a/src/main/java/binnie/core/network/packet/MessageMetadata.java b/src/main/java/binnie/core/network/packet/MessageMetadata.java index 85d57e86..306b4141 100644 --- a/src/main/java/binnie/core/network/packet/MessageMetadata.java +++ b/src/main/java/binnie/core/network/packet/MessageMetadata.java @@ -1,10 +1,11 @@ package binnie.core.network.packet; +import java.io.IOException; + +import net.minecraft.util.math.BlockPos; + import binnie.core.network.BinnieCorePacketID; import io.netty.buffer.ByteBuf; -import net.minecraft.util.math.BlockPos; - -import java.io.IOException; public class MessageMetadata extends MessageCoordinates { public int meta; diff --git a/src/main/java/binnie/core/network/packet/MessageNBT.java b/src/main/java/binnie/core/network/packet/MessageNBT.java index 281c2550..dae5e443 100644 --- a/src/main/java/binnie/core/network/packet/MessageNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageNBT.java @@ -1,11 +1,12 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; - import javax.annotation.Nullable; import java.io.IOException; +import net.minecraft.nbt.NBTTagCompound; + +import io.netty.buffer.ByteBuf; + public class MessageNBT extends MessageBase { @Nullable NBTTagCompound nbt; diff --git a/src/main/java/binnie/core/network/packet/MessageTileNBT.java b/src/main/java/binnie/core/network/packet/MessageTileNBT.java index 14297c87..d0a30c14 100644 --- a/src/main/java/binnie/core/network/packet/MessageTileNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageTileNBT.java @@ -1,13 +1,14 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; +import javax.annotation.Nullable; +import java.io.IOException; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.io.IOException; +import io.netty.buffer.ByteBuf; public class MessageTileNBT extends MessageNBT implements IPacketLocation { private int posX; diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index 3e3cc02f..d1e92e90 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -1,13 +1,14 @@ package binnie.core.network.packet; -import binnie.core.network.INetworkedEntity; -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import javax.annotation.Nullable; import java.io.IOException; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import binnie.core.network.INetworkedEntity; +import io.netty.buffer.ByteBuf; + public class MessageUpdate extends MessageCoordinates { @Nullable public PacketPayload payload; diff --git a/src/main/java/binnie/core/network/packet/PacketMetadata.java b/src/main/java/binnie/core/network/packet/PacketMetadata.java index 44ac7c98..ddee7bf4 100644 --- a/src/main/java/binnie/core/network/packet/PacketMetadata.java +++ b/src/main/java/binnie/core/network/packet/PacketMetadata.java @@ -1,12 +1,12 @@ package binnie.core.network.packet; +import java.io.IOException; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.math.BlockPos; -import java.io.IOException; - public class PacketMetadata extends SPacketUpdateTileEntity { public int metadata; diff --git a/src/main/java/binnie/core/network/packet/PacketPayload.java b/src/main/java/binnie/core/network/packet/PacketPayload.java index f8840ea1..bc594194 100644 --- a/src/main/java/binnie/core/network/packet/PacketPayload.java +++ b/src/main/java/binnie/core/network/packet/PacketPayload.java @@ -1,10 +1,10 @@ package binnie.core.network.packet; -import binnie.core.network.INetworkedEntity; - import java.util.ArrayList; import java.util.List; +import binnie.core.network.INetworkedEntity; + public class PacketPayload { public List intPayload; public List floatPayload; diff --git a/src/main/java/binnie/core/network/packet/package-info.java b/src/main/java/binnie/core/network/packet/package-info.java index d7185bce..39a73cdb 100644 --- a/src/main/java/binnie/core/network/packet/package-info.java +++ b/src/main/java/binnie/core/network/packet/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.network.packet; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/package-info.java b/src/main/java/binnie/core/package-info.java index 64748504..1eca6fa5 100644 --- a/src/main/java/binnie/core/package-info.java +++ b/src/main/java/binnie/core/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 8a490b53..7cd4f2e4 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -1,13 +1,9 @@ package binnie.core.proxy; -import binnie.Binnie; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.gui.IBinnieGUID; -import binnie.core.network.packet.MessageBase; import com.google.common.base.Preconditions; -import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; + +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; @@ -15,10 +11,18 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.util.math.BlockPos; + import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; -import javax.annotation.Nullable; +import forestry.core.models.BlockModelEntry; +import forestry.core.models.ModelEntry; + +import binnie.Binnie; +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.gui.IBinnieGUID; +import binnie.core.network.packet.MessageBase; public class BinnieModProxy implements IBinnieModProxy { @Nullable diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index d156782d..cc0d2a9e 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -1,10 +1,8 @@ package binnie.core.proxy; -import binnie.core.AbstractMod; -import binnie.core.network.BinnieCorePacketID; -import binnie.core.network.INetworkedEntity; -import binnie.core.network.packet.MessageUpdate; -import binnie.core.resource.BinnieResource; +import javax.annotation.Nullable; +import java.io.File; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; @@ -14,11 +12,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.registry.GameRegistry; -import javax.annotation.Nullable; -import java.io.File; +import binnie.core.AbstractMod; +import binnie.core.network.BinnieCorePacketID; +import binnie.core.network.INetworkedEntity; +import binnie.core.network.packet.MessageUpdate; +import binnie.core.resource.BinnieResource; public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { private short uniqueTextureUID; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index ec0f6985..ba6af794 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,10 +1,11 @@ package binnie.core.proxy; -import binnie.Constants; -import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; -import binnie.core.models.ModelManager; -import binnie.core.resource.BinnieResource; import com.google.common.base.Throwables; + +import javax.annotation.Nullable; +import java.io.File; +import java.io.IOException; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -18,16 +19,19 @@ import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; + import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.io.File; -import java.io.IOException; +import binnie.Constants; +import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.models.ModelManager; +import binnie.core.resource.BinnieResource; @SideOnly(Side.CLIENT) public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { diff --git a/src/main/java/binnie/core/proxy/IBinnieModProxy.java b/src/main/java/binnie/core/proxy/IBinnieModProxy.java index 8ba9583c..af5dc124 100644 --- a/src/main/java/binnie/core/proxy/IBinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieModProxy.java @@ -1,9 +1,10 @@ package binnie.core.proxy; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; + import binnie.core.gui.IBinnieGUID; import binnie.core.network.packet.MessageBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; public interface IBinnieModProxy extends IProxyCore { void openGui(final IBinnieGUID p0, final EntityPlayer p1, final BlockPos pos); diff --git a/src/main/java/binnie/core/proxy/IBinnieProxy.java b/src/main/java/binnie/core/proxy/IBinnieProxy.java index 4b7228db..8c7c09f5 100644 --- a/src/main/java/binnie/core/proxy/IBinnieProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieProxy.java @@ -1,7 +1,8 @@ package binnie.core.proxy; -import binnie.core.AbstractMod; -import binnie.core.resource.BinnieResource; +import javax.annotation.Nullable; +import java.io.File; + import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -10,8 +11,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.io.File; +import binnie.core.AbstractMod; +import binnie.core.resource.BinnieResource; public interface IBinnieProxy extends IProxyCore { boolean isClient(); diff --git a/src/main/java/binnie/core/proxy/IProxyCore.java b/src/main/java/binnie/core/proxy/IProxyCore.java index 4a821b30..7681128a 100644 --- a/src/main/java/binnie/core/proxy/IProxyCore.java +++ b/src/main/java/binnie/core/proxy/IProxyCore.java @@ -1,11 +1,12 @@ package binnie.core.proxy; -import binnie.core.AbstractMod; -import binnie.core.IInitializable; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; +import binnie.core.AbstractMod; +import binnie.core.IInitializable; + public interface IProxyCore extends IInitializable { void setMod(AbstractMod mod); diff --git a/src/main/java/binnie/core/proxy/package-info.java b/src/main/java/binnie/core/proxy/package-info.java index dbbed795..8861d08e 100644 --- a/src/main/java/binnie/core/proxy/package-info.java +++ b/src/main/java/binnie/core/proxy/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.proxy; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/resource/BinnieResource.java b/src/main/java/binnie/core/resource/BinnieResource.java index e619c4e1..2ca26b07 100644 --- a/src/main/java/binnie/core/resource/BinnieResource.java +++ b/src/main/java/binnie/core/resource/BinnieResource.java @@ -1,8 +1,9 @@ package binnie.core.resource; -import binnie.core.AbstractMod; import net.minecraft.util.ResourceLocation; +import binnie.core.AbstractMod; + public class BinnieResource { String mod; String path; diff --git a/src/main/java/binnie/core/resource/BinnieSprite.java b/src/main/java/binnie/core/resource/BinnieSprite.java index efe50235..25ec7741 100644 --- a/src/main/java/binnie/core/resource/BinnieSprite.java +++ b/src/main/java/binnie/core/resource/BinnieSprite.java @@ -1,15 +1,18 @@ package binnie.core.resource; -import binnie.Binnie; -import binnie.core.AbstractMod; import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import binnie.Binnie; +import binnie.core.AbstractMod; public class BinnieSprite extends BinnieResource { diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index 408a2a5f..ff4821c1 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -1,13 +1,14 @@ package binnie.core.resource; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; import java.util.List; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; + public class ManagerResource { private List sprites; diff --git a/src/main/java/binnie/core/resource/package-info.java b/src/main/java/binnie/core/resource/package-info.java index 6b115cbb..c3ed25b7 100644 --- a/src/main/java/binnie/core/resource/package-info.java +++ b/src/main/java/binnie/core/resource/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.resource; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/src/main/java/binnie/core/texture/BinnieCoreTexture.java index a944964f..8162e914 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -1,14 +1,15 @@ package binnie.core.texture; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public enum BinnieCoreTexture implements IBinnieTexture { Compartment(ResourceType.Tile, "compartment"), diff --git a/src/main/java/binnie/core/texture/TextureManager.java b/src/main/java/binnie/core/texture/TextureManager.java index 5e48213a..446db34c 100644 --- a/src/main/java/binnie/core/texture/TextureManager.java +++ b/src/main/java/binnie/core/texture/TextureManager.java @@ -1,12 +1,12 @@ package binnie.core.texture; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.swing.Icon; -import java.util.ArrayList; -import java.util.List; - @SideOnly(Side.CLIENT) public class TextureManager { static List textures = new ArrayList<>(); diff --git a/src/main/java/binnie/core/texture/package-info.java b/src/main/java/binnie/core/texture/package-info.java index 2f9b7417..cbccaa4b 100644 --- a/src/main/java/binnie/core/texture/package-info.java +++ b/src/main/java/binnie/core/texture/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.texture; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/triggers/package-info.java b/src/main/java/binnie/core/triggers/package-info.java index e31d92c7..c877602f 100644 --- a/src/main/java/binnie/core/triggers/package-info.java +++ b/src/main/java/binnie/core/triggers/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.core.triggers; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/util/FakeCraftingWorld.java b/src/main/java/binnie/core/util/FakeCraftingWorld.java index e5ae7e9c..a22beaf7 100644 --- a/src/main/java/binnie/core/util/FakeCraftingWorld.java +++ b/src/main/java/binnie/core/util/FakeCraftingWorld.java @@ -1,5 +1,7 @@ package binnie.core.util; +import javax.annotation.Nullable; + import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.profiler.Profiler; @@ -14,8 +16,6 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.WorldInfo; -import javax.annotation.Nullable; - public class FakeCraftingWorld extends World { private static final WorldSettings worldSettings = new WorldSettings(0, GameType.SURVIVAL, false, false, WorldType.DEFAULT); private static final WorldInfo worldInfo = new WorldInfo(worldSettings, "fake"); diff --git a/src/main/java/binnie/core/util/FakeMapStorage.java b/src/main/java/binnie/core/util/FakeMapStorage.java index 382c21e8..d7b65473 100644 --- a/src/main/java/binnie/core/util/FakeMapStorage.java +++ b/src/main/java/binnie/core/util/FakeMapStorage.java @@ -1,10 +1,10 @@ package binnie.core.util; +import javax.annotation.Nullable; + import net.minecraft.world.WorldSavedData; import net.minecraft.world.storage.MapStorage; -import javax.annotation.Nullable; - public class FakeMapStorage extends MapStorage { public FakeMapStorage() { super(null); diff --git a/src/main/java/binnie/core/util/FakeSaveHandler.java b/src/main/java/binnie/core/util/FakeSaveHandler.java index 8531d3f6..4b4ba70e 100644 --- a/src/main/java/binnie/core/util/FakeSaveHandler.java +++ b/src/main/java/binnie/core/util/FakeSaveHandler.java @@ -1,5 +1,7 @@ package binnie.core.util; +import java.io.File; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.MinecraftException; import net.minecraft.world.WorldProvider; @@ -9,8 +11,6 @@ import net.minecraft.world.storage.IPlayerFileData; import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.WorldInfo; -import java.io.File; - public class FakeSaveHandler implements ISaveHandler { @Override public WorldInfo loadWorldInfo() { diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index 1d899726..2a6f4a3d 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -1,7 +1,5 @@ package binnie.core.util; -import net.minecraftforge.fluids.FluidStack; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -9,6 +7,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import net.minecraftforge.fluids.FluidStack; + class FluidStackSet implements Set { protected final List fluidStacks; diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index 7198fed0..81a80759 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -1,13 +1,13 @@ package binnie.core.util; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Set; +import net.minecraft.item.ItemStack; + public class ItemStackSet implements Set { List itemStacks; diff --git a/src/main/java/binnie/core/util/OreDictionaryUtil.java b/src/main/java/binnie/core/util/OreDictionaryUtil.java index f7f49619..ba991f03 100644 --- a/src/main/java/binnie/core/util/OreDictionaryUtil.java +++ b/src/main/java/binnie/core/util/OreDictionaryUtil.java @@ -1,11 +1,12 @@ package binnie.core.util; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + public class OreDictionaryUtil { private OreDictionaryUtil() { diff --git a/src/main/java/binnie/core/util/TileUtil.java b/src/main/java/binnie/core/util/TileUtil.java index 88f1d1cd..1258067c 100644 --- a/src/main/java/binnie/core/util/TileUtil.java +++ b/src/main/java/binnie/core/util/TileUtil.java @@ -1,13 +1,14 @@ package binnie.core.util; +import javax.annotation.Nullable; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.capabilities.Capability; -import javax.annotation.Nullable; +import net.minecraftforge.common.capabilities.Capability; public class TileUtil { @Nullable diff --git a/src/main/java/binnie/core/util/package-info.java b/src/main/java/binnie/core/util/package-info.java index 40546adf..e831a02e 100644 --- a/src/main/java/binnie/core/util/package-info.java +++ b/src/main/java/binnie/core/util/package-info.java @@ -3,6 +3,6 @@ @FieldsAreNonnullByDefault package binnie.core.util; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java index 2ee72734..c9c2396b 100644 --- a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java +++ b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java @@ -1,21 +1,25 @@ package binnie.extrabees.alveary; -import binnie.extrabees.client.gui.AbstractAlvearyContainer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.energy.IEnergyStorage; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IIndividual; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import binnie.extrabees.client.gui.AbstractAlvearyContainer; public abstract class AbstractAlvearyLogic implements IBeeModifier, IBeeListener, ICapabilityProvider { diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java index b94063c0..a4e44087 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java @@ -1,25 +1,29 @@ package binnie.extrabees.alveary; -import binnie.extrabees.client.gui.AbstractAlvearyContainer; -import binnie.extrabees.client.gui.ContainerFrameHousing; -import binnie.extrabees.client.gui.GuiContainerAlvearyPart; -import binnie.extrabees.utils.Utils; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeRoot; import forestry.api.apiculture.IHiveFrame; import forestry.api.multiblock.IAlvearyController; import forestry.api.multiblock.IMultiblockLogicAlveary; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemStackHandler; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import binnie.extrabees.client.gui.AbstractAlvearyContainer; +import binnie.extrabees.client.gui.ContainerFrameHousing; +import binnie.extrabees.client.gui.GuiContainerAlvearyPart; +import binnie.extrabees.utils.Utils; public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic { diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java index 2164ad6e..ceb224ec 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java @@ -1,23 +1,27 @@ package binnie.extrabees.alveary; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeRoot; + import binnie.extrabees.client.gui.AbstractAlvearyContainer; import binnie.extrabees.client.gui.ContainerHatchery; import binnie.extrabees.client.gui.GuiContainerAlvearyPart; import binnie.extrabees.utils.Utils; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeRoot; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemStackHandler; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; public class AlvearyLogicHatchery extends AbstractAlvearyLogic { diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java index 3ad74f42..00cb6c75 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java @@ -1,20 +1,24 @@ package binnie.extrabees.alveary; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.IBeeGenome; + import binnie.extrabees.client.gui.AbstractAlvearyContainer; import binnie.extrabees.client.gui.ContainerMutator; import binnie.extrabees.client.gui.GuiContainerMutator; import binnie.extrabees.utils.AlvearyMutationHandler; -import forestry.api.apiculture.IBeeGenome; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemStackHandler; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; public class AlvearyLogicMutator extends AbstractAlvearyLogic { diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java index 2f2d6732..556bd861 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java @@ -1,27 +1,31 @@ package binnie.extrabees.alveary; -import binnie.extrabees.circuit.StimulatorCircuit; -import binnie.extrabees.client.gui.ContainerStimulator; -import binnie.extrabees.client.gui.GuiContainerStimulator; import com.google.common.collect.Lists; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.circuits.ChipsetManager; -import forestry.api.circuits.ICircuit; -import forestry.api.circuits.ICircuitBoard; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.energy.EnergyStorage; -import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.energy.EnergyStorage; +import net.minecraftforge.energy.IEnergyStorage; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; + +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.circuits.ChipsetManager; +import forestry.api.circuits.ICircuit; +import forestry.api.circuits.ICircuitBoard; + +import binnie.extrabees.circuit.StimulatorCircuit; +import binnie.extrabees.client.gui.ContainerStimulator; +import binnie.extrabees.client.gui.GuiContainerStimulator; + public class AlvearyLogicStimulator extends AbstractAlvearyLogic { private final IEnergyStorage energyStorage; diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java index 9469ee9e..b340f830 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java @@ -1,16 +1,18 @@ package binnie.extrabees.alveary; import com.google.common.collect.Lists; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.EnergyStorage; -import net.minecraftforge.energy.IEnergyStorage; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.EnergyStorage; +import net.minecraftforge.energy.IEnergyStorage; + public class AlvearyLogicTransmitter extends AbstractAlvearyLogic implements IEnergyStorage { private IEnergyStorage internalStorage; diff --git a/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java b/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java index 2107d10b..266a7802 100644 --- a/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java +++ b/src/main/java/binnie/extrabees/alveary/EnumAlvearyLogicType.java @@ -1,9 +1,9 @@ package binnie.extrabees.alveary; -import net.minecraft.util.IStringSerializable; - import javax.annotation.Nonnull; +import net.minecraft.util.IStringSerializable; + public enum EnumAlvearyLogicType implements IStringSerializable { FRAME { diff --git a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java index d99ecdee..7f646539 100644 --- a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java +++ b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java @@ -1,12 +1,11 @@ package binnie.extrabees.alveary; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.multiblock.IAlvearyComponent; -import forestry.api.multiblock.IMultiblockComponent; -import forestry.api.multiblock.IMultiblockController; -import forestry.apiculture.multiblock.MultiblockLogicAlveary; -import forestry.core.multiblock.MultiblockTileEntityForestry; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.Set; +import java.util.stream.Collectors; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; @@ -15,15 +14,19 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.common.capabilities.Capability; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Set; -import java.util.stream.Collectors; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.multiblock.IAlvearyComponent; +import forestry.api.multiblock.IMultiblockComponent; +import forestry.api.multiblock.IMultiblockController; +import forestry.apiculture.multiblock.MultiblockLogicAlveary; +import forestry.core.multiblock.MultiblockTileEntityForestry; public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry implements IAlvearyComponent.Active, diff --git a/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java b/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java index 7f1ac005..30c3e3b1 100644 --- a/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java +++ b/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java @@ -1,12 +1,12 @@ package binnie.extrabees.blocks; +import java.util.Random; + import net.minecraft.block.BlockWeb; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.Item; -import java.util.Random; - public class BlockEctoplasm extends BlockWeb { public BlockEctoplasm() { diff --git a/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java index be291069..56505b61 100644 --- a/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java @@ -1,14 +1,12 @@ package binnie.extrabees.blocks; -import binnie.core.genetics.ForestryAllele; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.blocks.type.EnumHiveType; -import binnie.extrabees.genetics.ExtraBeesSpecies; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IHiveDrop; -import forestry.api.core.Tabs; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; @@ -21,12 +19,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IHiveDrop; +import forestry.api.core.Tabs; + +import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.type.EnumHiveType; public class BlockExtraBeeHive extends Block { diff --git a/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java b/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java index c0b8e5c3..2cdd2abd 100644 --- a/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java +++ b/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java @@ -1,11 +1,12 @@ package binnie.extrabees.blocks.type; -import forestry.api.apiculture.IHiveDrop; -import net.minecraft.util.IStringSerializable; - import java.util.ArrayList; import java.util.List; +import net.minecraft.util.IStringSerializable; + +import forestry.api.apiculture.IHiveDrop; + public enum EnumHiveType implements IStringSerializable { Water, diff --git a/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java b/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java index 20c79209..67815f51 100644 --- a/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java +++ b/src/main/java/binnie/extrabees/circuit/AlvearySimulatorCircuitType.java @@ -1,14 +1,15 @@ package binnie.extrabees.circuit; -import binnie.extrabees.utils.BeeModifierLogic; -import binnie.extrabees.utils.EnumBeeBooleanModifier; -import binnie.extrabees.utils.EnumBeeModifier; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; import forestry.api.circuits.ICircuitLayout; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import binnie.extrabees.utils.BeeModifierLogic; +import binnie.extrabees.utils.EnumBeeBooleanModifier; +import binnie.extrabees.utils.EnumBeeModifier; public enum AlvearySimulatorCircuitType implements IBeeModifier { diff --git a/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java b/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java index 9f2ebe8e..e57335eb 100644 --- a/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java +++ b/src/main/java/binnie/extrabees/circuit/BinnieCircuitLayout.java @@ -1,9 +1,10 @@ package binnie.extrabees.circuit; +import net.minecraft.util.text.translation.I18n; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; -import net.minecraft.util.text.translation.I18n; public class BinnieCircuitLayout implements ICircuitLayout { diff --git a/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java b/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java index fb707fe3..5779b3d1 100644 --- a/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java +++ b/src/main/java/binnie/extrabees/circuit/StimulatorCircuit.java @@ -1,17 +1,19 @@ package binnie.extrabees.circuit; import com.google.common.collect.Lists; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; import forestry.core.PluginCore; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; public class StimulatorCircuit implements ICircuit, IBeeModifier { diff --git a/src/main/java/binnie/extrabees/client/BeeModelProvider.java b/src/main/java/binnie/extrabees/client/BeeModelProvider.java index 658d1ac4..ad7317e1 100644 --- a/src/main/java/binnie/extrabees/client/BeeModelProvider.java +++ b/src/main/java/binnie/extrabees/client/BeeModelProvider.java @@ -1,18 +1,20 @@ package binnie.extrabees.client; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBeeModelProvider; -import forestry.api.core.IModelManager; +import java.util.Locale; + import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Locale; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBeeModelProvider; +import forestry.api.core.IModelManager; public class BeeModelProvider implements IBeeModelProvider { public static final BeeModelProvider instance = new BeeModelProvider(); diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java b/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java index 3969580f..8c5aa9ba 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerFrameHousing.java @@ -1,9 +1,11 @@ package binnie.extrabees.client.gui; +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.items.SlotItemHandler; + import binnie.extrabees.alveary.AlvearyLogicFrameHousing; import binnie.extrabees.alveary.EnumAlvearyLogicType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.items.SlotItemHandler; public class ContainerFrameHousing extends AbstractAlvearyContainer { diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java b/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java index 4aeeb67d..ee269a98 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerHatchery.java @@ -1,9 +1,11 @@ package binnie.extrabees.client.gui; +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.items.SlotItemHandler; + import binnie.extrabees.alveary.AlvearyLogicHatchery; import binnie.extrabees.alveary.EnumAlvearyLogicType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.items.SlotItemHandler; public class ContainerHatchery extends AbstractAlvearyContainer { diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java b/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java index 860a8498..29a857ee 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerMutator.java @@ -1,11 +1,13 @@ package binnie.extrabees.client.gui; +import java.awt.Dimension; + +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.items.SlotItemHandler; + import binnie.extrabees.alveary.AlvearyLogicMutator; import binnie.extrabees.alveary.EnumAlvearyLogicType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.items.SlotItemHandler; - -import java.awt.Dimension; public class ContainerMutator extends AbstractAlvearyContainer { diff --git a/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java index 2c083d0b..622f401f 100644 --- a/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java +++ b/src/main/java/binnie/extrabees/client/gui/ContainerStimulator.java @@ -1,11 +1,13 @@ package binnie.extrabees.client.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IContainerListener; + +import net.minecraftforge.energy.IEnergyStorage; +import net.minecraftforge.items.SlotItemHandler; + import binnie.extrabees.alveary.AlvearyLogicStimulator; import binnie.extrabees.alveary.EnumAlvearyLogicType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IContainerListener; -import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.items.SlotItemHandler; public class ContainerStimulator extends AbstractAlvearyContainer { diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java index 17cbc633..295fe93a 100644 --- a/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerAlvearyPart.java @@ -1,15 +1,17 @@ package binnie.extrabees.client.gui; import com.google.common.collect.Lists; + +import java.awt.Color; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; + import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; - @SideOnly(Side.CLIENT) public class GuiContainerAlvearyPart extends GuiContainer { diff --git a/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java b/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java index 2f949177..581317ac 100644 --- a/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java +++ b/src/main/java/binnie/extrabees/client/gui/GuiContainerMutator.java @@ -1,11 +1,13 @@ package binnie.extrabees.client.gui; -import binnie.extrabees.utils.AlvearyMutationHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; +import java.awt.Color; + import org.apache.commons.lang3.tuple.Pair; -import java.awt.Color; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import binnie.extrabees.utils.AlvearyMutationHandler; public class GuiContainerMutator extends GuiContainerAlvearyPart { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index dfc5ff9f..282f5ce8 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -1,6 +1,13 @@ package binnie.extrabees.genetics; import com.google.common.base.Preconditions; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.common.BiomeDictionary; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeHousing; @@ -10,10 +17,6 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.apiculture.genetics.BeeDefinition; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.BiomeDictionary; import static forestry.apiculture.genetics.BeeDefinition.AUSTERE; import static forestry.apiculture.genetics.BeeDefinition.BOGGY; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java index 8322ed3b..3904b571 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesBranch.java @@ -1,14 +1,15 @@ package binnie.extrabees.genetics; -import binnie.extrabees.ExtraBees; +import javax.annotation.Nullable; +import java.util.LinkedHashSet; +import java.util.Set; + import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import javax.annotation.Nullable; -import java.util.LinkedHashSet; -import java.util.Set; +import binnie.extrabees.ExtraBees; public enum ExtraBeesBranch implements IClassification { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 0e1ad3e5..f4ffe501 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -1,7 +1,19 @@ package binnie.extrabees.genetics; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.utils.Utils; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.common.EnumPlantType; + import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -12,18 +24,9 @@ import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IFruitBearer; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; -import java.util.Collections; -import java.util.List; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.utils.Utils; public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType { WATER, diff --git a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java index 34bd4cc8..b97e32cf 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java +++ b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java @@ -1,5 +1,7 @@ package binnie.extrabees.genetics.effect; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.init.Blocks; @@ -8,8 +10,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import java.util.List; - public class EntityBeeLightning extends EntityLightningBolt { private int lightningState; diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 81eaeed6..90a26483 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -1,16 +1,9 @@ package binnie.extrabees.genetics.effect; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.genetics.ExtraBeesFlowers; -import binnie.extrabees.utils.Utils; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IAlleleBeeEffect; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IEffectData; -import forestry.core.render.ParticleRender; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -36,18 +29,29 @@ import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraft.world.WorldServer; + import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IEffectData; +import forestry.core.render.ParticleRender; + +import binnie.extrabees.ExtraBees; +import binnie.extrabees.genetics.ExtraBeesFlowers; +import binnie.extrabees.utils.Utils; public enum ExtraBeesEffect implements IAlleleBeeEffect { ECTOPLASM, diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index dadaca9c..be58080a 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -1,12 +1,12 @@ package binnie.extrabees.genetics.effect; +import java.util.ArrayList; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import java.util.ArrayList; - public class FireworkCreator { public enum Shape { diff --git a/src/main/java/binnie/extrabees/genetics/effect/package-info.java b/src/main/java/binnie/extrabees/genetics/effect/package-info.java index 668ec733..efff304d 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/package-info.java +++ b/src/main/java/binnie/extrabees/genetics/effect/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.genetics.effect; -import binnie.extrabees.utils.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/genetics/package-info.java b/src/main/java/binnie/extrabees/genetics/package-info.java index 41c34367..83b6ed70 100644 --- a/src/main/java/binnie/extrabees/genetics/package-info.java +++ b/src/main/java/binnie/extrabees/genetics/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.genetics; -import binnie.extrabees.utils.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java index bc90ce38..109b92df 100644 --- a/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -1,5 +1,10 @@ package binnie.extrabees.init; +import net.minecraftforge.fml.common.registry.GameRegistry; + +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.apiculture.genetics.BeeDefinition; + import binnie.extrabees.ExtraBees; import binnie.extrabees.alveary.BlockAlveary; import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart; @@ -10,9 +15,6 @@ import binnie.extrabees.genetics.ExtraBeesSpecies; import binnie.extrabees.utils.HiveDrop; import binnie.extrabees.utils.Utils; import binnie.extrabees.utils.config.ConfigurationMain; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.apiculture.genetics.BeeDefinition; -import net.minecraftforge.fml.common.registry.GameRegistry; public final class BlockRegister { diff --git a/src/main/java/binnie/extrabees/init/FluidRegister.java b/src/main/java/binnie/extrabees/init/FluidRegister.java index 1eef32b8..b2fe49ee 100644 --- a/src/main/java/binnie/extrabees/init/FluidRegister.java +++ b/src/main/java/binnie/extrabees/init/FluidRegister.java @@ -1,9 +1,10 @@ package binnie.extrabees.init; -import binnie.extrabees.utils.ExtraBeesResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import binnie.extrabees.utils.ExtraBeesResourceLocation; + public final class FluidRegister { //Fluids seem unused, diff --git a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java index d781dd2f..713d1cbd 100644 --- a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java @@ -1,7 +1,18 @@ package binnie.extrabees.items; -import binnie.extrabees.items.types.EnumHiveFrame; -import binnie.extrabees.utils.ExtraBeesResourceLocation; +import javax.annotation.Nullable; +import java.util.List; + +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.client.model.ModelLoader; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -11,16 +22,9 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.core.utils.Translator; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import binnie.extrabees.items.types.EnumHiveFrame; +import binnie.extrabees.utils.ExtraBeesResourceLocation; public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IItemModelRegister { diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java index b17ea958..77ec9753 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java @@ -1,21 +1,25 @@ package binnie.extrabees.items; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.Tabs; +import forestry.apiculture.PluginApiculture; +import forestry.core.PluginCore; +import forestry.core.items.IColoredItem; + import binnie.extrabees.ExtraBees; import binnie.extrabees.items.types.EnumHoneyComb; import binnie.extrabees.items.types.EnumHoneyDrop; import binnie.extrabees.items.types.EnumPropolis; import binnie.extrabees.items.types.ExtraBeeItems; import binnie.extrabees.utils.Utils; -import forestry.api.core.Tabs; -import forestry.apiculture.PluginApiculture; -import forestry.core.PluginCore; -import forestry.core.items.IColoredItem; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; public class ItemHoneyComb extends ItemProduct implements IColoredItem { diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java index c0833542..308df02b 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java @@ -1,9 +1,11 @@ package binnie.extrabees.items; -import binnie.extrabees.items.types.EnumHoneyDrop; +import net.minecraft.item.ItemStack; + import forestry.api.core.Tabs; import forestry.core.items.IColoredItem; -import net.minecraft.item.ItemStack; + +import binnie.extrabees.items.types.EnumHoneyDrop; public class ItemHoneyDrop extends ItemProduct implements IColoredItem { diff --git a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java index f1203c7f..e032b97e 100644 --- a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java @@ -1,17 +1,19 @@ package binnie.extrabees.items; -import binnie.extrabees.items.types.IndustrialFrame; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import binnie.extrabees.items.types.IndustrialFrame; public class ItemIndustrialFrame extends Item { diff --git a/src/main/java/binnie/extrabees/items/ItemProduct.java b/src/main/java/binnie/extrabees/items/ItemProduct.java index 7ab50699..fcd9d747 100644 --- a/src/main/java/binnie/extrabees/items/ItemProduct.java +++ b/src/main/java/binnie/extrabees/items/ItemProduct.java @@ -1,17 +1,21 @@ package binnie.extrabees.items; -import binnie.extrabees.items.types.IEBEnumItem; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.client.model.ModelLoader; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.extrabees.items.types.IEBEnumItem; + public class ItemProduct extends Item implements IItemModelRegister { protected IEBEnumItem[] types; diff --git a/src/main/java/binnie/extrabees/items/ItemPropolis.java b/src/main/java/binnie/extrabees/items/ItemPropolis.java index 8913bdab..dd088edb 100644 --- a/src/main/java/binnie/extrabees/items/ItemPropolis.java +++ b/src/main/java/binnie/extrabees/items/ItemPropolis.java @@ -1,9 +1,11 @@ package binnie.extrabees.items; -import binnie.extrabees.items.types.EnumPropolis; +import net.minecraft.item.ItemStack; + import forestry.api.core.Tabs; import forestry.core.items.IColoredItem; -import net.minecraft.item.ItemStack; + +import binnie.extrabees.items.types.EnumPropolis; public class ItemPropolis extends ItemProduct implements IColoredItem { diff --git a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java index 52245164..ab965896 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java @@ -1,27 +1,30 @@ package binnie.extrabees.items.types; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.items.ItemHiveFrame; -import binnie.extrabees.utils.BeeModifierLogic; -import binnie.extrabees.utils.EnumBeeBooleanModifier; -import binnie.extrabees.utils.EnumBeeModifier; +import javax.annotation.Nullable; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; import forestry.apiculture.PluginApiculture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.items.ItemHiveFrame; +import binnie.extrabees.utils.BeeModifierLogic; +import binnie.extrabees.utils.EnumBeeBooleanModifier; +import binnie.extrabees.utils.EnumBeeModifier; public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java index 9560d451..df7fdcea 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java @@ -1,17 +1,21 @@ package binnie.extrabees.items.types; -import binnie.extrabees.ExtraBees; import com.google.common.base.Objects; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.recipes.RecipeManagers; + +import binnie.extrabees.ExtraBees; + public enum EnumHoneyComb implements IEBEnumItem { BARREN(7564356, 12762791), diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java index d0ae205e..3beab507 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java @@ -1,11 +1,14 @@ package binnie.extrabees.items.types; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import forestry.api.recipes.RecipeManagers; + import binnie.extrabees.ExtraBees; import binnie.extrabees.utils.Utils; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public enum EnumHoneyDrop implements IEBEnumItem { diff --git a/src/main/java/binnie/extrabees/items/types/EnumPropolis.java b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java index f66a62aa..8be15bbe 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java @@ -1,10 +1,13 @@ package binnie.extrabees.items.types; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import forestry.api.recipes.RecipeManagers; + import binnie.extrabees.ExtraBees; import binnie.extrabees.utils.Utils; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public enum EnumPropolis implements IEBEnumItem { WATER(2405321, 12762791, "Water"), diff --git a/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java b/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java index fcd2364b..7e50191e 100644 --- a/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java @@ -1,12 +1,14 @@ package binnie.extrabees.items.types; -import binnie.extrabees.ExtraBees; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import javax.annotation.Nullable; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + +import binnie.extrabees.ExtraBees; + public enum ExtraBeeItems implements IEBItemMiscProvider { ScentedGear("Scented Gear", "scented_gear"), diff --git a/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java b/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java index b5989872..0d9a24a0 100644 --- a/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java @@ -1,12 +1,13 @@ package binnie.extrabees.items.types; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeModifier; +import javax.annotation.Nullable; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import javax.annotation.Nullable; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeModifier; public enum IndustrialFrame implements IBeeModifier { diff --git a/src/main/java/binnie/extrabees/proxy/package-info.java b/src/main/java/binnie/extrabees/proxy/package-info.java index e74acdc9..0c15c844 100644 --- a/src/main/java/binnie/extrabees/proxy/package-info.java +++ b/src/main/java/binnie/extrabees/proxy/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.proxy; -import binnie.extrabees.utils.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java b/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java index a46baafb..ca8e1d20 100644 --- a/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java +++ b/src/main/java/binnie/extrabees/utils/AlvearyMutationHandler.java @@ -1,16 +1,17 @@ package binnie.extrabees.utils; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.tuple.Pair; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import static org.apache.commons.lang3.ObjectUtils.firstNonNull; public class AlvearyMutationHandler { diff --git a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java index 0c6a5853..ac0a8f76 100644 --- a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java +++ b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java @@ -1,16 +1,18 @@ package binnie.extrabees.utils; -import forestry.core.utils.Translator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.utils.Translator; + public class BeeModifierLogic { private Map modifiers; diff --git a/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java b/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java index 3f90a1df..2687947d 100644 --- a/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java +++ b/src/main/java/binnie/extrabees/utils/ExtraBeesResourceLocation.java @@ -1,8 +1,9 @@ package binnie.extrabees.utils; -import binnie.extrabees.ExtraBees; import net.minecraft.util.ResourceLocation; +import binnie.extrabees.ExtraBees; + public class ExtraBeesResourceLocation extends ResourceLocation { public ExtraBeesResourceLocation(String resourceName) { diff --git a/src/main/java/binnie/extrabees/utils/HiveDrop.java b/src/main/java/binnie/extrabees/utils/HiveDrop.java index 781aaeba..56221a83 100644 --- a/src/main/java/binnie/extrabees/utils/HiveDrop.java +++ b/src/main/java/binnie/extrabees/utils/HiveDrop.java @@ -1,13 +1,14 @@ package binnie.extrabees.utils; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; + import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; import forestry.api.genetics.IAllele; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; public class HiveDrop implements IHiveDrop { diff --git a/src/main/java/binnie/extrabees/utils/Utils.java b/src/main/java/binnie/extrabees/utils/Utils.java index aebab3c1..773ef991 100644 --- a/src/main/java/binnie/extrabees/utils/Utils.java +++ b/src/main/java/binnie/extrabees/utils/Utils.java @@ -1,9 +1,7 @@ package binnie.extrabees.utils; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeRoot; -import forestry.apiculture.genetics.BeeDefinition; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; @@ -12,12 +10,17 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import net.minecraftforge.fml.common.registry.ForgeRegistries; -import javax.annotation.Nullable; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeRoot; +import forestry.apiculture.genetics.BeeDefinition; public class Utils { diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java index f4d2f95c..7bcca25f 100644 --- a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java +++ b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java @@ -2,11 +2,12 @@ package binnie.extrabees.utils.config; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import net.minecraftforge.common.config.Configuration; import java.io.File; import java.util.Set; +import net.minecraftforge.common.config.Configuration; + public class ConfigHandler { private final Configuration config; diff --git a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java index c177f1be..7a70819f 100644 --- a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java +++ b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java @@ -1,13 +1,15 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.utils.config.ConfigurationMain; +import java.util.Random; + import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; + import net.minecraftforge.fml.common.IWorldGenerator; -import java.util.Random; +import binnie.extrabees.utils.config.ConfigurationMain; public class ExtraBeesWorldGenerator implements IWorldGenerator { diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java index 542b7921..a850b2f4 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java @@ -1,8 +1,7 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.blocks.BlockExtraBeeHive; -import binnie.extrabees.blocks.type.EnumHiveType; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; @@ -10,9 +9,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.WorldGenerator; + import net.minecraftforge.common.BiomeDictionary; -import java.util.Random; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.BlockExtraBeeHive; +import binnie.extrabees.blocks.type.EnumHiveType; public class WorldGenHiveNether extends WorldGenerator { diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java index f42f877b..13769ed9 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java @@ -1,8 +1,7 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.blocks.BlockExtraBeeHive; -import binnie.extrabees.blocks.type.EnumHiveType; +import java.util.Random; + import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; @@ -10,7 +9,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import java.util.Random; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.BlockExtraBeeHive; +import binnie.extrabees.blocks.type.EnumHiveType; public class WorldGenHiveRock extends WorldGenerator { diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java index 98205c16..91a2980d 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java @@ -1,15 +1,16 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.blocks.BlockExtraBeeHive; -import binnie.extrabees.blocks.type.EnumHiveType; +import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import java.util.Random; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.BlockExtraBeeHive; +import binnie.extrabees.blocks.type.EnumHiveType; public class WorldGenHiveWater extends WorldGenerator { diff --git a/src/main/java/binnie/extrabees/worldgen/package-info.java b/src/main/java/binnie/extrabees/worldgen/package-info.java index a8a3eca2..7a48bf07 100644 --- a/src/main/java/binnie/extrabees/worldgen/package-info.java +++ b/src/main/java/binnie/extrabees/worldgen/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extrabees.worldgen; -import binnie.extrabees.utils.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 8b6deddc..4a84dfaf 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,5 +1,35 @@ package binnie.extratrees; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.texture.TextureMap; + +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; + +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLConstructionEvent; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.ITreeRoot; +import forestry.api.genetics.AlleleSpeciesRegisterEvent; +import forestry.api.lepidopterology.IButterflyRoot; + import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -23,31 +53,6 @@ import binnie.extratrees.item.ModuleItems; import binnie.extratrees.kitchen.ModuleKitchen; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.proxy.Proxy; -import com.google.common.base.Preconditions; -import forestry.api.arboriculture.ITreeRoot; -import forestry.api.genetics.AlleleSpeciesRegisterEvent; -import forestry.api.lepidopterology.IButterflyRoot; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLConstructionEvent; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraTrees extends AbstractMod { diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index 7f643491..1208dfbd 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -1,15 +1,17 @@ package binnie.extratrees.alcohol; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; import binnie.extratrees.ExtraTrees; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; - -import java.util.ArrayList; -import java.util.List; public enum Alcohol implements IFluidType, ICocktailLiquid { Apple("cider.apple", 16432700, 0.3, 0.05), diff --git a/src/main/java/binnie/extratrees/alcohol/Cocktail.java b/src/main/java/binnie/extratrees/alcohol/Cocktail.java index b517438c..5c43f1cd 100644 --- a/src/main/java/binnie/extratrees/alcohol/Cocktail.java +++ b/src/main/java/binnie/extratrees/alcohol/Cocktail.java @@ -1,13 +1,13 @@ package binnie.extratrees.alcohol; -import binnie.extratrees.alcohol.drink.DrinkLiquid; -import binnie.extratrees.alcohol.drink.DrinkManager; - import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import binnie.extratrees.alcohol.drink.DrinkLiquid; +import binnie.extratrees.alcohol.drink.DrinkManager; + public enum Cocktail { Bellini("Bellini", Glassware.Flute, 15974764), BlackRussian("Black Russian", Glassware.OldFashioned, 3347992), diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index 488a4168..8353535d 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -1,10 +1,11 @@ package binnie.extratrees.alcohol; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; public enum Glassware { BeerMug(480, 10, 14), diff --git a/src/main/java/binnie/extratrees/alcohol/Juice.java b/src/main/java/binnie/extratrees/alcohol/Juice.java index bdbef293..96817dc0 100644 --- a/src/main/java/binnie/extratrees/alcohol/Juice.java +++ b/src/main/java/binnie/extratrees/alcohol/Juice.java @@ -1,11 +1,13 @@ package binnie.extratrees.alcohol; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; public enum Juice implements IFluidType, ICocktailLiquid { Apple("Apple Juice", "juice.apple", 16763442, 0.7, "Apple"), diff --git a/src/main/java/binnie/extratrees/alcohol/Liqueur.java b/src/main/java/binnie/extratrees/alcohol/Liqueur.java index 2701dba8..191c423f 100644 --- a/src/main/java/binnie/extratrees/alcohol/Liqueur.java +++ b/src/main/java/binnie/extratrees/alcohol/Liqueur.java @@ -1,11 +1,13 @@ package binnie.extratrees.alcohol; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; public enum Liqueur implements IFluidType, ICocktailLiquid { Almond("Almond", 14966063, 0.3, 0.2), diff --git a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java index ae16e2d8..98800e6c 100644 --- a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java +++ b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java @@ -1,11 +1,13 @@ package binnie.extratrees.alcohol; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; public enum MiscFluid implements IFluidType, ICocktailLiquid { CarbonatedWater("Carbonated Water", "water.carbonated", 13421823, 0.10000000149011612), diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index d90abae4..429231b7 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -1,5 +1,19 @@ package binnie.extratrees.alcohol; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.recipes.ISqueezerRecipe; +import forestry.api.recipes.RecipeManagers; + import binnie.Binnie; import binnie.core.IInitializable; import binnie.core.liquid.IFluidType; @@ -15,17 +29,6 @@ import binnie.extratrees.machines.brewery.BreweryRecipes; import binnie.extratrees.machines.distillery.DistilleryLogic; import binnie.extratrees.machines.distillery.DistilleryRecipes; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; -import forestry.api.recipes.ISqueezerRecipe; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; public class ModuleAlcohol implements IInitializable { public ItemDrink drink; diff --git a/src/main/java/binnie/extratrees/alcohol/Spirit.java b/src/main/java/binnie/extratrees/alcohol/Spirit.java index b63b9364..4a69c31e 100644 --- a/src/main/java/binnie/extratrees/alcohol/Spirit.java +++ b/src/main/java/binnie/extratrees/alcohol/Spirit.java @@ -1,11 +1,13 @@ package binnie.extratrees.alcohol; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; public enum Spirit implements IFluidType, ICocktailLiquid { NeutralSpirit("Neutral Spirit", "spirit.neutral", 16777215, 0.05, 0.8), diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java index b291316f..034063d0 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java @@ -1,8 +1,9 @@ package binnie.extratrees.alcohol.drink; -import binnie.Binnie; import net.minecraftforge.fluids.FluidStack; +import binnie.Binnie; + public class DrinkLiquid implements IDrinkLiquid { private final String name; private final int colour; diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java index 3e50f8ad..2ae73f2d 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java @@ -1,12 +1,12 @@ package binnie.extratrees.alcohol.drink; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + public class DrinkManager { private static final Map DRINK_LIQUIDS = new HashMap<>(); diff --git a/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java b/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java index dd060f1e..2334bdef 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/FluidHandlerItemGlassware.java @@ -1,11 +1,13 @@ package binnie.extratrees.alcohol.drink; -import binnie.extratrees.alcohol.Glassware; import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; +import binnie.extratrees.alcohol.Glassware; + // TODO implement cocktails and only allow glassware to hold the correct cocktails. public class FluidHandlerItemGlassware extends FluidHandlerItemStackSimple { diff --git a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java index 441a33ad..5f2793f0 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java @@ -1,8 +1,7 @@ package binnie.extratrees.alcohol.drink; -import binnie.extratrees.alcohol.Alcohol; -import binnie.extratrees.alcohol.Glassware; -import forestry.api.core.Tabs; +import javax.annotation.Nullable; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; @@ -10,13 +9,18 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; + import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import forestry.api.core.Tabs; + +import binnie.extratrees.alcohol.Alcohol; +import binnie.extratrees.alcohol.Glassware; public class ItemDrink extends ItemFood { public ItemDrink() { diff --git a/src/main/java/binnie/extratrees/alcohol/drink/package-info.java b/src/main/java/binnie/extratrees/alcohol/drink/package-info.java index c0b35df7..84851bf8 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/package-info.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.alcohol.drink; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/alcohol/package-info.java b/src/main/java/binnie/extratrees/alcohol/package-info.java index 78a66231..1b27aa41 100644 --- a/src/main/java/binnie/extratrees/alcohol/package-info.java +++ b/src/main/java/binnie/extratrees/alcohol/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.alcohol; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java index 6fb58969..8ae911f2 100644 --- a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java +++ b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java @@ -1,11 +1,11 @@ package binnie.extratrees.api; -import net.minecraft.item.ItemStack; - import javax.annotation.Nullable; import java.util.Collection; import java.util.List; +import net.minecraft.item.ItemStack; + public interface ICarpentryInterface { boolean registerCarpentryWood(final int index, final IDesignMaterial material); diff --git a/src/main/java/binnie/extratrees/api/IDesignSystem.java b/src/main/java/binnie/extratrees/api/IDesignSystem.java index ccc36cd2..a043539e 100644 --- a/src/main/java/binnie/extratrees/api/IDesignSystem.java +++ b/src/main/java/binnie/extratrees/api/IDesignSystem.java @@ -1,12 +1,13 @@ package binnie.extratrees.api; +import javax.annotation.Nullable; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; - public interface IDesignSystem { @Nullable @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/extratrees/api/ILayout.java b/src/main/java/binnie/extratrees/api/ILayout.java index 199c5ea6..2fc5062a 100644 --- a/src/main/java/binnie/extratrees/api/ILayout.java +++ b/src/main/java/binnie/extratrees/api/ILayout.java @@ -1,6 +1,7 @@ package binnie.extratrees.api; import net.minecraft.client.renderer.texture.TextureAtlasSprite; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/api/IPattern.java b/src/main/java/binnie/extratrees/api/IPattern.java index c1596cba..6420eb45 100644 --- a/src/main/java/binnie/extratrees/api/IPattern.java +++ b/src/main/java/binnie/extratrees/api/IPattern.java @@ -1,10 +1,12 @@ package binnie.extratrees.api; -import forestry.api.core.ISpriteRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.ISpriteRegister; + public interface IPattern extends ISpriteRegister { @SideOnly(Side.CLIENT) TextureAtlasSprite getPrimarySprite(IDesignSystem system); diff --git a/src/main/java/binnie/extratrees/api/package-info.java b/src/main/java/binnie/extratrees/api/package-info.java index 76a83130..baa575f7 100644 --- a/src/main/java/binnie/extratrees/api/package-info.java +++ b/src/main/java/binnie/extratrees/api/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package binnie.extratrees.api; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index 8c40fcf9..bceff420 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -1,15 +1,10 @@ package binnie.extratrees.block; -import binnie.Constants; -import binnie.extratrees.block.property.PropertyETType; -import binnie.extratrees.genetics.ETTreeDefinition; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.core.blocks.IColoredBlock; -import forestry.core.proxy.Proxies; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -29,15 +24,24 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.IShearable; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.core.blocks.IColoredBlock; +import forestry.core.proxy.Proxies; + +import binnie.Constants; +import binnie.extratrees.block.property.PropertyETType; +import binnie.extratrees.genetics.ETTreeDefinition; public abstract class BlockETDecorativeLeaves extends Block implements IItemModelRegister, IColoredBlock, IShearable { private static final int VARIANTS_PER_BLOCK = 16; diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 9951c26d..850bb46f 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -1,11 +1,7 @@ package binnie.extratrees.block; -import binnie.Binnie; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; -import forestry.api.core.Tabs; +import java.util.List; + import net.minecraft.block.BlockDoor; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.SoundType; @@ -22,10 +18,17 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import forestry.api.core.Tabs; + +import binnie.Binnie; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntityProvider { /*private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) { diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index 52375bc3..eb0bde06 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -1,13 +1,16 @@ package binnie.extratrees.block; -import binnie.Constants; +import java.util.Locale; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.registry.GameRegistry; + import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import java.util.Locale; +import binnie.Constants; public enum EnumETLog implements IWoodType { Apple("Apple", PlankType.ExtraTreePlanks.Apple), diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/src/main/java/binnie/extratrees/block/IPlankType.java index 1238969d..0ce15849 100644 --- a/src/main/java/binnie/extratrees/block/IPlankType.java +++ b/src/main/java/binnie/extratrees/block/IPlankType.java @@ -1,12 +1,15 @@ package binnie.extratrees.block; -import binnie.extratrees.api.IDesignMaterial; -import forestry.api.arboriculture.IWoodType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IWoodType; + +import binnie.extratrees.api.IDesignMaterial; + public interface IPlankType extends IDesignMaterial { String getPlankTextureName(); diff --git a/src/main/java/binnie/extratrees/block/IWoodKind.java b/src/main/java/binnie/extratrees/block/IWoodKind.java index daa18780..dfa6a583 100644 --- a/src/main/java/binnie/extratrees/block/IWoodKind.java +++ b/src/main/java/binnie/extratrees/block/IWoodKind.java @@ -1,8 +1,9 @@ package binnie.extratrees.block; -import forestry.api.arboriculture.WoodBlockKind; import net.minecraft.block.properties.PropertyEnum; +import forestry.api.arboriculture.WoodBlockKind; + public interface IWoodKind { PropertyEnum getVariant(); diff --git a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java index f8b76775..083687ae 100644 --- a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java @@ -1,6 +1,11 @@ package binnie.extratrees.block; -import binnie.extratrees.genetics.ETTreeDefinition; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ITreeGenome; import forestry.arboriculture.PluginArboriculture; @@ -8,10 +13,8 @@ import forestry.arboriculture.items.ItemBlockLeaves; import forestry.core.items.IColoredItem; import forestry.core.items.ItemBlockForestry; import forestry.core.utils.Translator; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import binnie.extratrees.genetics.ETTreeDefinition; public class ItemBlockETDecorativeLeaves extends ItemBlockForestry implements IColoredItem { public ItemBlockETDecorativeLeaves(Block block) { diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index 03f07fd4..569e20f9 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -1,6 +1,5 @@ package binnie.extratrees.block; -import binnie.core.block.ItemMetadata; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -11,6 +10,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import binnie.core.block.ItemMetadata; + public class ItemETDoor extends ItemMetadata { /*@Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 319b8966..1f718142 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -1,21 +1,24 @@ package binnie.extratrees.block; -import binnie.Constants; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.api.CarpentryManager; -import forestry.api.arboriculture.EnumForestryWoodType; -import forestry.api.arboriculture.EnumVanillaWoodType; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; + +import binnie.Constants; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.CarpentryManager; + public class PlankType { public static final int MAX_PLANKS = 256; diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 3bcdab53..07f81399 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -1,20 +1,5 @@ package binnie.extratrees.block; -import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.api.CarpentryManager; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.block.decor.FenceDescription; -import binnie.extratrees.block.decor.FenceType; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; -import forestry.arboriculture.IWoodTyped; -import forestry.core.utils.Translator; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -23,6 +8,23 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.arboriculture.IWoodTyped; +import forestry.core.utils.Translator; + +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.block.decor.FenceDescription; +import binnie.extratrees.block.decor.FenceType; + public class WoodManager { public static Map PLANKS; diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index af0dcd7a..40a444cc 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -1,9 +1,8 @@ package binnie.extratrees.block.decor; -import forestry.api.arboriculture.EnumLeafType; -import forestry.api.core.Tabs; -import forestry.arboriculture.PluginArboriculture; -import forestry.core.blocks.IColoredBlock; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFenceGate; @@ -21,11 +20,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import forestry.api.arboriculture.EnumLeafType; +import forestry.api.core.Tabs; +import forestry.arboriculture.PluginArboriculture; +import forestry.core.blocks.IColoredBlock; public class BlockHedge extends Block implements IBlockFence, IColoredBlock { public BlockHedge() { diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index af8cfa78..18b39420 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -1,23 +1,8 @@ package binnie.extratrees.block.decor; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.models.DefaultStateMapper; -import binnie.core.models.ModelManager; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.PlankType; -import binnie.extratrees.block.WoodManager; -import binnie.extratrees.models.ModelMultiFence; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.Tabs; -import forestry.arboriculture.PluginArboriculture; -import forestry.core.blocks.properties.UnlistedBlockAccess; -import forestry.core.blocks.properties.UnlistedBlockPos; -import forestry.core.models.BlockModelEntry; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFenceGate; @@ -43,15 +28,34 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; +import forestry.arboriculture.PluginArboriculture; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; +import forestry.core.models.BlockModelEntry; + +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.models.DefaultStateMapper; +import binnie.core.models.ModelManager; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.PlankType; +import binnie.extratrees.block.WoodManager; +import binnie.extratrees.models.ModelMultiFence; public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStateMapperRegister, IItemModelRegister, IBlockFence { public BlockMultiFence() { diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index c81bd43b..99e3c132 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -1,11 +1,11 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.ExtraTrees; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import binnie.extratrees.ExtraTrees; + public class FenceType { public static List VALUES; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 786f9ae0..e58f4d4d 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -1,15 +1,17 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.WoodManager; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.common.ForgeHooks; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; + public class MultiFenceRecipeEmbedded implements IRecipe { private ItemStack cached = ItemStack.EMPTY; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java index 274f4180..f487d2d4 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipePattern.java @@ -1,8 +1,9 @@ package binnie.extratrees.block.decor; +import net.minecraft.item.ItemStack; + import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; -import net.minecraft.item.ItemStack; public class MultiFenceRecipePattern { public static MultiFenceRecipePattern[] VALUES; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 4b1b9ca1..66ce5841 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -1,17 +1,19 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.WoodManager; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.common.ForgeHooks; -import java.util.ArrayList; -import java.util.List; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; public class MultiFenceRecipeSize implements IRecipe { private ItemStack cached = ItemStack.EMPTY; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 0f20e85f..8f9bb7b4 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -1,14 +1,16 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.block.WoodManager; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.common.ForgeHooks; +import binnie.extratrees.block.WoodManager; + public class MultiFenceRecipeSolid implements IRecipe { private ItemStack cached = ItemStack.EMPTY; diff --git a/src/main/java/binnie/extratrees/block/decor/package-info.java b/src/main/java/binnie/extratrees/block/decor/package-info.java index 56d3f0aa..9aa14d50 100644 --- a/src/main/java/binnie/extratrees/block/decor/package-info.java +++ b/src/main/java/binnie/extratrees/block/decor/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.block.decor; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/package-info.java b/src/main/java/binnie/extratrees/block/package-info.java index c6a5320d..710011ce 100644 --- a/src/main/java/binnie/extratrees/block/package-info.java +++ b/src/main/java/binnie/extratrees/block/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.block; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java index 0f70ad57..d11692ac 100644 --- a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java @@ -1,11 +1,12 @@ package binnie.extratrees.block.property; -import binnie.extratrees.block.EnumETLog; -import binnie.extratrees.block.PlankType; import com.google.common.base.Predicate; import javax.annotation.Nullable; +import binnie.extratrees.block.EnumETLog; +import binnie.extratrees.block.PlankType; + public class ETWoodTypePredicate implements Predicate { private final int minWoodTypeMeta; private final int maxWoodTypeMeta; diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index 406bf07f..abcaa843 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -1,12 +1,14 @@ package binnie.extratrees.block.property; +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; + +import java.util.Collection; + +import forestry.arboriculture.blocks.PropertyWoodType; + import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; -import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; -import forestry.arboriculture.blocks.PropertyWoodType; - -import java.util.Collection; public class PropertyETWoodType extends PropertyWoodType { diff --git a/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java index 5a6d7de9..e44a892c 100644 --- a/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java @@ -1,10 +1,11 @@ package binnie.extratrees.block.property; -import binnie.extratrees.genetics.ETTreeDefinition; import com.google.common.base.Predicate; import javax.annotation.Nullable; +import binnie.extratrees.genetics.ETTreeDefinition; + public class TreeTypePredicate implements Predicate { private final int minMeta; private final int maxMeta; diff --git a/src/main/java/binnie/extratrees/block/property/package-info.java b/src/main/java/binnie/extratrees/block/property/package-info.java index 4852f92f..91f9f41b 100644 --- a/src/main/java/binnie/extratrees/block/property/package-info.java +++ b/src/main/java/binnie/extratrees/block/property/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.block.property; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java index b6eb9512..6b8946d7 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -1,16 +1,18 @@ package binnie.extratrees.block.wood; -import binnie.Constants; -import binnie.extratrees.block.EnumETLog; -import binnie.extratrees.block.property.PropertyETWoodType; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.ResourceLocation; + import forestry.api.core.IItemModelRegister; import forestry.api.core.IStateMapperRegister; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.blocks.BlockForestryFence; -import net.minecraft.util.ResourceLocation; -import java.util.ArrayList; -import java.util.List; +import binnie.Constants; +import binnie.extratrees.block.EnumETLog; +import binnie.extratrees.block.property.PropertyETWoodType; public abstract class BlockETFence extends BlockForestryFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { private BlockETFence(boolean fireproof, int blockNumber) { diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java index 97d74a24..abd8fa47 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -1,14 +1,16 @@ package binnie.extratrees.block.wood; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.ResourceLocation; + +import forestry.arboriculture.blocks.BlockForestryLog; +import forestry.arboriculture.blocks.PropertyWoodType; + import binnie.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; -import forestry.arboriculture.blocks.BlockForestryLog; -import forestry.arboriculture.blocks.PropertyWoodType; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.List; public abstract class BlockETLog extends BlockForestryLog { private BlockETLog(boolean fireproof, int blockNumber) { diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index 33bcde24..6d521939 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -1,13 +1,15 @@ package binnie.extratrees.block.wood; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.ResourceLocation; + +import forestry.arboriculture.blocks.BlockForestryPlanks; + import binnie.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; -import forestry.arboriculture.blocks.BlockForestryPlanks; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.List; public abstract class BlockETPlank extends BlockForestryPlanks { public static final String BLOCK_NAME = "plank"; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index 01e8e3cd..514dcecf 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -1,13 +1,15 @@ package binnie.extratrees.block.wood; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.ResourceLocation; + +import forestry.arboriculture.blocks.BlockForestrySlab; + import binnie.Constants; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; -import forestry.arboriculture.blocks.BlockForestrySlab; -import net.minecraft.util.ResourceLocation; - -import java.util.ArrayList; -import java.util.List; public abstract class BlockETSlab extends BlockForestrySlab { private BlockETSlab(boolean fireproof, int blockNumber) { diff --git a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java index d6f2b681..93a30ab9 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java @@ -1,13 +1,11 @@ package binnie.extratrees.block.wood; -import binnie.Constants; -import binnie.extratrees.block.EnumShrubLog; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.WoodBlockKind; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.IStateMapperRegister; -import forestry.arboriculture.IWoodTyped; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -27,15 +25,21 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Random; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.arboriculture.IWoodTyped; + +import binnie.Constants; +import binnie.extratrees.block.EnumShrubLog; public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister { diff --git a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java index 131e0206..daa92478 100644 --- a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java @@ -1,11 +1,13 @@ package binnie.extratrees.block.wood; -import binnie.extratrees.block.WoodManager; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + import forestry.api.arboriculture.IWoodType; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.items.ItemBlockWood; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; + +import binnie.extratrees.block.WoodManager; public class ItemBlockETWood extends ItemBlockWood { diff --git a/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java index 864b1608..4a88f398 100644 --- a/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java @@ -1,10 +1,12 @@ package binnie.extratrees.block.wood; -import binnie.extratrees.block.WoodManager; -import forestry.api.arboriculture.IWoodType; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; +import forestry.api.arboriculture.IWoodType; + +import binnie.extratrees.block.WoodManager; + public class ItemETSlab extends ItemSlab { public ItemETSlab(BlockETSlab block, BlockETSlab slab, BlockETSlab doubleSlab) { diff --git a/src/main/java/binnie/extratrees/block/wood/package-info.java b/src/main/java/binnie/extratrees/block/wood/package-info.java index b197b222..0df92558 100644 --- a/src/main/java/binnie/extratrees/block/wood/package-info.java +++ b/src/main/java/binnie/extratrees/block/wood/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.block.wood; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index 70f5677d..96280e87 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -1,13 +1,15 @@ package binnie.extratrees.carpentry; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; + +import forestry.api.core.Tabs; + import binnie.Binnie; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesign; import binnie.extratrees.block.PlankType; -import forestry.api.core.Tabs; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; public class BlockCarpentry extends BlockDesign { public BlockCarpentry(String name) { diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 1458152f..e68e134f 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -1,9 +1,7 @@ package binnie.extratrees.carpentry; -import binnie.Binnie; -import binnie.core.block.BlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; +import javax.annotation.Nullable; + import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,7 +13,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import javax.annotation.Nullable; +import binnie.Binnie; +import binnie.core.block.BlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; public class BlockCarpentryPanel extends BlockCarpentry { public BlockCarpentryPanel() { diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index f2c3a9a4..52e6a471 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -1,25 +1,8 @@ package binnie.extratrees.carpentry; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IMultipassBlock; -import binnie.core.block.TileEntityMetadata; -import binnie.core.models.DefaultStateMapper; -import binnie.core.models.ModelManager; -import binnie.core.models.ModelMutlipass; -import binnie.core.util.TileUtil; -import binnie.extratrees.api.CarpentryManager; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.api.IDesignSystem; -import binnie.extratrees.api.IToolHammer; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.ISpriteRegister; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.ITextureManager; -import forestry.core.blocks.IColoredBlock; -import forestry.core.blocks.properties.UnlistedBlockAccess; -import forestry.core.blocks.properties.UnlistedBlockPos; -import forestry.core.models.BlockModelEntry; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -40,17 +23,38 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.ISpriteRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.ITextureManager; +import forestry.core.blocks.IColoredBlock; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; +import forestry.core.models.BlockModelEntry; + +import binnie.core.block.BlockMetadata; +import binnie.core.block.IMultipassBlock; +import binnie.core.block.TileEntityMetadata; +import binnie.core.models.DefaultStateMapper; +import binnie.core.models.ModelManager; +import binnie.core.models.ModelMutlipass; +import binnie.core.util.TileUtil; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.api.IToolHammer; public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock, IColoredBlock, ISpriteRegister, IItemModelRegister, IStateMapperRegister { public static final EnumFacing[] RENDER_DIRECTIONS = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH}; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 55ef20fa..9a782d9e 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -1,9 +1,7 @@ package binnie.extratrees.carpentry; -import binnie.Binnie; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.api.IDesign; -import forestry.api.core.Tabs; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -12,10 +10,15 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; +import forestry.api.core.Tabs; + +import binnie.Binnie; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.IDesign; public class BlockStainedDesign extends BlockDesign { public BlockStainedDesign() { diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index 014403d3..518cbaa3 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -1,13 +1,5 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.ICarpentryInterface; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.api.IDesignCategory; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.ILayout; -import binnie.extratrees.api.IPattern; -import net.minecraft.item.ItemStack; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -16,6 +8,15 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.minecraft.item.ItemStack; + +import binnie.extratrees.api.ICarpentryInterface; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignCategory; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.ILayout; +import binnie.extratrees.api.IPattern; + public class CarpentryInterface implements ICarpentryInterface { static Map woodMap = new LinkedHashMap<>(); static Map designMap = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index 1205a808..9f43b6db 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -1,20 +1,22 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.IDesignSystem; -import binnie.extratrees.api.ILayout; -import binnie.extratrees.api.IToolHammer; +import javax.annotation.Nullable; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.api.ILayout; +import binnie.extratrees.api.IToolHammer; public class DesignBlock { private static final int[][] ROTATION_MATRIX = { diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index 66b671ef..50467496 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -1,5 +1,18 @@ package binnie.extratrees.carpentry; +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; @@ -8,17 +21,6 @@ import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.block.PlankType; import binnie.extratrees.item.ExtraTreeItems; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.Map; public enum DesignSystem implements IDesignSystem { Wood, diff --git a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java index f7a20d79..9d64660b 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java @@ -1,11 +1,11 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.IDesignSystem; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import binnie.extratrees.api.IDesignSystem; + public class DesignerManager { public static DesignerManager instance = new DesignerManager(); diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index d1b064f9..c4d93bc4 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -1,13 +1,13 @@ package binnie.extratrees.carpentry; +import java.util.ArrayList; +import java.util.List; + import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; import binnie.extratrees.api.ILayout; -import java.util.ArrayList; -import java.util.List; - public enum EnumDesign implements IDesign { Blank("Blank"), Octagon("Octagon"), diff --git a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java index 07856102..388bef33 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java @@ -1,12 +1,15 @@ package binnie.extratrees.carpentry; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.ITextureManager; + import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IPattern; -import forestry.api.core.ITextureManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public enum EnumPattern implements IPattern { Blank, diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index 0ef7ed46..0f9f6f4d 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -1,15 +1,16 @@ package binnie.extratrees.carpentry; +import javax.annotation.Nullable; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; -import java.util.LinkedHashMap; -import java.util.Map; public class GlassType implements IDesignMaterial { static Map types; diff --git a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java index 3eec7c4b..8287280a 100644 --- a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java @@ -1,11 +1,14 @@ package binnie.extratrees.carpentry; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.items.IColoredItem; + import binnie.core.block.ItemMetadata; import binnie.core.block.TileEntityMetadata; -import forestry.core.items.IColoredItem; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemDesign extends ItemMetadata implements IColoredItem { diff --git a/src/main/java/binnie/extratrees/carpentry/Layout.java b/src/main/java/binnie/extratrees/carpentry/Layout.java index 6c85c811..3ec84e55 100644 --- a/src/main/java/binnie/extratrees/carpentry/Layout.java +++ b/src/main/java/binnie/extratrees/carpentry/Layout.java @@ -1,11 +1,13 @@ package binnie.extratrees.carpentry; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IPattern; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class Layout implements ILayout { IPattern pattern; diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 846cc399..b5f2736b 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -1,5 +1,10 @@ package binnie.extratrees.carpentry; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.common.MinecraftForge; + import binnie.core.IInitializable; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; @@ -7,9 +12,6 @@ import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.MinecraftForge; public class ModuleCarpentry implements IInitializable { diff --git a/src/main/java/binnie/extratrees/carpentry/package-info.java b/src/main/java/binnie/extratrees/carpentry/package-info.java index 6c8ebf61..772d2c03 100644 --- a/src/main/java/binnie/extratrees/carpentry/package-info.java +++ b/src/main/java/binnie/extratrees/carpentry/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.carpentry; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/config/package-info.java b/src/main/java/binnie/extratrees/config/package-info.java index d39f0a0f..87d8646b 100644 --- a/src/main/java/binnie/extratrees/config/package-info.java +++ b/src/main/java/binnie/extratrees/config/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.config; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java index 322086c5..921f19de 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java @@ -1,14 +1,15 @@ package binnie.extratrees.core; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public enum ExtraTreeTexture implements IBinnieTexture { Gui(ResourceType.GUI, "gui"), diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index 5fdc17c4..2ca2812e 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -1,5 +1,13 @@ package binnie.extratrees.core; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import binnie.extratrees.kitchen.craftgui.WindowBottleRack; @@ -11,12 +19,6 @@ import binnie.extratrees.machines.craftgui.WindowLumbermill; import binnie.extratrees.machines.craftgui.WindowPress; import binnie.extratrees.machines.craftgui.WindowSetSquare; import binnie.extratrees.machines.craftgui.WindowWoodworker; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; public enum ExtraTreesGUID implements IBinnieGUID { Database, diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index bce43750..ce31f736 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -1,5 +1,15 @@ package binnie.extratrees.core; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Queue; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IWoodType; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.extratrees.api.CarpentryManager; @@ -9,15 +19,6 @@ import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; import binnie.extratrees.genetics.AlleleETFruit; import binnie.extratrees.genetics.ETTreeDefinition; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IWoodType; - -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collections; -import java.util.LinkedList; -import java.util.Queue; public class ModuleCore implements IInitializable { @Override diff --git a/src/main/java/binnie/extratrees/core/package-info.java b/src/main/java/binnie/extratrees/core/package-info.java index 852bb844..20bd14df 100644 --- a/src/main/java/binnie/extratrees/core/package-info.java +++ b/src/main/java/binnie/extratrees/core/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.core; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/gen/TreeGenBase.java b/src/main/java/binnie/extratrees/gen/TreeGenBase.java index bbb9d86d..0c6e632f 100644 --- a/src/main/java/binnie/extratrees/gen/TreeGenBase.java +++ b/src/main/java/binnie/extratrees/gen/TreeGenBase.java @@ -1,12 +1,13 @@ package binnie.extratrees.gen; -import forestry.api.arboriculture.ITree; -import forestry.api.world.ITreeGenData; +import java.util.Random; + import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import java.util.Random; +import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; public class TreeGenBase extends WorldGenerator { protected ITree tree; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java index b9fe80a7..92c48d07 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java @@ -1,14 +1,15 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenAlder { public static class CommonAlder extends forestry.arboriculture.worldgen.WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenApple.java b/src/main/java/binnie/extratrees/gen/WorldGenApple.java index b7ea8376..b4975e2d 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenApple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenApple.java @@ -1,13 +1,14 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenApple { public static class OrchardApple extends forestry.arboriculture.worldgen.WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java index a8110d6e..3b2ecd2f 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java @@ -1,13 +1,14 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenAsh { public static class CommonAsh extends forestry.arboriculture.worldgen.WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index db4ca251..900804a9 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -1,13 +1,14 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree { public WorldGenBanana(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java index 4620235b..cee77abe 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java @@ -1,13 +1,14 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenBeech { public static class CommonBeech extends forestry.arboriculture.worldgen.WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java index 3ab5e9da..7cdaee85 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java @@ -1,13 +1,14 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenConifer { public static class WesternHemlock extends forestry.arboriculture.worldgen.WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java index 9fd520d2..5272f90e 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java @@ -1,9 +1,10 @@ package binnie.extratrees.gen; -import binnie.extratrees.worldgen.WorldGenBlockType; -import binnie.extratrees.worldgen.BlockTypeLog; import forestry.api.world.ITreeGenData; +import binnie.extratrees.worldgen.BlockTypeLog; +import binnie.extratrees.worldgen.WorldGenBlockType; + public class WorldGenDefault extends WorldGenTree { public WorldGenDefault(final ITreeGenData tree) { super(tree); diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java index d40ac394..43600e7e 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java @@ -1,13 +1,14 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenPalm { public static class Coconut extends forestry.arboriculture.worldgen.WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java index bf858b8c..c4660198 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java @@ -1,5 +1,14 @@ package binnie.extratrees.gen; +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.Set; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.arboriculture.ITreeModifier; import forestry.api.arboriculture.TreeManager; import forestry.api.world.ITreeGenData; @@ -8,14 +17,6 @@ import forestry.arboriculture.worldgen.TreeBlockTypeLog; import forestry.arboriculture.worldgen.WorldGenArboriculture; import forestry.core.worldgen.WorldGenHelper; import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.Set; public class WorldGenShrub { public static class Shrub extends WorldGenArboriculture { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree.java b/src/main/java/binnie/extratrees/gen/WorldGenTree.java index 8a9d40b2..74106244 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree.java @@ -1,21 +1,24 @@ package binnie.extratrees.gen; +import javax.annotation.Nullable; +import java.util.Random; + +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +import com.mojang.authlib.GameProfile; + +import forestry.api.world.ITreeGenData; +import forestry.arboriculture.tiles.TileTreeContainer; + import binnie.core.util.TileUtil; import binnie.extratrees.worldgen.BlockType; import binnie.extratrees.worldgen.BlockTypeLeaf; import binnie.extratrees.worldgen.BlockTypeLog; import binnie.extratrees.worldgen.BlockTypeVoid; import binnie.extratrees.worldgen.WorldGenBlockType; -import com.mojang.authlib.GameProfile; -import forestry.api.world.ITreeGenData; -import forestry.arboriculture.tiles.TileTreeContainer; -import net.minecraft.init.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -import javax.annotation.Nullable; -import java.util.Random; public class WorldGenTree extends WorldGenerator { protected ITreeGenData treeGen; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java index 18dbea9f..e0031198 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java @@ -1,14 +1,15 @@ package binnie.extratrees.gen; +import java.util.List; +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.arboriculture.worldgen.WorldGenTree; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; public class WorldGenWalnut { public static class BlackWalnut extends WorldGenTree { diff --git a/src/main/java/binnie/extratrees/gen/package-info.java b/src/main/java/binnie/extratrees/gen/package-info.java index 30cea164..4f2a3804 100644 --- a/src/main/java/binnie/extratrees/gen/package-info.java +++ b/src/main/java/binnie/extratrees/gen/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.gen; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index de9fc558..fb0f918a 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -1,13 +1,27 @@ package binnie.extratrees.genetics; -import binnie.Binnie; -import binnie.Constants; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.FruitPod; -import binnie.extratrees.config.ConfigurationMain; -import binnie.extratrees.item.Food; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; + +import javax.annotation.Nullable; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -20,23 +34,13 @@ import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderNone; import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; import forestry.core.genetics.alleles.AlleleCategorized; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Random; +import binnie.Binnie; +import binnie.Constants; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.FruitPod; +import binnie.extratrees.config.ConfigurationMain; +import binnie.extratrees.item.Food; public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider { public static final AlleleETFruit Blackthorn = new AlleleETFruit("Blackthorn", 10, 7180062, 14561129, FruitSprite.SMALL); diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 2c8e6d25..e71dd057 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -1,6 +1,10 @@ package binnie.extratrees.genetics; -import binnie.Constants; +import java.awt.Color; +import java.util.Arrays; + +import net.minecraft.item.ItemStack; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; @@ -17,10 +21,8 @@ import forestry.lepidopterology.genetics.Butterfly; import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.lepidopterology.genetics.IButterflyDefinition; import forestry.lepidopterology.genetics.MothDefinition; -import net.minecraft.item.ItemStack; -import java.awt.Color; -import java.util.Arrays; +import binnie.Constants; public enum ButterflySpecies implements IButterflyDefinition { White_Admiral("White Admiral", "Limenitis camilla", 16448250), diff --git a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java index d437797a..4b278994 100644 --- a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java +++ b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java @@ -1,14 +1,16 @@ package binnie.extratrees.genetics; -import binnie.extratrees.block.ModuleBlocks; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ILeafProvider; import forestry.api.genetics.IAllele; import forestry.arboriculture.genetics.TreeDefinition; -import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; +import binnie.extratrees.block.ModuleBlocks; public class ETLeafProvider implements ILeafProvider { @Nullable diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 2d2741c1..a45eeb22 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -1,32 +1,25 @@ package binnie.extratrees.genetics; -import binnie.Constants; -import binnie.core.genetics.ForestryAllele; -import binnie.extratrees.block.EnumETLog; -import binnie.extratrees.block.EnumShrubLog; -import binnie.extratrees.gen.WorldGenAlder; -import binnie.extratrees.gen.WorldGenApple; -import binnie.extratrees.gen.WorldGenAsh; -import binnie.extratrees.gen.WorldGenBanana; -import binnie.extratrees.gen.WorldGenBeech; -import binnie.extratrees.gen.WorldGenConifer; -import binnie.extratrees.gen.WorldGenEucalyptus; -import binnie.extratrees.gen.WorldGenFir; -import binnie.extratrees.gen.WorldGenHolly; -import binnie.extratrees.gen.WorldGenJungle; -import binnie.extratrees.gen.WorldGenLazy; -import binnie.extratrees.gen.WorldGenMaple; -import binnie.extratrees.gen.WorldGenPalm; -import binnie.extratrees.gen.WorldGenPoplar; -import binnie.extratrees.gen.WorldGenShrub; -import binnie.extratrees.gen.WorldGenSorbus; -import binnie.extratrees.gen.WorldGenTree; -import binnie.extratrees.gen.WorldGenTree2; -import binnie.extratrees.gen.WorldGenTree3; -import binnie.extratrees.gen.WorldGenTropical; -import binnie.extratrees.gen.WorldGenWalnut; import com.google.common.base.Preconditions; + +import java.awt.Color; +import java.util.Arrays; +import java.util.Locale; + +import org.apache.commons.lang3.StringUtils; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockLog; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + import com.mojang.authlib.GameProfile; + import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumLeafType; @@ -59,20 +52,32 @@ import forestry.arboriculture.worldgen.WorldGenLemon; import forestry.arboriculture.worldgen.WorldGenPlum; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.tiles.TileUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLog; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; -import org.apache.commons.lang3.StringUtils; -import java.awt.Color; -import java.util.Arrays; -import java.util.Locale; +import binnie.Constants; +import binnie.core.genetics.ForestryAllele; +import binnie.extratrees.block.EnumETLog; +import binnie.extratrees.block.EnumShrubLog; +import binnie.extratrees.gen.WorldGenAlder; +import binnie.extratrees.gen.WorldGenApple; +import binnie.extratrees.gen.WorldGenAsh; +import binnie.extratrees.gen.WorldGenBanana; +import binnie.extratrees.gen.WorldGenBeech; +import binnie.extratrees.gen.WorldGenConifer; +import binnie.extratrees.gen.WorldGenEucalyptus; +import binnie.extratrees.gen.WorldGenFir; +import binnie.extratrees.gen.WorldGenHolly; +import binnie.extratrees.gen.WorldGenJungle; +import binnie.extratrees.gen.WorldGenLazy; +import binnie.extratrees.gen.WorldGenMaple; +import binnie.extratrees.gen.WorldGenPalm; +import binnie.extratrees.gen.WorldGenPoplar; +import binnie.extratrees.gen.WorldGenShrub; +import binnie.extratrees.gen.WorldGenSorbus; +import binnie.extratrees.gen.WorldGenTree; +import binnie.extratrees.gen.WorldGenTree2; +import binnie.extratrees.gen.WorldGenTree3; +import binnie.extratrees.gen.WorldGenTropical; +import binnie.extratrees.gen.WorldGenWalnut; public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, ITreeGenerator { OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)) { diff --git a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java index 2f34022c..0721a580 100644 --- a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java +++ b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java @@ -1,16 +1,18 @@ package binnie.extratrees.genetics; -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IGermlingModelProvider; -import forestry.api.core.IModelManager; +import java.awt.Color; + import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.core.IModelManager; public enum EnumSaplingType { Default, diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index 15b8365b..6304a97e 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -1,7 +1,15 @@ package binnie.extratrees.genetics; -import binnie.Binnie; import com.google.common.base.Preconditions; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutation; @@ -9,13 +17,8 @@ import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import binnie.Binnie; public class ExtraTreeMutation implements ITreeMutation { int chance; diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/src/main/java/binnie/extratrees/genetics/FruitSprite.java index 6924186f..850aa2df 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -1,13 +1,15 @@ package binnie.extratrees.genetics; -import binnie.Constants; +import java.util.Locale; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Locale; +import binnie.Constants; public enum FruitSprite { TINY, diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 171225cf..7ce65231 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -1,14 +1,16 @@ package binnie.extratrees.genetics; -import binnie.core.BinnieCore; -import binnie.core.IInitializable; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.genetics.AlleleRegisterEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - import java.util.ArrayList; import java.util.List; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.genetics.AlleleRegisterEvent; + +import binnie.core.BinnieCore; +import binnie.core.IInitializable; + public class ModuleGenetics implements IInitializable { String[] branches; List> classifications; diff --git a/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/src/main/java/binnie/extratrees/genetics/WoodProvider.java index b0420fb9..a07de300 100644 --- a/src/main/java/binnie/extratrees/genetics/WoodProvider.java +++ b/src/main/java/binnie/extratrees/genetics/WoodProvider.java @@ -1,21 +1,24 @@ package binnie.extratrees.genetics; import com.google.common.base.Preconditions; -import forestry.api.arboriculture.IWoodProvider; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; -import forestry.api.core.ITextureManager; + +import javax.annotation.Nullable; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import forestry.api.arboriculture.IWoodProvider; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.ITextureManager; public class WoodProvider implements IWoodProvider { private IWoodType type; diff --git a/src/main/java/binnie/extratrees/genetics/package-info.java b/src/main/java/binnie/extratrees/genetics/package-info.java index 819ab900..369e1904 100644 --- a/src/main/java/binnie/extratrees/genetics/package-info.java +++ b/src/main/java/binnie/extratrees/genetics/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.genetics; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index f293cd71..ed389e12 100644 --- a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -1,5 +1,8 @@ package binnie.extratrees.integration.jei; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.core.integration.jei.Drawables; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.WoodManager; @@ -21,8 +24,6 @@ import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModRegistry; import mezz.jei.api.ISubtypeRegistry; import mezz.jei.api.JEIPlugin; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; @JEIPlugin public class ExtraTreesJeiPlugin extends BlankModPlugin { diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java index d9316b41..d6b3984f 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java @@ -1,5 +1,12 @@ package binnie.extratrees.integration.jei.brewery; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.Fluid; + import binnie.extratrees.ExtraTrees; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; @@ -11,11 +18,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; - -import java.util.List; public class BreweryRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java index 42a0a1fd..35011a81 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java @@ -1,11 +1,11 @@ package binnie.extratrees.integration.jei.brewery; -import binnie.extratrees.machines.brewery.BreweryRecipes; -import binnie.extratrees.machines.brewery.IBreweryRecipe; - import java.util.ArrayList; import java.util.List; +import binnie.extratrees.machines.brewery.BreweryRecipes; +import binnie.extratrees.machines.brewery.IBreweryRecipe; + public class BreweryRecipeMaker { public static List create() { List recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java index 0c279190..703cf3b1 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java @@ -1,15 +1,17 @@ package binnie.extratrees.integration.jei.brewery; -import binnie.extratrees.machines.brewery.IBreweryRecipe; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import binnie.extratrees.machines.brewery.IBreweryRecipe; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeWrapper; + public class BreweryRecipeWrapper extends BlankRecipeWrapper { private final IBreweryRecipe recipe; diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java b/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java index 3b79d059..1af3b71a 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.extratrees.integration.jei.brewery; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java index 15378b90..e57e588e 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java @@ -1,5 +1,10 @@ package binnie.extratrees.integration.jei.distillery.brewery; +import net.minecraft.client.Minecraft; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; @@ -18,9 +23,6 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class DistilleryRecipeCategory extends BlankRecipeCategory { private static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 60, ExtraTreeTexture.Gui); diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java index 8265fd2f..77339b3d 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java @@ -1,12 +1,14 @@ package binnie.extratrees.integration.jei.distillery.brewery; -import binnie.extratrees.machines.distillery.DistilleryRecipes; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.tuple.Pair; - import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraftforge.fluids.FluidStack; + +import binnie.extratrees.machines.distillery.DistilleryRecipes; + public class DistilleryRecipeMaker { public static List create() { List recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java index 337b9932..4bef75f3 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java @@ -1,14 +1,17 @@ package binnie.extratrees.integration.jei.distillery.brewery; +import net.minecraft.client.Minecraft; + +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.geometry.Point; import binnie.extratrees.machines.craftgui.ControlDistilleryProgress; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class DistilleryRecipeWrapper extends BlankRecipeWrapper { private final int level; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/package-info.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/package-info.java index e9672d76..494f06e5 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/package-info.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.extratrees.integration.jei.distillery.brewery; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java index fcb9761a..a4110bdf 100644 --- a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java @@ -1,5 +1,7 @@ package binnie.extratrees.integration.jei.fruitpress; +import net.minecraft.client.Minecraft; + import binnie.extratrees.ExtraTrees; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; @@ -11,7 +13,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; public class FruitPressRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java index a3a1e846..f656de45 100644 --- a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java +++ b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java @@ -1,14 +1,17 @@ package binnie.extratrees.integration.jei.fruitpress; -import binnie.extratrees.machines.fruitpress.FruitPressRecipes; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.tuple.Pair; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import binnie.extratrees.machines.fruitpress.FruitPressRecipes; + public class FruitPressRecipeMaker { public static List create() { List recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java index 51bca9d5..2c5d5ce7 100644 --- a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeWrapper.java @@ -1,9 +1,11 @@ package binnie.extratrees.integration.jei.fruitpress; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class FruitPressRecipeWrapper extends BlankRecipeWrapper { private final ItemStack input; diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java b/src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java index cae49821..1b6784a0 100644 --- a/src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java +++ b/src/main/java/binnie/extratrees/integration/jei/fruitpress/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.extratrees.integration.jei.fruitpress; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java index 77303959..d916aba8 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java @@ -1,5 +1,7 @@ package binnie.extratrees.integration.jei.lumbermill; +import net.minecraft.client.Minecraft; + import binnie.extratrees.ExtraTrees; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; @@ -11,7 +13,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; public class LumbermillRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java index 7b806ac1..502601f4 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeMaker.java @@ -1,13 +1,15 @@ package binnie.extratrees.integration.jei.lumbermill; -import binnie.extratrees.machines.lumbermill.LumbermillRecipes; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.tuple.Pair; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.item.ItemStack; + +import binnie.extratrees.machines.lumbermill.LumbermillRecipes; + public class LumbermillRecipeMaker { public static List create() { List recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java index d13911b2..ab536f42 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java @@ -1,15 +1,17 @@ package binnie.extratrees.integration.jei.lumbermill; +import java.util.Arrays; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ExtraTreeItems; import binnie.extratrees.machines.lumbermill.LumbermillLogic; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import java.util.Arrays; public class LumbermillRecipeWrapper extends BlankRecipeWrapper { private static final FluidStack WATER = new FluidStack(FluidRegistry.WATER, LumbermillLogic.WATER_PER_TICK * LumbermillLogic.PROCESS_LENGTH); diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java index 17140e3f..86ac2b75 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.extratrees.integration.jei.lumbermill; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java index b325bacf..ca947d2b 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java @@ -1,5 +1,12 @@ package binnie.extratrees.integration.jei.multifence; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; + +import net.minecraft.item.ItemStack; + import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceDescription; @@ -7,12 +14,6 @@ import binnie.extratrees.block.decor.FenceType; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; public class MultiFenceRecipeEmbeddedWrapper extends BlankRecipeWrapper implements IShapedCraftingRecipeWrapper { diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java index c9b1e61e..9268a1b8 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java @@ -1,5 +1,11 @@ package binnie.extratrees.integration.jei.multifence; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.item.ItemStack; + import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceDescription; @@ -12,11 +18,6 @@ import mezz.jei.api.recipe.IRecipeRegistryPlugin; import mezz.jei.api.recipe.IRecipeWrapper; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import mezz.jei.gui.Focus; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java index b355f4fb..2aa2b6da 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java @@ -1,17 +1,18 @@ package binnie.extratrees.integration.jei.multifence; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.MultiFenceRecipePattern; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; public class MultiFenceRecipeSizeWrapper extends BlankRecipeWrapper { diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java index 9b35ee1c..24c46fbc 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java @@ -1,5 +1,11 @@ package binnie.extratrees.integration.jei.multifence; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceDescription; @@ -7,11 +13,6 @@ import binnie.extratrees.block.decor.FenceType; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public class MultiFenceRecipeSolidWrapper extends BlankRecipeWrapper implements IShapedCraftingRecipeWrapper { diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java b/src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java index d6e4f5ac..e590e2cb 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.extratrees.integration.jei.multifence; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/integration/jei/package-info.java b/src/main/java/binnie/extratrees/integration/jei/package-info.java index e263da1a..6a95597b 100644 --- a/src/main/java/binnie/extratrees/integration/jei/package-info.java +++ b/src/main/java/binnie/extratrees/integration/jei/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.extratrees.integration.jei; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index c6149f4b..4367acbc 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -1,10 +1,11 @@ package binnie.extratrees.item; +import java.util.List; + +import net.minecraft.item.ItemStack; + import binnie.core.item.IItemMiscProvider; import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; - -import java.util.List; public enum ExtraTreeItems implements IItemMiscProvider { CarpentryHammer("Fake Hammer", "carpentry_hammer"), diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index 9a1851d8..71a5aa1d 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -1,11 +1,13 @@ package binnie.extratrees.item; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.Constants; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.ILiquidType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; public enum ExtraTreeLiquid implements ILiquidType { Sap("Sap", "sap", 12481858), diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 1bae864b..66238cdf 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -1,19 +1,22 @@ package binnie.extratrees.item; -import binnie.core.Mods; -import binnie.core.item.IItemMiscProvider; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.alcohol.Juice; -import forestry.api.recipes.RecipeManagers; -import forestry.core.fluids.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Locale; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.recipes.RecipeManagers; +import forestry.core.fluids.Fluids; + +import binnie.core.Mods; +import binnie.core.item.IItemMiscProvider; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.alcohol.Juice; + public enum Food implements IItemMiscProvider { CRABAPPLE(2), ORANGE(4), diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index cd10f651..4a30f4d9 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -1,10 +1,7 @@ package binnie.extratrees.item; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.core.ExtraTreesGUID; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,10 +12,16 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; + +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.core.ExtraTreesGUID; public class ItemArboristDatabase extends Item implements IItemModelRegister { diff --git a/src/main/java/binnie/extratrees/item/ItemETFood.java b/src/main/java/binnie/extratrees/item/ItemETFood.java index 749c95a2..88a2af14 100644 --- a/src/main/java/binnie/extratrees/item/ItemETFood.java +++ b/src/main/java/binnie/extratrees/item/ItemETFood.java @@ -1,19 +1,22 @@ package binnie.extratrees.item; -import binnie.core.item.IItemMiscProvider; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; + +import binnie.core.item.IItemMiscProvider; public class ItemETFood extends ItemFood implements IItemModelRegister { static final IItemMiscProvider[] items = Food.VALUES; diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 2947f8be..5b8b50b9 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,16 +1,19 @@ package binnie.extratrees.item; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.api.IToolHammer; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.IToolHammer; + public class ItemHammer extends Item implements IToolHammer, IItemModelRegister { private boolean isDurableHammer; diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index f778cc59..9c55898f 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,10 +1,7 @@ package binnie.extratrees.item; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.core.ExtraTreesGUID; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,10 +12,16 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; + +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.core.ExtraTreesGUID; public class ItemMothDatabase extends Item implements IItemModelRegister { diff --git a/src/main/java/binnie/extratrees/item/ItemSetSquare.java b/src/main/java/binnie/extratrees/item/ItemSetSquare.java index 9477b0d2..ff932675 100644 --- a/src/main/java/binnie/extratrees/item/ItemSetSquare.java +++ b/src/main/java/binnie/extratrees/item/ItemSetSquare.java @@ -1,15 +1,18 @@ package binnie.extratrees.item; -import binnie.extratrees.api.IToolHammer; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; + +import binnie.extratrees.api.IToolHammer; + public class ItemSetSquare extends Item implements IToolHammer, IItemModelRegister { private EnumSetSquareMode mode; diff --git a/src/main/java/binnie/extratrees/item/package-info.java b/src/main/java/binnie/extratrees/item/package-info.java index 3ed33374..53322304 100644 --- a/src/main/java/binnie/extratrees/item/package-info.java +++ b/src/main/java/binnie/extratrees/item/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.item; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index 4eae493b..eaf5ac4e 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -1,17 +1,19 @@ package binnie.extratrees.kitchen; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; import binnie.core.machines.MachinePackage; import binnie.core.machines.TileEntityMachine; import binnie.core.resource.IBinnieTexture; import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public enum KitchenMachine implements IMachineType { // TODO implement diff --git a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java index 94741e76..267d086a 100644 --- a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java @@ -1,9 +1,10 @@ package binnie.extratrees.kitchen; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.machines.Machine; import binnie.core.resource.BinnieResource; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRendererKitchen { diff --git a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java index f4dc2609..6f089122 100644 --- a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java @@ -1,9 +1,10 @@ package binnie.extratrees.kitchen; -import binnie.core.IInitializable; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import binnie.core.IInitializable; + public class ModuleKitchen implements IInitializable { public Block blockKitchen = Blocks.AIR; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java index 747e20b4..fae0ea3c 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -1,5 +1,18 @@ package binnie.extratrees.kitchen.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -8,16 +21,6 @@ import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ControlFluidDisplay extends Control implements ITooltip { @Nullable diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index bd1e9983..c15dcc41 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -1,5 +1,12 @@ package binnie.extratrees.kitchen.craftgui; +import javax.annotation.Nullable; + +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -11,11 +18,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ControlSlotFluid extends Control implements ITooltip { ControlFluidDisplay itemDisplay; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java index 10843782..e1ff7836 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java @@ -1,10 +1,11 @@ package binnie.extratrees.kitchen.craftgui; +import net.minecraft.item.ItemStack; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.minecraft.control.ControlSlotBase; import binnie.extratrees.alcohol.Glassware; -import net.minecraft.item.ItemStack; public class ControlSlotGlassware extends ControlSlotBase implements IControlValue { Glassware glassware; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index db580bf2..3bb68f66 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -1,12 +1,14 @@ package binnie.extratrees.kitchen.craftgui; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlTankSlot extends ControlSlotFluid { int tankID; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java index 1886a89a..1c7f8f3f 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java @@ -1,15 +1,17 @@ package binnie.extratrees.kitchen.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public class WindowBottleRack extends Window { public WindowBottleRack(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java b/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java index abb1e6e4..0ec227c9 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.kitchen.craftgui; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/kitchen/package-info.java b/src/main/java/binnie/extratrees/kitchen/package-info.java index 712931f6..3c53d96e 100644 --- a/src/main/java/binnie/extratrees/kitchen/package-info.java +++ b/src/main/java/binnie/extratrees/kitchen/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.kitchen; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index b6890923..184bac29 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -1,5 +1,14 @@ package binnie.extratrees.machines; +import javax.annotation.Nullable; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.component.ComponentRecipe; @@ -13,14 +22,6 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.core.ExtraTreesGUID; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import javax.annotation.Nullable; -import java.util.Map; public abstract class Designer { public static int beeswaxSlot = 0; diff --git a/src/main/java/binnie/extratrees/machines/DesignerType.java b/src/main/java/binnie/extratrees/machines/DesignerType.java index 8e3e3773..47b1acca 100644 --- a/src/main/java/binnie/extratrees/machines/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/DesignerType.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines; +import net.minecraft.item.ItemStack; + import binnie.botany.Botany; import binnie.botany.ceramic.CeramicDesignSystem; import binnie.core.resource.IBinnieTexture; @@ -12,7 +14,6 @@ import binnie.extratrees.carpentry.DesignSystem; import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.carpentry.ModuleCarpentry; import binnie.extratrees.core.ExtraTreeTexture; -import net.minecraft.item.ItemStack; public enum DesignerType { Woodworker("woodworker", ExtraTreeTexture.Carpenter), diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index a8ca1b61..fbd608aa 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,5 +1,14 @@ package binnie.extratrees.machines; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; @@ -14,13 +23,6 @@ import binnie.extratrees.machines.brewery.BreweryMachine; import binnie.extratrees.machines.distillery.DistilleryMachine; import binnie.extratrees.machines.fruitpress.FruitPressMachine; import binnie.extratrees.machines.lumbermill.LumbermillMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public enum ExtraTreeMachine implements IMachineType { Lumbermill(LumbermillMachine.class), diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index bde786f6..fe54e885 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -1,5 +1,15 @@ package binnie.extratrees.machines; +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -14,14 +24,6 @@ import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.Map; public class Infuser { public static final int tankInput = 0; diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java index 28ff3f53..520d5298 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java @@ -1,13 +1,15 @@ package binnie.extratrees.machines; import com.google.common.base.Throwables; -import forestry.core.render.TankRenderInfo; -import net.minecraft.util.EnumFacing; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import net.minecraft.util.EnumFacing; + +import forestry.core.render.TankRenderInfo; + public class MachineRendererForestry { static Map instances = new HashMap<>(); static Method renderMethod; diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java index f9a91397..baec4968 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java @@ -1,12 +1,14 @@ package binnie.extratrees.machines; +import net.minecraft.client.renderer.GlStateManager; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class MachineRendererNursery { public static MachineRendererNursery instance = new MachineRendererNursery(); diff --git a/src/main/java/binnie/extratrees/machines/ModelNursery.java b/src/main/java/binnie/extratrees/machines/ModelNursery.java index acd988c6..0ccbe0a1 100644 --- a/src/main/java/binnie/extratrees/machines/ModelNursery.java +++ b/src/main/java/binnie/extratrees/machines/ModelNursery.java @@ -3,6 +3,7 @@ package binnie.extratrees.machines; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 4abe02ea..9a35f600 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -1,5 +1,16 @@ package binnie.extratrees.machines; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.crafting.CraftingManager; + +import net.minecraftforge.oredict.ShapedOreRecipe; + +import net.minecraftforge.fml.common.registry.GameRegistry; + +import forestry.api.core.Tabs; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; @@ -7,13 +18,6 @@ import binnie.core.machines.MachineGroup; import binnie.core.machines.inventory.ValidatorSprite; import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ExtraTreeItems; -import forestry.api.core.Tabs; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { public static ValidatorSprite spritePolish; diff --git a/src/main/java/binnie/extratrees/machines/Nursery.java b/src/main/java/binnie/extratrees/machines/Nursery.java index d36f1807..7ed4509c 100644 --- a/src/main/java/binnie/extratrees/machines/Nursery.java +++ b/src/main/java/binnie/extratrees/machines/Nursery.java @@ -1,9 +1,10 @@ package binnie.extratrees.machines; +import net.minecraft.tileentity.TileEntity; + import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.extratrees.core.ExtraTreeTexture; -import net.minecraft.tileentity.TileEntity; public class Nursery { public static int slotCaterpillar = 0; diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index 45930c7f..f9fec097 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -1,20 +1,22 @@ package binnie.extratrees.machines; -import binnie.core.machines.TileEntityMachine; +import javax.annotation.Nullable; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import javax.annotation.Nullable; -import java.util.HashSet; -import java.util.Set; +import binnie.core.machines.TileEntityMachine; public class TileEntityNursery extends TileEntityMachine implements IButterflyNursery { public TileEntityNursery(final Nursery.PackageNursery pack) { diff --git a/src/main/java/binnie/extratrees/machines/Validators.java b/src/main/java/binnie/extratrees/machines/Validators.java index 0886c6c6..f69a2409 100644 --- a/src/main/java/binnie/extratrees/machines/Validators.java +++ b/src/main/java/binnie/extratrees/machines/Validators.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.extratrees.api.IDesignMaterial; -import net.minecraft.item.ItemStack; public class Validators { public static class SlotValidatorBeeswax extends SlotValidator { diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java index 11c13acf..4e613648 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java @@ -1,11 +1,13 @@ package binnie.extratrees.machines.brewery; -import forestry.api.core.INbtWritable; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nullable; +import forestry.api.core.INbtWritable; public class BreweryCrafting implements INbtWritable { @Nullable diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java index 179d6c64..bbb611a5 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java @@ -1,19 +1,22 @@ package binnie.extratrees.machines.brewery; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import com.google.common.base.Preconditions; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import javax.annotation.Nullable; -import java.util.Map; public class BreweryLogic extends ComponentProcessSetCost implements IProcess, INetwork.GuiNBT { @Nullable diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java index 8222f6cc..90f31ccc 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines.brewery; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -12,7 +14,6 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; -import net.minecraft.tileentity.TileEntity; public class BreweryMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public static final int TANK_INPUT = 0; diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java index 228a5a5a..385aa963 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java @@ -1,13 +1,15 @@ package binnie.extratrees.machines.brewery; -import binnie.extratrees.item.ExtraTreeItems; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import javax.annotation.Nullable; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import binnie.extratrees.item.ExtraTreeItems; + public class BreweryRecipe implements IBreweryRecipe { private final FluidStack input; private final FluidStack output; diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java index 1419a5ca..a780395e 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java @@ -1,14 +1,15 @@ package binnie.extratrees.machines.brewery; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + public class BreweryRecipes { public static final int GRAIN_BARLEY = OreDictionary.getOreID("seedBarley"); public static final int GRAIN_WHEAT = OreDictionary.getOreID("seedWheat"); diff --git a/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java index b0548de0..e697a899 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/IBreweryRecipe.java @@ -1,11 +1,12 @@ package binnie.extratrees.machines.brewery; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import javax.annotation.Nullable; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + public interface IBreweryRecipe { @Nullable FluidStack getOutput(final BreweryCrafting crafting); diff --git a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java index 3587214c..c8461973 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java +++ b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.brewery; -import binnie.core.machines.inventory.SlotValidator; import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.SlotValidator; + public class SlotValidatorBreweryGrain extends SlotValidator { public SlotValidatorBreweryGrain() { super(SlotValidator.spriteBlock); diff --git a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java index 2963fa46..01fe730b 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java +++ b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.brewery; -import binnie.core.machines.inventory.SlotValidator; import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.SlotValidator; + public class SlotValidatorBreweryIngredient extends SlotValidator { public SlotValidatorBreweryIngredient() { super(SlotValidator.spriteBlock); diff --git a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java index d4f0ee87..ada86f3f 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java +++ b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.brewery; -import binnie.core.machines.inventory.SlotValidator; import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.SlotValidator; + public class SlotValidatorBreweryYeast extends SlotValidator { public SlotValidatorBreweryYeast() { super(SlotValidator.spriteBlock); diff --git a/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentInput.java b/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentInput.java index 5f9586ee..5be86ccb 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentInput.java +++ b/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentInput.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.brewery; -import binnie.core.machines.inventory.TankValidator; import net.minecraftforge.fluids.FluidStack; +import binnie.core.machines.inventory.TankValidator; + public class TankValidatorFermentInput extends TankValidator { @Override public boolean isValid(final FluidStack itemStack) { diff --git a/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentOutput.java b/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentOutput.java index a1a22e30..08771016 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentOutput.java +++ b/src/main/java/binnie/extratrees/machines/brewery/TankValidatorFermentOutput.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.brewery; -import binnie.core.machines.inventory.TankValidator; import net.minecraftforge.fluids.FluidStack; +import binnie.core.machines.inventory.TankValidator; + public class TankValidatorFermentOutput extends TankValidator { @Override public boolean isValid(final FluidStack itemStack) { diff --git a/src/main/java/binnie/extratrees/machines/brewery/package-info.java b/src/main/java/binnie/extratrees/machines/brewery/package-info.java index 1759a822..bb097879 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/package-info.java +++ b/src/main/java/binnie/extratrees/machines/brewery/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.machines.brewery; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java index 7e87f4a6..9f6a6254 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java @@ -1,12 +1,14 @@ package binnie.extratrees.machines.craftgui; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlBlockIconDisplay extends Control { TextureAtlasSprite icon; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java index e3a28687..0a87f2ed 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java @@ -1,5 +1,14 @@ package binnie.extratrees.machines.craftgui; +import java.util.Collections; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.lwjgl.opengl.GL11; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -15,12 +24,6 @@ import binnie.core.util.ItemStackSet; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.brewery.BreweryLogic; import binnie.extratrees.machines.brewery.BreweryRecipes; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - -import java.util.Collections; public class ControlBreweryProgress extends ControlProgressBase { static Texture Brewery = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.Gui); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java index a6f8218f..b8f087f2 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java @@ -1,5 +1,13 @@ package binnie.extratrees.machines.craftgui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.events.EventMouse; @@ -14,11 +22,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.Machine; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.distillery.DistilleryLogic; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlDistilleryProgress extends ControlProgressBase { public static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java index b3c582e7..c9f2d113 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java @@ -1,5 +1,16 @@ package binnie.extratrees.machines.craftgui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -14,14 +25,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.fruitpress.FruitPressMachine; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlFruitPressProgress extends ControlProgressBase { private static final Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java index 22c56d13..8520eada 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java @@ -1,5 +1,15 @@ package binnie.extratrees.machines.craftgui; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.lwjgl.opengl.GL11; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.geometry.Area; @@ -13,13 +23,6 @@ import binnie.core.craftgui.window.Panel; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.lumbermill.LumbermillMachine; import binnie.extratrees.machines.lumbermill.LumbermillRecipes; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; public class ControlLumbermillProgress extends ControlProgressBase { static Texture Saw = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.Gui); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java index 7bae9fdb..93651a15 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java @@ -1,5 +1,9 @@ package binnie.extratrees.machines.craftgui; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.minecraft.Window; @@ -7,9 +11,6 @@ import binnie.core.craftgui.minecraft.control.ControlSlotBase; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.component.IComponentRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; public class ControlRecipeSlot extends ControlSlotBase { public ControlRecipeSlot(final IWidget parent, final int x, final int y) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index b28e141d..9b4e61c6 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -1,5 +1,17 @@ package binnie.extratrees.machines.craftgui; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.craftgui.Attribute; @@ -22,16 +34,6 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.machines.Designer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; public class ControlTileSelect extends Control implements IControlValue, IControlScrollable { IDesign value; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java index 2ba322ba..0a36bb9a 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java @@ -1,5 +1,14 @@ package binnie.extratrees.machines.craftgui; +import java.util.Collection; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.database.ControlSpeciesBox; @@ -11,12 +20,6 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; import binnie.extratrees.ExtraTrees; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Collection; @SideOnly(Side.CLIENT) public class PageFruit extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index 8f0d924b..6bcc8eaf 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -1,5 +1,10 @@ package binnie.extratrees.machines.craftgui; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -17,9 +22,6 @@ import binnie.extratrees.block.DoorType; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceType; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class PagePlanksOverview extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java index ce3e0b9f..1964f085 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java @@ -1,5 +1,14 @@ package binnie.extratrees.machines.craftgui; +import java.util.Collection; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.database.ControlSpeciesBox; @@ -10,12 +19,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Collection; @SideOnly(Side.CLIENT) public class PagePlanksTrees extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java index db96bc59..41efd20c 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines.craftgui; +import forestry.api.genetics.IAlleleSpecies; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.database.ControlDatabaseIndividualDisplay; @@ -8,7 +10,6 @@ import binnie.core.craftgui.database.EnumDiscoveryState; import binnie.core.craftgui.database.PageSpecies; import binnie.core.craftgui.minecraft.MinecraftGUI; import binnie.core.craftgui.window.Panel; -import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesImage extends PageSpecies { ControlDatabaseIndividualDisplay display; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 9f2cc432..e95db547 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -1,5 +1,27 @@ package binnie.extratrees.machines.craftgui; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ILeafSpriteProvider; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; @@ -14,25 +36,6 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; import binnie.extratrees.ExtraTrees; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ILeafSpriteProvider; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; @SideOnly(Side.CLIENT) public class PageSpeciesTreeGenome extends PageSpecies { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java index c2dab224..0e26acf1 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java @@ -1,5 +1,14 @@ package binnie.extratrees.machines.craftgui; +import java.util.Collection; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.database.ControlSpeciesBox; @@ -10,12 +19,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Collection; @SideOnly(Side.CLIENT) public class PageWood extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 5a3f4247..3e43e9f8 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -1,5 +1,13 @@ package binnie.extratrees.machines.craftgui; +import java.util.stream.Collectors; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.IWidget; @@ -21,12 +29,6 @@ import binnie.core.genetics.TreeBreedingSystem; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.WoodManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.stream.Collectors; public class WindowArboristDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxFruit; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java index 66405f6a..6f62929d 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java @@ -1,5 +1,12 @@ package binnie.extratrees.machines.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; @@ -12,11 +19,6 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.brewery.BreweryMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public class WindowBrewery extends Window { public WindowBrewery(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java index 4eed6c17..1c06dcf6 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java @@ -1,5 +1,13 @@ package binnie.extratrees.machines.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; @@ -11,12 +19,6 @@ import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.distillery.DistilleryLogic; import binnie.extratrees.machines.distillery.DistilleryMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public class WindowDistillery extends Window { public WindowDistillery(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java index 35ff502b..76c060f1 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java @@ -1,5 +1,10 @@ package binnie.extratrees.machines.craftgui; +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.database.DatabaseTab; @@ -13,9 +18,6 @@ import binnie.core.craftgui.database.PageSpeciesResultant; import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.minecraft.Window; import binnie.extratrees.ExtraTrees; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowLepidopteristDatabase extends WindowAbstractDatabase { public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java index 3014be96..c2b6a146 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java @@ -1,5 +1,12 @@ package binnie.extratrees.machines.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; @@ -11,11 +18,6 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public class WindowLumbermill extends Window { public WindowLumbermill(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index 64959843..41c217bf 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -1,5 +1,14 @@ package binnie.extratrees.machines.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.InventoryType; @@ -14,13 +23,6 @@ import binnie.core.machines.power.ErrorState; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.fruitpress.FruitPressLogic; import binnie.extratrees.machines.fruitpress.FruitPressMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public class WindowPress extends Window { public WindowPress(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java index ceb0f317..33b06ca1 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java @@ -1,14 +1,16 @@ package binnie.extratrees.machines.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.extratrees.ExtraTrees; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public class WindowSetSquare extends Window { public WindowSetSquare(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index fa6d4fc2..3a79549a 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -1,5 +1,13 @@ package binnie.extratrees.machines.craftgui; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.craftgui.controls.ControlText; @@ -20,12 +28,6 @@ import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.Designer; import binnie.extratrees.machines.DesignerType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class WindowWoodworker extends Window { ControlTextEdit textEdit; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/package-info.java b/src/main/java/binnie/extratrees/machines/craftgui/package-info.java index 67da091c..00b59a54 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/package-info.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.machines.craftgui; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java index 875a1e4c..0c0b49fc 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java @@ -1,17 +1,19 @@ package binnie.extratrees.machines.distillery; +import javax.annotation.Nullable; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import javax.annotation.Nullable; -import java.util.Map; public class DistilleryLogic extends ComponentProcessSetCost implements IProcess, INetwork.SendGuiNBT, INetwork.ReceiveGuiNBT { public static final int INPUT_FLUID_AMOUNT = Fluid.BUCKET_VOLUME; diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java index 7fc93daf..db0eeddf 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines.distillery; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -11,7 +13,6 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; -import net.minecraft.tileentity.TileEntity; public class DistilleryMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public static final int TANK_INPUT = 0; diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java index 708301c4..ad75919b 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java @@ -1,9 +1,5 @@ package binnie.extratrees.machines.distillery; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.tuple.Pair; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -12,6 +8,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + public class DistilleryRecipes { private static final List>> recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryInput.java b/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryInput.java index d33c008c..dc0b9121 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryInput.java +++ b/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryInput.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.distillery; -import binnie.core.machines.inventory.TankValidator; import net.minecraftforge.fluids.FluidStack; +import binnie.core.machines.inventory.TankValidator; + public class TankValidatorDistilleryInput extends TankValidator { @Override public boolean isValid(final FluidStack itemStack) { diff --git a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryOutput.java b/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryOutput.java index da4cc840..f2b18673 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryOutput.java +++ b/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryOutput.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.distillery; -import binnie.core.machines.inventory.TankValidator; import net.minecraftforge.fluids.FluidStack; +import binnie.core.machines.inventory.TankValidator; + public class TankValidatorDistilleryOutput extends TankValidator { @Override public boolean isValid(final FluidStack itemStack) { diff --git a/src/main/java/binnie/extratrees/machines/distillery/package-info.java b/src/main/java/binnie/extratrees/machines/distillery/package-info.java index c93c481c..b4cd4323 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/package-info.java +++ b/src/main/java/binnie/extratrees/machines/distillery/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.machines.distillery; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java index 88e2d84f..ef6899dc 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java @@ -1,10 +1,11 @@ package binnie.extratrees.machines.fruitpress; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import net.minecraftforge.fluids.FluidStack; public class FruitPressLogic extends ComponentProcessSetCost implements IProcess { public static final int PROCESS_ENERGY = 1000; diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java index 77eabb22..1f9bd727 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines.fruitpress; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -11,7 +13,6 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; -import net.minecraft.tileentity.TileEntity; public class FruitPressMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public static final int SLOT_FRUIT = 0; diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java index ef854eb7..57f74b1e 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java @@ -2,15 +2,18 @@ package binnie.extratrees.machines.fruitpress; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; import java.util.Collection; import java.util.Map; +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + public class FruitPressRecipes { //Map> private static Multimap> pressRecipes = ArrayListMultimap.create(); diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java b/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java index 8a0bf399..7b3ee628 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java @@ -1,8 +1,9 @@ package binnie.extratrees.machines.fruitpress; -import binnie.core.machines.inventory.SlotValidator; import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.SlotValidator; + public class SlotValidatorSqueezable extends SlotValidator { public SlotValidatorSqueezable() { super(SlotValidator.spriteBlock); diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java b/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java index f3a1c09e..70335bb4 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.machines.fruitpress; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java index 78a83aa6..0ca6c364 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java @@ -1,11 +1,12 @@ package binnie.extratrees.machines.lumbermill; +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.extratrees.item.ExtraTreeItems; -import net.minecraft.item.ItemStack; public class LumbermillLogic extends ComponentProcessSetCost implements IProcess { public static final int PROCESS_ENERGY = 900; diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java index cf83da63..0ef851d7 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java @@ -1,12 +1,13 @@ package binnie.extratrees.machines.lumbermill; -import binnie.core.util.FakeCraftingWorld; -import binnie.core.util.OreDictionaryUtil; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; + +import java.util.Collection; +import java.util.List; + +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -14,11 +15,15 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.tuple.Pair; -import java.util.Collection; -import java.util.List; +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; + +import binnie.core.util.FakeCraftingWorld; +import binnie.core.util.OreDictionaryUtil; public class LumbermillRecipes { //Map> diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java b/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java index 9b7ecd37..313b3f66 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java @@ -1,9 +1,11 @@ package binnie.extratrees.machines.lumbermill; -import binnie.core.machines.inventory.SlotValidator; import net.minecraft.item.ItemStack; + import net.minecraftforge.oredict.OreDictionary; +import binnie.core.machines.inventory.SlotValidator; + public class SlotValidatorLog extends SlotValidator { private static final int logWoodId = OreDictionary.getOreID("logWood"); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java b/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java index ed8c8d30..b870fc75 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.machines.lumbermill; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/package-info.java b/src/main/java/binnie/extratrees/machines/package-info.java index 192cff36..2cb96d66 100644 --- a/src/main/java/binnie/extratrees/machines/package-info.java +++ b/src/main/java/binnie/extratrees/machines/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.machines; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java b/src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java index 87bda8d8..fdd3be55 100644 --- a/src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java +++ b/src/main/java/binnie/extratrees/models/ModelDefaultETLeaves.java @@ -1,15 +1,7 @@ package binnie.extratrees.models; -import binnie.extratrees.block.BlockETDefaultLeaves; -import binnie.extratrees.genetics.ETTreeDefinition; import com.google.common.base.Preconditions; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ILeafSpriteProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.core.IModelBaker; -import forestry.core.models.ModelBlockCached; -import forestry.core.models.baker.ModelBaker; -import forestry.core.proxy.Proxies; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -19,6 +11,17 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ILeafSpriteProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.IModelBaker; +import forestry.core.models.ModelBlockCached; +import forestry.core.models.baker.ModelBaker; +import forestry.core.proxy.Proxies; + +import binnie.extratrees.block.BlockETDefaultLeaves; +import binnie.extratrees.genetics.ETTreeDefinition; + public class ModelDefaultETLeaves extends ModelBlockCached { public ModelDefaultETLeaves() { diff --git a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java index ae2b6778..d1e1dff3 100644 --- a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java @@ -1,14 +1,5 @@ package binnie.extratrees.models; -import binnie.extratrees.block.BlockETDecorativeLeaves; -import binnie.extratrees.genetics.ETTreeDefinition; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ILeafSpriteProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.core.IModelBaker; -import forestry.core.models.ModelBlockCached; -import forestry.core.models.baker.ModelBaker; -import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -17,9 +8,21 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ILeafSpriteProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.IModelBaker; +import forestry.core.models.ModelBlockCached; +import forestry.core.models.baker.ModelBaker; +import forestry.core.proxy.Proxies; + +import binnie.extratrees.block.BlockETDecorativeLeaves; +import binnie.extratrees.genetics.ETTreeDefinition; + @SideOnly(Side.CLIENT) public class ModelETDecorativeLeaves extends ModelBlockCached { public ModelETDecorativeLeaves() { diff --git a/src/main/java/binnie/extratrees/models/ModelMultiFence.java b/src/main/java/binnie/extratrees/models/ModelMultiFence.java index e77a8e7f..874d314b 100644 --- a/src/main/java/binnie/extratrees/models/ModelMultiFence.java +++ b/src/main/java/binnie/extratrees/models/ModelMultiFence.java @@ -1,15 +1,5 @@ package binnie.extratrees.models; -import binnie.core.block.TileEntityMetadata; -import binnie.core.models.AABBModelBaker; -import binnie.core.models.ModelManager; -import binnie.extratrees.block.WoodManager; -import binnie.extratrees.block.decor.BlockMultiFence; -import binnie.extratrees.block.decor.FenceType; -import forestry.api.core.IModelBaker; -import forestry.core.blocks.properties.UnlistedBlockAccess; -import forestry.core.blocks.properties.UnlistedBlockPos; -import forestry.core.models.ModelBlockCached; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.state.IBlockState; @@ -19,8 +9,21 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.common.property.IExtendedBlockState; +import forestry.api.core.IModelBaker; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; +import forestry.core.models.ModelBlockCached; + +import binnie.core.block.TileEntityMetadata; +import binnie.core.models.AABBModelBaker; +import binnie.core.models.ModelManager; +import binnie.extratrees.block.WoodManager; +import binnie.extratrees.block.decor.BlockMultiFence; +import binnie.extratrees.block.decor.FenceType; + public class ModelMultiFence extends ModelBlockCached { public static final float POST_WIDGTH = 0.25F; diff --git a/src/main/java/binnie/extratrees/models/package-info.java b/src/main/java/binnie/extratrees/models/package-info.java index d07fc140..db356ffb 100644 --- a/src/main/java/binnie/extratrees/models/package-info.java +++ b/src/main/java/binnie/extratrees/models/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.models; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/package-info.java b/src/main/java/binnie/extratrees/package-info.java index 3e76c1fe..013f6fa1 100644 --- a/src/main/java/binnie/extratrees/package-info.java +++ b/src/main/java/binnie/extratrees/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java b/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java index d1524829..668a527c 100644 --- a/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java +++ b/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java @@ -1,8 +1,9 @@ package binnie.extratrees.proxy; -import binnie.core.proxy.IProxyCore; import net.minecraft.block.Block; +import binnie.core.proxy.IProxyCore; + public interface IExtraTreeProxy extends IProxyCore { void setCustomStateMapper(String name, Block block); } diff --git a/src/main/java/binnie/extratrees/proxy/Proxy.java b/src/main/java/binnie/extratrees/proxy/Proxy.java index 0c8a8a91..d98d124b 100644 --- a/src/main/java/binnie/extratrees/proxy/Proxy.java +++ b/src/main/java/binnie/extratrees/proxy/Proxy.java @@ -1,8 +1,9 @@ package binnie.extratrees.proxy; -import binnie.core.proxy.BinnieModProxy; import net.minecraft.block.Block; +import binnie.core.proxy.BinnieModProxy; + public class Proxy extends BinnieModProxy implements IExtraTreeProxy { @Override public void setCustomStateMapper(String name, Block block) { diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index ac230598..1c6adf6d 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -1,26 +1,30 @@ package binnie.extratrees.proxy; -import binnie.Constants; -import binnie.core.models.ModelManager; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.BlockETDecorativeLeaves; -import binnie.extratrees.block.BlockETDefaultLeaves; -import binnie.extratrees.models.ModelDefaultETLeaves; -import binnie.extratrees.block.wood.BlockETSlab; -import binnie.extratrees.models.ModelETDecorativeLeaves; -import forestry.arboriculture.PluginArboriculture; -import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.client.model.ModelLoader; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.arboriculture.PluginArboriculture; +import forestry.core.models.BlockModelEntry; +import forestry.core.models.ModelEntry; + +import binnie.Constants; +import binnie.core.models.ModelManager; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.BlockETDecorativeLeaves; +import binnie.extratrees.block.BlockETDefaultLeaves; +import binnie.extratrees.block.wood.BlockETSlab; +import binnie.extratrees.models.ModelDefaultETLeaves; +import binnie.extratrees.models.ModelETDecorativeLeaves; + @SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IExtraTreeProxy { public static ModelManager modelManager = new ModelManager(Constants.EXTRA_TREES_MOD_ID); diff --git a/src/main/java/binnie/extratrees/proxy/package-info.java b/src/main/java/binnie/extratrees/proxy/package-info.java index b10a79ba..3b7316fb 100644 --- a/src/main/java/binnie/extratrees/proxy/package-info.java +++ b/src/main/java/binnie/extratrees/proxy/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.proxy; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/village/package-info.java b/src/main/java/binnie/extratrees/village/package-info.java index a78a0517..da27e9cd 100644 --- a/src/main/java/binnie/extratrees/village/package-info.java +++ b/src/main/java/binnie/extratrees/village/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.village; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/worldgen/BlockType.java b/src/main/java/binnie/extratrees/worldgen/BlockType.java index beb894f2..9fb5dc17 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockType.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockType.java @@ -1,10 +1,11 @@ package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; + public class BlockType implements WorldGenBlockType { IBlockState blockState; diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java index 920d2712..3f059eb1 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java @@ -1,11 +1,13 @@ package binnie.extratrees.worldgen; -import com.mojang.authlib.GameProfile; -import forestry.api.world.ITreeGenData; +import javax.annotation.Nullable; + import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; +import com.mojang.authlib.GameProfile; + +import forestry.api.world.ITreeGenData; public class BlockTypeLeaf implements WorldGenBlockType { GameProfile owner; diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java index 7b92d541..78f5c796 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java @@ -1,10 +1,11 @@ package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; + public class BlockTypeLog implements WorldGenBlockType { ITreeGenData treeGenData; diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java index 91335690..66bc0668 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java @@ -1,10 +1,11 @@ package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; + public class BlockTypeVoid implements WorldGenBlockType { @Override diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java b/src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java index 645a644f..3734b4a6 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenBlockType.java @@ -1,10 +1,10 @@ package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; -import net.minecraft.block.Block; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; + public interface WorldGenBlockType { void setBlock(final World world, final ITreeGenData tree, final BlockPos pos); } diff --git a/src/main/java/binnie/extratrees/worldgen/package-info.java b/src/main/java/binnie/extratrees/worldgen/package-info.java index 24399927..9a33792f 100644 --- a/src/main/java/binnie/extratrees/worldgen/package-info.java +++ b/src/main/java/binnie/extratrees/worldgen/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.extratrees.worldgen; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/CreativeTabGenetics.java b/src/main/java/binnie/genetics/CreativeTabGenetics.java index 7c2baebd..c3a9597e 100644 --- a/src/main/java/binnie/genetics/CreativeTabGenetics.java +++ b/src/main/java/binnie/genetics/CreativeTabGenetics.java @@ -1,11 +1,13 @@ package binnie.genetics; -import binnie.genetics.item.GeneticsItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.genetics.item.GeneticsItems; + public class CreativeTabGenetics extends CreativeTabs { public static CreativeTabs instance = new CreativeTabGenetics(); diff --git a/src/main/java/binnie/genetics/api/IGene.java b/src/main/java/binnie/genetics/api/IGene.java index f7bd6cc9..1fdc964c 100644 --- a/src/main/java/binnie/genetics/api/IGene.java +++ b/src/main/java/binnie/genetics/api/IGene.java @@ -1,11 +1,12 @@ package binnie.genetics.api; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.nbt.NBTTagCompound; public interface IGene extends INbtReadable, INbtWritable { IChromosomeType getChromosome(); diff --git a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java index da0bd9fb..a2d80363 100644 --- a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java +++ b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java @@ -1,10 +1,12 @@ package binnie.genetics.api; -import binnie.core.machines.MachineUtil; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nullable; +import binnie.core.machines.MachineUtil; public interface IIncubatorRecipe { boolean isInputLiquid(@Nullable final FluidStack fluid); diff --git a/src/main/java/binnie/genetics/api/IItemChargeable.java b/src/main/java/binnie/genetics/api/IItemChargeable.java index e40b3787..140ebc65 100644 --- a/src/main/java/binnie/genetics/api/IItemChargeable.java +++ b/src/main/java/binnie/genetics/api/IItemChargeable.java @@ -1,9 +1,10 @@ package binnie.genetics.api; -import forestry.api.genetics.ISpeciesRoot; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; +import forestry.api.genetics.ISpeciesRoot; public interface IItemChargeable { int getCharges(ItemStack itemStack); diff --git a/src/main/java/binnie/genetics/api/IItemSerum.java b/src/main/java/binnie/genetics/api/IItemSerum.java index 2a70046b..520dd20a 100644 --- a/src/main/java/binnie/genetics/api/IItemSerum.java +++ b/src/main/java/binnie/genetics/api/IItemSerum.java @@ -1,9 +1,9 @@ package binnie.genetics.api; -import net.minecraft.item.ItemStack; - import javax.annotation.Nullable; +import net.minecraft.item.ItemStack; + public interface IItemSerum extends IItemChargeable { IGene[] getGenes(final ItemStack p0); diff --git a/src/main/java/binnie/genetics/api/package-info.java b/src/main/java/binnie/genetics/api/package-info.java index 2f855ec6..b4774354 100644 --- a/src/main/java/binnie/genetics/api/package-info.java +++ b/src/main/java/binnie/genetics/api/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.api; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/config/package-info.java b/src/main/java/binnie/genetics/config/package-info.java index edd6ef99..4cdd1308 100644 --- a/src/main/java/binnie/genetics/config/package-info.java +++ b/src/main/java/binnie/genetics/config/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.config; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/src/main/java/binnie/genetics/core/GeneticsGUI.java index 3c3d146b..949a480c 100644 --- a/src/main/java/binnie/genetics/core/GeneticsGUI.java +++ b/src/main/java/binnie/genetics/core/GeneticsGUI.java @@ -1,5 +1,15 @@ package binnie.genetics.core; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import binnie.genetics.gui.WindowAnalyst; @@ -16,14 +26,6 @@ import binnie.genetics.machine.isolator.WindowIsolator; import binnie.genetics.machine.polymeriser.WindowPolymeriser; import binnie.genetics.machine.sequencer.WindowSequencer; import binnie.genetics.machine.splicer.WindowSplicer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; public enum GeneticsGUI implements IBinnieGUID { Genepool(WindowGenepool::new), diff --git a/src/main/java/binnie/genetics/core/GeneticsPacket.java b/src/main/java/binnie/genetics/core/GeneticsPacket.java index a9ed486a..31cbff93 100644 --- a/src/main/java/binnie/genetics/core/GeneticsPacket.java +++ b/src/main/java/binnie/genetics/core/GeneticsPacket.java @@ -1,13 +1,15 @@ package binnie.genetics.core; +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.BinnieCore; import binnie.core.network.IPacketID; import binnie.core.network.packet.MessageBinnie; import binnie.core.network.packet.MessageNBT; import binnie.genetics.genetics.GeneTracker; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; public enum GeneticsPacket implements IPacketID { GeneTrackerSync; diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/src/main/java/binnie/genetics/core/GeneticsTexture.java index 5c36750c..b7c7e71b 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -1,15 +1,16 @@ package binnie.genetics.core; +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.resource.BinnieResource; import binnie.core.resource.BinnieSprite; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; import binnie.genetics.Genetics; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public enum GeneticsTexture implements IBinnieTexture { GeneticMachine(ResourceType.Tile, "GeneticMachine"), diff --git a/src/main/java/binnie/genetics/core/package-info.java b/src/main/java/binnie/genetics/core/package-info.java index 5c48ca3c..9d604094 100644 --- a/src/main/java/binnie/genetics/core/package-info.java +++ b/src/main/java/binnie/genetics/core/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.core; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index b3241022..0495817f 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -1,5 +1,10 @@ package binnie.genetics.genetics; +import javax.annotation.Nullable; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemChargeable; @@ -7,10 +12,6 @@ import binnie.genetics.api.IItemSerum; import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; public class Engineering { public static boolean isGeneAcceptor(final ItemStack stack) { diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index 2faece3e..cf766975 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -1,24 +1,27 @@ package binnie.genetics.genetics; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { static final String GENES_NBT = "genes"; diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index 2be999e3..d4db1bc8 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -1,20 +1,24 @@ package binnie.genetics.genetics; +import javax.annotation.Nullable; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.common.util.Constants; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.INbtWritable; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; -import forestry.api.core.INbtWritable; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; public class GeneItem implements INbtWritable, IGeneItem { private IGene gene; diff --git a/src/main/java/binnie/genetics/genetics/GeneProject.java b/src/main/java/binnie/genetics/genetics/GeneProject.java index 4d63cd03..b8f3d0cf 100644 --- a/src/main/java/binnie/genetics/genetics/GeneProject.java +++ b/src/main/java/binnie/genetics/genetics/GeneProject.java @@ -1,10 +1,10 @@ package binnie.genetics.genetics; -import com.mojang.authlib.GameProfile; - import java.util.ArrayList; import java.util.List; +import com.mojang.authlib.GameProfile; + public class GeneProject { private int id; private String name; diff --git a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java b/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java index 7bdb0d70..3ab86609 100644 --- a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java @@ -1,15 +1,16 @@ package binnie.genetics.genetics; -import com.mojang.authlib.GameProfile; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; - import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraft.world.WorldSavedData; + +import com.mojang.authlib.GameProfile; + public class GeneProjectTracker extends WorldSavedData { Map projects; Map> TeamInvites; diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/src/main/java/binnie/genetics/genetics/GeneTracker.java index 9f599b68..d62ae602 100644 --- a/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -1,15 +1,8 @@ package binnie.genetics.genetics; -import binnie.core.genetics.Gene; -import binnie.core.network.packet.MessageNBT; -import binnie.genetics.Genetics; -import binnie.genetics.api.IGene; -import binnie.genetics.core.GeneticsPacket; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; +import javax.annotation.Nullable; +import java.util.ArrayList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -17,8 +10,18 @@ import net.minecraft.nbt.NBTTagString; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; -import javax.annotation.Nullable; -import java.util.ArrayList; +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; + +import binnie.core.genetics.Gene; +import binnie.core.network.packet.MessageNBT; +import binnie.genetics.Genetics; +import binnie.genetics.api.IGene; +import binnie.genetics.core.GeneticsPacket; public class GeneTracker extends WorldSavedData { private ArrayList discoveredGenes; diff --git a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java index 38158a20..66016274 100644 --- a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java +++ b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java @@ -1,13 +1,6 @@ package binnie.genetics.genetics; -import binnie.core.genetics.BreedingSystem; import com.google.common.base.Throwables; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; import java.util.ArrayList; import java.util.Comparator; @@ -16,6 +9,15 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleFloat; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + +import binnie.core.genetics.BreedingSystem; + public class GeneticEngineeringSystem { static List speciesList; public Map> chromosomeMap; diff --git a/src/main/java/binnie/genetics/genetics/IGeneItem.java b/src/main/java/binnie/genetics/genetics/IGeneItem.java index f07e2bd8..504281e6 100644 --- a/src/main/java/binnie/genetics/genetics/IGeneItem.java +++ b/src/main/java/binnie/genetics/genetics/IGeneItem.java @@ -1,14 +1,17 @@ package binnie.genetics.genetics; -import binnie.genetics.api.IGene; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import javax.annotation.Nullable; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.ISpeciesRoot; + +import binnie.genetics.api.IGene; + public interface IGeneItem { @Nullable ISpeciesRoot getSpeciesRoot(); diff --git a/src/main/java/binnie/genetics/genetics/SequencerItem.java b/src/main/java/binnie/genetics/genetics/SequencerItem.java index 8fc0cb62..8e0e8e9c 100644 --- a/src/main/java/binnie/genetics/genetics/SequencerItem.java +++ b/src/main/java/binnie/genetics/genetics/SequencerItem.java @@ -1,12 +1,14 @@ package binnie.genetics.genetics; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.Constants; + import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.Constants; - -import javax.annotation.Nullable; public class SequencerItem extends GeneItem { public int sequenced; diff --git a/src/main/java/binnie/genetics/genetics/package-info.java b/src/main/java/binnie/genetics/genetics/package-info.java index dcf877ef..965c9063 100644 --- a/src/main/java/binnie/genetics/genetics/package-info.java +++ b/src/main/java/binnie/genetics/genetics/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.genetics; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index dd3b2c16..374d5bb7 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -1,5 +1,18 @@ package binnie.genetics.gui; +import net.minecraft.util.math.Vec3i; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IBee; +import forestry.api.genetics.IIndividual; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.IAlleleButterflyEffect; +import forestry.api.lepidopterology.IButterfly; +import forestry.apiculture.PluginApiculture; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; @@ -8,16 +21,6 @@ import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; -import forestry.api.apiculture.IAlleleBeeEffect; -import forestry.api.apiculture.IBee; -import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.lepidopterology.IAlleleButterflyEffect; -import forestry.api.lepidopterology.IButterfly; -import forestry.apiculture.PluginApiculture; -import net.minecraft.util.math.Vec3i; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; //TODO:localise @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java index c97b2f83..fc718578 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java @@ -1,5 +1,20 @@ package binnie.genetics.gui; +import java.text.DecimalFormat; +import java.util.Locale; + +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.IBee; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; +import forestry.api.lepidopterology.IButterfly; +import forestry.apiculture.PluginApiculture; + import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.core.craftgui.IWidget; @@ -9,18 +24,6 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlIconDisplay; import binnie.genetics.Genetics; import binnie.genetics.item.ModuleItems; -import forestry.api.apiculture.IBee; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.ITree; -import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.IButterfly; -import forestry.apiculture.PluginApiculture; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.text.DecimalFormat; -import java.util.Locale; //TODO:localise @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index 7857b23e..a9d17d34 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -1,5 +1,18 @@ package binnie.genetics.gui; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Objects; + +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; @@ -18,16 +31,6 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.genetics.Genetics; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Objects; public class AnalystPageDatabase extends ControlAnalystPage { private final ControlScrollableContent scroll; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index e4dd2bac..f5c453c2 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -1,5 +1,15 @@ package binnie.genetics.gui; +import java.util.Objects; + +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -8,13 +18,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.genetics.Genetics; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Objects; @SideOnly(Side.CLIENT) public class AnalystPageDescription extends ControlAnalystPage { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 3e9ef545..72e4ce3e 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -1,5 +1,17 @@ package binnie.genetics.gui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -11,15 +23,6 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.BreedingSystem; import binnie.genetics.Genetics; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class AnalystPageGenome extends ControlAnalystPage { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java index b6a983c1..0f3ce92a 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java @@ -1,16 +1,18 @@ package binnie.genetics.gui; +import net.minecraft.util.text.TextFormatting; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.core.genetics.BreedingSystem; import binnie.genetics.Genetics; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.util.text.TextFormatting; public class AnalystPageKaryogram extends ControlAnalystPage { public AnalystPageKaryogram(final IWidget parent, final Area area, final IIndividual ind) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 326c4b55..8d48f6d8 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -1,5 +1,21 @@ package binnie.genetics.gui; +import java.util.Collection; +import java.util.List; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.IBee; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.craftgui.Attribute; @@ -19,19 +35,6 @@ import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.resource.BinnieSprite; import binnie.genetics.Genetics; import binnie.genetics.item.ModuleItems; -import forestry.api.apiculture.IBee; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Collection; -import java.util.List; public class AnalystPageMutations extends ControlAnalystPage { public AnalystPageMutations(final IWidget parent, final Area area, final IIndividual ind, final boolean isMaster) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index b35eeca5..9481d41f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -1,5 +1,24 @@ package binnie.genetics.gui; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +import forestry.api.recipes.ICentrifugeRecipe; +import forestry.api.recipes.ISqueezerRecipe; +import forestry.api.recipes.RecipeManagers; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; @@ -10,22 +29,6 @@ import binnie.extratrees.machines.brewery.BreweryRecipes; import binnie.extratrees.machines.distillery.DistilleryRecipes; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; import binnie.genetics.gui.bee.AnalystPageProducts; -import forestry.api.recipes.ICentrifugeRecipe; -import forestry.api.recipes.ISqueezerRecipe; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; public abstract class AnalystPageProduce extends ControlAnalystPage { public AnalystPageProduce(final IWidget parent, final Area area) { diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 0299b930..15ebc877 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -1,5 +1,12 @@ package binnie.genetics.gui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; @@ -12,11 +19,6 @@ import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; import binnie.core.texture.BinnieCoreTexture; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlAnalystChromosome extends Control implements ITooltip { IAllele allele0; diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java index 737a2a58..41e233b1 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java @@ -1,11 +1,11 @@ package binnie.genetics.gui; +import java.text.DecimalFormat; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; -import java.text.DecimalFormat; - public abstract class ControlAnalystPage extends Control { public ControlAnalystPage(final IWidget parent, final Area area) { super(parent, area); diff --git a/src/main/java/binnie/genetics/gui/ControlBiome.java b/src/main/java/binnie/genetics/gui/ControlBiome.java index eb583116..a9978a2a 100644 --- a/src/main/java/binnie/genetics/gui/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/ControlBiome.java @@ -1,17 +1,21 @@ package binnie.genetics.gui; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.common.BiomeDictionary; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.ForestryAPI; + import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.renderer.RenderUtil; -import forestry.api.core.ForestryAPI; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlBiome extends Control implements ITooltip { private final Biome biome; diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index d5c0ff53..23c4d9fb 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -1,5 +1,10 @@ package binnie.genetics.gui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IChromosomeType; + import binnie.Binnie; import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.Attribute; @@ -12,9 +17,6 @@ import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import forestry.api.genetics.IChromosomeType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlChromoPicker extends Control implements ITooltip { Texture Selected; diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index 70e62439..7dd36c50 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -1,5 +1,18 @@ package binnie.genetics.gui; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.lepidopterology.EnumButterflyChromosome; + import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.core.craftgui.CraftGUI; @@ -10,16 +23,6 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.texture.BinnieCoreTexture; -import com.google.common.base.Preconditions; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ControlChromosome extends Control implements IControlValue { Texture BeeTexture; diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java index 9351acd8..124cb4a7 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java @@ -1,13 +1,14 @@ package binnie.genetics.gui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlOption; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.Gene; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlGenesisOption extends ControlOption { public ControlGenesisOption(final ControlList parent, final Gene gene, final int y) { diff --git a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java index 3515a79b..94a30fb3 100644 --- a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java @@ -1,14 +1,16 @@ package binnie.genetics.gui; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IIndividual; + import binnie.Binnie; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; public class ControlIndividualDisplay extends ControlItemDisplay implements ITooltip { public ControlIndividualDisplay(final IWidget parent, final int x, final int y, final IIndividual ind) { diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index eed1932e..934f2c56 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -1,5 +1,15 @@ package binnie.genetics.gui; +import java.util.EnumSet; + +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.EnumTemperature; +import forestry.api.genetics.EnumTolerance; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -9,13 +19,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Border; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.Tolerance; -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.EnumTolerance; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.EnumSet; public abstract class ControlToleranceBar> extends Control implements ITooltip { EnumSet tolerated; diff --git a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java index 525d7bdc..48c337fe 100644 --- a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java @@ -1,5 +1,28 @@ package binnie.genetics.gui.bee; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.apiculture.PluginApiculture; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; @@ -14,25 +37,6 @@ import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay; import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.apiculture.PluginApiculture; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; public class AnalystPageProducts extends AnalystPageProduce { public AnalystPageProducts(final IWidget parent, final Area area, final IBee ind) { diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java b/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java index 0d0d4e0a..ee956bea 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java @@ -1,5 +1,17 @@ package binnie.genetics.gui.bee.database; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; + import binnie.Binnie; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; @@ -9,15 +21,6 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.List; public class ControlBiomes extends Control implements ITooltip { List tolerated; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java b/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java index d38781e1..3a6eddaf 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java @@ -1,5 +1,18 @@ package binnie.genetics.gui.bee.database; +import java.util.ArrayList; +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAllele; + import binnie.Binnie; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; @@ -10,17 +23,6 @@ import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IAllele; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.List; public class ControlClimateBar extends Control implements ITooltip { boolean isHumidity; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java index b74fb880..60780ed6 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java @@ -1,17 +1,19 @@ package binnie.genetics.gui.bee.database; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.genetics.IAllele; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.genetics.IAllele; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; public class ControlProductsBox extends ControlListBox { IAlleleBeeSpecies species; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java index e8a8a072..ba4c678d 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java @@ -1,5 +1,7 @@ package binnie.genetics.gui.bee.database; +import java.text.DecimalFormat; + import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.listbox.ControlList; @@ -8,8 +10,6 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import java.text.DecimalFormat; - public class ControlProductsItem extends ControlOption { ControlItemDisplay item; diff --git a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java index 21254e59..d9b6541f 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java +++ b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java @@ -1,11 +1,12 @@ package binnie.genetics.gui.bee.database; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.genetics.IAlleleSpecies; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageSpecies; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesClimate extends PageSpecies { ControlClimateBar tempBar; diff --git a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java index d9ce8f9a..39b68c6e 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java @@ -1,5 +1,12 @@ package binnie.genetics.gui.bee.database; +import net.minecraft.util.math.Vec3i; + +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -8,11 +15,6 @@ import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageSpecies; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.util.math.Vec3i; public class PageSpeciesGenome extends PageSpecies { ControlText pageSpeciesGenome_Title; diff --git a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java index aa7baeda..f2170539 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java +++ b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java @@ -1,12 +1,13 @@ package binnie.genetics.gui.bee.database; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.genetics.IAlleleSpecies; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageSpecies; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesProducts extends PageSpecies { ControlText pageSpeciesProducts_Title; diff --git a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java index 0bbef5ce..d7a18e88 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java @@ -1,5 +1,10 @@ package binnie.genetics.gui.bee.database; +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.database.DatabaseTab; @@ -13,9 +18,6 @@ import binnie.core.craftgui.database.PageSpeciesResultant; import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.minecraft.Window; import binnie.genetics.Genetics; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowApiaristDatabase extends WindowAbstractDatabase { public WindowApiaristDatabase(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/genetics/gui/bee/database/package-info.java b/src/main/java/binnie/genetics/gui/bee/database/package-info.java index 1d132f39..7933355d 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/package-info.java +++ b/src/main/java/binnie/genetics/gui/bee/database/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.gui.bee.database; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/bee/package-info.java b/src/main/java/binnie/genetics/gui/bee/package-info.java index 9c746b32..0e0582f0 100644 --- a/src/main/java/binnie/genetics/gui/bee/package-info.java +++ b/src/main/java/binnie/genetics/gui/bee/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.gui.bee; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java index 36e9cad4..698bd5af 100644 --- a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java +++ b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java @@ -1,13 +1,15 @@ package binnie.genetics.gui.butterfly; +import net.minecraft.util.text.TextFormatting; + +import forestry.api.lepidopterology.IButterfly; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlIndividualDisplay; -import forestry.api.lepidopterology.IButterfly; -import net.minecraft.util.text.TextFormatting; public class AnalystPageSpecimen extends ControlAnalystPage { public AnalystPageSpecimen(final IWidget parent, final Area area, final IButterfly ind) { diff --git a/src/main/java/binnie/genetics/gui/butterfly/package-info.java b/src/main/java/binnie/genetics/gui/butterfly/package-info.java index 86ed8bf1..1715c532 100644 --- a/src/main/java/binnie/genetics/gui/butterfly/package-info.java +++ b/src/main/java/binnie/genetics/gui/butterfly/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.gui.butterfly; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java index 26d7b360..ccb75ea0 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java @@ -1,5 +1,13 @@ package binnie.genetics.gui.flower; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAlleleSpecies; + import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerType; @@ -13,11 +21,6 @@ import binnie.core.craftgui.minecraft.control.ControlIconDisplay; import binnie.core.craftgui.renderer.RenderUtil; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; -import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class AnalystPageAppearance extends ControlAnalystPage { public AnalystPageAppearance(final IWidget parent, final Area area, final IFlower flower) { diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java index 273d64fe..f646ed16 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java @@ -1,5 +1,14 @@ package binnie.genetics.gui.flower; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import forestry.api.genetics.EnumTolerance; + import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; @@ -15,13 +24,6 @@ import binnie.core.genetics.Tolerance; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlToleranceBar; -import forestry.api.genetics.EnumTolerance; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; - -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; public class AnalystPageSoil extends ControlAnalystPage { public AnalystPageSoil(final IWidget parent, final Area area, final IFlower flower) { diff --git a/src/main/java/binnie/genetics/gui/flower/package-info.java b/src/main/java/binnie/genetics/gui/flower/package-info.java index f4b17aee..d13057d6 100644 --- a/src/main/java/binnie/genetics/gui/flower/package-info.java +++ b/src/main/java/binnie/genetics/gui/flower/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.gui.flower; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/package-info.java b/src/main/java/binnie/genetics/gui/package-info.java index aa7d8609..b13fe3b7 100644 --- a/src/main/java/binnie/genetics/gui/package-info.java +++ b/src/main/java/binnie/genetics/gui/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.gui; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index 83977955..6569c38e 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -1,5 +1,10 @@ package binnie.genetics.gui.punnett; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IChromosomeType; + import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -8,9 +13,6 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.renderer.RenderUtil; -import forestry.api.genetics.IChromosomeType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlChromosome extends Control implements IControlValue, ITooltip { private IChromosomeType value; diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java index af108819..cde60f6b 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java @@ -1,20 +1,22 @@ package binnie.genetics.gui.punnett; +import java.util.LinkedList; +import java.util.List; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.renderer.RenderUtil; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.LinkedList; -import java.util.List; public class ControlPunnett extends Control { static int boxWidth = 80; diff --git a/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java index ecd9732f..de242bde 100644 --- a/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java +++ b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java @@ -1,5 +1,15 @@ package binnie.genetics.gui.punnett; +import javax.annotation.Nullable; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.CraftGUI; @@ -13,13 +23,6 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; import binnie.genetics.Genetics; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class WindowPunnettSquare extends Window { diff --git a/src/main/java/binnie/genetics/gui/punnett/package-info.java b/src/main/java/binnie/genetics/gui/punnett/package-info.java index 37854217..62934f34 100644 --- a/src/main/java/binnie/genetics/gui/punnett/package-info.java +++ b/src/main/java/binnie/genetics/gui/punnett/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.gui.punnett; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java index fd1d5b60..b67899c0 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java @@ -1,5 +1,22 @@ package binnie.genetics.gui.tree; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Biomes; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.biome.Biome; + +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IBee; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IIndividual; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.IButterfly; + import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IFlower; import binnie.core.craftgui.IWidget; @@ -13,21 +30,6 @@ import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlBiome; import binnie.genetics.gui.ControlToleranceBar; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IBee; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.lepidopterology.IButterfly; -import net.minecraft.init.Biomes; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.biome.Biome; - -import java.util.ArrayList; -import java.util.List; public class AnalystPageClimate extends ControlAnalystPage { public AnalystPageClimate(final IWidget parent, final Area area, final IIndividual ind) { diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java index 75ff1653..f075e3b3 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java @@ -1,5 +1,24 @@ package binnie.genetics.gui.tree; +import com.google.common.base.Throwables; + +import java.lang.reflect.Field; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IFruitFamily; +import forestry.arboriculture.FruitProviderPod; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; @@ -9,22 +28,6 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueItemStackSet; import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; -import com.google.common.base.Throwables; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IFruitFamily; -import forestry.arboriculture.FruitProviderPod; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; - -import java.lang.reflect.Field; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; public class AnalystPageFruit extends AnalystPageProduce { public AnalystPageFruit(final IWidget parent, final Area area, final ITree ind) { diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java index fdddcee1..5d309a28 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java @@ -1,16 +1,18 @@ package binnie.genetics.gui.tree; +import net.minecraft.util.text.TextFormatting; + +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.ITree; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; -import net.minecraft.util.text.TextFormatting; public class AnalystPageGrowth extends ControlAnalystPage { public AnalystPageGrowth(final IWidget parent, final Area area, final IIndividual ind) { diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java index 9c1f4b27..2f901eb1 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java @@ -1,5 +1,19 @@ package binnie.genetics.gui.tree; +import java.util.Collection; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.IAlleleBoolean; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.Area; @@ -10,17 +24,6 @@ import binnie.core.util.UniqueItemStackSet; import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; import binnie.genetics.item.ModuleItems; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.genetics.IAlleleBoolean; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Collection; @SideOnly(Side.CLIENT) public class AnalystPageWood extends AnalystPageProduce { diff --git a/src/main/java/binnie/genetics/gui/tree/package-info.java b/src/main/java/binnie/genetics/gui/tree/package-info.java index aac2cfd2..ec7684fc 100644 --- a/src/main/java/binnie/genetics/gui/tree/package-info.java +++ b/src/main/java/binnie/genetics/gui/tree/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.gui.tree; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 176ba851..28625371 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -1,5 +1,14 @@ package binnie.genetics.integration.jei; +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.ISpeciesRoot; + import binnie.core.integration.jei.Drawables; import binnie.genetics.Genetics; import binnie.genetics.api.IIncubatorRecipe; @@ -26,19 +35,12 @@ import binnie.genetics.machine.AdvGeneticMachine; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.LaboratoryMachine; import binnie.genetics.machine.incubator.Incubator; -import forestry.api.genetics.ISpeciesRoot; import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModRegistry; import mezz.jei.api.ISubtypeRegistry; import mezz.jei.api.JEIPlugin; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.List; @JEIPlugin public class GeneticsJeiPlugin extends BlankModPlugin { diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java index 3dc24af5..ee498b94 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java @@ -1,15 +1,17 @@ package binnie.genetics.integration.jei.database; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ModuleItems; import mezz.jei.api.recipe.IStackHelper; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.List; public class DatabaseRecipeMaker { public static List create() { diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java index b6ce3e0d..f961e594 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java @@ -1,20 +1,22 @@ package binnie.genetics.integration.jei.database; +import java.awt.Color; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.awt.Color; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; public class DatabaseRecipeWrapper extends BlankRecipeWrapper { private final ItemStack input; diff --git a/src/main/java/binnie/genetics/integration/jei/database/package-info.java b/src/main/java/binnie/genetics/integration/jei/database/package-info.java index 837d016a..78313c83 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/database/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei.database; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java index 857baa9e..683822a4 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java @@ -1,5 +1,7 @@ package binnie.genetics.integration.jei.genepool; +import net.minecraft.client.Minecraft; + import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; @@ -11,7 +13,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; public class GenepoolRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java index 2583c642..b05783e4 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java @@ -1,16 +1,18 @@ package binnie.genetics.integration.jei.genepool; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; public class GenepoolRecipeMaker { public static List create() { diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java index 0342678b..1cef856c 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java @@ -1,21 +1,25 @@ package binnie.genetics.integration.jei.genepool; -import binnie.genetics.item.GeneticLiquid; -import binnie.genetics.item.GeneticsItems; -import binnie.genetics.machine.genepool.GenepoolLogic; -import forestry.core.fluids.Fluids; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.awt.Color; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.fluids.Fluids; + +import binnie.genetics.item.GeneticLiquid; +import binnie.genetics.item.GeneticsItems; +import binnie.genetics.machine.genepool.GenepoolLogic; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeWrapper; + public class GenepoolRecipeWrapper extends BlankRecipeWrapper { private static final ItemStack ENZYME = GeneticsItems.Enzyme.get(1); diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/package-info.java b/src/main/java/binnie/genetics/integration/jei/genepool/package-info.java index 992f296b..f58b9365 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei.genepool; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java index fcc2fb37..7854d4ba 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java @@ -1,5 +1,7 @@ package binnie.genetics.integration.jei.incubator; +import net.minecraft.client.Minecraft; + import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; @@ -11,7 +13,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; public class IncubatorRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java index 8f10873f..ff9faa65 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java @@ -1,15 +1,18 @@ package binnie.genetics.integration.jei.incubator; +import java.awt.Color; + +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.genetics.api.IIncubatorRecipe; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.awt.Color; public class IncubatorRecipeWrapper extends BlankRecipeWrapper { private final IIncubatorRecipe recipe; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java index 2b0416b2..a0708242 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java @@ -1,18 +1,20 @@ package binnie.genetics.integration.jei.incubator; -import binnie.Binnie; -import binnie.genetics.integration.jei.GeneticsJeiPlugin; -import binnie.genetics.machine.incubator.IncubatorRecipe; -import binnie.genetics.machine.incubator.IncubatorRecipeLarvae; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; -import net.minecraft.item.ItemStack; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; + +import binnie.Binnie; +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import binnie.genetics.machine.incubator.IncubatorRecipe; +import binnie.genetics.machine.incubator.IncubatorRecipeLarvae; + public class LarvaeIncubatorRecipeMaker { public static List create(@Nullable IncubatorRecipeLarvae recipeLarvae) { if (recipeLarvae == null) { diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/package-info.java b/src/main/java/binnie/genetics/integration/jei/incubator/package-info.java index dad8c888..0d375a4c 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei.incubator; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java index 6c5873e1..19bcfa3c 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java @@ -1,5 +1,13 @@ package binnie.genetics.integration.jei.inoculator; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.core.genetics.Gene; import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; @@ -7,10 +15,6 @@ import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.item.ItemSerum; import binnie.genetics.machine.inoculator.Inoculator; import binnie.genetics.machine.inoculator.InoculatorLogic; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IGuiFluidStackGroup; @@ -19,8 +23,6 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IFocus; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; public class InoculatorRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java index 67a1c22c..44a35948 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java @@ -1,21 +1,24 @@ package binnie.genetics.integration.jei.inoculator; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.genetics.Engineering; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.List; public class InoculatorRecipeMaker { public static List create() { diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java index ec084b3a..d0ce0647 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java @@ -1,24 +1,28 @@ package binnie.genetics.integration.jei.inoculator; +import javax.annotation.Nullable; +import java.awt.Color; +import java.text.NumberFormat; +import java.util.Arrays; +import java.util.Map; + +import org.apache.commons.lang3.time.DurationFormatUtils; + +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.genetics.item.GeneticLiquid; import binnie.genetics.machine.inoculator.InoculatorLogic; import binnie.genetics.machine.splicer.SplicerLogic; import mezz.jei.api.gui.IGuiIngredient; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.time.DurationFormatUtils; - -import javax.annotation.Nullable; -import java.awt.Color; -import java.text.NumberFormat; -import java.util.Arrays; -import java.util.Map; public class InoculatorRecipeWrapper extends BlankRecipeWrapper { private static final FluidStack BACTERIA_VECTOR = GeneticLiquid.BacteriaVector.get(InoculatorLogic.BACTERIA_PER_PROCESS); diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java b/src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java index c7cd0d01..ffbdf8e6 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei.inoculator; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java index de28427a..4ff36ea0 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java @@ -1,5 +1,12 @@ package binnie.genetics.integration.jei.isolator; +import java.awt.Color; + +import net.minecraft.client.Minecraft; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; @@ -11,11 +18,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.awt.Color; public class IsolatorRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java index b670e044..7506602a 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java @@ -1,19 +1,22 @@ package binnie.genetics.integration.jei.isolator; -import binnie.core.genetics.Gene; -import binnie.genetics.item.ItemSequence; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import binnie.core.genetics.Gene; +import binnie.genetics.item.ItemSequence; public class IsolatorRecipeMaker { public static List create() { diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java index 06727276..308fce38 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java @@ -1,20 +1,24 @@ package binnie.genetics.integration.jei.isolator; -import binnie.genetics.item.GeneticsItems; -import binnie.genetics.machine.isolator.IsolatorLogic; -import forestry.core.fluids.Fluids; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import java.awt.Color; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.fluids.Fluids; + +import binnie.genetics.item.GeneticsItems; +import binnie.genetics.machine.isolator.IsolatorLogic; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeWrapper; + public class IsolatorRecipeWrapper extends BlankRecipeWrapper { private static final FluidStack ETHANOL = Fluids.BIO_ETHANOL.getFluid(IsolatorLogic.ETHANOL_PER_PROCESS); private static final ItemStack EMPTY_SEQUENCE = GeneticsItems.EmptySequencer.get(1); diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/package-info.java b/src/main/java/binnie/genetics/integration/jei/isolator/package-info.java index 78359ce0..b2d92c26 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei.isolator; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/package-info.java b/src/main/java/binnie/genetics/integration/jei/package-info.java index 29d2fe65..a1070d08 100644 --- a/src/main/java/binnie/genetics/integration/jei/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java index 527fa74c..dcc7779a 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java @@ -1,5 +1,7 @@ package binnie.genetics.integration.jei.polymeriser; +import net.minecraft.client.Minecraft; + import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; @@ -11,7 +13,6 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; -import net.minecraft.client.Minecraft; public class PolymeriserRecipeCategory extends BlankRecipeCategory { @Override diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java index b53b0d50..49fb37b5 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeMaker.java @@ -1,15 +1,17 @@ package binnie.genetics.integration.jei.polymeriser; -import binnie.genetics.Genetics; -import binnie.genetics.integration.jei.GeneticsJeiPlugin; -import mezz.jei.api.recipe.IStackHelper; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + +import binnie.genetics.Genetics; +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import mezz.jei.api.recipe.IStackHelper; + public class PolymeriserRecipeMaker { public static List create() { List recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java index ae49ee8d..29065e86 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeWrapper.java @@ -1,18 +1,20 @@ package binnie.genetics.integration.jei.polymeriser; -import binnie.genetics.item.GeneticLiquid; -import binnie.genetics.machine.polymeriser.PolymeriserLogic; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import binnie.genetics.item.GeneticLiquid; +import binnie.genetics.machine.polymeriser.PolymeriserLogic; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeWrapper; + public class PolymeriserRecipeWrapper extends BlankRecipeWrapper { private final ItemStack input; diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java index 5ae33774..0492d372 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei.polymeriser; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java index 2451221a..8f3219a7 100644 --- a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java @@ -1,17 +1,19 @@ package binnie.genetics.integration.jei.sequencer; -import binnie.core.genetics.Gene; -import binnie.genetics.item.ItemSequence; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; + +import binnie.core.genetics.Gene; +import binnie.genetics.item.ItemSequence; + public class SequencerRecipeMaker { public static List create() { List recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java index 91dfa0ef..c8bbe7d8 100644 --- a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java @@ -1,5 +1,10 @@ package binnie.genetics.integration.jei.sequencer; +import java.util.Arrays; + +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + import binnie.genetics.Genetics; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.item.GeneticsItems; @@ -8,10 +13,6 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; - -import java.util.Arrays; public class SequencerRecipeWrapper extends BlankRecipeWrapper { private final ItemStack input; diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java b/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java index d40f6f2d..8c061126 100644 --- a/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java @@ -3,7 +3,7 @@ @MethodsReturnNonnullByDefault package binnie.genetics.integration.jei.sequencer; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 40bb139b..8f128c90 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -1,11 +1,13 @@ package binnie.genetics.item; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.IFluidType; import binnie.genetics.Genetics; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; public enum GeneticLiquid implements IFluidType { GrowthMedium("Growth Medium", "growth.medium", 15460533), diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 14c769a9..f94f314a 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -1,11 +1,12 @@ package binnie.genetics.item; -import binnie.core.item.IItemMiscProvider; -import binnie.genetics.Genetics; +import java.util.List; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import java.util.List; +import binnie.core.item.IItemMiscProvider; +import binnie.genetics.Genetics; public enum GeneticsItems implements IItemMiscProvider { LaboratoryCasing("Reinforced Casing", "casing_iron"), diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 549760e1..e2014e7b 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -1,15 +1,16 @@ package binnie.genetics.item; -import binnie.core.item.ItemCore; -import binnie.genetics.CreativeTabGenetics; -import binnie.genetics.Genetics; -import binnie.genetics.core.GeneticsGUI; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import binnie.core.item.ItemCore; +import binnie.genetics.CreativeTabGenetics; +import binnie.genetics.Genetics; +import binnie.genetics.core.GeneticsGUI; + public class ItemAnalyst extends ItemCore { /*@Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/item/ItemBeeDictionary.java b/src/main/java/binnie/genetics/item/ItemBeeDictionary.java index ed830142..19a04fb0 100644 --- a/src/main/java/binnie/genetics/item/ItemBeeDictionary.java +++ b/src/main/java/binnie/genetics/item/ItemBeeDictionary.java @@ -1,10 +1,8 @@ package binnie.genetics.item; -import binnie.genetics.Genetics; -import binnie.genetics.core.GeneticsGUI; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; +import javax.annotation.Nonnull; +import java.util.List; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,12 +12,18 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; -import java.util.List; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; + +import binnie.genetics.Genetics; +import binnie.genetics.core.GeneticsGUI; public class ItemBeeDictionary extends Item implements IItemModelRegister { diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index e1889907..d56a46c1 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -1,10 +1,5 @@ package binnie.genetics.item; -import binnie.core.item.ItemCore; -import binnie.genetics.CreativeTabGenetics; -import binnie.genetics.Genetics; -import binnie.genetics.core.GeneticsGUI; -import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,9 +9,17 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; + +import binnie.core.item.ItemCore; +import binnie.genetics.CreativeTabGenetics; +import binnie.genetics.Genetics; +import binnie.genetics.core.GeneticsGUI; + public class ItemDatabase extends ItemCore { public ItemDatabase() { diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 62571357..8ba87c9a 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,20 +1,23 @@ package binnie.genetics.item; -import binnie.core.item.ItemCore; -import binnie.genetics.CreativeTabGenetics; -import binnie.genetics.Genetics; -import binnie.genetics.genetics.IGeneItem; -import forestry.core.items.IColoredItem; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; +import forestry.core.items.IColoredItem; + +import binnie.core.item.ItemCore; +import binnie.genetics.CreativeTabGenetics; +import binnie.genetics.Genetics; +import binnie.genetics.genetics.IGeneItem; public abstract class ItemGene extends ItemCore implements IColoredItem { diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index ed997f81..fbb7767b 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -1,15 +1,16 @@ package binnie.genetics.item; -import binnie.core.item.ItemCore; -import binnie.genetics.CreativeTabGenetics; -import binnie.genetics.Genetics; -import binnie.genetics.core.GeneticsGUI; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import binnie.core.item.ItemCore; +import binnie.genetics.CreativeTabGenetics; +import binnie.genetics.Genetics; +import binnie.genetics.core.GeneticsGUI; + public class ItemMasterRegistry extends ItemCore { /*@Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/item/ItemPunnettSquare.java b/src/main/java/binnie/genetics/item/ItemPunnettSquare.java index 9f32184a..0f091a1e 100644 --- a/src/main/java/binnie/genetics/item/ItemPunnettSquare.java +++ b/src/main/java/binnie/genetics/item/ItemPunnettSquare.java @@ -1,7 +1,5 @@ package binnie.genetics.item; -import binnie.genetics.Genetics; -import binnie.genetics.core.GeneticsGUI; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,6 +9,9 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import binnie.genetics.Genetics; +import binnie.genetics.core.GeneticsGUI; + public class ItemPunnettSquare extends Item { public ItemPunnettSquare() { diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index 7aa65f16..b19c26c9 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -1,15 +1,16 @@ package binnie.genetics.item; -import binnie.core.item.ItemCore; -import binnie.genetics.CreativeTabGenetics; -import binnie.genetics.Genetics; -import binnie.genetics.core.GeneticsGUI; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import binnie.core.item.ItemCore; +import binnie.genetics.CreativeTabGenetics; +import binnie.genetics.Genetics; +import binnie.genetics.core.GeneticsGUI; + public class ItemRegistry extends ItemCore { /*@Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 4d007f6f..a1e63588 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -1,5 +1,23 @@ package binnie.genetics.item; +import com.google.common.base.Preconditions; + +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.Gene; import binnie.core.item.ItemCore; @@ -10,20 +28,6 @@ import binnie.genetics.api.IItemAnalysable; import binnie.genetics.api.IItemChargeable; import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.SequencerItem; -import com.google.common.base.Preconditions; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.List; public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChargeable { public ItemSequence() { diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 331096c4..ca673a1b 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,5 +1,24 @@ package binnie.genetics.item; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -8,21 +27,6 @@ import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.IGeneItem; -import com.google.common.base.Preconditions; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; public class ItemSerum extends ItemGene implements IItemSerum { public ItemSerum() { diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 93b43d18..9cfb5007 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,5 +1,24 @@ package binnie.genetics.item; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -8,21 +27,6 @@ import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.GeneArrayItem; import binnie.genetics.genetics.IGeneItem; -import com.google.common.base.Preconditions; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nullable; public class ItemSerumArray extends ItemGene implements IItemSerum { public ItemSerumArray() { diff --git a/src/main/java/binnie/genetics/item/package-info.java b/src/main/java/binnie/genetics/item/package-info.java index 20a9927d..e6916969 100644 --- a/src/main/java/binnie/genetics/item/package-info.java +++ b/src/main/java/binnie/genetics/item/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.item; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java index c3dfb6f5..ddfd67cd 100644 --- a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java @@ -1,11 +1,12 @@ package binnie.genetics.machine; +import net.minecraft.item.ItemStack; + import binnie.core.machines.IMachineType; import binnie.core.machines.MachinePackage; import binnie.core.resource.IBinnieTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.splicer.PackageSplicer; -import net.minecraft.item.ItemStack; public enum AdvGeneticMachine implements IMachineType { Splicer(PackageSplicer.class); diff --git a/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java b/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java index 835b473a..1b73f25f 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java +++ b/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java @@ -1,13 +1,14 @@ package binnie.genetics.machine; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class ComponentGeneticGUI extends MachineComponent implements IInteraction.RightClick { GeneticsGUI id; diff --git a/src/main/java/binnie/genetics/machine/GeneticMachine.java b/src/main/java/binnie/genetics/machine/GeneticMachine.java index aa514f41..fed2ce73 100644 --- a/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -1,5 +1,11 @@ package binnie.genetics.machine; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; import binnie.core.machines.MachinePackage; @@ -10,10 +16,6 @@ import binnie.genetics.machine.inoculator.PackageInoculator; import binnie.genetics.machine.isolator.PackageIsolator; import binnie.genetics.machine.polymeriser.PackagePolymeriser; import binnie.genetics.machine.sequencer.PackageSequencer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public enum GeneticMachine implements IMachineType { Isolator(PackageIsolator.class), diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index 348ffaf9..f2f569fd 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -1,5 +1,14 @@ package binnie.genetics.machine; +import javax.annotation.Nonnull; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import binnie.core.machines.IMachine; import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; @@ -13,14 +22,6 @@ import binnie.genetics.machine.acclimatiser.PackageAcclimatiser; import binnie.genetics.machine.analyser.PackageAnalyser; import binnie.genetics.machine.genepool.PackageGenepool; import binnie.genetics.machine.incubator.PackageIncubator; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; public enum LaboratoryMachine implements IMachineType { LabMachine(PackageLabMachine.class), diff --git a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java index f46720b0..0692376b 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java @@ -1,13 +1,15 @@ package binnie.genetics.machine; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.math.BlockPos; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.Machine; import binnie.core.machines.component.IRender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRendererGenetics { diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index 7c83175b..24a3b287 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -1,7 +1,5 @@ package binnie.genetics.machine; -import binnie.core.BinnieCore; -import binnie.core.machines.Machine; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; @@ -10,9 +8,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import binnie.core.BinnieCore; +import binnie.core.machines.Machine; + @SideOnly(Side.CLIENT) public class MachineRendererLab { public static MachineRendererLab instance = new MachineRendererLab(); diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 019c2849..727428df 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -1,5 +1,14 @@ package binnie.genetics.machine; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; + +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import net.minecraftforge.fml.common.registry.GameRegistry; + import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; @@ -9,12 +18,6 @@ import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.acclimatiser.Acclimatiser; import binnie.genetics.machine.incubator.Incubator; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { public static ValidatorSprite spriteSequencer; diff --git a/src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java b/src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java index c9ae85b9..2f19a053 100644 --- a/src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java +++ b/src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java @@ -1,8 +1,9 @@ package binnie.genetics.machine; -import binnie.core.machines.inventory.Validator; import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.Validator; + public class SlotValidatorInoculatorCatalyst extends Validator { @Override public boolean isValid(final ItemStack itemStack) { diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 236ae324..f1938893 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -1,21 +1,5 @@ package binnie.genetics.machine.acclimatiser; -import binnie.Binnie; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.core.BinnieCore; -import binnie.core.genetics.Tolerance; -import binnie.core.liquid.FluidContainerType; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; - import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; @@ -23,6 +7,25 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidRegistry; + +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.lepidopterology.EnumButterflyChromosome; + +import binnie.Binnie; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.core.BinnieCore; +import binnie.core.genetics.Tolerance; +import binnie.core.liquid.FluidContainerType; + public class Acclimatiser { public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3}; public static final int SLOT_TARGET = 4; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java index 08daad63..da851a5a 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java @@ -1,13 +1,14 @@ package binnie.genetics.machine.acclimatiser; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + import binnie.core.machines.IMachine; import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; import binnie.genetics.Genetics; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; -import java.util.List; public class AcclimatiserLogic extends ComponentProcessIndefinate { public AcclimatiserLogic(final IMachine machine) { diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java index 26e0a8b2..09782015 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.acclimatiser; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -12,8 +15,6 @@ import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class PackageAcclimatiser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageAcclimatiser() { diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java index 5ca69c5d..d193942d 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java @@ -1,17 +1,19 @@ package binnie.genetics.machine.acclimatiser; -import binnie.core.genetics.Gene; -import binnie.core.genetics.Tolerance; -import binnie.genetics.machine.inoculator.Inoculator; +import java.util.Random; + +import net.minecraft.item.ItemStack; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; -import java.util.Random; +import binnie.core.genetics.Gene; +import binnie.core.genetics.Tolerance; +import binnie.genetics.machine.inoculator.Inoculator; class ToleranceSystem { String uid; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java index 83084c20..f58fed09 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java @@ -1,8 +1,9 @@ package binnie.genetics.machine.acclimatiser; -import binnie.botany.gardening.Gardening; import net.minecraft.item.ItemStack; +import binnie.botany.gardening.Gardening; + public enum ToleranceType { Temperature, Humidity, diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java b/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java index 88471a30..d3d14007 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java @@ -1,8 +1,9 @@ package binnie.genetics.machine.acclimatiser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; -import net.minecraft.item.ItemStack; public class ValidatorAcclimatiserItem extends SlotValidator { public ValidatorAcclimatiserItem() { diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index d66ec285..1a34b0b0 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -1,7 +1,12 @@ package binnie.genetics.machine.acclimatiser; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; -import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; import binnie.core.craftgui.minecraft.control.ControlErrorState; @@ -14,10 +19,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowAcclimatiser extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 64, 64, 64, GeneticsTexture.GUIProcess3); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java b/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java index 98fd6e8c..2035f119 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.acclimatiser; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java index 5b8694bc..390ee69c 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserFX.java @@ -1,10 +1,7 @@ package binnie.genetics.machine.analyser; -import binnie.core.BinnieCore; -import binnie.core.machines.IMachine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.component.IRender; -import binnie.core.machines.network.INetwork; +import java.util.Random; + import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -14,10 +11,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; +import binnie.core.BinnieCore; +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.component.IRender; +import binnie.core.machines.network.INetwork; public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { private final EntityItem dummyEntityItem; diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 1295e82a..7520b461 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.analyser; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -15,8 +18,6 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class PackageAnalyser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageAnalyser() { diff --git a/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java b/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java index 6a853c07..933502e7 100644 --- a/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java +++ b/src/main/java/binnie/genetics/machine/analyser/SlotValidatorUnanalysed.java @@ -1,8 +1,9 @@ package binnie.genetics.machine.analyser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; -import net.minecraft.item.ItemStack; public class SlotValidatorUnanalysed extends SlotValidator { public SlotValidatorUnanalysed() { diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index e029f865..dead60a3 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -1,7 +1,12 @@ package binnie.genetics.machine.analyser; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; -import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.MinecraftGUI; @@ -19,10 +24,6 @@ import binnie.core.craftgui.window.Panel; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowAnalyser extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, GeneticsTexture.GUIProcess3); diff --git a/src/main/java/binnie/genetics/machine/analyser/package-info.java b/src/main/java/binnie/genetics/machine/analyser/package-info.java index 6434b1bf..f9bdc414 100644 --- a/src/main/java/binnie/genetics/machine/analyser/package-info.java +++ b/src/main/java/binnie/genetics/machine/analyser/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.analyser; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 2486fa98..b56ddbaf 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.craftgui; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Binnie; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.ITooltip; @@ -15,10 +21,6 @@ import binnie.core.genetics.BreedingSystem; import binnie.genetics.api.IGene; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.genetics.Engineering; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlGene extends Control implements IControlValue, ITooltip { private IGene gene; diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 3b2ed539..7f83a395 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -1,5 +1,13 @@ package binnie.genetics.machine.craftgui; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -10,13 +18,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.genetics.GeneTracker; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; public class ControlGeneScroll extends Control implements IControlValue { private String filter; diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java index 91a9d6cf..89745602 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java @@ -1,12 +1,13 @@ package binnie.genetics.machine.craftgui; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.control.ControlMachineProgress; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlProcessTemporary extends ControlMachineProgress { public ControlProcessTemporary(final IWidget parent, final int x, final int y, final int width, final int height) { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index 7d5520b1..eae0b0c6 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -1,5 +1,21 @@ package binnie.genetics.machine.craftgui; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.Tooltip; @@ -22,19 +38,6 @@ import binnie.core.genetics.Gene; import binnie.genetics.Genetics; import binnie.genetics.genetics.Engineering; import binnie.genetics.genetics.GeneTracker; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; public class WindowGeneBank extends WindowMachine { //public static IIcon[] iconsDNA; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java index e705afbf..3f9dbe71 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBankNEI.java @@ -2,6 +2,7 @@ package binnie.genetics.machine.craftgui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; + import net.minecraftforge.fml.relauncher.Side; public class WindowGeneBankNEI extends WindowGeneBank { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java index 2b03d0f9..414c4103 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java @@ -1,11 +1,13 @@ package binnie.genetics.machine.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.genetics.Genetics; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; public class WindowGeneProject extends Window { public WindowGeneProject(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java index f0c0b78a..0ba02d50 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java @@ -1,11 +1,13 @@ package binnie.genetics.machine.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; + import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.genetics.Genetics; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; public class WindowGenomeAssembler extends WindowMachine { public WindowGenomeAssembler(final EntityPlayer player, final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java index 16be4dc9..ef18d514 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java @@ -1,12 +1,14 @@ package binnie.genetics.machine.craftgui; -import binnie.core.craftgui.minecraft.Window; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; +import binnie.core.craftgui.minecraft.Window; public abstract class WindowMachine extends Window { public WindowMachine(final int width, final int height, final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { diff --git a/src/main/java/binnie/genetics/machine/craftgui/package-info.java b/src/main/java/binnie/genetics/machine/craftgui/package-info.java index 2db43520..05473446 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/package-info.java +++ b/src/main/java/binnie/genetics/machine/craftgui/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.craftgui; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java index fff8e9b3..232f86a4 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java @@ -1,16 +1,18 @@ package binnie.genetics.machine.genepool; +import java.util.Random; + +import net.minecraft.client.particle.Particle; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IRender; -import net.minecraft.client.particle.Particle; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Random; public class GenepoolFX extends MachineComponent implements IRender.DisplayTick { public GenepoolFX(final IMachine machine) { diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java index 053acefc..46130de0 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java @@ -1,5 +1,10 @@ package binnie.genetics.machine.genepool; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; @@ -8,9 +13,6 @@ import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticLiquid; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { public static final float ENZYME_PER_PROCESS = 0.25f; diff --git a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java index 60696222..ed0148d5 100644 --- a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java @@ -1,5 +1,12 @@ package binnie.genetics.machine.genepool; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import forestry.core.fluids.Fluids; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -18,10 +25,6 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.ModuleMachine; -import forestry.core.fluids.Fluids; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class PackageGenepool extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageGenepool() { diff --git a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index 6b3fa319..1c249953 100644 --- a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -1,7 +1,12 @@ package binnie.genetics.machine.genepool; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; -import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; @@ -18,10 +23,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowGenepool extends WindowMachine { static Texture ProgressBase = new StandardTexture(64, 0, 130, 21, GeneticsTexture.GUIProcess3); diff --git a/src/main/java/binnie/genetics/machine/genepool/package-info.java b/src/main/java/binnie/genetics/machine/genepool/package-info.java index 2078664b..0b825ea3 100644 --- a/src/main/java/binnie/genetics/machine/genepool/package-info.java +++ b/src/main/java/binnie/genetics/machine/genepool/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.genepool; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index c55414fa..081bc161 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -1,5 +1,20 @@ package binnie.genetics.machine.incubator; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -7,18 +22,6 @@ import binnie.core.machines.MachineUtil; import binnie.genetics.api.IIncubatorRecipe; import binnie.genetics.item.GeneticLiquid; import binnie.genetics.item.GeneticsItems; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; public class Incubator { public static final int[] SLOT_QUEUE = new int[]{0, 1, 2}; diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java index ae53c613..f0e8a07c 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -1,5 +1,13 @@ package binnie.genetics.machine.incubator; +import javax.annotation.Nullable; +import java.util.Random; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; @@ -7,12 +15,6 @@ import binnie.core.machines.power.IProcess; import binnie.core.machines.transfer.TransferRequest; import binnie.genetics.Genetics; import binnie.genetics.api.IIncubatorRecipe; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -import javax.annotation.Nullable; -import java.util.Random; public class IncubatorLogic extends ComponentProcessIndefinate implements IProcess { @Nullable diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java index 4c6f10aa..ee8f0678 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.incubator; +import javax.annotation.Nullable; +import java.util.Random; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.MachineUtil; import binnie.core.machines.transfer.TransferRequest; import binnie.genetics.api.IIncubatorRecipe; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import javax.annotation.Nullable; -import java.util.Random; public class IncubatorRecipe implements IIncubatorRecipe { private final FluidStack input; diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java index 170cd11b..cb7cadae 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java @@ -1,10 +1,11 @@ package binnie.genetics.machine.incubator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import javax.annotation.Nullable; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + public class IncubatorRecipeLarvae extends IncubatorRecipe { public IncubatorRecipeLarvae(ItemStack itemStack, FluidStack input, @Nullable FluidStack output, float lossChance, float chance) { super(itemStack, input, output, lossChance, chance); diff --git a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java index f6c46f25..81d9de83 100644 --- a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.incubator; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -11,7 +13,6 @@ import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; -import net.minecraft.tileentity.TileEntity; public class PackageIncubator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageIncubator() { diff --git a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index 49a99a3d..e67737a4 100644 --- a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.incubator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; @@ -16,10 +22,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowIncubator extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess); diff --git a/src/main/java/binnie/genetics/machine/incubator/package-info.java b/src/main/java/binnie/genetics/machine/incubator/package-info.java index 68adbc3b..37c7a52d 100644 --- a/src/main/java/binnie/genetics/machine/incubator/package-info.java +++ b/src/main/java/binnie/genetics/machine/incubator/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.incubator; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java b/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java index 26bec2be..205417ad 100644 --- a/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/indexer/ComponentApiaristIndexerInventory.java @@ -1,18 +1,19 @@ package binnie.genetics.machine.indexer; -import binnie.Binnie; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.SetList; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import binnie.Binnie; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.SetList; public class ComponentApiaristIndexerInventory extends ComponentIndexerInventory implements IInventory { public ComponentApiaristIndexerInventory(final Machine machine) { diff --git a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java index 7209145f..e6f7eb87 100644 --- a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java @@ -1,16 +1,17 @@ package binnie.genetics.machine.indexer; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.ComponentInventory; -import binnie.core.machines.inventory.SetList; +import javax.annotation.Nullable; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import javax.annotation.Nullable; -import java.util.List; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.ComponentInventory; +import binnie.core.machines.inventory.SetList; public abstract class ComponentIndexerInventory extends ComponentInventory implements IInventory { public int guiRefreshCounter; diff --git a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java index 0ee09546..5807c40f 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.inoculator; -import binnie.genetics.api.IGene; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IBeeRoot; -import forestry.api.genetics.IAllele; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IBeeRoot; +import forestry.api.genetics.IAllele; + +import binnie.genetics.api.IGene; + public class Inoculator { public static final int SLOT_SERUM_VIAL = 0; public static final int[] SLOT_SERUM_RESERVE = new int[]{1, 2}; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java index d66d3408..33b0ab43 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java @@ -1,10 +1,7 @@ package binnie.genetics.machine.inoculator; -import binnie.core.BinnieCore; -import binnie.core.machines.IMachine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.component.IRender; -import binnie.core.machines.network.INetwork; +import java.util.Random; + import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -14,10 +11,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; +import binnie.core.BinnieCore; +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.component.IRender; +import binnie.core.machines.network.INetwork; public class InoculatorFX extends MachineComponent implements IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { private final EntityItem dummyEntityItem; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index 02d2979f..ee2244da 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -1,5 +1,17 @@ package binnie.genetics.machine.inoculator; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; + import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; import binnie.core.machines.power.ComponentProcess; @@ -9,15 +21,6 @@ import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.oredict.OreDictionary; - -import javax.annotation.Nullable; public class InoculatorLogic extends ComponentProcess implements IProcess { public static final int PROCESS_BASE_LENGTH = 12000; diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index 605df4f0..273af27c 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -1,5 +1,10 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fluids.FluidStack; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; @@ -20,9 +25,6 @@ import binnie.genetics.item.GeneticLiquid; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; public class PackageInoculator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageInoculator() { diff --git a/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java b/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java index bc0bd7e7..affeeacb 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java +++ b/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java @@ -1,10 +1,12 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; public class ValidatorIndividualInoculate extends SlotValidator { public ValidatorIndividualInoculate() { diff --git a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index d2595a2a..2b06cced 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; @@ -18,10 +24,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowInoculator extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2); diff --git a/src/main/java/binnie/genetics/machine/inoculator/package-info.java b/src/main/java/binnie/genetics/machine/inoculator/package-info.java index dfa19cdd..94ac7f9c 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/package-info.java +++ b/src/main/java/binnie/genetics/machine/inoculator/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.inoculator; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java index a02b1ac1..54e0f154 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java @@ -1,16 +1,18 @@ package binnie.genetics.machine.isolator; +import java.util.Random; + +import net.minecraft.client.particle.Particle; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IRender; -import net.minecraft.client.particle.Particle; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Random; public class IsolaterFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick { public IsolaterFX(final IMachine machine) { diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java index a1cf6d66..aca8cca4 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java @@ -1,5 +1,16 @@ package binnie.genetics.machine.isolator; +import java.util.Random; + +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; + import binnie.core.genetics.Gene; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; @@ -9,15 +20,6 @@ import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.Genetics; import binnie.genetics.item.ItemSequence; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; - -import java.util.Random; public class IsolatorLogic extends ComponentProcessSetCost implements IProcess { public static final float ENZYME_PER_PROCESS = 0.5f; diff --git a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java index e2c54ea3..e5e1750f 100644 --- a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java @@ -1,5 +1,14 @@ package binnie.genetics.machine.isolator; +import java.util.Objects; + +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import forestry.core.fluids.Fluids; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -17,12 +26,6 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.ModuleMachine; -import forestry.core.fluids.Fluids; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import java.util.Objects; public class PackageIsolator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageIsolator() { diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index f717c7e6..a67940ea 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -1,7 +1,12 @@ package binnie.genetics.machine.isolator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; -import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; @@ -18,10 +23,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowIsolator extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, GeneticsTexture.GUIProcess3); diff --git a/src/main/java/binnie/genetics/machine/isolator/package-info.java b/src/main/java/binnie/genetics/machine/isolator/package-info.java index 8f0b5674..69a0be91 100644 --- a/src/main/java/binnie/genetics/machine/isolator/package-info.java +++ b/src/main/java/binnie/genetics/machine/isolator/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.isolator; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/package-info.java b/src/main/java/binnie/genetics/machine/package-info.java index 9d702f43..a7a2d277 100644 --- a/src/main/java/binnie/genetics/machine/package-info.java +++ b/src/main/java/binnie/genetics/machine/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index 95383aaa..ab84487e 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.polymeriser; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.fluids.FluidStack; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -17,10 +23,6 @@ import binnie.genetics.item.GeneticLiquid; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java index 9b432014..21633be0 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java @@ -1,16 +1,18 @@ package binnie.genetics.machine.polymeriser; +import java.util.Random; + +import net.minecraft.client.particle.Particle; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IRender; -import net.minecraft.client.particle.Particle; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Random; public class PolymeriserFX extends MachineComponent implements IRender.DisplayTick { public PolymeriserFX(final IMachine machine) { diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java index 312cdcb2..3e0a3006 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.polymeriser; +import com.google.common.base.Preconditions; + +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.Genetics; import binnie.genetics.genetics.Engineering; -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; public class PolymeriserLogic extends ComponentProcessSetCost implements IProcess { private static float chargePerProcess = 0.4f; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java index dc1b8e65..36a4a8f6 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java @@ -1,10 +1,11 @@ package binnie.genetics.machine.polymeriser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; import binnie.genetics.api.IItemChargeable; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class SlotValidatorUnfilledSerum extends SlotValidator { public SlotValidatorUnfilledSerum() { diff --git a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index c7d4498c..302a3186 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.polymeriser; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; @@ -17,10 +23,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowPolymeriser extends WindowMachine { static Texture ProgressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUIProcess); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/package-info.java b/src/main/java/binnie/genetics/machine/polymeriser/package-info.java index b04cbb07..03022e4f 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/package-info.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.polymeriser; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java index e9ef9dd3..ff43c317 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java @@ -1,5 +1,10 @@ package binnie.genetics.machine.sequencer; +import java.util.Random; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.geometry.Area; @@ -11,10 +16,6 @@ import binnie.core.craftgui.window.Panel; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; - -import java.util.Random; public class ControlSequencerProgress extends ControlProgressBase { static final String[] CODES = {"A", "T", "G", "C"}; diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index ea6715e7..df9f601d 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.sequencer; +import net.minecraft.tileentity.TileEntity; + import binnie.Binnie; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; @@ -17,7 +19,6 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.tileentity.TileEntity; public class PackageSequencer extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageSequencer() { diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java index 4a263176..1a92c934 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java @@ -1,17 +1,19 @@ package binnie.genetics.machine.sequencer; +import java.util.Random; + +import net.minecraft.client.particle.Particle; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IRender; import binnie.core.resource.BinnieSprite; -import net.minecraft.client.particle.Particle; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Random; public class SequencerFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick { public SequencerFX(final IMachine machine) { diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index 2cd5e04c..25899185 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -1,5 +1,9 @@ package binnie.genetics.machine.sequencer; +import com.google.common.base.Preconditions; + +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcess; import binnie.core.machines.power.ErrorState; @@ -8,8 +12,6 @@ import binnie.genetics.Genetics; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.item.GeneticsItems; -import com.google.common.base.Preconditions; -import net.minecraft.item.ItemStack; public class SequencerLogic extends ComponentProcess implements IProcess { public SequencerLogic(final Machine machine) { diff --git a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java index babc6a81..e64b5ff3 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java @@ -1,10 +1,11 @@ package binnie.genetics.machine.sequencer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class SlotValidatorUnsequenced extends SlotValidator { public SlotValidatorUnsequenced() { diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index af490c53..21007504 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -1,7 +1,14 @@ package binnie.genetics.machine.sequencer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; -import binnie.core.ExtraBeeTexture; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.CraftGUIUtil; @@ -20,12 +27,6 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowSequencer extends WindowMachine { static Texture ProgressBase = new StandardTexture(64, 114, 98, 9, GeneticsTexture.GUIProcess3); diff --git a/src/main/java/binnie/genetics/machine/sequencer/package-info.java b/src/main/java/binnie/genetics/machine/sequencer/package-info.java index 9c30feab..f8cb8e23 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/package-info.java +++ b/src/main/java/binnie/genetics/machine/sequencer/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.sequencer; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java b/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java index 414ff51a..24fc4d13 100644 --- a/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java +++ b/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java @@ -1,11 +1,12 @@ package binnie.genetics.machine.splicer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.control.ControlProgressBase; import binnie.core.craftgui.renderer.RenderUtil; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSplicerProgress extends ControlProgressBase { float strength; diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index bcb18576..0d0c48a3 100644 --- a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.splicer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; @@ -18,8 +21,6 @@ import binnie.genetics.genetics.Engineering; import binnie.genetics.machine.AdvGeneticMachine; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class PackageSplicer extends AdvGeneticMachine.PackageAdvGeneticBase implements IMachineInformation { public PackageSplicer() { diff --git a/src/main/java/binnie/genetics/machine/splicer/Splicer.java b/src/main/java/binnie/genetics/machine/splicer/Splicer.java index a476f14e..63c98683 100644 --- a/src/main/java/binnie/genetics/machine/splicer/Splicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/Splicer.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.splicer; -import binnie.genetics.api.IGene; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IBeeRoot; -import forestry.api.genetics.IAllele; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IBeeRoot; +import forestry.api.genetics.IAllele; + +import binnie.genetics.api.IGene; + public class Splicer { public static final int SLOT_SERUM_VIAL = 0; public static final int[] SLOT_SERUM_RESERVE = new int[]{1, 2}; diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java index 1393ce59..7aa650a5 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerFX.java @@ -1,10 +1,7 @@ package binnie.genetics.machine.splicer; -import binnie.core.BinnieCore; -import binnie.core.machines.IMachine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.component.IRender; -import binnie.core.machines.network.INetwork; +import java.util.Random; + import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -14,10 +11,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Random; +import binnie.core.BinnieCore; +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.component.IRender; +import binnie.core.machines.network.INetwork; public class SplicerFX extends MachineComponent implements IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { private final EntityItem dummyEntityItem; diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java index b47872ba..5d08eaf4 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java @@ -1,5 +1,16 @@ package binnie.genetics.machine.splicer; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IIndividual; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcess; import binnie.core.machines.power.ErrorState; @@ -8,14 +19,6 @@ import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; -import com.google.common.base.Preconditions; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import javax.annotation.Nullable; public class SplicerLogic extends ComponentProcess implements IProcess { public static int PROCESS_ENERGY = 12000000; diff --git a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java b/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java index bfd2f922..13101480 100644 --- a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java +++ b/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java @@ -1,11 +1,13 @@ package binnie.genetics.machine.splicer; +import net.minecraft.item.ItemStack; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.ISpeciesRoot; + import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; public class ValidatorIndividualInoculate extends SlotValidator { public ValidatorIndividualInoculate() { diff --git a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index 147c825b..5e427599 100644 --- a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.splicer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; @@ -17,10 +23,6 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; import binnie.genetics.machine.inoculator.Inoculator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WindowSplicer extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2); diff --git a/src/main/java/binnie/genetics/machine/splicer/package-info.java b/src/main/java/binnie/genetics/machine/splicer/package-info.java index 9b4bc969..2191319b 100644 --- a/src/main/java/binnie/genetics/machine/splicer/package-info.java +++ b/src/main/java/binnie/genetics/machine/splicer/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.machine.splicer; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/network/package-info.java b/src/main/java/binnie/genetics/network/package-info.java index ec2315a2..bd8156f0 100644 --- a/src/main/java/binnie/genetics/network/package-info.java +++ b/src/main/java/binnie/genetics/network/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.network; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/package-info.java b/src/main/java/binnie/genetics/package-info.java index dc0da5bd..2dfeccfe 100644 --- a/src/main/java/binnie/genetics/package-info.java +++ b/src/main/java/binnie/genetics/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/proxy/ProxyClient.java b/src/main/java/binnie/genetics/proxy/ProxyClient.java index 56f6a481..a18f138c 100644 --- a/src/main/java/binnie/genetics/proxy/ProxyClient.java +++ b/src/main/java/binnie/genetics/proxy/ProxyClient.java @@ -1,11 +1,13 @@ package binnie.genetics.proxy; +import net.minecraft.block.Block; +import net.minecraft.item.Item; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import binnie.Constants; import binnie.core.models.ModelManager; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IGeneticsProxy { diff --git a/src/main/java/binnie/genetics/proxy/package-info.java b/src/main/java/binnie/genetics/proxy/package-info.java index 7db8987f..df8576cd 100644 --- a/src/main/java/binnie/genetics/proxy/package-info.java +++ b/src/main/java/binnie/genetics/proxy/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie.genetics.proxy; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/package-info.java b/src/main/java/binnie/package-info.java index 7ea4a7d8..536e4882 100644 --- a/src/main/java/binnie/package-info.java +++ b/src/main/java/binnie/package-info.java @@ -3,7 +3,7 @@ @FieldsAreNonnullByDefault package binnie; -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file