packetadder wip

1 files changed, 13 insertions, 20 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();
     }