💄 Refactoring Mixins

Author: Hexeption

src/main/java/uk/co/hexeption/darkforge/MC.java

@@ -18,11 +18,13 @@
 package uk.co.hexeption.darkforge;
 
 import net.minecraft.client.Minecraft;
+import uk.co.hexeption.darkforge.mixin.imp.IMixinMinecraft;
 
 /**
  * Created by Keir on 21/04/2017.
  */
 public interface MC {
 
     Minecraft mc = Minecraft.getMinecraft();
+    IMixinMinecraft mixMC = (IMixinMinecraft) mc;
 }

src/main/java/uk/co/hexeption/darkforge/mod/Mod.java

@@ -26,6 +26,7 @@
 import net.minecraft.client.settings.GameSettings;
 import org.lwjgl.input.Keyboard;
 import uk.co.hexeption.darkforge.DarkForge;
+import uk.co.hexeption.darkforge.MC;
 import uk.co.hexeption.darkforge.event.EventListener;
 import uk.co.hexeption.darkforge.font.MinecraftFontRenderer;
 import uk.co.hexeption.darkforge.managers.EventManager;
@@ -38,7 +39,7 @@
 /**
  * Created by Hexeption on 15/01/2017.
  */
-public abstract class Mod implements EventListener {
+public abstract class Mod implements EventListener, MC {
 
     protected Minecraft mc = Minecraft.getMinecraft();
 

src/main/java/uk/co/hexeption/darkforge/mod/mods/movement/BHop.java

@@ -44,7 +44,7 @@ public void onEvent(Event event) {
 
         if (getState() && event.getType() == Event.Type.PRE) {
             if (event instanceof EventMove) {
-                ((IMixinMinecraft) mc).getTimer().timerSpeed = 1.0888F;
+                mixMC.getTimer().timerSpeed = 1.0888F;
 
                 if ((!mc.player.isCollidedHorizontally)) {
                     if (MathUtils.round(mc.player.posY - (int) mc.player.posY, 3) == MathUtils.round(0.4D, 3)) {

src/main/java/uk/co/hexeption/darkforge/utils/LoginUtils.java

@@ -27,40 +27,15 @@
 import net.minecraft.util.Session;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import uk.co.hexeption.darkforge.MC;
 
 import java.lang.reflect.Field;
 import java.net.Proxy;
 
-public class LoginUtils {
+public class LoginUtils implements MC{
 
     private static final Logger logger = LogManager.getLogger();
 
-    public static void setSession(Session s) throws IllegalAccessException {
-
-        Class<? extends Minecraft> mc = Minecraft.getMinecraft().getClass();
-        try {
-            Field session = null;
-
-            for (Field f : mc.getDeclaredFields()) {
-                if (f.getType().isInstance(s)) {
-                    session = f;
-                }
-            }
-
-            if (session == null) {
-                throw new IllegalStateException("no field of type " + Session.class.getCanonicalName() + " declared.");
-            }
-
-            session.setAccessible(true);
-            session.set(Minecraft.getMinecraft(), s);
-            session.setAccessible(false);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-
     public static String loginAlt(String email, String password) {
 
         YggdrasilAuthenticationService authenticationService = new YggdrasilAuthenticationService(Proxy.NO_PROXY, "");
@@ -71,7 +46,7 @@ public static String loginAlt(String email, String password) {
 
         try {
             authentication.logIn();
-            setSession(new Session(authentication.getSelectedProfile().getName(), authentication.getSelectedProfile().getId().toString(), authentication.getAuthenticatedToken(), "mojang"));
+            mixMC.setSession(new Session(authentication.getSelectedProfile().getName(), authentication.getSelectedProfile().getId().toString(), authentication.getAuthenticatedToken(), "mojang"));
             displayText = "";
         } catch (AuthenticationUnavailableException e) {
             displayText = "§4§lCannot contact authentication server!";
@@ -86,8 +61,6 @@ public static String loginAlt(String email, String password) {
             logger.error(e.getMessage());
         } catch (NullPointerException e) {
             displayText = "§4§lWrong password!";
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
         }
 
         return displayText;
@@ -110,11 +83,7 @@ public static String getName(String email, String password) {
 
     public static void changeCrackedName(String name) {
 
-        try {
-            setSession(new Session(name, "", "", "mojang"));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        mixMC.setSession(new Session(name, "", "", "mojang"));
     }