Use Accessors in IMinecraft

Author: LeafHacker

src/main/java/me/zero/client/load/mixin/MixinMinecraft.java

@@ -28,12 +28,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.util.Session;
-import net.minecraft.util.Timer;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
@@ -51,15 +46,7 @@
  * @since 4/27/2017 12:00 PM
  */
 @Mixin(Minecraft.class)
-public class MixinMinecraft implements IMinecraft {
-
-    @Shadow @Final private Timer timer;
-    @Shadow @Final @Mutable private Session session;
-    @Shadow private int rightClickDelayTimer;
-
-    @Shadow private void clickMouse() {}
-    @Shadow private void rightClickMouse() {}
-    @Shadow private void middleClickMouse() {}
+public abstract class MixinMinecraft implements IMinecraft {
 
     @Inject(method = "runTick", at = @At("HEAD"))
     public void onTick(CallbackInfo ci) {
@@ -153,29 +140,14 @@ public void shutdown(CallbackInfo ci) {
             ci.cancel();
     }
 
-    @Override
-    public Timer getTimer() {
-        return this.timer;
-    }
-
-    @Override
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
     @Override
     public void clickMouse(ClickEvent.MouseButton button) {
         // IF statements are required because Mixin doesn't support SWITCH
         if (button == LEFT)
-            clickMouse();
+            leftClickMouse();
         if (button == RIGHT)
             rightClickMouse();
         if (button == MIDDLE)
             middleClickMouse();
     }
-
-    @Override
-    public void setRightClickDelayTimer(int delay) {
-        this.rightClickDelayTimer = delay;
-    }
 }

src/main/java/me/zero/client/load/mixin/wrapper/IMinecraft.java

@@ -17,38 +17,47 @@
 package me.zero.client.load.mixin.wrapper;
 
 import me.zero.client.api.event.defaults.ClickEvent;
+import net.minecraft.client.Minecraft;
 import net.minecraft.util.Session;
 import net.minecraft.util.Timer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
 /**
  * @author Brady
  * @since 2/20/2017 12:00 PM
  */
+@Mixin(Minecraft.class)
 public interface IMinecraft {
 
     /**
      * @return Returns the Game's Timer
      */
-    Timer getTimer();
+    @Accessor Timer getTimer();
 
     /**
      * Sets the game's session
      *
      * @param session The new Session
      */
-    void setSession(Session session);
+    @Accessor void setSession(Session session);
 
     /**
-     * Clicks a mouse button
+     * Sets the right click delay timer
      *
-     * @param button The button
+     * @param delay The new right click delay
      */
-    void clickMouse(ClickEvent.MouseButton button);
+    @Accessor void setRightClickDelayTimer(int delay);
+
+    @Invoker("clickMouse") void leftClickMouse();
+    @Invoker("rightClickMouse") void rightClickMouse();
+    @Invoker("middleClickMouse") void middleClickMouse();
 
     /**
-     * Sets the right click delay timer
+     * Clicks a mouse button
      *
-     * @param delay The new right click delay
+     * @param button The button
      */
-    void setRightClickDelayTimer(int delay);
+    void clickMouse(ClickEvent.MouseButton button);
 }

src/main/resources/mixins.wrapper.capi.json

@@ -9,6 +9,7 @@
     "IGameType",
     "IItemRenderer",
     "IKeyBinding",
+    "IMinecraft",
     "IPlayerControllerMP",
     "IRenderManager",
     "IShaderGroup",