From 825fc22f55a9dedcc40bbe247e993884ba458575 Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Fri, 16 Jun 2017 01:41:36 -0400
Subject: [PATCH] Fix mappings for hdskins

---
 build.gradle                                         | 12 ++++++------
 build.number                                         |  4 ++--
 .../voxelmodpack/hdskins/gui/GuiItemStackButton.java |  5 ++---
 .../java/com/voxelmodpack/hdskins/gui/GuiSkins.java  | 12 ++++++------
 .../voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java |  3 +--
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index a23ba919..d5b82f06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ sourceCompatibility = 1.8
 
 minecraft {
 	version = "1.12"
-	mappings = 'snapshot_20170611'
+	mappings = 'snapshot_20170615'
 	runDir = 'run'
 	replace '@VERSION@', project.version
 }
@@ -48,14 +48,14 @@ mixin {
 }
 
 litemod.json {
-	author = 'Verdana, Rene_Z, Mumfrey, JoyJoy'
+	author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221'
 	description = 'Mine Little Pony turns players and mobs into ponies'
 	description.minelittlepony = '''\
 		Mine Little Pony turns players and mobs into ponies
 		Press F9 ingame to access settings'''.stripIndent()
 	description.hdskinsmod = '''\
-		Seperate skin server for Mine Little Pony that also supports HD skins.
-		Access via Skin Manager key binding (default: F1) in the main menu.'''.stripIndent()
+		Separate skin server for Mine Little Pony that also supports HD skins.
+		Access via button on the main menu.'''.stripIndent()
 
 	mixinConfigs += [
 		'mixin.minelp.json',
@@ -65,7 +65,7 @@ litemod.json {
 
 jar {
 	from sourceSets.hdskins.output
-	from litemod.outputs
+	from litemod
 }
 sourceJar {
 	// add hdskins sources
@@ -73,7 +73,7 @@ sourceJar {
 }
 task srgJar(type: Jar) {
 	from sourceSets.hdskins.output
-	from litemod.outputs
+	from litemod
 	classifier "mc$minecraft.version-srg"
 	baseName "mod-${project.name.toLowerCase()}"
 }
diff --git a/build.number b/build.number
index f3153177..ab595f01 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Jun 13 04:25:28 EDT 2017
-build.number=346
+#Fri Jun 16 00:07:29 EDT 2017
+build.number=375
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiItemStackButton.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiItemStackButton.java
index 66cfe0b5..d4d7eede 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiItemStackButton.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiItemStackButton.java
@@ -13,10 +13,9 @@ public class GuiItemStackButton extends GuiButton {
         this.itemStack = itemStack;
     }
 
-    // drawButton
     @Override
-    public void func_191745_a(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
-        super.func_191745_a(mc, mouseX, mouseY, partialTicks);
+    public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
+        super.drawButton(mc, mouseX, mouseY, partialTicks);
 
         mc.getRenderItem().renderItemIntoGUI(itemStack, this.x + 2, this.y + 2);
     }
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
index 5c6b346d..c9da726f 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
@@ -1,5 +1,9 @@
 package com.voxelmodpack.hdskins.gui;
 
+import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.ELYTRA;
+import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.SKIN;
+import static net.minecraft.client.renderer.GlStateManager.*;
+
 import com.google.common.collect.ImmutableMap;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.exceptions.AuthenticationException;
@@ -33,8 +37,6 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.GLU;
 
-import javax.imageio.ImageIO;
-import javax.swing.*;
 import java.awt.Color;
 import java.awt.Window.Type;
 import java.awt.dnd.DropTarget;
@@ -44,10 +46,8 @@ import java.io.IOException;
 import java.nio.DoubleBuffer;
 import java.util.Locale;
 import java.util.Map;
-
-import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.ELYTRA;
-import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.SKIN;
-import static net.minecraft.client.renderer.GlStateManager.*;
+import javax.imageio.ImageIO;
+import javax.swing.*;
 
 public class GuiSkins extends GuiScreen {
     private static final int MAX_SKIN_DIMENSION = 8192;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java
index 3f1b0711..664aa5c8 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java
@@ -18,8 +18,7 @@ public class HDSkinsConfigPanel implements ConfigPanel {
 
     @Override
     public void drawPanel(ConfigPanelHost host, int mouseX, int mouseY, float partialTicks) {
-        // TODO drawButton
-        this.button.func_191745_a(Minecraft.getMinecraft(), mouseX, mouseY, partialTicks);
+        this.button.drawButton(Minecraft.getMinecraft(), mouseX, mouseY, partialTicks);
     }
 
     @Override