Finally updated all the mappings

build.gradle

@@ -23,10 +23,10 @@ if(hasProperty('buildnumber')){
 }
 
 minecraft {
-    version = "1.11-13.19.0.2154"
+    version = "1.11-13.19.0.2160"
     runDir = "idea"
 
-    mappings = "snapshot_20161111"
+    mappings = "snapshot_20161126"
     makeObfSourceJar = false
     //useDepAts = true
 
@@ -45,7 +45,7 @@ repositories {
 
 dependencies {
     compile "net.darkhax.tesla:Tesla:1.11-1.3.0.51"
-    deobfCompile "mezz.jei:jei_1.11:4.0.2.194"
+    deobfCompile "mezz.jei:jei_1.11:4.0.4.198"
 }
 
 processResources {

src/main/java/de/ellpeck/actuallyadditions/api/recipe/OilGenRecipe.java

@@ -10,8 +10,6 @@
 
 package de.ellpeck.actuallyadditions.api.recipe;
 
-import net.minecraftforge.fluids.FluidStack;
-
 public class OilGenRecipe{
 
     public final String fluidName;

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

@@ -21,8 +21,8 @@ import de.ellpeck.actuallyadditions.mod.crafting.ItemCrafting;
 import de.ellpeck.actuallyadditions.mod.entity.InitEntities;
 import de.ellpeck.actuallyadditions.mod.event.CommonEvents;
 import de.ellpeck.actuallyadditions.mod.fluids.InitFluids;
-import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager;
 import de.ellpeck.actuallyadditions.mod.gen.OreGen;
+import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;

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

@@ -18,9 +18,10 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDirectional;
+import net.minecraft.block.SoundType;
 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.Minecraft;
@@ -113,7 +114,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
     @Override
     @SideOnly(Side.CLIENT)
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+        TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
         if(tile instanceof TileEntityAtomicReconstructor){
             ItemStack slot = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0);
             String strg;
@@ -141,7 +142,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
 
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
-        int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
+        int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
         world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
 
         super.onBlockPlacedBy(world, pos, state, player, stack);
@@ -201,8 +202,8 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
 
             if(this.lastSysTime+3000 < sysTime){
                 this.lastSysTime = sysTime;
-                this.toPick1 = player.worldObj.rand.nextInt(NAME_FLAVOR_AMOUNTS_1)+1;
+                this.toPick1 = player.world.rand.nextInt(NAME_FLAVOR_AMOUNTS_1)+1;
-                this.toPick2 = player.worldObj.rand.nextInt(NAME_FLAVOR_AMOUNTS_2)+1;
+                this.toPick2 = player.world.rand.nextInt(NAME_FLAVOR_AMOUNTS_2)+1;
             }
 
             String base = "tile."+ModUtil.MOD_ID+"."+((BlockAtomicReconstructor)this.block).getBaseName()+".info.";

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

@@ -17,10 +17,8 @@ import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBreaker;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityPlacer;
 import net.minecraft.block.BlockDirectional;
-import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -76,7 +74,7 @@ public class BlockBreaker extends BlockContainerBase{
 
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
-        int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
+        int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
         world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
 
         super.onBlockPlacedBy(world, pos, state, player, stack);

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

@@ -15,11 +15,9 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator;
-import net.minecraft.block.BlockDirectional;
 import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -29,7 +27,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

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

@@ -17,7 +17,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine;
 import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -95,7 +94,7 @@ public class BlockCoffeeMachine extends BlockContainerBase{
 
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
-        int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;
+        int rotation = MathHelper.floor((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;
 
         if(rotation == 0){
             world.setBlockState(pos, this.getStateFromMeta(0), 2);

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

@@ -15,14 +15,12 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors;
-import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
@@ -40,7 +38,6 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.oredict.OreDictionary;
 
-import java.util.List;
 import java.util.Random;
 
 public class BlockColoredLamp extends BlockBase{
@@ -103,11 +100,6 @@ public class BlockColoredLamp extends BlockBase{
         return false;
     }
 
-    @Override
-    public ItemStack createStackedBlock(IBlockState state){
-        return new ItemStack(InitBlocks.blockColoredLamp, 1, this.getMetaFromState(state));
-    }
-
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item item, CreativeTabs tab, NonNullList list){

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

@@ -160,7 +160,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{
     @Override
     @SideOnly(Side.CLIENT)
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+        TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
         if(tile instanceof TileEntityCompost){
             ItemStack slot = ((TileEntityCompost)tile).getStackInSlot(0);
             String strg;

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

@@ -16,25 +16,18 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.Mirror;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.Rotation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.List;
-
 public class BlockCrystal extends BlockBase{
 
     public static final TheCrystals[] ALL_CRYSTALS = TheCrystals.values();

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

@@ -16,10 +16,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker;
 import net.minecraft.block.BlockDirectional;
-import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -72,7 +70,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase{
 
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
-        int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
+        int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
         world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
 
         super.onBlockPlacedBy(world, pos, state, player, stack);

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

@@ -50,7 +50,7 @@ public class BlockDisplayStand extends BlockContainerBase{
     }
 
     @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand,EnumFacing par6, float par7, float par8, float par9){
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){
         ItemStack heldItem = player.getHeldItem(hand);
         if(!world.isRemote){
             TileEntityDisplayStand stand = (TileEntityDisplayStand)world.getTileEntity(pos);

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

@@ -54,7 +54,7 @@ public class BlockDistributorItem extends BlockContainerBase implements IHudDisp
 
     @Override
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+        TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
         if(tile instanceof TileEntityDistributorItem){
             TileEntityDistributorItem distributor = (TileEntityDistributorItem)tile;
             ItemStack slot = distributor.getStackInSlot(0);

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

@@ -15,11 +15,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper;
 import net.minecraft.block.BlockDirectional;
-import net.minecraft.block.BlockHorizontal;
-import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -72,7 +69,7 @@ public class BlockDropper extends BlockContainerBase{
 
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
-        int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
+        int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
         world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
 
         super.onBlockPlacedBy(world, pos, state, player, stack);

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

@@ -17,8 +17,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer;
 import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyDirection;
-import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
@@ -31,7 +29,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.Mirror;
 import net.minecraft.util.Rotation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 
 public class BlockFarmer extends BlockContainerBase{

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

@@ -17,10 +17,8 @@ import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidPlacer;
 import net.minecraft.block.BlockDirectional;
-import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -78,7 +76,7 @@ public class BlockFluidCollector extends BlockContainerBase{
 
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
-        int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
+        int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
         world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
 
         super.onBlockPlacedBy(world, pos, state, player, stack);

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

@@ -15,10 +15,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
 import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDirectional;
-import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -55,7 +53,7 @@ public class BlockLampPowerer extends BlockBase{
 
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){
-        int rotation = EnumFacing.func_190914_a(pos, player).ordinal();
+        int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal();
         world.setBlockState(pos, this.getStateFromMeta(rotation), 2);
 
         super.onBlockPlacedBy(world, pos, state, player, stack);

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

@@ -19,10 +19,8 @@ import de.ellpeck.actuallyadditions.mod.tile.*;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.BlockDirectional;
-import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.SoundType;
 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.Minecraft;
@@ -122,9 +120,8 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{
         return false;
     }
 
-
     @Override
-    public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){
+    public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){
         return this.getStateFromMeta(side.ordinal());
     }
 
@@ -214,8 +211,8 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{
     @Override
     @SideOnly(Side.CLIENT)
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        if(posHit != null && posHit.getBlockPos() != null && minecraft.theWorld != null){
+        if(posHit != null && posHit.getBlockPos() != null && minecraft.world != null){
-            TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+            TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
             if(tile instanceof TileEntityLaserRelayItem){
                 TileEntityLaserRelayItem relay = (TileEntityLaserRelayItem)tile;
 

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

@@ -51,7 +51,7 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IH
     @Override
     @SideOnly(Side.CLIENT)
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        TileEntityLavaFactoryController factory = (TileEntityLavaFactoryController)minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+        TileEntityLavaFactoryController factory = (TileEntityLavaFactoryController)minecraft.world.getTileEntity(posHit.getBlockPos());
         if(factory != null){
             int state = factory.isMultiblock();
             if(state == TileEntityLavaFactoryController.NOT_MULTI){

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

@@ -79,7 +79,7 @@ public class BlockMiner extends BlockContainerBase implements IHudDisplay{
     @Override
     @SideOnly(Side.CLIENT)
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+        TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
         if(tile instanceof TileEntityMiner){
             String info = ((TileEntityMiner)tile).layerAt <= 0 ? "Done Mining!" : "Mining at Y = "+((TileEntityMiner)tile).layerAt+".";
             minecraft.fontRendererObj.drawStringWithShadow(info, resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-20, StringUtil.DECIMAL_COLOR_WHITE);

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

@@ -14,12 +14,10 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
-import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
@@ -30,8 +28,6 @@ import net.minecraft.util.NonNullList;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.List;
-
 public class BlockMisc extends BlockBase{
 
     public static final TheMiscBlocks[] ALL_MISC_BLOCKS = TheMiscBlocks.values();

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

@@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -77,7 +76,8 @@ public class BlockOilGenerator extends BlockContainerBase{
     }
 
     @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){ItemStack stack = player.getHeldItem(hand);
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9){
+        ItemStack stack = player.getHeldItem(hand);
         if(!world.isRemote){
             TileEntityOilGenerator generator = (TileEntityOilGenerator)world.getTileEntity(pos);
             if(generator != null){

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

@@ -127,14 +127,14 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay{
     @Override
     @SideOnly(Side.CLIENT)
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+        TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
         if(tile != null){
             if(tile instanceof IPhantomTile){
                 IPhantomTile phantom = (IPhantomTile)tile;
                 minecraft.fontRendererObj.drawStringWithShadow(TextFormatting.GOLD+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".blockPhantomRange.desc")+": "+phantom.getRange(), resolution.getScaledWidth()/2+5, resolution.getScaledHeight()/2-40, StringUtil.DECIMAL_COLOR_WHITE);
                 if(phantom.hasBoundPosition()){
                     int distance = (int)new Vec3d(posHit.getBlockPos()).distanceTo(new Vec3d(phantom.getBoundPosition()));
-                    IBlockState state = minecraft.theWorld.getBlockState(phantom.getBoundPosition());
+                    IBlockState state = minecraft.world.getBlockState(phantom.getBoundPosition());
                     Block block = state.getBlock();
                     Item item = Item.getItemFromBlock(block);
                     String name = item == null ? "Something Unrecognizable" : item.getItemStackDisplayName(new ItemStack(block, 1, block.getMetaFromState(state)));

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

@@ -69,7 +69,7 @@ public class BlockPlayerInterface extends BlockContainerBase implements IHudDisp
     @Override
     @SideOnly(Side.CLIENT)
     public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution){
-        TileEntity tile = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+        TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
         if(tile != null){
             if(tile instanceof TileEntityPlayerInterface){
                 TileEntityPlayerInterface face = (TileEntityPlayerInterface)tile;

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

@@ -14,17 +14,18 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.BlockSlab;
 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.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
@@ -78,7 +79,7 @@ public class BlockSlabs extends BlockBase{
 
 
     @Override
-    public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
+    public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
         if(facing.ordinal() == 1){
             return this.getStateFromMeta(meta);
         }

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

@@ -19,7 +19,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud;
 import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -29,7 +28,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

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

@@ -106,7 +106,7 @@ public class BlockTinyTorch extends BlockBase{
     }
 
     @Override
-    public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
+    public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer){
         if(this.canPlaceAt(worldIn, pos, facing)){
             return this.getDefaultState().withProperty(BlockTorch.FACING, facing);
         }

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

@@ -18,7 +18,6 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -90,10 +89,10 @@ public class BlockTreasureChest extends BlockBase{
     }
 
     private void dropItems(World world, BlockPos pos){
-        for(int i = 0; i < MathHelper.getRandomIntegerInRange(world.rand, 3, 6); i++){
+        for(int i = 0; i < MathHelper.getInt(world.rand, 3, 6); i++){
             TreasureChestLoot theReturn = WeightedRandom.getRandomItem(world.rand, ActuallyAdditionsAPI.TREASURE_CHEST_LOOT);
             ItemStack itemStack = theReturn.returnItem.copy();
-            itemStack = StackUtil.setStackSize(itemStack, MathHelper.getRandomIntegerInRange(world.rand, theReturn.minAmount, theReturn.maxAmount));
+            itemStack = StackUtil.setStackSize(itemStack, MathHelper.getInt(world.rand, theReturn.minAmount, theReturn.maxAmount));
 
             float dX = world.rand.nextFloat()*0.8F+0.1F;
             float dY = world.rand.nextFloat()*0.8F+0.1F;
@@ -103,7 +102,7 @@ public class BlockTreasureChest extends BlockBase{
             entityItem.motionX = world.rand.nextGaussian()*factor;
             entityItem.motionY = world.rand.nextGaussian()*factor+0.2F;
             entityItem.motionZ = world.rand.nextGaussian()*factor;
-            world.spawnEntityInWorld(entityItem);
+            world.spawnEntity(entityItem);
         }
     }
 

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

@@ -26,12 +26,9 @@ import net.minecraft.util.NonNullList;
 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.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.List;
-
 public class BlockWallAA extends BlockBase{
 
     protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[]{new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)};

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

@@ -16,13 +16,11 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants;
-import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;

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

@@ -18,7 +18,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
 import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.SoundType;
 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.entity.EntityLivingBase;
@@ -31,7 +30,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.Mirror;
 import net.minecraft.util.Rotation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 
 public class BlockXPSolidifier extends BlockContainerBase{

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

@@ -14,9 +14,6 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import net.minecraft.block.Block;
 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.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 

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

@@ -14,9 +14,6 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import net.minecraft.block.BlockBush;
 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.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 

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

@@ -19,8 +19,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockRedstoneTorch;
 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.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
@@ -34,7 +32,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagInt;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
@@ -110,7 +107,7 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB
             entityItem.motionX = world.rand.nextGaussian()*factor;
             entityItem.motionY = world.rand.nextGaussian()*factor+0.2F;
             entityItem.motionZ = world.rand.nextGaussian()*factor;
-            world.spawnEntityInWorld(entityItem);
+            world.spawnEntity(entityItem);
         }
     }
 

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

@@ -105,7 +105,7 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit
 
                         if(StackUtil.isValid(drop)){
                             EntityItem entity = new EntityItem(world, pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5, drop);
-                            world.spawnEntityInWorld(entity);
+                            world.spawnEntity(entity);
                         }
                     }
                 }

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

@@ -39,11 +39,6 @@ public enum TheColoredLampColors implements IStringSerializable{
         this.regName = regName;
     }
 
-    @Override
-    public String getName(){
-        return this.regName;
-    }
-
     public static TheColoredLampColors getColorFromDyeName(String color){
         if(color.substring(0, 3).equals("dye")){
             String actualName = color.substring(3);
@@ -58,4 +53,9 @@ public enum TheColoredLampColors implements IStringSerializable{
         }
         return null;
     }
+
+    @Override
+    public String getName(){
+        return this.regName;
+    }
 }

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

@@ -50,7 +50,7 @@ public class RenderCompost extends TileEntitySpecialRenderer{
                     GlStateManager.pushMatrix();
                     GlStateManager.translate((float)x+0.5F, (float)y+(i/3F)+0.01F, (float)z+0.5F);
                     //Hehe
-                    if("ShadowfactsDev".equals(Minecraft.getMinecraft().thePlayer.getName())){
+                    if("ShadowfactsDev".equals(Minecraft.getMinecraft().player.getName())){
                         GlStateManager.translate(0F, 1F, 0F);
                     }
                     GlStateManager.scale(1.5F, i, 1.5F);

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/entry/BookletEntry.java

@@ -56,7 +56,7 @@ public class BookletEntry implements IBookletEntry{
         if(!items.isEmpty()){
             for(ItemStack stack : items){
                 if(StackUtil.isValid(stack)){
-                    List<String> tooltip = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
+                    List<String> tooltip = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips);
                     for(String strg : tooltip){
                         if(strg != null && strg.toLowerCase(Locale.ROOT).contains(searchBarText)){
                             return true;

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

@@ -93,7 +93,7 @@ public abstract class GuiBooklet extends GuiBookletBase{
         }
 
         if(this.hasBookmarkButtons()){
-            PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
+            PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
 
             int xStart = this.guiLeft+this.xSize/2-16*this.bookmarkButtons.length/2;
             for(int i = 0; i < this.bookmarkButtons.length; i++){
@@ -114,7 +114,7 @@ public abstract class GuiBooklet extends GuiBookletBase{
         //Don't cache the parent GUI, otherwise it opens again when you close the cached book!
         this.previousScreen = null;
 
-        PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
+        PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
 
         boolean change = false;
         for(int i = 0; i < this.bookmarkButtons.length; i++){
@@ -126,7 +126,7 @@ public abstract class GuiBooklet extends GuiBookletBase{
         data.lastOpenBooklet = this;
 
         if(change){
-            PacketHandlerHelper.sendPlayerDataPacket(this.mc.thePlayer, true, false);
+            PacketHandlerHelper.sendPlayerDataPacket(this.mc.player, true, false);
         }
     }
 

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java

@@ -77,12 +77,12 @@ public class GuiMainPage extends GuiBooklet{
         super.initGui();
 
         int flavor = 1;
-        if(this.mc.theWorld.rand.nextFloat() <= 0.1){
+        if(this.mc.world.rand.nextFloat() <= 0.1){
-            flavor = MathHelper.getRandomIntegerInRange(this.mc.theWorld.rand, 2, 7);
+            flavor = MathHelper.getInt(this.mc.world.rand, 2, 7);
         }
         this.bookletName = "info."+ModUtil.MOD_ID+".booklet.manualName.1."+flavor;
 
-        String usedQuote = QUOTES[this.mc.theWorld.rand.nextInt(QUOTES.length)];
+        String usedQuote = QUOTES[this.mc.world.rand.nextInt(QUOTES.length)];
         String[] quoteSplit = usedQuote.split("@");
         if(quoteSplit.length == 2){
             this.quote = this.fontRendererObj.listFormattedStringToWidth(quoteSplit[0], 120);
@@ -101,7 +101,7 @@ public class GuiMainPage extends GuiBooklet{
         this.achievementButton = new TexturedButton(RES_LOC_GADGETS, -389, this.guiLeft+36, this.guiTop+this.ySize-30, 204, 14, 16, 16, achievementText);
         this.buttonList.add(this.achievementButton);
 
-        PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
+        PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
         if(!data.didBookTutorial){
             this.showTutorial = true;
 
@@ -134,7 +134,7 @@ public class GuiMainPage extends GuiBooklet{
             }
         }
         else if(button == this.achievementButton){
-            GuiScreen achievements = new GuiAAAchievements(this, this.mc.thePlayer.getStatFileWriter());
+            GuiScreen achievements = new GuiAAAchievements(this, this.mc.player.getStatFileWriter());
             this.mc.displayGuiScreen(achievements);
         }
         else if(button == this.configButton){
@@ -154,9 +154,9 @@ public class GuiMainPage extends GuiBooklet{
                 this.configButton.visible = true;
                 this.achievementButton.visible = true;
 
-                PlayerSave data = PlayerData.getDataFromPlayer(this.mc.thePlayer);
+                PlayerSave data = PlayerData.getDataFromPlayer(this.mc.player);
                 data.didBookTutorial = true;
-                PacketHandlerHelper.sendPlayerDataPacket(this.mc.thePlayer, true, false);
+                PacketHandlerHelper.sendPlayerDataPacket(this.mc.player, true, false);
             }
         }
         else{
@@ -174,7 +174,7 @@ public class GuiMainPage extends GuiBooklet{
         this.fontRendererObj.drawString(strg, this.guiLeft+72-this.fontRendererObj.getStringWidth(strg)/2-3, this.guiTop+19+this.fontRendererObj.FONT_HEIGHT, 0);
 
         String versionStrg;
-        String playerName = Minecraft.getMinecraft().thePlayer.getName();
+        String playerName = Minecraft.getMinecraft().player.getName();
 
         if(Util.isDevVersion()){
             versionStrg = "Dev's Edition";

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java

@@ -55,6 +55,8 @@ public class GuiAAAchievements extends GuiAchievements{
         if(key == Keyboard.KEY_ESCAPE || key == this.mc.gameSettings.keyBindInventory.getKeyCode()){
             this.mc.displayGuiScreen(this.parentScreen);
         }
-        else super.keyTyped(typedChar, key);
+        else{
+            super.keyTyped(typedChar, key);
+        }
     }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/ItemDisplay.java

@@ -58,7 +58,7 @@ public class ItemDisplay{
             boolean flagBefore = mc.fontRendererObj.getUnicodeFlag();
             mc.fontRendererObj.setUnicodeFlag(false);
 
-            List<String> list = this.stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
+            List<String> list = this.stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips);
 
             for(int k = 0; k < list.size(); ++k){
                 if(k == 0){

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

@@ -30,7 +30,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.potion.PotionHelper;
 import net.minecraft.potion.PotionUtils;
 import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.fml.common.registry.GameRegistry;

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

@@ -24,8 +24,6 @@ import net.minecraftforge.fluids.UniversalBucket;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.List;
-
 public class CreativeTab extends CreativeTabs{
 
     public static final CreativeTab INSTANCE = new CreativeTab();

src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java

@@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave;
 import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import io.netty.util.internal.ConcurrentSet;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -28,7 +27,6 @@ import net.minecraftforge.common.WorldSpecificSaveHandler;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.util.ArrayList;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 

src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityWorm.java

@@ -65,43 +65,43 @@ public class EntityWorm extends Entity{
 
     @Override
     public void onEntityUpdate(){
-        if(!this.worldObj.isRemote){
+        if(!this.world.isRemote){
             this.timer++;
 
             if(this.timer%50 == 0){
                 for(int x = -1; x <= 1; x++){
                     for(int z = -1; z <= 1; z++){
                         BlockPos pos = new BlockPos(this.posX+x, this.posY, this.posZ+z);
-                        IBlockState state = this.worldObj.getBlockState(pos);
+                        IBlockState state = this.world.getBlockState(pos);
                         Block block = state.getBlock();
                         boolean isMiddlePose = x == 0 && z == 0;
 
-                        if(canWormify(this.worldObj, pos, state)){
+                        if(canWormify(this.world, pos, state)){
                             boolean isFarmland = block instanceof BlockFarmland;
 
                             if(!isFarmland || state.getValue(BlockFarmland.MOISTURE) < 7){
-                                if(isMiddlePose || this.worldObj.rand.nextFloat() >= 0.45F){
+                                if(isMiddlePose || this.world.rand.nextFloat() >= 0.45F){
                                     IBlockState stateToModify = isFarmland ? state : Blocks.FARMLAND.getDefaultState();
-                                    this.worldObj.setBlockState(pos, stateToModify.withProperty(BlockFarmland.MOISTURE, 7), 2);
+                                    this.world.setBlockState(pos, stateToModify.withProperty(BlockFarmland.MOISTURE, 7), 2);
 
                                     if(!isFarmland){
-                                        this.worldObj.setBlockToAir(pos.up());
+                                        this.world.setBlockToAir(pos.up());
                                     }
                                 }
                             }
 
-                            if(isFarmland && this.worldObj.rand.nextFloat() >= 0.95F){
+                            if(isFarmland && this.world.rand.nextFloat() >= 0.95F){
                                 BlockPos plant = pos.up();
-                                if(!this.worldObj.isAirBlock(plant)){
+                                if(!this.world.isAirBlock(plant)){
-                                    IBlockState plantState = this.worldObj.getBlockState(plant);
+                                    IBlockState plantState = this.world.getBlockState(plant);
                                     Block plantBlock = plantState.getBlock();
 
                                     if((plantBlock instanceof IGrowable || plantBlock instanceof IPlantable) && !(plantBlock instanceof BlockGrass)){
-                                        plantBlock.updateTick(this.worldObj, plant, plantState, this.worldObj.rand);
+                                        plantBlock.updateTick(this.world, plant, plantState, this.world.rand);
 
-                                        IBlockState newState = this.worldObj.getBlockState(plant);
+                                        IBlockState newState = this.world.getBlockState(plant);
                                         if(newState.getBlock().getMetaFromState(newState) != plantBlock.getMetaFromState(plantState)){
-                                            this.worldObj.playEvent(2005, plant, 0);
+                                            this.world.playEvent(2005, plant, 0);
                                         }
                                     }
                                 }

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

@@ -136,7 +136,7 @@ public class ClientEvents{
     public void onGameOverlay(RenderGameOverlayEvent.Post event){
         if(event.getType() == RenderGameOverlayEvent.ElementType.ALL && Minecraft.getMinecraft().currentScreen == null){
             Minecraft minecraft = Minecraft.getMinecraft();
-            EntityPlayer player = minecraft.thePlayer;
+            EntityPlayer player = minecraft.player;
             RayTraceResult posHit = minecraft.objectMouseOver;
             FontRenderer font = minecraft.fontRendererObj;
             ItemStack stack = player.getHeldItemMainhand();
@@ -148,8 +148,8 @@ public class ClientEvents{
             }
 
             if(posHit != null && posHit.getBlockPos() != null){
-                Block blockHit = minecraft.theWorld.getBlockState(posHit.getBlockPos()).getBlock();
+                Block blockHit = minecraft.world.getBlockState(posHit.getBlockPos()).getBlock();
-                TileEntity tileHit = minecraft.theWorld.getTileEntity(posHit.getBlockPos());
+                TileEntity tileHit = minecraft.world.getTileEntity(posHit.getBlockPos());
 
                 if(blockHit instanceof IHudDisplay){
                     ((IHudDisplay)blockHit).displayHud(minecraft, player, stack, posHit, event.getResolution());

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

@@ -56,11 +56,11 @@ public class CommonEvents{
 
     @SubscribeEvent
     public void onEntityDropEvent(LivingDropsEvent event){
-        if(event.getEntityLiving().worldObj != null && !event.getEntityLiving().worldObj.isRemote && event.getSource().getEntity() instanceof EntityPlayer){
+        if(event.getEntityLiving().world != null && !event.getEntityLiving().world.isRemote && event.getSource().getEntity() instanceof EntityPlayer){
             //Drop Cobwebs from Spiders
             if(ConfigBoolValues.DO_SPIDER_DROPS.isEnabled() && event.getEntityLiving() instanceof EntitySpider){
-                if(event.getEntityLiving().worldObj.rand.nextInt(20) <= event.getLootingLevel()*2){
+                if(event.getEntityLiving().world.rand.nextInt(20) <= event.getLootingLevel()*2){
-                    event.getEntityLiving().entityDropItem(new ItemStack(Blocks.WEB, event.getEntityLiving().worldObj.rand.nextInt(2+event.getLootingLevel())+1), 0);
+                    event.getEntityLiving().entityDropItem(new ItemStack(Blocks.WEB, event.getEntityLiving().world.rand.nextInt(2+event.getLootingLevel())+1), 0);
                 }
             }
         }
@@ -68,7 +68,7 @@ public class CommonEvents{
 
     @SubscribeEvent
     public void onLogInEvent(PlayerEvent.PlayerLoggedInEvent event){
-        if(!event.player.worldObj.isRemote && event.player instanceof EntityPlayerMP){
+        if(!event.player.world.isRemote && event.player instanceof EntityPlayerMP){
             EntityPlayerMP player = (EntityPlayerMP)event.player;
             PacketHandlerHelper.sendPlayerDataPacket(player, true, true);
             ModUtil.LOGGER.info("Sending Player Data to player "+player.getName()+" with UUID "+player.getUniqueID()+".");
@@ -80,7 +80,7 @@ public class CommonEvents{
         checkAchievements(event.crafting, event.player, InitAchievements.Type.CRAFTING);
 
         if(ConfigBoolValues.GIVE_BOOKLET_ON_FIRST_CRAFT.isEnabled()){
-            if(!event.player.worldObj.isRemote && StackUtil.isValid(event.crafting) && event.crafting.getItem() != InitItems.itemBooklet){
+            if(!event.player.world.isRemote && StackUtil.isValid(event.crafting) && event.crafting.getItem() != InitItems.itemBooklet){
 
                 String name = event.crafting.getItem().getRegistryName().toString();
                 if(name != null && name.toLowerCase(Locale.ROOT).contains(ModUtil.MOD_ID)){
@@ -88,9 +88,9 @@ public class CommonEvents{
                     if(save != null && !save.bookGottenAlready){
                         save.bookGottenAlready = true;
 
-                        EntityItem entityItem = new EntityItem(event.player.worldObj, event.player.posX, event.player.posY, event.player.posZ, new ItemStack(InitItems.itemBooklet));
+                        EntityItem entityItem = new EntityItem(event.player.world, event.player.posX, event.player.posY, event.player.posZ, new ItemStack(InitItems.itemBooklet));
                         entityItem.setPickupDelay(0);
-                        event.player.worldObj.spawnEntityInWorld(entityItem);
+                        event.player.world.spawnEntity(entityItem);
                     }
                 }
             }

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

@@ -67,7 +67,7 @@ public class OreGen implements IWorldGenerator{
 
     private void generateDefault(World world, Random random, int x, int z){
         if(ConfigBoolValues.GENERATE_QUARTZ.isEnabled()){
-            this.addOreSpawn(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), Blocks.STONE, world, random, x*16, z*16, MathHelper.getRandomIntegerInRange(random, 5, 8), 10, QUARTZ_MIN, QUARTZ_MAX);
+            this.addOreSpawn(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), Blocks.STONE, world, random, x*16, z*16, MathHelper.getInt(random, 5, 8), 10, QUARTZ_MIN, QUARTZ_MAX);
         }
 
         if(ConfigBoolValues.GEN_LUSH_CAVES.isEnabled()){
@@ -81,7 +81,7 @@ public class OreGen implements IWorldGenerator{
                     Random chunkRand = new Random(randConst ^ world.getSeed() ^ (chunkX*29+chunkZ*31));
                     if(chunkRand.nextInt(ConfigIntValues.LUSH_CAVE_CHANCE.getValue()) <= 0){
                         BlockPos randPos = world.getTopSolidOrLiquidBlock(new BlockPos(chunkX*16+chunkRand.nextInt(16)+8, 0, chunkZ*16+chunkRand.nextInt(16)+8));
-                        BlockPos pos = randPos.down(MathHelper.getRandomIntegerInRange(chunkRand, 15, randPos.getY()-15));
+                        BlockPos pos = randPos.down(MathHelper.getInt(chunkRand, 15, randPos.getY()-15));
                         this.caveGen.generate(world, chunkRand, pos, box);
                     }
                 }

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

@@ -18,7 +18,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
@@ -97,7 +96,7 @@ public class WorldGenLushCaves{
                     trees.generate(world, rand, pos.up());
 
                     if(ConfigBoolValues.DUNGEON_LOOT.isEnabled() && !crateGenDone && genCrate){
-                        BlockPos cratePos = pos.add(MathHelper.getRandomIntegerInRange(rand, -2, 2), MathHelper.getRandomIntegerInRange(rand, 3, 8), MathHelper.getRandomIntegerInRange(rand, -2, 2));
+                        BlockPos cratePos = pos.add(MathHelper.getInt(rand, -2, 2), MathHelper.getInt(rand, 3, 8), MathHelper.getInt(rand, -2, 2));
 
                         IBlockState state = world.getBlockState(cratePos);
                         if(state != null && state.getBlock().isLeaves(state, world, cratePos)){

src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/BasicTradeList.java

@@ -44,7 +44,7 @@ public class BasicTradeList implements ITradeList{
     }
 
     @Override
-    public void func_190888_a(IMerchant merchant, MerchantRecipeList recipeList, Random random){
+    public void addMerchantRecipe(IMerchant merchant, MerchantRecipeList recipeList, Random random){
         ItemStack in = this.input.copy();
         in = StackUtil.setStackSize(in, this.inputAmount.getPrice(random));
         ItemStack out = this.output.copy();

src/main/java/de/ellpeck/actuallyadditions/mod/gen/village/JamVillagerTradeList.java

@@ -25,7 +25,7 @@ import java.util.Random;
 public class JamVillagerTradeList implements ITradeList{
 
     @Override
-    public void func_190888_a(IMerchant merchant, MerchantRecipeList recipeList, Random random){
+    public void addMerchantRecipe(IMerchant merchant, MerchantRecipeList recipeList, Random random){
         for(int i = 0; i < random.nextInt(3)+3; i++){
             ItemStack jam = new ItemStack(InitItems.itemJams, 1, random.nextInt(TheJams.values().length));
             ItemStack emerald = new ItemStack(Items.EMERALD);

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

@@ -99,7 +99,7 @@ public class VillageComponentCustomCropField extends StructureVillagePieces.Hous
     }
 
     private IBlockState getRandomCropType(Random rand){
-        int randomMeta = MathHelper.getRandomIntegerInRange(rand, 1, 7);
+        int randomMeta = MathHelper.getInt(rand, 1, 7);
         switch(rand.nextInt(4)){
             case 0:
                 return InitBlocks.blockFlax.getStateFromMeta(randomMeta);

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

@@ -53,6 +53,24 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{
         return canVillageGoDeeper(boundingBox) && StructureComponent.findIntersecting(pieces, boundingBox) == null ? new VillageComponentJamHouse(boundingBox, p4) : null;
     }
 
+    public static boolean generateCrate(World world, StructureBoundingBox box, int x, int y, int z, ResourceLocation loot){
+        BlockPos pos = new BlockPos(x, y, z);
+
+        if(box.isVecInside(pos)){
+            world.setBlockState(pos, InitBlocks.blockGiantChest.getDefaultState(), 2);
+
+            TileEntity tile = world.getTileEntity(pos);
+            if(tile instanceof TileEntityGiantChest){
+                ((TileEntityGiantChest)tile).lootTable = loot;
+            }
+
+            return true;
+        }
+        else{
+            return false;
+        }
+    }
+
     @Override
     public boolean addComponentParts(World world, Random rand, StructureBoundingBox sbb){
         if(this.averageGroundLevel < 0){
@@ -210,22 +228,4 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{
     protected VillagerProfession chooseForgeProfession(int count, VillagerProfession prof){
         return InitVillager.jamProfession;
     }
-
-    public static boolean generateCrate(World world, StructureBoundingBox box, int x, int y, int z, ResourceLocation loot){
-        BlockPos pos = new BlockPos(x, y, z);
-
-        if(box.isVecInside(pos)){
-            world.setBlockState(pos, InitBlocks.blockGiantChest.getDefaultState(), 2);
-
-            TileEntity tile = world.getTileEntity(pos);
-            if(tile instanceof TileEntityGiantChest){
-                ((TileEntityGiantChest)tile).lootTable = loot;
-            }
-
-            return true;
-        }
-        else{
-            return false;
-        }
-    }
 }

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

@@ -29,8 +29,6 @@ import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.Arrays;
-
 
 public class ContainerBag extends Container implements IButtonReactor{
 
@@ -184,7 +182,7 @@ public class ContainerBag extends Container implements IButtonReactor{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -219,7 +217,7 @@ public class ContainerBag extends Container implements IButtonReactor{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.bagInventory.isUseableByPlayer(player);
+        return this.bagInventory.isUsableByPlayer(player);
     }
 
     @Override
@@ -256,7 +254,7 @@ public class ContainerBag extends Container implements IButtonReactor{
         }
 
         @Override
-        public boolean isUseableByPlayer(EntityPlayer player){
+        public boolean isUsableByPlayer(EntityPlayer player){
             return true;
         }
 
@@ -307,7 +305,7 @@ public class ContainerBag extends Container implements IButtonReactor{
         }
 
         @Override
-        public boolean func_191420_l(){
+        public boolean isEmpty(){
             return StackUtil.isIInvEmpty(this.slots);
         }
 

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

@@ -88,7 +88,7 @@ public class ContainerBioReactor extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -97,6 +97,6 @@ public class ContainerBioReactor extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.tile.isUseableByPlayer(player);
+        return this.tile.isUsableByPlayer(player);
     }
 }

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

@@ -85,7 +85,7 @@ public class ContainerBreaker extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -94,6 +94,6 @@ public class ContainerBreaker extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.breaker.isUseableByPlayer(player);
+        return this.breaker.isUsableByPlayer(player);
     }
 }

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

@@ -87,7 +87,7 @@ public class ContainerCanolaPress extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -96,6 +96,6 @@ public class ContainerCanolaPress extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.press.isUseableByPlayer(player);
+        return this.press.isUsableByPlayer(player);
     }
 }

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

@@ -86,7 +86,7 @@ public class ContainerCoalGenerator extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -95,6 +95,6 @@ public class ContainerCoalGenerator extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.generator.isUseableByPlayer(player);
+        return this.generator.isUsableByPlayer(player);
     }
 }

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

@@ -114,7 +114,7 @@ public class ContainerCoffeeMachine extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -123,6 +123,6 @@ public class ContainerCoffeeMachine extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.machine.isUseableByPlayer(player);
+        return this.machine.isUsableByPlayer(player);
     }
 }

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

@@ -29,7 +29,7 @@ public class ContainerCrafter extends Container{
     public ContainerCrafter(EntityPlayer player){
         InventoryPlayer inventory = player.inventory;
 
-        this.world = player.worldObj;
+        this.world = player.world;
 
         this.addSlotToContainer(new SlotCrafting(inventory.player, this.craftMatrix, this.craftResult, 0, 124, 35));
         for(int i = 0; i < 3; i++){
@@ -91,7 +91,7 @@ public class ContainerCrafter extends Container{
                 return StackUtil.getNull();
             }
 
-            slot.func_190901_a(player, itemstack1);
+            slot.onTake(player, itemstack1);
         }
 
         return itemstack;

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

@@ -85,7 +85,7 @@ public class ContainerDirectionalBreaker extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -94,6 +94,6 @@ public class ContainerDirectionalBreaker extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.breaker.isUseableByPlayer(player);
+        return this.breaker.isUsableByPlayer(player);
     }
 }

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

@@ -14,7 +14,6 @@ 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.StackUtil;
-import de.ellpeck.actuallyadditions.mod.util.compat.TeslaUtil;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ClickType;
@@ -26,8 +25,6 @@ import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
 
-import java.util.Arrays;
-
 
 public class ContainerDrill extends Container{
 
@@ -114,7 +111,7 @@ public class ContainerDrill extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -142,7 +139,7 @@ public class ContainerDrill extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.drillInventory.isUseableByPlayer(player);
+        return this.drillInventory.isUsableByPlayer(player);
     }
 
     public static class InventoryDrill implements IInventory{
@@ -165,7 +162,7 @@ public class ContainerDrill extends Container{
         }
 
         @Override
-        public boolean isUseableByPlayer(EntityPlayer player){
+        public boolean isUsableByPlayer(EntityPlayer player){
             return true;
         }
 
@@ -216,7 +213,7 @@ public class ContainerDrill extends Container{
         }
 
         @Override
-        public boolean func_191420_l(){
+        public boolean isEmpty(){
             return StackUtil.isIInvEmpty(this.slots);
         }
 

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

@@ -85,7 +85,7 @@ public class ContainerDropper extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -94,6 +94,6 @@ public class ContainerDropper extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.dropper.isUseableByPlayer(player);
+        return this.dropper.isUsableByPlayer(player);
     }
 }

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

@@ -124,7 +124,7 @@ public class ContainerEnergizer extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -133,6 +133,6 @@ public class ContainerEnergizer extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.energizer.isUseableByPlayer(player);
+        return this.energizer.isUsableByPlayer(player);
     }
 }

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

@@ -123,7 +123,7 @@ public class ContainerEnervator extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -132,6 +132,6 @@ public class ContainerEnervator extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.enervator.isUseableByPlayer(player);
+        return this.enervator.isUsableByPlayer(player);
     }
 }

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

@@ -18,7 +18,6 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.IPlantable;
 
 
 public class ContainerFarmer extends Container{
@@ -95,7 +94,7 @@ public class ContainerFarmer extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -104,6 +103,6 @@ public class ContainerFarmer extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.farmer.isUseableByPlayer(player);
+        return this.farmer.isUsableByPlayer(player);
     }
 }

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

@@ -80,7 +80,7 @@ public class ContainerFeeder extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -89,6 +89,6 @@ public class ContainerFeeder extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.tileFeeder.isUseableByPlayer(player);
+        return this.tileFeeder.isUsableByPlayer(player);
     }
 }

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

@@ -75,7 +75,7 @@ public class ContainerFermentingBarrel extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }

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

@@ -26,8 +26,6 @@ import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
 
-import java.util.Arrays;
-
 
 public class ContainerFilter extends Container{
 
@@ -105,7 +103,7 @@ public class ContainerFilter extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -137,7 +135,7 @@ public class ContainerFilter extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.filterInventory.isUseableByPlayer(player);
+        return this.filterInventory.isUsableByPlayer(player);
     }
 
     public static class InventoryFilter implements IInventory{
@@ -160,7 +158,7 @@ public class ContainerFilter extends Container{
         }
 
         @Override
-        public boolean isUseableByPlayer(EntityPlayer player){
+        public boolean isUsableByPlayer(EntityPlayer player){
             return true;
         }
 
@@ -211,7 +209,7 @@ public class ContainerFilter extends Container{
         }
 
         @Override
-        public boolean func_191420_l(){
+        public boolean isEmpty(){
             return StackUtil.isIInvEmpty(this.slots);
         }
 

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

@@ -82,7 +82,7 @@ public class ContainerFluidCollector extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }

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

@@ -99,7 +99,7 @@ public class ContainerFurnaceDouble extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -108,6 +108,6 @@ public class ContainerFurnaceDouble extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.tileFurnace.isUseableByPlayer(player);
+        return this.tileFurnace.isUsableByPlayer(player);
     }
 }

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

@@ -86,7 +86,7 @@ public class ContainerGiantChest extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -95,6 +95,6 @@ public class ContainerGiantChest extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.tileChest.isUseableByPlayer(player);
+        return this.tileChest.isUsableByPlayer(player);
     }
 }

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

@@ -110,7 +110,7 @@ public class ContainerGrinder extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -119,6 +119,6 @@ public class ContainerGrinder extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.tileGrinder.isUseableByPlayer(player);
+        return this.tileGrinder.isUsableByPlayer(player);
     }
 }

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

@@ -97,7 +97,7 @@ public class ContainerInputter extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -117,6 +117,6 @@ public class ContainerInputter extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.tileInputter.isUseableByPlayer(player);
+        return this.tileInputter.isUsableByPlayer(player);
     }
 }

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

@@ -85,7 +85,7 @@ public class ContainerLaserRelayItemWhitelist extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }

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

@@ -85,7 +85,7 @@ public class ContainerMiner extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -94,6 +94,6 @@ public class ContainerMiner extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.miner.isUseableByPlayer(player);
+        return this.miner.isUsableByPlayer(player);
     }
 }

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

@@ -74,7 +74,7 @@ public class ContainerOilGenerator extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }

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

@@ -85,7 +85,7 @@ public class ContainerPhantomPlacer extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -94,6 +94,6 @@ public class ContainerPhantomPlacer extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.placer.isUseableByPlayer(player);
+        return this.placer.isUsableByPlayer(player);
     }
 }

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

@@ -92,7 +92,7 @@ public class ContainerRangedCollector extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -112,6 +112,6 @@ public class ContainerRangedCollector extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.collector.isUseableByPlayer(player);
+        return this.collector.isUsableByPlayer(player);
     }
 }

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

@@ -87,7 +87,7 @@ public class ContainerRepairer extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -96,6 +96,6 @@ public class ContainerRepairer extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.tileRepairer.isUseableByPlayer(player);
+        return this.tileRepairer.isUsableByPlayer(player);
     }
 }

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

@@ -85,7 +85,7 @@ public class ContainerXPSolidifier extends Container{
             if(StackUtil.getStackSize(newStack) == StackUtil.getStackSize(currentStack)){
                 return StackUtil.getNull();
             }
-            theSlot.func_190901_a(player, newStack);
+            theSlot.onTake(player, newStack);
 
             return currentStack;
         }
@@ -94,6 +94,6 @@ public class ContainerXPSolidifier extends Container{
 
     @Override
     public boolean canInteractWith(EntityPlayer player){
-        return this.solidifier.isUseableByPlayer(player);
+        return this.solidifier.isUsableByPlayer(player);
     }
 }

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

@@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
 import net.minecraftforge.fml.client.config.GuiUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -68,7 +67,7 @@ public class EnergyDisplay extends Gui{
         if(this.rfReference.getEnergyStored() > 0){
             int i = this.rfReference.getEnergyStored()*83/this.rfReference.getMaxEnergyStored();
 
-            float[] color = AssetUtil.getWheelColor(mc.theWorld.getTotalWorldTime()%256);
+            float[] color = AssetUtil.getWheelColor(mc.world.getTotalWorldTime()%256);
             GlStateManager.color(color[0]/255F, color[1]/255F, color[2]/255F);
             this.drawTexturedModalRect(barX+1, barY+84-i, 36, 172, 16, i);
             GlStateManager.color(1F, 1F, 1F);

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

@@ -42,16 +42,16 @@ public class FilterSettingsGui extends Gui{
 
         this.whitelistButton = new SmallerButton(this.theSettings.whitelistButtonId, x, y, "", true);
         buttonList.add(this.whitelistButton);
-        y+=14;
+        y += 14;
         this.metaButton = new SmallerButton(this.theSettings.metaButtonId, x, y, "", true);
         buttonList.add(this.metaButton);
-        y+=14;
+        y += 14;
         this.nbtButton = new SmallerButton(this.theSettings.nbtButtonId, x, y, "", true);
         buttonList.add(this.nbtButton);
-        y+=14;
+        y += 14;
         this.oredictButton = new SmallerButton(this.theSettings.oredictButtonId, x, y, "", true);
         buttonList.add(this.oredictButton);
-        y+=15;
+        y += 15;
         this.modButton = new SmallerButton(this.theSettings.modButtonId, x, y, "", true);
         buttonList.add(this.modButton);
 

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

@@ -68,8 +68,8 @@ public class GuiBag extends GuiContainer{
     protected void actionPerformed(GuiButton button) throws IOException{
         NBTTagCompound data = new NBTTagCompound();
         data.setInteger("ButtonID", button.id);
-        data.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId());
+        data.setInteger("PlayerID", Minecraft.getMinecraft().player.getEntityId());
-        data.setInteger("WorldID", Minecraft.getMinecraft().theWorld.provider.getDimension());
+        data.setInteger("WorldID", Minecraft.getMinecraft().world.provider.getDimension());
         PacketHandler.theNetwork.sendToServer(new PacketClientToServer(data, PacketHandler.GUI_BUTTON_TO_CONTAINER_HANDLER));
     }
 

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

@@ -19,8 +19,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 
-import java.io.IOException;
-
 public class GuiBioReactor extends GuiContainer{
 
     private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bio_reactor");

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiCanolaPress extends GuiContainer{
 

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiCoalGenerator extends GuiContainer{
 

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

@@ -25,7 +25,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
 import java.util.Collections;
 
 @SideOnly(Side.CLIENT)

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiDirectionalBreaker extends GuiContainer{
 

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiEnergizer extends GuiContainer{
 

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiEnervator extends GuiContainer{
 

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiFarmer extends GuiContainer{
 

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

@@ -233,7 +233,7 @@ public class GuiInputter extends GuiContainer{
         compound.setInteger("Y", this.y);
         compound.setInteger("Z", this.z);
         compound.setInteger("WorldID", this.world.provider.getDimension());
-        compound.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId());
+        compound.setInteger("PlayerID", Minecraft.getMinecraft().player.getEntityId());
         compound.setInteger("NumberID", textID);
         compound.setInteger("Number", text);
         PacketHandler.theNetwork.sendToServer(new PacketClientToServer(compound, PacketHandler.GUI_NUMBER_TO_TILE_HANDLER));

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiOilGenerator extends GuiContainer{
 

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

@@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.io.IOException;
-
 @SideOnly(Side.CLIENT)
 public class GuiRepairer extends GuiContainer{
 

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

@@ -120,7 +120,7 @@ public class GuiSmileyCloud extends GuiContainer{
         compound.setInteger("Y", this.y);
         compound.setInteger("Z", this.z);
         compound.setInteger("WorldID", this.world.provider.getDimension());
-        compound.setInteger("PlayerID", Minecraft.getMinecraft().thePlayer.getEntityId());
+        compound.setInteger("PlayerID", Minecraft.getMinecraft().player.getEntityId());
         compound.setInteger("TextID", textID);
         compound.setString("Text", text);
         PacketHandler.theNetwork.sendToServer(new PacketClientToServer(compound, PacketHandler.GUI_STRING_TO_TILE_HANDLER));

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

@@ -85,6 +85,6 @@ public class GuiXPSolidifier extends GuiContainer{
     public void actionPerformed(GuiButton button){
         PacketHandlerHelper.sendButtonPacket(this.solidifier, button.id);
 
-        this.solidifier.onButtonPressed(button.id, Minecraft.getMinecraft().thePlayer);
+        this.solidifier.onButtonPressed(button.id, Minecraft.getMinecraft().player);
     }
 }

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

@@ -16,9 +16,7 @@ import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler.GuiTypes;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
 import de.ellpeck.actuallyadditions.mod.tile.FilterSettings;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
-import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
-import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;

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

@@ -20,7 +20,6 @@ import net.darkhax.tesla.api.ITeslaConsumer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ActionResult;