update to 1.9

RecursiveG · RecursiveG · commit bd19d56485fb · 2016-03-29T16:46:27.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+build
+*.iml
+*.jar
+*.class
+.gradle
+src/main/java/net/minecraft
diff --git a/build.gradle b/build.gradle
@@ -1,54 +1,37 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
     }
 }
+apply plugin: 'net.minecraftforge.gradle.forge'
 
-apply plugin: 'forge'
-
-version = "0.4-beta"
-group= "org.devinprogress.YAIF" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "YetAnotherInputFix-1.8"
+version = "0.5-beta"
+group= "org.devinprogress.yaif"
+archivesBaseName = "YetAnotherInputFix-1.9"
 
 minecraft {
-    version = "1.8-11.14.1.1328"
-    runDir = "eclipse"
-    mappings = 'snapshot_20150221'
+    version = "1.9-12.16.0.1813-1.9"
+    runDir = "../gameDir"
+    mappings = 'snapshot_20160329'
 }
 
 jar
 {
     manifest {
-        attributes 'FMLCorePlugin': 'org.devinprogress.YAIF.fmlplugin.Loader'
+        attributes 'FMLCorePlugin': 'org.devinprogress.yaif.fmlplugin.Loader'
         attributes 'FMLCorePluginContainsFMLMod': true
         attributes 'FMLAT': 'inputfix_at.cfg'
     }
 }
 
 dependencies {
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
-      
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
 }
 
@@ -61,11 +44,11 @@ processResources
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-                
+
         // replace version and mcversion
         expand 'version':project.version, 'mcversion':project.minecraft.version
     }
-        
+
     // copy everything else, thats not the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
diff --git a/src/main/java/org/devinprogress/yaif/GuiStateManager.java b/src/main/java/org/devinprogress/yaif/GuiStateManager.java
@@ -1,12 +1,12 @@
-package org.devinprogress.YAIF;
+package org.devinprogress.yaif;
 
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiScreenBook;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
 import net.minecraft.client.gui.inventory.GuiEditSign;
-import org.devinprogress.YAIF.Bridges.*;
+import org.devinprogress.yaif.bridges.*;
 
 import java.lang.reflect.Field;
 import java.util.HashSet;
diff --git a/src/main/java/org/devinprogress/yaif/InputFieldWrapper.java b/src/main/java/org/devinprogress/yaif/InputFieldWrapper.java
@@ -1,14 +1,10 @@
-package org.devinprogress.YAIF;
+package org.devinprogress.yaif;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.util.Util;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.apache.logging.log4j.LogManager;
-import org.devinprogress.YAIF.Bridges.BaseActionBridge;
-import org.lwjgl.input.Keyboard;
+import org.devinprogress.yaif.bridges.BaseActionBridge;
 import org.lwjgl.opengl.AWTGLCanvas;
 import org.lwjgl.opengl.Display;
 
@@ -18,9 +14,6 @@
 import java.awt.event.ComponentEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.nio.ByteBuffer;
 
 // Author: Recursive G
 // Source released under GPLv2
@@ -75,7 +68,7 @@ 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
+        if(Util.getOSType()==Util.EnumOS.OSX) {  //OSX blacks-screen patch
             panel.addComponentListener(new ComponentAdapter() {
                 @Override
                 public void componentResized(ComponentEvent e) {
@@ -107,6 +100,12 @@ public void windowClosing(WindowEvent e) {
         frame.validate();
         frame.setLocationRelativeTo(null);
         frame.setVisible(true);
+
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+        }
     }
 
     public void setupBridge(BaseActionBridge bridge){
diff --git a/src/main/java/org/devinprogress/yaif/YetAnotherInputFix.java b/src/main/java/org/devinprogress/yaif/YetAnotherInputFix.java
@@ -1,4 +1,4 @@
-package org.devinprogress.YAIF;
+package org.devinprogress.yaif;
 
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraftforge.client.event.GuiOpenEvent;
@@ -54,18 +54,18 @@ public void load(FMLInitializationEvent event) {
     @SubscribeEvent
     public void onGuiChange(GuiScreenEvent.InitGuiEvent.Post e) {
         //log("PostGuiChangeEvent {GUI:%s}",e.gui.toString());
-        stateMachine.postInitGuiEvent(e.gui);
+        stateMachine.postInitGuiEvent(e.getGui());
     }
 
     @SubscribeEvent
     public void preGuiInit(GuiScreenEvent.InitGuiEvent.Pre e){
         //log("PreGuiInitEvent {GUI:%s}",e.gui.toString());
-        stateMachine.preInitGuiEvent(e.gui);
+        stateMachine.preInitGuiEvent(e.getGui());
     }
 
     @SubscribeEvent
     public void onGuiOpen(GuiOpenEvent e){
-        if(e.gui==null) {
+        if(e.getGui()==null) {
             //log("NullGui Open");
             stateMachine.nullGuiOpenEvent(FMLClientHandler.instance().getClient().currentScreen);
         }
diff --git a/src/main/java/org/devinprogress/yaif/bridges/BaseActionBridge.java b/src/main/java/org/devinprogress/yaif/bridges/BaseActionBridge.java
@@ -1,4 +1,4 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiChat;
diff --git a/src/main/java/org/devinprogress/yaif/bridges/CommonBridgeNoField.java b/src/main/java/org/devinprogress/yaif/bridges/CommonBridgeNoField.java
@@ -1,9 +1,9 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 import net.minecraft.client.gui.GuiScreen;
-import org.devinprogress.YAIF.GuiStateManager;
-import org.devinprogress.YAIF.InputFieldWrapper;
-import org.devinprogress.YAIF.YetAnotherInputFix;
+import org.devinprogress.yaif.GuiStateManager;
+import org.devinprogress.yaif.InputFieldWrapper;
+import org.devinprogress.yaif.YetAnotherInputFix;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/main/java/org/devinprogress/yaif/bridges/CommonBridgeTextField.java b/src/main/java/org/devinprogress/yaif/bridges/CommonBridgeTextField.java
@@ -1,10 +1,10 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
-import org.devinprogress.YAIF.GuiStateManager;
-import org.devinprogress.YAIF.InputFieldWrapper;
-import org.devinprogress.YAIF.YetAnotherInputFix;
+import org.devinprogress.yaif.GuiStateManager;
+import org.devinprogress.yaif.InputFieldWrapper;
+import org.devinprogress.yaif.YetAnotherInputFix;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/main/java/org/devinprogress/yaif/bridges/CreativeInventoryBridge.java b/src/main/java/org/devinprogress/yaif/bridges/CreativeInventoryBridge.java
@@ -1,8 +1,8 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
-import org.devinprogress.YAIF.InputFieldWrapper;
+import org.devinprogress.yaif.InputFieldWrapper;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/main/java/org/devinprogress/yaif/bridges/DoNothingBridge.java b/src/main/java/org/devinprogress/yaif/bridges/DoNothingBridge.java
@@ -1,4 +1,4 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 /**
  * Created by recursiveg on 14-12-17.
diff --git a/src/main/java/org/devinprogress/yaif/bridges/EditSignBridge.java b/src/main/java/org/devinprogress/yaif/bridges/EditSignBridge.java
@@ -1,9 +1,9 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 import net.minecraft.client.gui.inventory.GuiEditSign;
 import net.minecraft.tileentity.TileEntitySign;
-import net.minecraft.util.ChatComponentText;
-import org.devinprogress.YAIF.InputFieldWrapper;
+import net.minecraft.util.text.TextComponentString;
+import org.devinprogress.yaif.InputFieldWrapper;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -87,9 +87,9 @@ public void run() {
                     wrapper.setText(str.substring(0,signLineLimit));
                 }
             });
-            sign.signText[currentLine]=new ChatComponentText(str.substring(0,signLineLimit));
+            sign.signText[currentLine]=new TextComponentString(str.substring(0,signLineLimit));
         }else {
-            sign.signText[currentLine]=new ChatComponentText(str);
+            sign.signText[currentLine]=new TextComponentString(str);
         }
     }
 
diff --git a/src/main/java/org/devinprogress/yaif/bridges/GuiBookBridge.java b/src/main/java/org/devinprogress/yaif/bridges/GuiBookBridge.java
@@ -1,7 +1,7 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 import net.minecraft.client.gui.GuiScreenBook;
-import org.devinprogress.YAIF.InputFieldWrapper;
+import org.devinprogress.yaif.InputFieldWrapper;
 
 // Author: Recursive G
 // Source released under GPLv2
diff --git a/src/main/java/org/devinprogress/yaif/bridges/GuiChatBridge.java b/src/main/java/org/devinprogress/yaif/bridges/GuiChatBridge.java
@@ -1,8 +1,8 @@
-package org.devinprogress.YAIF.Bridges;
+package org.devinprogress.yaif.bridges;
 
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.GuiTextField;
-import org.devinprogress.YAIF.InputFieldWrapper;
+import org.devinprogress.yaif.InputFieldWrapper;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/main/java/org/devinprogress/yaif/fmlplugin/AccessTransformer.java b/src/main/java/org/devinprogress/yaif/fmlplugin/AccessTransformer.java
@@ -1,4 +1,4 @@
-package org.devinprogress.YAIF.fmlplugin;
+package org.devinprogress.yaif.fmlplugin;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/devinprogress/yaif/fmlplugin/BaseAsmTransformer.java b/src/main/java/org/devinprogress/yaif/fmlplugin/BaseAsmTransformer.java
@@ -1,11 +1,8 @@
-package org.devinprogress.YAIF.fmlplugin;
+package org.devinprogress.yaif.fmlplugin;
 
 import net.minecraft.launchwrapper.IClassTransformer;
-import net.minecraftforge.fml.common.asm.ASMTransformerWrapper;
 import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
 import net.minecraftforge.fml.relauncher.FMLRelaunchLog;
-import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
-import org.apache.logging.log4j.LogManager;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.AbstractInsnNode;
diff --git a/src/main/java/org/devinprogress/yaif/fmlplugin/BytecodeTransformer.java b/src/main/java/org/devinprogress/yaif/fmlplugin/BytecodeTransformer.java
@@ -1,4 +1,4 @@
-package org.devinprogress.YAIF.fmlplugin;
+package org.devinprogress.yaif.fmlplugin;
 
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.*;
@@ -27,7 +27,7 @@ public void transform(MethodNode mn, String srgName, boolean devEnv, String obfe
             mn.instructions.insertBefore(n,new VarInsnNode(Opcodes.ALOAD,0));
             mn.instructions.insertBefore(n,new FieldInsnNode(Opcodes.GETFIELD,obfedClassName.replace('.','/'),heightVarName,"I"));
             mn.instructions.insertBefore(n,new MethodInsnNode(Opcodes.INVOKESTATIC,
-                    "org/devinprogress/YAIF/YetAnotherInputFix","SetupTextFieldWrapper","(II)V",false));
+                    "org/devinprogress/yaif/YetAnotherInputFix","SetupTextFieldWrapper","(II)V",false));
         }
     }
 
@@ -38,7 +38,7 @@ public void transform(MethodNode mn, String srgName, boolean devEnv, String obfe
             mn.instructions.insertBefore(n,new VarInsnNode(Opcodes.ALOAD,0));
             mn.instructions.insertBefore(n,new VarInsnNode(Opcodes.ILOAD,1));
             mn.instructions.insertBefore(n,new MethodInsnNode(Opcodes.INVOKESTATIC,
-                    "org/devinprogress/YAIF/YetAnotherInputFix","TextFieldFocusChange",
+                    "org/devinprogress/yaif/YetAnotherInputFix","TextFieldFocusChange",
                     "(L"+obfedClassName.replace('.','/')+";Z)V",false));
         }
     }
@@ -48,7 +48,7 @@ private class onTabComplete implements IMethodTransformer{
         public void transform(MethodNode mn, String srgName, boolean devEnv, String classObfName) {
             AbstractInsnNode n=getNthInsnNode(mn, Opcodes.INVOKEVIRTUAL, 2);
             mn.instructions.insert(n, new MethodInsnNode(Opcodes.INVOKESTATIC,
-                    "org/devinprogress/YAIF/YetAnotherInputFix", "onTabCompletePacket", "()V", false));
+                    "org/devinprogress/yaif/YetAnotherInputFix", "onTabCompletePacket", "()V", false));
         }
     }
 }
diff --git a/src/main/java/org/devinprogress/yaif/fmlplugin/Loader.java b/src/main/java/org/devinprogress/yaif/fmlplugin/Loader.java
@@ -1,4 +1,4 @@
-package org.devinprogress.YAIF.fmlplugin;
+package org.devinprogress.yaif.fmlplugin;
 
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 
diff --git a/src/main/java/org/devinprogress/yaif/switchListener.java b/src/main/java/org/devinprogress/yaif/switchListener.java
@@ -1,4 +1,4 @@
-package org.devinprogress.YAIF;
+package org.devinprogress.yaif;
 
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -1,10 +1,13 @@
-[
 {
-  "modid": "YAIF",
-  "name": "Yet Another InputFix",
-  "description": "InputFix MOD using ASMTransformer.",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
-  "authorList": ["RecursiveG"]
+  "modListVersion": 2,
+  "modList": [{
+    "modid": "yaif",
+    "name": "Yet Another InputFix",
+    "description": "Add extra TextField allowing CJK input",
+    "version": "${version}",
+    "mcversion": "${mcversion}",
+    "url": "https://github.com/RecursiveG/Yet-Another-Input-Fix",
+    "authorList": [ "RecursiveG" ],
+    "useDependencyInformation": false
+  }]
 }
-]

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +build
 +*.iml
 +*.jar
 +*.class
 +.gradle
 +src/main/java/net/minecraft
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.devinprogress.YAIF.Bridges;`
	`1`	`+package org.devinprogress.yaif.bridges;`
`2`	`2`
`3`	`3`	`import net.minecraft.client.Minecraft;`
`4`	`4`	`import net.minecraft.client.gui.GuiChat;`