From 45282b147aa6ac0c01e32acf0fda701e4dc3d890 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 10 Aug 2018 18:17:26 +0200
Subject: [PATCH] Fix rebase errors (Killjoy)

---
 .../minelittlepony/gui/IGuiTooltipped.java    |  7 -----
 .../com/minelittlepony/gui/IconicButton.java  | 31 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 src/common/java/com/minelittlepony/gui/IGuiTooltipped.java
 delete mode 100644 src/common/java/com/minelittlepony/gui/IconicButton.java

diff --git a/src/common/java/com/minelittlepony/gui/IGuiTooltipped.java b/src/common/java/com/minelittlepony/gui/IGuiTooltipped.java
deleted file mode 100644
index edb3acaa..00000000
--- a/src/common/java/com/minelittlepony/gui/IGuiTooltipped.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.minelittlepony.gui;
-
-import net.minecraft.client.Minecraft;
-
-public interface IGuiTooltipped {
-    void renderToolTip(Minecraft mc, int mouseX, int mouseY);
-}
diff --git a/src/common/java/com/minelittlepony/gui/IconicButton.java b/src/common/java/com/minelittlepony/gui/IconicButton.java
deleted file mode 100644
index 418b7f87..00000000
--- a/src/common/java/com/minelittlepony/gui/IconicButton.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.minelittlepony.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-public class IconicButton extends Button {
-
-    private ItemStack itemStack = ItemStack.EMPTY;
-
-    public IconicButton(int x, int y, IGuiAction<IconicButton> callback) {
-        super(x, y, 20, 20, "", callback);
-    }
-
-    public IconicButton setIcon(ItemStack stack) {
-        itemStack = stack;
-        return this;
-    }
-
-    public IconicButton setIcon(ItemStack stack, int colour) {
-        Items.LEATHER_LEGGINGS.setColor(stack, colour);
-        return setIcon(stack);
-    }
-
-    @Override
-    public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
-        super.drawButton(mc, mouseX, mouseY, partialTicks);
-
-        mc.getRenderItem().renderItemIntoGUI(itemStack, x + 2, y + 2);
-    }
-}