diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
index 2a78acf7..56acd768 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
@@ -104,10 +104,12 @@ public final class HDSkinManager {
             ThreadDownloadImageData threaddownloadimagedata = new ThreadDownloadImageData(file2, texture.getUrl(),
                     DefaultPlayerSkin.getDefaultSkinLegacy(),
                     new IImageBuffer() {
+                        @Override
                         public BufferedImage parseUserSkin(BufferedImage image) {
                             return imagebufferdownload.parseUserSkin(image);
                         }
 
+                        @Override
                         public void skinAvailable() {
                             imagebufferdownload.skinAvailable();
                             if (callback != null) {
diff --git a/src/main/java/com/brohoof/minelittlepony/mixin/MixinRenderPlayer.java b/src/main/java/com/brohoof/minelittlepony/mixin/MixinRenderPlayer.java
index 64fa3fbc..c96edd9e 100644
--- a/src/main/java/com/brohoof/minelittlepony/mixin/MixinRenderPlayer.java
+++ b/src/main/java/com/brohoof/minelittlepony/mixin/MixinRenderPlayer.java
@@ -3,7 +3,6 @@ package com.brohoof.minelittlepony.mixin;
 import static net.minecraft.client.renderer.GlStateManager.scale;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -66,7 +65,7 @@ public abstract class MixinRenderPlayer extends RendererLivingEntity<AbstractCli
      * @reason render a pony instead of a human
      * @author JoyJoy
      */
-    @Overwrite
+    @Override
     public void doRender(AbstractClientPlayer player, double x, double y, double z, float yaw, float partialTicks) {
         updateModel(player);
         ItemStack currentItemStack = player.inventory.getCurrentItem();
diff --git a/src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java b/src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java
index 199a47b9..eee67b91 100644
--- a/src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java
+++ b/src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java
@@ -64,6 +64,7 @@ public class UnicornHorn extends AbstractHeadPart implements PonyModelConstants
         }
     }
 
+    @Override
     protected void position(float posX, float posY, float posZ) {
         AbstractPonyModel.setRotationPoint(this.horn, posX, posY, posZ);
         for (int i = 0; i < this.hornglow.length; i++) {
@@ -71,6 +72,7 @@ public class UnicornHorn extends AbstractHeadPart implements PonyModelConstants
         }
     }
 
+    @Override
     protected void rotate(float rotX, float rotY) {
 
         this.horn.rotateAngleX = rotX + 0.5F;
diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java b/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java
index f15fb58b..4c6e618e 100644
--- a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java
+++ b/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java
@@ -559,6 +559,7 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
         }
     }
 
+    @Override
     protected void initTextures() {
         this.Tail = new PlaneRenderer[21];
 
@@ -653,6 +654,7 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
         this.Tail[20] = new PlaneRenderer(this, 32, 0);
     }
 
+    @Override
     protected void initPositions(float yOffset, float stretch) {
         this.initHeadPositions(yOffset, stretch);
         this.initBodyPositions(yOffset, stretch);
diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java b/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java
index 3ae6f64f..0bad3c08 100644
--- a/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java
+++ b/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java
@@ -27,6 +27,7 @@ public class HornGlowRenderer extends ModelRenderer {
 
     }
 
+    @Override
     public HornGlowRenderer addBox(String par1Str, float par2, float par3, float par4, int par5, int par6, int par7) {
         par1Str = this.boxName + "." + par1Str;
         TextureOffset var8 = this.baseModel.getTextureOffset(par1Str);
@@ -35,11 +36,13 @@ public class HornGlowRenderer extends ModelRenderer {
         return this;
     }
 
+    @Override
     public HornGlowRenderer addBox(float par1, float par2, float par3, int par4, int par5, int par6) {
         this.cubeList.add(new ModelHornGlow(this, this.textureOffsetX, this.textureOffsetY, par1, par2, par3, par4, par5, par6, 0.0F));
         return this;
     }
 
+    @Override
     public void addBox(float par1, float par2, float par3, int par4, int par5, int par6, float par7) {
         this.cubeList.add(new ModelHornGlow(this, this.textureOffsetX, this.textureOffsetY, par1, par2, par3, par4, par5, par6, par7));
     }
diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java b/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java
index 37dfff3b..01576da6 100644
--- a/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java
+++ b/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java
@@ -289,6 +289,7 @@ public class PlaneRenderer extends ModelRenderer {
 
     }
 
+    @Override
     public void render(float f) {
         if (!this.isHidden) {
             if (this.showModel) {
@@ -327,6 +328,7 @@ public class PlaneRenderer extends ModelRenderer {
         }
     }
 
+    @Override
     public void renderWithRotation(float f) {
         if (!this.isHidden) {
             if (this.showModel) {
@@ -354,6 +356,7 @@ public class PlaneRenderer extends ModelRenderer {
         }
     }
 
+    @Override
     public void postRender(float scale) {
         if (!this.isHidden) {
             if (this.showModel) {
diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java
index 3b59a72b..b3f06ad1 100644
--- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java
+++ b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java
@@ -28,6 +28,7 @@ public class LayerPonyCape implements LayerRenderer<AbstractClientPlayer> {
         this.cape = new LayerCape((RenderPlayer) entity);
     }
 
+    @Override
     public void doRenderLayer(AbstractClientPlayer clientPlayer, float p2, float p3, float ticks, float p5, float p6,
             float p7, float scale) {
         PlayerModel model = ((IRenderPony) renderer).getPony();