 +            NovaDraw.incrementZ();
 +            if (this.hasListHeader) {
 +                drawListHeader(k, l);
-@@ -251,0 +241,3 @@ public abstract class GuiSlot
+@@ -251,0 +243,3 @@ public abstract class GuiSlot
 +            NovaDraw.incrementZ();
 +
 +            drawSelectionBox(k, l, mouseXIn, mouseYIn);
-@@ -253 +244,0 @@ public abstract class GuiSlot
+@@ -253 +246,0 @@ public abstract class GuiSlot
 -            this.drawSelectionBox(k, l, mouseXIn, mouseYIn);
-@@ -254,0 +246,2 @@ public abstract class GuiSlot
+@@ -254,0 +248,2 @@ public abstract class GuiSlot
 +            NovaDraw.incrementZ();
 +
-@@ -262,13 +255,29 @@ public abstract class GuiSlot
+@@ -262,13 +257,29 @@ public abstract class GuiSlot
 -            int i1 = 4;
 -            vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
 -            vertexbuffer.pos((double)this.left, (double)(this.top + 4), 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 0).endVertex();

+            // All the frames are in a line in the y-direction. Because each frame is square, the height divided by the
+            // width is the total number of frames
+            int numFrames = bufferedimage.getHeight() / this.width;
@@ -296,3 +282,2 @@ public class TextureAtlasSprite
-                while (iterator.hasNext())
-                {
-                    int j = ((Integer)iterator.next()).intValue();
+            if (animationData.getFrameCount() > 0) {
+                Iterator iterator = animationData.getFrameIndexSet().iterator();
@@ -300,3 +285,5 @@ public class TextureAtlasSprite
-                    if (j >= i)
-                    {
-                        throw new RuntimeException("invalid frameindex " + j);

+            ResourceLocation resourcelocation = (ResourceLocation)other;
@@ -80,0 +70 @@ public class ResourceLocation
+    @Override
diff --git a/minecraft/util/registry/RegistryNamespacedDefaultedByKey.java b/minecraft/util/registry/RegistryNamespacedDefaultedByKey.java
index f07e16d..3d9d403 100644
--- a/minecraft/util/registry/RegistryNamespacedDefaultedByKey.java
+++ b/minecraft/util/registry/RegistryNamespacedDefaultedByKey.java
@@ -7,0 +8 @@ import org.apache.commons.lang3.Validate;
+@SuppressWarnings("ALL")
diff --git a/minecraft/util/registry/RegistrySimple.java b/minecraft/util/registry/RegistrySimple.java
index 2444c5f..a68557f 100644
--- a/minecraft/util/registry/RegistrySimple.java
+++ b/minecraft/util/registry/RegistrySimple.java
@@ -10,0 +11,4 @@ import javax.annotation.Nullable;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.util.ResourceLocation;
diff --git a/minecraft/util/text/translation/LanguageMap.java b/minecraft/util/text/translation/LanguageMap.java
index 04931bb..68c4fcf 100644
--- a/minecraft/util/text/translation/LanguageMap.java
