packetadder wip

6 files changed, 92 insertions, 95 deletions

diff --git a/src/main/java/me/shedaniel/gui/widget/Button.java b/src/main/java/me/shedaniel/gui/widget/Button.java
index df43893ff..0c23a91db 100755
--- a/src/main/java/me/shedaniel/gui/widget/Button.java
+++ b/src/main/java/me/shedaniel/gui/widget/Button.java
@@ -1,11 +1,11 @@
 package me.shedaniel.gui.widget;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.gui.REIRenderHelper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.FontRenderer;
+import net.minecraft.client.gui.ContainerGui;
+import net.minecraft.util.Identifier;
 
 import java.awt.*;
 
@@ -14,7 +14,7 @@ import java.awt.*;
  */
 public class Button extends Control {
     private String buttonText;
-    protected static final ResourceLocation BUTTON_TEXTURES = new ResourceLocation("textures/gui/widgets.png");
+    protected static final Identifier BUTTON_TEXTURES = new Identifier("textures/gui/widgets.png");
     
     
     public Button(int x, int y, int width, int height, String buttonText) {
@@ -36,8 +36,8 @@ public class Button extends Control {
     public void draw() {
         GlStateManager.pushMatrix();
         GlStateManager.disableLighting();
-        GuiContainer gui = REIRenderHelper.getOverlayedGui();
-        Minecraft lvt_4_1_ = Minecraft.getInstance();
+        ContainerGui gui = REIRenderHelper.getOverlayedGui();
+        MinecraftClient lvt_4_1_ = MinecraftClient.getInstance();
         FontRenderer lvt_5_1_ = lvt_4_1_.fontRenderer;
         lvt_4_1_.getTextureManager().bindTexture(BUTTON_TEXTURES);
         GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -50,20 +50,13 @@ public class Button extends Control {
         }
         
         GlStateManager.enableBlend();
-        GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
-        GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-        gui.drawTexturedModalRect(rect.x, rect.y, 0, 46 + hoverState * 20, rect.width / 2, rect.height);
-        gui.drawTexturedModalRect(rect.x + rect.width / 2, rect.y, 200 - rect.width / 2, 46 + hoverState * 20, rect.width / 2, rect.height);
-        //this.mouseDragged(lvt_4_1_, p_194828_1_, p_194828_2_);
+        GlStateManager.blendFuncSeparate(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SrcBlendFactor.ONE, GlStateManager.DstBlendFactor.ZERO);
+        GlStateManager.blendFunc(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA);
+        gui.drawTexturedRect(rect.x, rect.y, 0, 46 + hoverState * 20, rect.width / 2, rect.height);
+        gui.drawTexturedRect(rect.x + rect.width / 2, rect.y, 200 - rect.width / 2, 46 + hoverState * 20, rect.width / 2, rect.height);
         int lvt_7_1_ = 14737632;
-//        if(!this.enabled) {
-//            lvt_7_1_ = 10526880;
-//        } else if(this.hovered) {
-//            lvt_7_1_ = 16777120;
-//        }
         
-        
-        gui.drawCenteredString(lvt_5_1_, this.buttonText, rect.x + rect.width / 2, rect.y + (rect.height - 8) / 2, lvt_7_1_);
+        gui.drawStringCentered(lvt_5_1_, this.buttonText, rect.x + rect.width / 2, rect.y + (rect.height - 8) / 2, lvt_7_1_);
         GlStateManager.enableLighting();
         GlStateManager.popMatrix();
     }
diff --git a/src/main/java/me/shedaniel/gui/widget/Control.java b/src/main/java/me/shedaniel/gui/widget/Control.java
index dd674e605..9be17a0c2 100755
--- a/src/main/java/me/shedaniel/gui/widget/Control.java
+++ b/src/main/java/me/shedaniel/gui/widget/Control.java
@@ -1,11 +1,11 @@
 package me.shedaniel.gui.widget;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.api.TriBooleanProducer;
 import me.shedaniel.gui.Drawable;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
 
 import java.awt.*;
 import java.util.function.BiConsumer;
@@ -61,19 +61,19 @@ public abstract class Control extends Drawable {
         float lvt_7_1_ = (float) (p_drawRect_4_ >> 8 & 255) / 255.0F;
         float lvt_8_1_ = (float) (p_drawRect_4_ & 255) / 255.0F;
         Tessellator lvt_9_1_ = Tessellator.getInstance();
-        BufferBuilder lvt_10_1_ = lvt_9_1_.getBuffer();
+        BufferBuilder lvt_10_1_ = lvt_9_1_.getBufferBuilder();
         GlStateManager.enableAlphaTest();
         GlStateManager.enableBlend();
-        GlStateManager.disableTexture2D();
-        GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
+        GlStateManager.disableTexture();
+        GlStateManager.blendFuncSeparate(GlStateManager.SrcBlendFactor.SRC_ALPHA, GlStateManager.DstBlendFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SrcBlendFactor.ONE, GlStateManager.DstBlendFactor.ZERO);
         GlStateManager.color4f(lvt_6_1_, lvt_7_1_, lvt_8_1_, lvt_5_3_1);
-        lvt_10_1_.begin(7, DefaultVertexFormats.POSITION);
-        lvt_10_1_.pos((double) p_drawRect_0_, (double) p_drawRect_3_, 0.0D).endVertex();
-        lvt_10_1_.pos((double) p_drawRect_2_, (double) p_drawRect_3_, 0.0D).endVertex();
-        lvt_10_1_.pos((double) p_drawRect_2_, (double) p_drawRect_1_, 0.0D).endVertex();
-        lvt_10_1_.pos((double) p_drawRect_0_, (double) p_drawRect_1_, 0.0D).endVertex();
+        lvt_10_1_.begin(7, VertexFormats.POSITION);
+        lvt_10_1_.vertex((double) p_drawRect_0_, (double) p_drawRect_3_, 0.0D).next();
+        lvt_10_1_.vertex((double) p_drawRect_2_, (double) p_drawRect_3_, 0.0D).next();
+        lvt_10_1_.vertex((double) p_drawRect_2_, (double) p_drawRect_1_, 0.0D).next();
+        lvt_10_1_.vertex((double) p_drawRect_0_, (double) p_drawRect_1_, 0.0D).next();
         lvt_9_1_.draw();
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
         GlStateManager.disableBlend();
         GlStateManager.disableAlphaTest();
     }
@@ -82,12 +82,12 @@ public abstract class Control extends Drawable {
         float lvt_7_1_ = 0.00390625F;
         float lvt_8_1_ = 0.00390625F;
         Tessellator lvt_9_1_ = Tessellator.getInstance();
-        BufferBuilder lvt_10_1_ = lvt_9_1_.getBuffer();
-        lvt_10_1_.begin(7, DefaultVertexFormats.POSITION_TEX);
-        lvt_10_1_.pos((double) (x + 0), (double) (y + height), (double) 200).tex((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).endVertex();
-        lvt_10_1_.pos((double) (x + width), (double) (y + height), (double) 200).tex((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).endVertex();
-        lvt_10_1_.pos((double) (x + width), (double) (y + 0), (double) 200).tex((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).endVertex();
-        lvt_10_1_.pos((double) (x + 0), (double) (y + 0), (double) 200).tex((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).endVertex();
+        BufferBuilder lvt_10_1_ = lvt_9_1_.getBufferBuilder();
+        lvt_10_1_.begin(7, VertexFormats.POSITION_UV);
+        lvt_10_1_.vertex((double) (x + 0), (double) (y + height), (double) 200).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next();
+        lvt_10_1_.vertex((double) (x + width), (double) (y + height), (double) 200).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next();
+        lvt_10_1_.vertex((double) (x + width), (double) (y + 0), (double) 200).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next();
+        lvt_10_1_.vertex((double) (x + 0), (double) (y + 0), (double) 200).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next();
         lvt_9_1_.draw();
     }
     
@@ -95,12 +95,12 @@ public abstract class Control extends Drawable {
         float lvt_7_1_ = 0.00390625F;
         float lvt_8_1_ = 0.00390625F;
         Tessellator lvt_9_1_ = Tessellator.getInstance();
-        BufferBuilder lvt_10_1_ = lvt_9_1_.getBuffer();
-        lvt_10_1_.begin(7, DefaultVertexFormats.POSITION_TEX);
-        lvt_10_1_.pos((double) (x + 0), (double) (y + height), zLevel).tex((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).endVertex();
-        lvt_10_1_.pos((double) (x + width), (double) (y + height), zLevel).tex((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).endVertex();
-        lvt_10_1_.pos((double) (x + width), (double) (y + 0), zLevel).tex((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).endVertex();
-        lvt_10_1_.pos((double) (x + 0), (double) (y + 0), zLevel).tex((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).endVertex();
+        BufferBuilder lvt_10_1_ = lvt_9_1_.getBufferBuilder();
+        lvt_10_1_.begin(7, VertexFormats.POSITION_UV);
+        lvt_10_1_.vertex((double) (x + 0), (double) (y + height), zLevel).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next();
+        lvt_10_1_.vertex((double) (x + width), (double) (y + height), zLevel).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + height) * 0.00390625F)).next();
+        lvt_10_1_.vertex((double) (x + width), (double) (y + 0), zLevel).texture((double) ((float) (u + width) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next();
+        lvt_10_1_.vertex((double) (x + 0), (double) (y + 0), zLevel).texture((double) ((float) (u + 0) * 0.00390625F), (double) ((float) (v + 0) * 0.00390625F)).next();
         lvt_9_1_.draw();
     }
     
diff --git a/src/main/java/me/shedaniel/gui/widget/REISlot.java b/src/main/java/me/shedaniel/gui/widget/REISlot.java
index 2a2c65569..5ed1fe0aa 100755
--- a/src/main/java/me/shedaniel/gui/widget/REISlot.java
+++ b/src/main/java/me/shedaniel/gui/widget/REISlot.java
@@ -2,17 +2,16 @@ package me.shedaniel.gui.widget;
 
 import com.google.common.collect.Lists;
 import me.shedaniel.gui.REIRenderHelper;
-import me.shedaniel.impl.REIRecipeManager;
-import me.shedaniel.listenerdefinitions.IMixinGuiContainer;
+import me.shedaniel.listenerdefinitions.IMixinContainerGui;
 import me.shedaniel.network.CheatPacket;
 import me.shedaniel.network.DeletePacket;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.ContainerGui;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.render.GuiLighting;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
 
 import java.awt.*;
 import java.util.LinkedList;
@@ -22,7 +21,7 @@ import java.util.List;
  * Created by James on 7/28/2018.
  */
 public class REISlot extends Control {
-    private static final ResourceLocation RECIPE_GUI = new ResourceLocation("almostenoughitems", "textures/gui/recipecontainer.png");
+    private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
     private boolean cheatable = false;
     private List<ItemStack> itemList = new LinkedList<>();
     private int itemListPointer = 0;
@@ -85,12 +84,12 @@ public class REISlot extends Control {
     @Override
     public void draw() {
         if (drawBackground) {
-            Minecraft.getInstance().getTextureManager().bindTexture(RECIPE_GUI);
+            MinecraftClient.getInstance().getTextureManager().bindTexture(RECIPE_GUI);
             drawTexturedModalRect(rect.x - 1, rect.y - 1, backgroundUV.x, backgroundUV.y, rect.width, rect.height);
         }
         if (getStack().isEmpty())
             return;
-        RenderHelper.enableGUIStandardItemLighting();
+        GuiLighting.enableForItems();
         
         drawStack(rect.x, rect.y);
         if (isHighlighted())
@@ -105,13 +104,13 @@ public class REISlot extends Control {
     }
     
     private boolean onClick(int button) {
-        EntityPlayer player = Minecraft.getInstance().player;
-        if (REIRenderHelper.reiGui.canCheat() && !(player.inventory.getItemStack().isEmpty())) {
+        ClientPlayerEntity player = MinecraftClient.getInstance().player;
+        if (REIRenderHelper.reiGui.canCheat() && !(player.inventory.getCursorStack().isEmpty())) {
             //Delete the itemstack.
-            Minecraft.getInstance().getConnection().sendPacket(new DeletePacket());
+            MinecraftClient.getInstance().getNetworkHandler().sendPacket(new DeletePacket());
             return true;
         }
-        if (!player.inventory.getItemStack().isEmpty()) {
+        if (!player.inventory.getCursorStack().isEmpty()) {
             return false;
         }
         
@@ -119,11 +118,11 @@ public class REISlot extends Control {
             if (getStack() != null && !getStack().isEmpty()) {
                 ItemStack cheatedStack = getStack().copy();
                 if (button == 0)
-                    cheatedStack.setCount(1);
+                    cheatedStack.setAmount(1);
                 if (button == 1) {
-                    cheatedStack.setCount(cheatedStack.getMaxStackSize());
+                    cheatedStack.setAmount(cheatedStack.getMaxAmount());
                 }
-                Minecraft.getInstance().getConnection().sendPacket(new CheatPacket(cheatedStack));
+                MinecraftClient.getInstance().getNetworkHandler().sendPacket(new CheatPacket(cheatedStack));
                 return true;
             }
         } else {
@@ -134,20 +133,20 @@ public class REISlot extends Control {
     
     
     private void drawStack(int x, int y) {
-        GuiContainer gui = REIRenderHelper.getOverlayedGui();
-        REIRenderHelper.getItemRender().zLevel = 200.0F;
-        REIRenderHelper.getItemRender().renderItemAndEffectIntoGUI(getStack(), x, y);
+        ContainerGui gui = REIRenderHelper.getOverlayedGui();
+        REIRenderHelper.getItemRender().zOffset = 200.0F;
+        REIRenderHelper.getItemRender().renderItemAndGlowInGui(getStack(), x, y);
         assert gui != null;
-        if (((IMixinGuiContainer) gui).getDraggedStack().isEmpty())
-            REIRenderHelper.getItemRender().renderItemOverlayIntoGUI(Minecraft.getInstance().fontRenderer, getStack(), x, y - 0, "");
+        if (((IMixinContainerGui) gui).getDraggedStack().isEmpty())
+            REIRenderHelper.getItemRender().renderItemOverlaysInGUIWithText(MinecraftClient.getInstance().fontRenderer, getStack(), x, y - 0, "");
         else
-            REIRenderHelper.getItemRender().renderItemOverlayIntoGUI(Minecraft.getInstance().fontRenderer, getStack(), x, y - 8, "");
-        REIRenderHelper.getItemRender().zLevel = 0.0F;
+            REIRenderHelper.getItemRender().renderItemOverlaysInGUIWithText(MinecraftClient.getInstance().fontRenderer, getStack(), x, y - 8, "");
+        REIRenderHelper.getItemRender().zOffset = 0.0F;
     }
     
     public String getMod() {
         if (!getStack().isEmpty()) {
-            ResourceLocation location = IRegistry.ITEM.getKey(getStack().getItem());
+            Identifier location = Registry.ITEM.getId(getStack().getItem());
             assert location != null;
             return REIRenderHelper.tryGettingModName(location.getNamespace());
         }
@@ -155,11 +154,11 @@ public class REISlot extends Control {
     }
     
     protected List<String> getTooltip() {
-        Minecraft mc = Minecraft.getInstance();
-        GuiContainer gui = REIRenderHelper.getOverlayedGui();
+        MinecraftClient mc = MinecraftClient.getInstance();
+        ContainerGui gui = REIRenderHelper.getOverlayedGui();
         List<String> toolTip = Lists.newArrayList();
         if (gui != null) {
-            toolTip = gui.getItemToolTip(getStack());
+            toolTip = gui.getStackTooltip(getStack());
         } else {
             toolTip.add(getStack().getDisplayName().getFormattedText());
         }
diff --git a/src/main/java/me/shedaniel/gui/widget/Tab.java b/src/main/java/me/shedaniel/gui/widget/Tab.java
index b667435b0..5f5e931df 100644
--- a/src/main/java/me/shedaniel/gui/widget/Tab.java
+++ b/src/main/java/me/shedaniel/gui/widget/Tab.java
@@ -1,10 +1,9 @@
 package me.shedaniel.gui.widget;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.gui.REIRenderHelper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.item.Item;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.item.ItemStack;
 
 import java.awt.*;
@@ -22,7 +21,7 @@ public class Tab extends Control {
         super(x, y, width, height);
         this.id = id;
         this.guiLeft = guiLeft;
-        itemRender = Minecraft.getInstance().getItemRenderer();
+        itemRender = MinecraftClient.getInstance().getItemRenderer();
     }
     
     public void moveTo(int guiLeft, int x, int y) {
@@ -79,13 +78,13 @@ public class Tab extends Control {
             GlStateManager.disableLighting();
             this.drawTexturedModalRect(rect.x, rect.y - (selected ? 0 : 2), 28, (selected ? 32 : 0), 28, (selected ? 32 : 31));
             this.zLevel = 100.0F;
-            this.itemRender.zLevel = 100.0F;
+            this.itemRender.zOffset = 100.0F;
             GlStateManager.enableLighting();
             GlStateManager.enableRescaleNormal();
-            this.itemRender.renderItemAndEffectIntoGUI(getItemStack(), l, i1);
-            this.itemRender.renderItemOverlays(Minecraft.getInstance().fontRenderer, getItemStack(), l, i1);
+            this.itemRender.renderItemAndGlowInGui(getItemStack(), l, i1);
+            this.itemRender.renderItemOverlaysInGUI(MinecraftClient.getInstance().fontRenderer, getItemStack(), l, i1);
             GlStateManager.disableLighting();
-            this.itemRender.zLevel = 0.0F;
+            this.itemRender.zOffset = 0.0F;
             this.zLevel = 0.0F;
             if (isHighlighted())
                 drawTooltip();
diff --git a/src/main/java/me/shedaniel/gui/widget/TextBox.java b/src/main/java/me/shedaniel/gui/widget/TextBox.java
index 3798fa5fc..6a33031a9 100755
--- a/src/main/java/me/shedaniel/gui/widget/TextBox.java
+++ b/src/main/java/me/shedaniel/gui/widget/TextBox.java
@@ -1,7 +1,7 @@
 package me.shedaniel.gui.widget;
 
 import me.shedaniel.gui.REIRenderHelper;
-import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.gui.widget.TextFieldWidget;
 
 import java.awt.*;
 
@@ -10,11 +10,11 @@ import java.awt.*;
  */
 public class TextBox extends Control implements IFocusable {
     
-    private GuiTextField textField;
+    private TextFieldWidget textField;
     
     public TextBox(int x, int y, int width, int height) {
         super(x, y, width, height);
-        textField = new GuiTextField(-1, REIRenderHelper.getFontRenderer(), x, y, width, height);
+        textField = new TextFieldWidget(-1, REIRenderHelper.getFontRenderer(), x, y, width, height);
         this.onClick = this::doMouseClick;
         this.onKeyDown = this::onKeyPressed;
         this.charPressed = this::charTyped;
@@ -22,7 +22,7 @@ public class TextBox extends Control implements IFocusable {
     
     @Override
     public void draw() {
-        textField.drawTextField(0, 0, 0);
+        textField.render(0, 0, 0);
     }
     
     @Override
diff --git a/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java b/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java
index 40d53c3bb..524f1ce39 100755
--- a/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java
+++ b/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java
@@ -1,26 +1,32 @@
 package me.shedaniel.gui.widget;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.util.ResourceLocation;
+import com.mojang.blaze3d.platform.GlStateManager;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.GuiLighting;
+import net.minecraft.util.Identifier;
 
 public class WidgetArrow extends Control {
-    private static final ResourceLocation RECIPE_GUI = new ResourceLocation("almostenoughitems", "textures/gui/recipecontainer.png");
+    private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
     private int progress = 0;
     private int updateTick = 0;
+    private final int speed;
     private boolean animated;
     
     public WidgetArrow(int x, int y, boolean animated) {
+        this(x, y, animated, 20);
+    }
+    
+    public WidgetArrow(int x, int y, boolean animated, int speed) {
         super(x, y, 22, 18);
         this.animated = animated;
+        this.speed = speed;
     }
     
     @Override
     public void draw() {
         GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-        RenderHelper.disableStandardItemLighting();
-        Minecraft.getInstance().getTextureManager().bindTexture(RECIPE_GUI);
+        GuiLighting.disable();
+        MinecraftClient.getInstance().getTextureManager().bindTexture(RECIPE_GUI);
         this.drawTexturedModalRect(rect.x, rect.y, 18, 222, 22, 18);
         if (animated) {
             int width = (int) ((progress / 10f) * 22);
@@ -31,7 +37,7 @@ public class WidgetArrow extends Control {
     @Override
     public void tick() {
         updateTick++;
-        if (updateTick >= 20) {
+        if (updateTick >= speed) {
             updateTick = 0;
             
             progress++;