OSX black screen fix, java8 not work

Author: RecursiveG

src/main/java/org/devinprogress/YAIF/InputFieldWrapper.java

@@ -2,12 +2,15 @@
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
+import net.minecraft.util.Util;
 import org.devinprogress.YAIF.Bridges.BaseActionBridge;
 import org.lwjgl.opengl.AWTGLCanvas;
 import org.lwjgl.opengl.Display;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
@@ -63,6 +66,23 @@ public InputFieldWrapper(int Width,int Height){ //Should be Called only once
         panel.add(textField, BorderLayout.PAGE_END);
         panel.setVisible(true);
         panel.validate();
+        if(Util.getOSType()==Util.EnumOS.OSX&&false) {  //OSX blacks-screen patch
+            panel.addComponentListener(new ComponentAdapter() {
+                @Override
+                public void componentResized(ComponentEvent e) {
+                    YetAnotherInputFix.log("Panel Resizing...");
+                    SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            panel.requestFocusInWindow();
+                            canvas.requestFocusInWindow();
+                            canvas.requestFocus();
+                            YetAnotherInputFix.needCurrent = true;
+                        }
+                    });
+                }
+            });
+        }
 
         // Setup frame
         frame.setUndecorated(false);
@@ -71,8 +91,8 @@ public InputFieldWrapper(int Width,int Height){ //Should be Called only once
         frame.addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(WindowEvent e) {
-                FMLCommonHandler.instance().exitJava(0,false);
-                //FMLClientHandler.instance().getClient().shutdown();
+                //FMLCommonHandler.instance().exitJava(0,false);
+                FMLClientHandler.instance().getClient().shutdown();
             }
         });
         frame.pack();

src/main/java/org/devinprogress/YAIF/YetAnotherInputFix.java

@@ -20,7 +20,6 @@
 public class YetAnotherInputFix{
     private static GuiStateManager stateMachine=null;
     public static boolean ObfuscatedEnv=true;
-    public static boolean needFocus=false;
 
     public static void log(String msg,Object... args){
         LogManager.getLogger("YAIF").info(String.format(msg,args));
@@ -73,7 +72,12 @@ public void onGuiOpen(GuiOpenEvent e){
 
     //Multi-threading is a problem
     //TODO: UGLY PATCH!!!
-    //TODO: use ASM to reduce potential lag
+    //TODO: Use better ways to deal with the problems addressed below
+    public static boolean needFocus=false;
+    public static boolean needCurrent=false;
+    private static int downCounter=0;
+    private static int logCounter=0;
+
     @SubscribeEvent
     public void tryGetFocus(TickEvent.ClientTickEvent event){
         if(needFocus){
@@ -82,10 +86,23 @@ public void tryGetFocus(TickEvent.ClientTickEvent event){
             }catch(Exception e){
                 e.printStackTrace();
             }
+            ++logCounter;
             if(Display.isActive()){
                 FMLClientHandler.instance().getClient().setIngameFocus();
-
+                log("Focus Grabbed after %s tries",logCounter);
                 needFocus=false;
+                logCounter=0;
+            }
+        }
+        if(needCurrent){
+            downCounter=100;
+            needCurrent=false;
+        }
+        if(--downCounter>0){
+            try{
+                Display.makeCurrent();
+            }catch(Exception e){
+                e.printStackTrace();
             }
         }
     }