packetadder wip

1 files changed, 23 insertions, 23 deletions

diff --git a/src/main/java/me/shedaniel/mixins/MixinGuiContainer.java b/src/main/java/me/shedaniel/mixins/MixinGuiContainer.java
index b4c0dbab3..69adb45ad 100755
--- a/src/main/java/me/shedaniel/mixins/MixinGuiContainer.java
+++ b/src/main/java/me/shedaniel/mixins/MixinGuiContainer.java
@@ -1,12 +1,12 @@
 package me.shedaniel.mixins;
 
+import me.shedaniel.Core;
 import me.shedaniel.listenerdefinitions.*;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.IGuiEventListenerDeferred;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Slot;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.ContainerGui;
+import net.minecraft.client.gui.GuiEventListener;
+import net.minecraft.container.Slot;
 import net.minecraft.item.ItemStack;
-import org.dimdev.riftloader.RiftLoader;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,32 +17,32 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 /**
  * Created by James on 7/27/2018.
  */
-@Mixin(GuiContainer.class)
-public abstract class MixinGuiContainer implements IGuiEventListenerDeferred, IMixinGuiContainer {
+@Mixin(ContainerGui.class)
+public abstract class MixinGuiContainer implements GuiEventListener, IMixinContainerGui {
     @Shadow
-    protected Slot hoveredSlot;
+    protected Slot focusedSlot;
     @Shadow
-    private ItemStack draggedStack;
+    private ItemStack field_2782; //draggedStack
     @Shadow
-    protected int guiLeft;
+    protected int left;
     @Shadow
-    protected int guiTop;
+    protected int top;
     @Shadow
-    protected int xSize;
+    protected int containerWidth;
     @Shadow
-    protected int ySize;
+    protected int containerHeight;
     
-    @Inject(method = "render", at = @At("RETURN"))
+    @Inject(method = "draw", at = @At("RETURN"))
     private void onRender(int p_drawScreen_1_, int p_drawScreen_2_, float p_drawScreen_3_, CallbackInfo ci) {
-        for(DrawContainer listener : RiftLoader.instance.getListeners(DrawContainer.class)) {
-            listener.draw(p_drawScreen_1_, p_drawScreen_2_, p_drawScreen_3_, (GuiContainer) Minecraft.getInstance().currentScreen);
+        for(DrawContainer listener : Core.getListeners(DrawContainer.class)) {
+            listener.draw(p_drawScreen_1_, p_drawScreen_2_, p_drawScreen_3_, (ContainerGui) MinecraftClient.getInstance().currentGui);
         }
     }
     
     @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
     private void onMouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_, int p_mouseClicked_5_, CallbackInfoReturnable<Boolean> ci) {
         boolean handled = false;
-        for(GuiCickListener listener : RiftLoader.instance.getListeners(GuiCickListener.class)) {
+        for(GuiCickListener listener : Core.getListeners(GuiCickListener.class)) {
             if (listener.onClick((int) p_mouseClicked_1_, (int) p_mouseClicked_3_, p_mouseClicked_5_)) {
                 ci.setReturnValue(true);
                 handled = true;
@@ -56,7 +56,7 @@ public abstract class MixinGuiContainer implements IGuiEventListenerDeferred, IM
     @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
     private void onKeyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_, CallbackInfoReturnable<Boolean> ci) {
         boolean handled = false;
-        for(GuiKeyDown listener : RiftLoader.instance.getListeners(GuiKeyDown.class)) {
+        for(GuiKeyDown listener : Core.getListeners(GuiKeyDown.class)) {
             if (listener.keyDown(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_))
                 handled = true;
         }
@@ -68,7 +68,7 @@ public abstract class MixinGuiContainer implements IGuiEventListenerDeferred, IM
     
     public boolean mouseScrolled(double p_mouseScrolled_1_) {
         boolean handled = false;
-        for(MouseScrollListener listener : RiftLoader.instance.getListeners(MouseScrollListener.class)) {
+        for(MouseScrollListener listener : Core.getListeners(MouseScrollListener.class)) {
             if (listener.mouseScrolled(p_mouseScrolled_1_)) {
                 handled = true;
             }
@@ -78,21 +78,21 @@ public abstract class MixinGuiContainer implements IGuiEventListenerDeferred, IM
     
     @Override
     public ItemStack getDraggedStack() {
-        return draggedStack;
+        return field_2782;
     }
     
     @Override
     public int getGuiLeft() {
-        return guiLeft;
+        return left;
     }
     
     @Override
     public int getXSize() {
-        return xSize;
+        return containerWidth;
     }
     
     @Override
     public Slot getHoveredSlot() {
-        return hoveredSlot;
+        return focusedSlot;
     }
 }