Remove remaining deprecations, improve a few patch comments

src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java

@@ -39,13 +39,6 @@ public final class ItemTextureQuadConverter
         // non-instantiable
     }
 
-    /** @deprecated use {@link #convertTexture(VertexFormat, TRSRTransformation, TextureAtlasSprite, TextureAtlasSprite, float, EnumFacing, int, int)}*/
-    @Deprecated // TODO: remove
-    public static List<UnpackedBakedQuad> convertTexture(VertexFormat format, TRSRTransformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, EnumFacing facing, int color)
-    {
-        return convertTexture(format, transform, template, sprite, z, facing, color, -1);
-    }
-
     /**
      * Takes a texture and converts it into BakedQuads.
      * The conversion is done by scanning the texture horizontally and vertically and creating "strips" of the texture.
@@ -67,13 +60,6 @@ public final class ItemTextureQuadConverter
         return horizontal.size() >= vertical.size() ? horizontal : vertical;
     }
 
-    /** @deprecated use {@link #convertTextureHorizontal(VertexFormat, TRSRTransformation, TextureAtlasSprite, TextureAtlasSprite, float, EnumFacing, int, int)} */
-    @Deprecated // TODO: remove
-    public static List<UnpackedBakedQuad> convertTextureHorizontal(VertexFormat format, TRSRTransformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, EnumFacing facing, int color)
-    {
-        return convertTextureHorizontal(format, transform, template, sprite, z, facing, color, -1);
-    }
-
     /**
      * Scans a texture and converts it into a list of horizontal strips stacked on top of each other.
      * The height of the strips is as big as possible.
@@ -145,13 +131,6 @@ public final class ItemTextureQuadConverter
         return quads;
     }
 
-    /** @deprecated use {@link #convertTextureVertical(VertexFormat, TRSRTransformation, TextureAtlasSprite, TextureAtlasSprite, float, EnumFacing, int, int)} */
-    @Deprecated // TODO: remove
-    public static List<UnpackedBakedQuad> convertTextureVertical(VertexFormat format, TRSRTransformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, EnumFacing facing, int color)
-    {
-        return convertTextureVertical(format, transform, template, sprite, z, facing, color, -1);
-    }
-
     /**
      * Scans a texture and converts it into a list of vertical strips stacked next to each other from left to right.
      * The width of the strips is as big as possible.
@@ -228,13 +207,6 @@ public final class ItemTextureQuadConverter
         return (color >> 24 & 255) / 255f > 0.1f;
     }
 
-    /** @deprecated use {@link #genQuad(VertexFormat, TRSRTransformation, float, float, float, float, float, TextureAtlasSprite, EnumFacing, int, int)} */
-    @Deprecated // TODO: remove
-    public static UnpackedBakedQuad genQuad(VertexFormat format, TRSRTransformation transform, float x1, float y1, float x2, float y2, float z, TextureAtlasSprite sprite, EnumFacing facing, int color)
-    {
-        return genQuad(format, transform, x1, y1, x2, y2, z, sprite, facing, color, -1);
-    }
-
     /**
      * Generates a Front/Back quad for an itemmodel. Therefore only supports facing NORTH and SOUTH.
      * Coordinates are [0,16] to match the usual coordinates used in TextureAtlasSprites

src/main/java/net/minecraftforge/common/extensions/IForgeBlockState.java

@@ -571,7 +571,6 @@ public interface IForgeBlockState
         return getBlockState().getBlock().rotate(getBlockState(), world, pos, direction);
     }
 
-
    /**
     * Determines the amount of enchanting power this block can provide to an enchanting table.
     * @param world The World

src/main/java/net/minecraftforge/common/model/animation/AnimationStateMachine.java

@@ -93,12 +93,6 @@ public final class AnimationStateMachine implements IAnimationStateMachine
             }
         });
 
-    @Deprecated
-    public AnimationStateMachine(ImmutableMap<String, ITimeValue> parameters, ImmutableMap<String, IClip> clips, ImmutableList<String> states, ImmutableMap<String, String> transitions, String startState)
-    {
-        this(parameters, clips, states, ImmutableMultimap.copyOf(Multimaps.newSetMultimap(Maps.transformValues(transitions, ImmutableSet::of), Sets::newHashSet)), startState);
-    }
-
     public AnimationStateMachine(ImmutableMap<String, ITimeValue> parameters, ImmutableMap<String, IClip> clips, ImmutableList<String> states, ImmutableMultimap<String, String> transitions, String startState)
     {
         this.parameters = parameters;

src/main/java/net/minecraftforge/event/world/BlockEvent.java

@@ -194,9 +194,6 @@ public class BlockEvent extends Event
         }
 
         public EntityPlayer getPlayer() { return player; }
-        @Nonnull
-        @Deprecated
-        public ItemStack getItemInHand() { return player.getHeldItem(hand); }
         public BlockSnapshot getBlockSnapshot() { return blockSnapshot; }
         public IBlockState getPlacedBlock() { return placedBlock; }
         public IBlockState getPlacedAgainst() { return placedAgainst; }