 +                        0, 1, 2, 2, 3, 0
 +                };
 +
-+                NovaDraw.draw(NovaRenderer.WHITE_TEXTURE_GUI_LOCATION, indices, scrollbarShade);
++                NovaDraw.draw(WHITE_TEXTURE_GUI_LOCATION, indices, scrollbarShade);
 +
 +                NovaDraw.incrementZ();
 +

@@ -9 +12 @@ import net.minecraft.util.math.MathHelper;
-import org.lwjgl.input.Mouse;
+import com.continuum.nova.input.Mouse;
@@ -11,2 +14,3 @@ import org.lwjgl.input.Mouse;
-public abstract class GuiSlot
-{
+import java.awt.*;
+
+public abstract class GuiSlot {
@@ -62,0 +67 @@ public abstract class GuiSlot
+    protected boolean stateChanged;
@@ -126,5 +131 @@ public abstract class GuiSlot
-    protected abstract void drawBackground();
-
-    protected void updateItemPos(int entryID, int insideLeft, int yPos)
-    {
-    }
+    protected void updateItemPos(int entryID, int insideLeft, int yPos) {}
@@ -137,3 +138 @@ public abstract class GuiSlot
-    protected void drawListHeader(int insideLeft, int insideTop, Tessellator tessellatorIn)
-    {
-    }
+    protected void drawListHeader(int insideLeft, int insideTop) {}
@@ -141,3 +140 @@ public abstract class GuiSlot
-    protected void clickedHeader(int p_148132_1_, int p_148132_2_)
-    {
-    }
+    protected void clickedHeader(int p_148132_1_, int p_148132_2_) {}
@@ -145,3 +142 @@ public abstract class GuiSlot
-    protected void renderDecorations(int mouseXIn, int mouseYIn)
-    {
-    }
+    protected void renderDecorations(int mouseXIn, int mouseYIn) {}
@@ -149 +144 @@ public abstract class GuiSlot
-    public int getSlotIndexFromScreenCoords(int posX, int posY)
+    protected int getSlotIndexFromScreenCoords(int posX, int posY)
@@ -170,2 +165 @@ public abstract class GuiSlot
-    protected void bindAmountScrolled()
-    {
+    protected void bindAmountScrolled() {
@@ -188,3 +182,2 @@ public abstract class GuiSlot
-    public boolean isMouseYWithinSlotBounds(int p_148141_1_)
-    {
-        return p_148141_1_ >= this.top && p_148141_1_ <= this.bottom && this.mouseX >= this.left && this.mouseX <= this.right;
+    public boolean isMouseYWithinSlotBounds(int mouseYIn) {
+        return mouseYIn >= this.top && mouseYIn <= this.bottom && this.mouseX >= this.left && this.mouseX <= this.right;
@@ -203,6 +196,3 @@ public abstract class GuiSlot
-    public void actionPerformed(GuiButton button)
-    {
-        if (button.enabled)

+        return whiteImage;
+    }
+
+    public Map<String,TextureAtlasSprite> getMapUploadedSprites() {
+        return mapUploadedSprites;
+    }
diff --git a/minecraft/client/renderer/texture/TextureUtil.java b/minecraft/client/renderer/texture/TextureUtil.java
index b0a0490..d121ce3 100644
--- a/minecraft/client/renderer/texture/TextureUtil.java
