cleanup & fix for obfuscated env

Author: RecursiveG

src/main/java/org/devinprogress/YAIF/Bridges/EditSignBridge.java

@@ -37,7 +37,7 @@ public EditSignBridge(GuiEditSign gui,InputFieldWrapper w){
             }
 
         try {
-            currentLineField = gui.getClass().getDeclaredField(YetAnotherInputFix.ObfuscatedEnv ? "h" : "editLine");
+            currentLineField = gui.getClass().getDeclaredField(YetAnotherInputFix.ObfuscatedEnv ? "field_146851_h" : "editLine");
             currentLineField.setAccessible(true);
         }catch(Exception e){
             e.printStackTrace();
@@ -57,6 +57,7 @@ public ActionFeedback onEnter(JTextField txt) {
 
     @Override
     public ActionFeedback onEsc(JTextField txt) {
+        //SetInGameFocus will close the GuiEditSign.
         return ActionFeedback.Quit;
     }
 

src/main/java/org/devinprogress/YAIF/Bridges/GuiChatBridge.java

@@ -1,17 +1,14 @@
 package org.devinprogress.YAIF.Bridges;
 
-import cpw.mods.fml.client.FMLClientHandler;
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
 import org.devinprogress.YAIF.InputFieldWrapper;
 import org.devinprogress.YAIF.YetAnotherInputFix;
-import org.lwjgl.input.Keyboard;
 
 import javax.swing.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.logging.Logger;
 
 /**
  * Created by recursiveg on 14-9-13.
@@ -71,11 +68,7 @@ public ActionFeedback onEnter(JTextField txt) { //send
 
     @Override
     public ActionFeedback onEsc(JTextField txt) {
-        /*try {
-            keyTypedMethod.invoke(screen, ' ', 1);
-        }catch(Exception e){
-            e.printStackTrace();
-        }*/
+        //SetInGameFocus will close the GuiChat.
         return ActionFeedback.Quit;
     }
 

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

@@ -1,6 +1,5 @@
 package org.devinprogress.YAIF;
 
-import com.sun.istack.internal.Nullable;
 import cpw.mods.fml.client.FMLClientHandler;
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.inventory.GuiEditSign;
@@ -169,7 +168,6 @@ public void show(){//called when GuiTextField: New/Re-click/change
         }
     }
 
-    //TODO: Fix Bugs about focus
     public void hide(){
         bridge=null;
         if(!shown)return;
@@ -195,7 +193,6 @@ public void DoActions(IActionBridge.ActionFeedback action, Object obj){
         }
     }
 
-    @Nullable
     private IActionBridge getBridge(){//Remember to add cases here if new Bridges added.
         if(bridge!=null&&bridge.sameAs(YetAnotherInputFix.currentGuiScreen,YetAnotherInputFix.currentTextField))
             return bridge;

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

@@ -1,27 +1,18 @@
 package org.devinprogress.YAIF;
 
-import com.google.common.eventbus.EventBus;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.*;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-import cpw.mods.fml.common.versioning.VersionRange;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiScreenBook;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.inventory.GuiEditSign;
-import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import org.lwjgl.opengl.Display;
 
-import java.io.File;
 import java.lang.reflect.Field;
-import java.security.cert.Certificate;
 import java.util.*;
 import java.util.logging.Logger;
 
@@ -55,9 +46,6 @@ public void load(FMLInitializationEvent event) {
 
     @SubscribeEvent
     public void onGuiChange(GuiScreenEvent.InitGuiEvent.Post e) {
-        if(e.gui==null){
-            logger.info("EventGui == null");
-        }
         if(e.gui instanceof GuiEditSign){
             currentGuiScreen=e.gui;
             currentTextField=null;
@@ -82,15 +70,9 @@ public void tryGetFocus(TickEvent.ClientTickEvent event){
         }
     }
 
+    //Called from GuiTextField.setFocused() due to ASMTransformed
     public static void TextFieldFocusChange(GuiTextField textField, boolean isFocused) {
         if (isFocused) {
-            /*if (currentGuiScreen != null) {
-                currentTextField = textField;
-                wrapper.show();
-            }else {
-                currentTextField = null;
-                wrapper.hide();
-            }*/
             GuiScreen sc= FMLClientHandler.instance().getClient().currentScreen;
             if(GuiCanInput(sc)){
                 currentGuiScreen=sc;