Cleanup

src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java

@@ -31,14 +31,6 @@ public class ActuallyAdditionsAPI{
     public static final String MOD_ID = "actuallyadditions";
     public static final String API_ID = MOD_ID+"api";
     public static final String API_VERSION = "15";
-
-    /**
-     * Use this to handle things that aren't based in the API itself
-     * DO NOT CHANGE/OVERRIDE THIS!!
-     * This is getting initialized in Actually Additions' PreInit phase
-     */
-    public static IMethodHandler methodHandler;
-
     public static final List<CrusherRecipe> CRUSHER_RECIPES = new ArrayList<CrusherRecipe>();
     public static final List<BallOfFurReturn> BALL_OF_FUR_RETURN_ITEMS = new ArrayList<BallOfFurReturn>();
     public static final List<TreasureChestLoot> TREASURE_CHEST_LOOT = new ArrayList<TreasureChestLoot>();
@@ -46,10 +38,14 @@ public class ActuallyAdditionsAPI{
     public static final Map<Item, IColorLensChanger> RECONSTRUCTOR_LENS_COLOR_CHANGERS = new HashMap<Item, IColorLensChanger>();
     public static final List<CoffeeIngredient> COFFEE_MACHINE_INGREDIENTS = new ArrayList<CoffeeIngredient>();
     public static final List<CompostRecipe> COMPOST_RECIPES = new ArrayList<CompostRecipe>();
-
     public static final List<IBookletEntry> BOOKLET_ENTRIES = new ArrayList<IBookletEntry>();
     public static final List<BookletPage> BOOKLET_PAGES_WITH_ITEM_DATA = new ArrayList<BookletPage>();
-
+    /**
+     * Use this to handle things that aren't based in the API itself
+     * DO NOT CHANGE/OVERRIDE THIS!!
+     * This is getting initialized in Actually Additions' PreInit phase
+     */
+    public static IMethodHandler methodHandler;
     //These are getting initialized in Actually Additions' PreInit phase
     //DO NOT CHANGE/OVERRIDE THESE!!
     public static IBookletEntry entryGettingStarted;

src/main/java/de/ellpeck/actuallyadditions/api/lens/LensConversion.java

@@ -19,7 +19,7 @@ import net.minecraft.util.math.BlockPos;
 /**
  * This is the base class for a Reconstructor Lens Type that converts two items
  * via the ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES list.
- *
+ * <p>
  * If you want to make a new type of conversion, just use your type in the recipe
  * If you want to use the default type of conversion, use ActuallyAdditionsAPI.lensDefaultConversion.
  */

src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java

@@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
-import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
 import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler;
 import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting;
 import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting;

src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java

@@ -19,9 +19,9 @@ import java.util.ArrayList;
 
 public class InitAchievements{
 
+    public static final ArrayList<Achievement> achievementList = new ArrayList<Achievement>();
     public static int pageNumber;
     public static AchievementPage theAchievementPage;
-    public static final ArrayList<Achievement> achievementList = new ArrayList<Achievement>();
 
     public static void init(){
         ModUtil.LOGGER.info("Initializing Achievements...");

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java

@@ -40,7 +40,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class BlockAtomicReconstructor extends BlockContainerBase implements IHudDisplay{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBookletStand.java

@@ -43,8 +43,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 @SuppressWarnings("deprecation")
 public class BlockBookletStand extends BlockContainerBase implements IHudDisplay{
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java

@@ -32,8 +32,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockBreaker extends BlockContainerBase{
 
     private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java

@@ -26,8 +26,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockCanolaPress extends BlockContainerBase{
 
     public BlockCanolaPress(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java

@@ -33,7 +33,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 public class BlockCoalGenerator extends BlockContainerBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java

@@ -32,8 +32,6 @@ import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockCoffeeMachine extends BlockContainerBase{
 
     private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0625, 0, 0.0625, 1-0.0625, 1-0.0625*2, 1-0.0625);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java

@@ -22,7 +22,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -37,7 +36,6 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.oredict.OreDictionary;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Random;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java

@@ -37,7 +37,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class BlockCompost extends BlockContainerBase implements IHudDisplay{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java

@@ -19,7 +19,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
@@ -27,7 +26,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class BlockCrystal extends BlockBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDirectionalBreaker.java

@@ -31,8 +31,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockDirectionalBreaker extends BlockContainerBase{
 
     private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java

@@ -30,8 +30,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockDropper extends BlockContainerBase{
 
     private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java

@@ -27,8 +27,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockEnergizer extends BlockContainerBase{
 
     private final boolean isEnergizer;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java

@@ -26,8 +26,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockFeeder extends BlockContainerBase{
 
     public BlockFeeder(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java

@@ -26,8 +26,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockFermentingBarrel extends BlockContainerBase{
 
     public BlockFermentingBarrel(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java

@@ -25,8 +25,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockFireworkBox extends BlockContainerBase{
 
     public BlockFireworkBox(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java

@@ -23,8 +23,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockFishingNet extends BlockContainerBase{
 
     private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.0625, 1);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java

@@ -32,8 +32,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockFluidCollector extends BlockContainerBase{
 
     private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java

@@ -35,7 +35,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 public class BlockFurnaceDouble extends BlockContainerBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java

@@ -23,8 +23,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockFurnaceSolar extends BlockContainerBase{
 
     private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 6*0.0625, 1);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java

@@ -32,7 +32,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 
 public class BlockGiantChest extends BlockContainerBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java

@@ -27,8 +27,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 public class BlockGreenhouseGlass extends BlockContainerBase{
 
     public BlockGreenhouseGlass(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java

@@ -34,7 +34,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 public class BlockGrinder extends BlockContainerBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java

@@ -19,8 +19,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockHeatCollector extends BlockContainerBase{
 
     public BlockHeatCollector(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockInputter.java

@@ -34,8 +34,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockInputter extends BlockContainerBase{
 
     public static final int NAME_FLAVOR_AMOUNTS = 15;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemRepairer.java

@@ -29,8 +29,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockItemRepairer extends BlockContainerBase{
 
     public BlockItemRepairer(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java

@@ -19,8 +19,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockItemViewer extends BlockContainerBase{
 
     public BlockItemViewer(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java

@@ -31,8 +31,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockLaserRelay extends BlockContainerBase{
 
     private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java

@@ -28,8 +28,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 public class BlockLavaFactoryController extends BlockContainerBase implements IHudDisplay{
 
     public BlockLavaFactoryController(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java

@@ -21,8 +21,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockLeafGenerator extends BlockContainerBase{
 
     public BlockLeafGenerator(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java

@@ -34,8 +34,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 public class BlockMiner extends BlockContainerBase implements IHudDisplay{
 
     public BlockMiner(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMisc.java

@@ -19,7 +19,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
@@ -27,7 +26,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class BlockMisc extends BlockBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java

@@ -33,7 +33,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 public class BlockOilGenerator extends BlockContainerBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java

@@ -39,8 +39,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 public class BlockPhantom extends BlockContainerBase implements IHudDisplay{
 
     public final Type type;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java

@@ -23,8 +23,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockPhantomBooster extends BlockContainerBase{
 
     private static final AxisAlignedBB AABB = new AxisAlignedBB(2*0.0625, 0, 2*0.0625, 1-2*0.0625, 1, 1-2*0.0625);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java

@@ -26,8 +26,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockRangedCollector extends BlockContainerBase{
 
     public BlockRangedCollector(String name){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java

@@ -31,8 +31,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 public class BlockSlabs extends BlockBase{
 
     private static final AxisAlignedBB AABB_BOTTOM_HALF = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java

@@ -36,7 +36,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 public class BlockSmileyCloud extends BlockContainerBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTreasureChest.java

@@ -34,7 +34,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 public class BlockTreasureChest extends BlockBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java

@@ -30,7 +30,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class BlockWallAA extends BlockBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java

@@ -23,7 +23,6 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -37,7 +36,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class BlockWildPlant extends BlockBushBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java

@@ -34,8 +34,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 public class BlockXPSolidifier extends BlockContainerBase{
 
     private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3);

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.blocks;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockStair;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
-import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
 import de.ellpeck.actuallyadditions.mod.util.CompatUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java

@@ -17,12 +17,9 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 public class BlockBase extends Block{
 
     private final String name;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java

@@ -17,12 +17,9 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 public class BlockBushBase extends BlockBush{
 
     private final String name;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java

@@ -21,7 +21,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -40,7 +39,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Random;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java

@@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import net.minecraft.block.BlockCrops;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -27,18 +26,17 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.EnumPlantType;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Random;
 
 public class BlockPlant extends BlockCrops{
 
-    public Item seedItem;
-    public Item returnItem;
-    public int returnMeta;
     private final String name;
     private final int minDropAmount;
     private final int addDropAmount;
+    public Item seedItem;
+    public Item returnItem;
+    public int returnMeta;
 
     public BlockPlant(String name, int minDropAmount, int addDropAmount){
         this.name = name;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java

@@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/ItemBlockBase.java

@@ -16,8 +16,6 @@ import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 public class ItemBlockBase extends ItemBlock{
 
     public ItemBlockBase(Block block){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java

@@ -10,8 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.blocks.metalists;
 
-import java.util.Locale;
-
 public enum TheColoredLampColors{
 
     WHITE("White"),

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderCompost.java

@@ -21,8 +21,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
-import javax.annotation.Nonnull;
-
 public class RenderCompost extends TileEntitySpecialRenderer{
 
     @Override

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java

@@ -20,8 +20,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
-import javax.annotation.Nonnull;
-
 public class RenderReconstructorLens extends TileEntitySpecialRenderer{
 
     @Override

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java

@@ -21,9 +21,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 
-import javax.annotation.Nonnull;
-import java.util.Locale;
-
 public class RenderSmileyCloud extends TileEntitySpecialRenderer{
 
     @Override

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java

@@ -13,8 +13,8 @@ package de.ellpeck.actuallyadditions.mod.booklet;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
-import de.ellpeck.actuallyadditions.api.internal.IEntrySet;
 import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
+import de.ellpeck.actuallyadditions.api.internal.IEntrySet;
 import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton;
 import de.ellpeck.actuallyadditions.mod.booklet.button.IndexButton;
 import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton;
@@ -46,7 +46,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -65,9 +64,14 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
     private static final int[] AND_HIS_NAME_IS = new int[]{Keyboard.KEY_C, Keyboard.KEY_E, Keyboard.KEY_N, Keyboard.KEY_A};
     public final int xSize;
     public final int ySize;
+    public final IEntrySet currentEntrySet = new EntrySet(null);
+    public final GuiButton[] chapterButtons = new GuiButton[CHAPTER_BUTTONS_AMOUNT];
+    public final GuiButton[] bookmarkButtons = new GuiButton[8];
+    public final GuiScreen parentScreen;
+    private final boolean tryOpenMainPage;
+    private final boolean saveOnClose;
     public int guiLeft;
     public int guiTop;
-    public final IEntrySet currentEntrySet = new EntrySet(null);
     public int indexPageAmount;
     public GuiButton buttonForward;
     public GuiButton buttonBackward;
@@ -80,14 +84,9 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
     public GuiButton buttonWebsite;
     public GuiButton buttonPatreon;
     public GuiButton buttonViewOnline;
-    public final GuiButton[] chapterButtons = new GuiButton[CHAPTER_BUTTONS_AMOUNT];
-    public final GuiButton[] bookmarkButtons = new GuiButton[8];
     public GuiTextField searchField;
-    public final GuiScreen parentScreen;
     private int ticksElapsed;
     private boolean mousePressed;
-    private final boolean tryOpenMainPage;
-    private final boolean saveOnClose;
     private int hisNameIsAt;
 
     public GuiBooklet(GuiScreen parentScreen, boolean tryOpenMainPage, boolean saveOnClose){

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBookletStand.java

@@ -20,8 +20,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 @SideOnly(Side.CLIENT)
 public class GuiBookletStand extends GuiBooklet{
 

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java

@@ -10,9 +10,9 @@
 
 package de.ellpeck.actuallyadditions.mod.booklet.button;
 
-import de.ellpeck.actuallyadditions.mod.booklet.entry.EntrySet;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
+import de.ellpeck.actuallyadditions.mod.booklet.entry.EntrySet;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.client.Minecraft;
@@ -22,14 +22,12 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.TextFormatting;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 
 public class BookmarkButton extends GuiButton{
 
-    public EntrySet assignedEntry = new EntrySet(null);
-
     private final GuiBooklet booklet;
+    public EntrySet assignedEntry = new EntrySet(null);
 
     public BookmarkButton(int id, int x, int y, GuiBooklet booklet){
         super(id, x, y, 16, 16, "");

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java

@@ -21,12 +21,10 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.text.TextFormatting;
 
-import javax.annotation.Nonnull;
-
 public class IndexButton extends GuiButton{
 
-    public IBookletChapter chap;
     private final GuiBooklet gui;
+    public IBookletChapter chap;
 
     public IndexButton(int id, int x, int y, int width, int height, String text, GuiBooklet gui){
         super(id, x, y, width, height, text);

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/TexturedButton.java

@@ -15,17 +15,15 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
 public class TexturedButton extends GuiButton{
 
+    public final List textList = new ArrayList();
     public int texturePosX;
     public int texturePosY;
 
-    public final List textList = new ArrayList();
-
     public TexturedButton(int id, int x, int y, int texturePosX, int texturePosY, int width, int height){
         this(id, x, y, texturePosX, texturePosY, width, height, new ArrayList());
     }

src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java

@@ -29,6 +29,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 public class BlockCrafting{
 
+    public static final IRecipe[] recipesLamps = new IRecipe[BlockColoredLamp.allLampTypes.length];
     public static IRecipe recipeSmileyCloud;
     public static IRecipe recipePhantomface;
     public static IRecipe recipeLiquiface;
@@ -71,7 +72,6 @@ public class BlockCrafting{
     public static IRecipe recipeCrate;
     public static IRecipe recipeFermentingBarrel;
     public static IRecipe recipeCanolaPress;
-    public static final IRecipe[] recipesLamps = new IRecipe[BlockColoredLamp.allLampTypes.length];
     public static IRecipe recipePowerer;
     public static IRecipe recipeLeafGen;
     public static IRecipe recipeDirectionalBreaker;

src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java

@@ -12,11 +12,8 @@ package de.ellpeck.actuallyadditions.mod.crafting;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
-import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
-import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
-import de.ellpeck.actuallyadditions.mod.items.metalists.TheDusts;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods;
 import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
@@ -29,10 +26,10 @@ import java.util.ArrayList;
 
 public class CrusherCrafting{
 
+    public static final ArrayList<CrusherRecipe> miscRecipes = new ArrayList<CrusherRecipe>();
     public static CrusherRecipe recipeIronHorseArmor;
     public static CrusherRecipe recipeGoldHorseArmor;
     public static CrusherRecipe recipeDiamondHorseArmor;
-    public static final ArrayList<CrusherRecipe> miscRecipes = new ArrayList<CrusherRecipe>();
 
     public static void init(){
         ModUtil.LOGGER.info("Initializing Crusher Recipes...");

src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java

@@ -38,15 +38,16 @@ import java.util.ArrayList;
 
 public class ItemCrafting{
 
+    public static final ArrayList<IRecipe> recipesMashedFood = new ArrayList<IRecipe>();
+    public static final ArrayList<IRecipe> recipesDrillColoring = new ArrayList<IRecipe>();
+    public static final ArrayList<IRecipe> recipesPotionRings = new ArrayList<IRecipe>();
     public static IRecipe recipePhantomConnector;
     public static IRecipe recipeCoil;
     public static IRecipe recipeCoilAdvanced;
     public static IRecipe recipeBook;
     public static IRecipe recipeTinyCoal;
     public static IRecipe recipeTinyChar;
-    public static final ArrayList<IRecipe> recipesMashedFood = new ArrayList<IRecipe>();
     public static IRecipe recipeDrill;
-    public static final ArrayList<IRecipe> recipesDrillColoring = new ArrayList<IRecipe>();
     public static IRecipe recipeDrillSpeedI;
     public static IRecipe recipeDrillSpeedII;
     public static IRecipe recipeDrillSpeedIII;
@@ -75,7 +76,6 @@ public class ItemCrafting{
     public static IRecipe recipeRiceDough;
     public static IRecipe recipeLeafBlower;
     public static IRecipe recipeLeafBlowerAdvanced;
-    public static final ArrayList<IRecipe> recipesPotionRings = new ArrayList<IRecipe>();
     public static IRecipe recipeChestToCrateUpgrade;
     public static IRecipe recipeLaserWrench;
     public static IRecipe recipeDrillCore;

src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.creative;
 
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
-import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
 import de.ellpeck.actuallyadditions.mod.fluids.InitFluids;
 import de.ellpeck.actuallyadditions.mod.items.InitForeignPaxels;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
@@ -25,7 +24,6 @@ import net.minecraftforge.fluids.UniversalBucket;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 
 public class CreativeTab extends CreativeTabs{

src/main/java/de/ellpeck/actuallyadditions/mod/event/EntityLivingEvents.java

@@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.ItemWingsOfTheBats;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
 import de.ellpeck.actuallyadditions.mod.misc.WorldData;
-import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
 import de.ellpeck.actuallyadditions.mod.util.playerdata.PlayerServerData;
 import net.minecraft.entity.EntityCreature;
@@ -29,10 +28,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.util.text.Style;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextComponentTranslation;
-import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;

src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentCustomCropField.java

@@ -21,7 +21,6 @@ import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;
 import net.minecraft.world.gen.structure.StructureVillagePieces;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Random;
 

src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java

@@ -19,7 +19,6 @@ import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;
 import net.minecraft.world.gen.structure.StructureVillagePieces;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Random;
 

src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java

@@ -20,7 +20,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.*;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBreaker.java

@@ -18,8 +18,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerBreaker extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java

@@ -14,15 +14,12 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerCanolaPress extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -20,8 +19,6 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityFurnace;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerCoalGenerator extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoffeeMachine.java

@@ -16,15 +16,12 @@ import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerCoffeeMachine extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCrafter.java

@@ -18,8 +18,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerCrafter extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java

@@ -12,15 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerDirectionalBreaker extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java

@@ -14,8 +14,6 @@ import cofh.api.energy.IEnergyContainerItem;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotImmovable;
 import de.ellpeck.actuallyadditions.mod.items.ItemDrill;
 import de.ellpeck.actuallyadditions.mod.items.ItemDrillUpgrade;
-import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -24,11 +22,8 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextComponentTranslation;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerDrill extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java

@@ -12,15 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerDropper extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java

@@ -14,7 +14,6 @@ import cofh.api.energy.IEnergyContainerItem;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -25,8 +24,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerEnergizer extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java

@@ -14,7 +14,6 @@ import cofh.api.energy.IEnergyContainerItem;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -25,8 +24,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerEnervator extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java

@@ -12,15 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerFeeder extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java

@@ -12,15 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerFermentingBarrel extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java

@@ -12,15 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerFluidCollector extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -21,8 +20,6 @@ import net.minecraft.inventory.SlotFurnaceOutput;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerFurnaceDouble extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java

@@ -18,8 +18,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 public class ContainerGiantChest extends Container{
 
     public final TileEntityGiantChest tileChest;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java

@@ -14,15 +14,12 @@ import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerGrinder extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java

@@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -22,8 +21,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerInputter extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -21,8 +20,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerLaserRelayItemWhitelist extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java

@@ -12,15 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerMiner extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java

@@ -18,8 +18,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 public class ContainerOilGenerator extends Container{
 
     private final TileEntityOilGenerator generator;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java

@@ -12,15 +12,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerPhantomPlacer extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -21,8 +20,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerRangedCollector extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java

@@ -13,15 +13,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemRepairer;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerRepairer extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java

@@ -14,8 +14,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 public class ContainerSmileyCloud extends Container{
 
     @Override

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java

@@ -13,15 +13,12 @@ package de.ellpeck.actuallyadditions.mod.inventory;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class ContainerXPSolidifier extends Container{
 

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java

@@ -32,7 +32,6 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.lwjgl.input.Keyboard;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -56,13 +55,13 @@ public class GuiInputter extends GuiContainer{
     private final int y;
     private final int z;
     private final World world;
+    private final boolean isAdvanced;
     private SmallerButton whitelistPut;
     private SmallerButton whitelistPull;
     private GuiTextField fieldPutStart;
     private GuiTextField fieldPutEnd;
     private GuiTextField fieldPullStart;
     private GuiTextField fieldPullEnd;
-    private final boolean isAdvanced;
 
     public GuiInputter(InventoryPlayer inventory, TileEntityBase tile, int x, int y, int z, World world, boolean isAdvanced){
         super(new ContainerInputter(inventory, tile, isAdvanced));

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java

@@ -35,13 +35,11 @@ public class GuiRangedCollector extends GuiContainer{
 
     private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiRangedCollector");
     private final TileEntityRangedCollector collector;
-
-    private GuiInputter.SmallerButton whitelistButton;
-
     private final int x;
     private final int y;
     private final int z;
     private final World world;
+    private GuiInputter.SmallerButton whitelistButton;
 
     public GuiRangedCollector(InventoryPlayer inventory, TileEntityBase tile, int x, int y, int z, World world){
         super(new ContainerRangedCollector(inventory, tile));

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java

@@ -40,10 +40,8 @@ public class GuiSmileyCloud extends GuiContainer{
     private final int y;
     private final int z;
     private final World world;
-
-    private GuiTextField nameField;
-
     private final TileEntitySmileyCloud cloud;
+    private GuiTextField nameField;
 
     public GuiSmileyCloud(TileEntityBase tile, int x, int y, int z, World world){
         super(new ContainerSmileyCloud());

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/slot/SlotImmovable.java

@@ -15,8 +15,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 public class SlotImmovable extends Slot{
 
     public SlotImmovable(IInventory inventory, int id, int x, int y){

src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java

@@ -30,6 +30,8 @@ public class InitForeignPaxels{
     public static final String[] MT_NAMES = new String[]{"Obsidian", "LapisLazuli", "Osmium", "Bronze", "Glowstone", "Steel"};
     public static final int[] TF_COLORS = new int[]{13332762, 5407943, 5407895, 5394789, 12960613, 12960653, 12410135, 2999795, 10143162};
     public static final int[] SO_COLORS = new int[]{9409450, 2040021, 5714944, 526344, 545032};
+    public static final Item[] tfPaxels = new Item[9];
+    public static final Item[] soPaxels = new Item[5];
     //MekanismTools
     private static final String MEKANISM_TOOLS = "MekanismTools";
     private static final String[] MT_REPAIR_NAMES = new String[]{"ingotRefinedObsidian", "gemLapis", "ingotOsmium", "ingotBronze", "ingotRefinedGlowstone", "ingotSteel"};
@@ -40,8 +42,6 @@ public class InitForeignPaxels{
     private static final String SIMPLE_ORES = "simpleores";
     private static final String[] SO_NAMES = new String[]{"tin", "mythril", "copper", "onyx", "adamantium"};
     private static final String[] SO_REPAIR_NAMES = new String[]{"ingotTin", "ingotMythril", "ingotCopper", "gemOnyx", "ingotAdamantium"};
-    public static final Item[] tfPaxels = new Item[9];
-    public static final Item[] soPaxels = new Item[5];
     private static final Item[] mtPaxels = new Item[6];
 
     public static void init(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java

@@ -12,7 +12,10 @@ package de.ellpeck.actuallyadditions.mod.items;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
-import de.ellpeck.actuallyadditions.mod.items.base.*;
+import de.ellpeck.actuallyadditions.mod.items.base.ItemArmorAA;
+import de.ellpeck.actuallyadditions.mod.items.base.ItemHoeAA;
+import de.ellpeck.actuallyadditions.mod.items.base.ItemSeed;
+import de.ellpeck.actuallyadditions.mod.items.base.ItemSwordAA;
 import de.ellpeck.actuallyadditions.mod.items.lens.ItemLens;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods;