Skip to content
This repository was archived by the owner on Jan 3, 2020. It is now read-only.

Commit c0fe781

Browse files
RecursiveGRecursiveG
committed
clean up
1 parent f14b77b commit c0fe781

17 files changed

+364
-275
lines changed

‎README.MD

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
Using ASM Transformer to hook into Minecraft, hoping to provide a universal solution to Minecraft IME issue.
33
Forge Required.
44

5+
## Known Issues
6+
- Key Event not work properly
7+
- Focus not change on OSX
8+
- Not work with Java 8
9+
- harm to performance
10+
511
## License
6-
- GPLv3
7-
- **NOT** allowed in ModPacks without my permission.
12+
- GPLv2
813
- USE AT YOUR OWN RISK
14+

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717

1818
apply plugin: 'forge'
1919

20-
version = "0.2-dev"
20+
version = "0.3-dev"
2121
group= "org.devinprogress.YAIF" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2222
archivesBaseName = "YetAnotherInputFix"
2323

‎src/main/java/org/devinprogress/YAIF/Bridges/BaseActionBridge.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22

33
import net.minecraft.client.Minecraft;
44
import net.minecraft.client.gui.GuiChat;
5-
import net.minecraft.client.gui.GuiScreen;
6-
import net.minecraft.client.gui.GuiTextField;
7-
import org.devinprogress.YAIF.InputFieldWrapper;
85

96
import javax.swing.*;
107
import javax.swing.event.DocumentEvent;
118
import javax.swing.event.DocumentListener;
129
import java.awt.*;
13-
import java.awt.event.KeyEvent;
1410
import java.util.Collections;
1511

16-
/**
17-
* Created by recursiveg on 14-9-11.
18-
*/
12+
// Author: Recursive G
13+
// Source released under GPLv2
14+
// Full document under resources/LICENSE
15+
1916
public abstract class BaseActionBridge {
2017
protected boolean textChangedByBridge=false;
2118
private DocumentListener documentListener=null;

‎src/main/java/org/devinprogress/YAIF/Bridges/CommonBridgeNoField.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@
1010
import java.awt.event.KeyEvent;
1111
import java.lang.reflect.Method;
1212

13-
/**
14-
* Created by recursiveg on 14-11-12.
15-
*/
13+
// Author: Recursive G
14+
// Source released under GPLv2
15+
// Full document under resources/LICENSE
16+
1617
public class CommonBridgeNoField extends BaseActionBridge{
1718
private final GuiScreen gui;
1819
private final InputFieldWrapper wrapper;
1920
private Method keyTypedMethod=null;
2021

2122
public CommonBridgeNoField(GuiScreen screen,InputFieldWrapper wrapper){
22-
YetAnotherInputFix.log("CommonBridgeNoField Initialized. %s", this);
23+
//YetAnotherInputFix.log("CommonBridgeNoField Initialized. %s", this);
2324
gui=screen;
2425
this.wrapper=wrapper;
2526
try{
@@ -33,7 +34,7 @@ public CommonBridgeNoField(GuiScreen screen,InputFieldWrapper wrapper){
3334
@Override
3435
public boolean needShow(){
3536
if(keyTypedMethod==null){
36-
YetAnotherInputFix.log("failed to determine keyTypedMethod @%s",gui);
37+
//YetAnotherInputFix.log("failed to determine keyTypedMethod @%s",gui);
3738
return false;
3839
}
3940
return true;
@@ -80,7 +81,6 @@ public void run() {
8081
public void actionPerformed(ActionEvent e) {
8182
GuiStateManager.getInstance().TextFieldFocusChanged(gui,null,false);
8283
wrapper.closeInputField();
83-
//wrapper.bridgeQuit();
8484
}
8585
});
8686

‎src/main/java/org/devinprogress/YAIF/Bridges/CommonBridgeTextField.java

+5-10
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import java.awt.event.KeyEvent;
1212
import java.lang.reflect.Method;
1313

14-
/**
15-
* Created by recursiveg on 14-9-11.
16-
*/
14+
// Author: Recursive G
15+
// Source released under GPLv2
16+
// Full document under resources/LICENSE
1717

1818
public class CommonBridgeTextField extends BaseActionBridge {
1919
private GuiScreen scr=null;
@@ -22,7 +22,7 @@ public class CommonBridgeTextField extends BaseActionBridge {
2222
private Method keyTypedMethod=null;
2323

2424
public CommonBridgeTextField(GuiScreen screen,GuiTextField textField,InputFieldWrapper wrapper){
25-
YetAnotherInputFix.log("CommonBridgeTextField Initialized. %s",this);
25+
//YetAnotherInputFix.log("CommonBridgeTextField Initialized. %s",this);
2626
scr=screen;
2727
this.wrapper=wrapper;
2828
txt=textField;
@@ -38,12 +38,7 @@ public CommonBridgeTextField(GuiScreen screen,GuiTextField textField,InputFieldW
3838

3939
@Override
4040
public boolean needShow(){
41-
if(keyTypedMethod==null){
42-
YetAnotherInputFix.log("failed to determine keyTypedMethod @%s",scr);
43-
return false;
44-
}
45-
//return System.getProperty("YAIF.useCommonBridgeTextField","false").equals("true");
46-
return true;
41+
return keyTypedMethod!=null;
4742
}
4843

4944
@Override

‎src/main/java/org/devinprogress/YAIF/Bridges/CreativeInventoryBridge.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import net.minecraft.client.gui.GuiTextField;
44
import net.minecraft.client.gui.inventory.GuiContainerCreative;
55
import org.devinprogress.YAIF.InputFieldWrapper;
6-
import org.devinprogress.YAIF.YetAnotherInputFix;
76

87
import javax.swing.*;
98
import java.awt.event.ActionEvent;
109
import java.awt.event.KeyEvent;
1110

12-
/**
13-
* Created by recursiveg on 14-11-12.
14-
*/
11+
// Author: Recursive G
12+
// Source released under GPLv2
13+
// Full document under resources/LICENSE
14+
1515
public class CreativeInventoryBridge extends BaseActionBridge{
1616
private GuiContainerCreative gui;
1717
private GuiTextField searchField;
@@ -35,7 +35,7 @@ public void bindKeys(JTextField tf){
3535
bindKey(tf, KeyEvent.VK_ESCAPE, "esc", new AbstractAction() {
3636
@Override
3737
public void actionPerformed(ActionEvent e) {
38-
YetAnotherInputFix.log("CreativeInventoryBridge ESC Pressed");
38+
//YetAnotherInputFix.log("CreativeInventoryBridge ESC Pressed");
3939
wrapper.bridgeQuit();
4040
}
4141
});

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
package org.devinprogress.YAIF.Bridges;
22

3-
import net.minecraft.client.gui.GuiScreen;
4-
import net.minecraft.client.gui.GuiTextField;
53
import net.minecraft.client.gui.inventory.GuiEditSign;
64
import net.minecraft.tileentity.TileEntitySign;
75
import org.devinprogress.YAIF.InputFieldWrapper;
8-
import org.devinprogress.YAIF.YetAnotherInputFix;
96

107
import javax.swing.*;
118
import java.awt.event.ActionEvent;
129
import java.awt.event.KeyEvent;
1310

14-
/**
15-
* Created by recursiveg on 14-9-21.
16-
*/
11+
// Author: Recursive G
12+
// Source released under GPLv2
13+
// Full document under resources/LICENSE
14+
1715
public class EditSignBridge extends BaseActionBridge {
1816
private GuiEditSign gui;
1917
private InputFieldWrapper wrapper;
@@ -23,7 +21,6 @@ public EditSignBridge(GuiEditSign gui,InputFieldWrapper w){
2321
this.gui=gui;
2422
this.wrapper=w;
2523
currentLine=0;
26-
//w.setTextNoEvent("");
2724
sign=gui.tileSign;
2825
}
2926

@@ -49,7 +46,7 @@ public void actionPerformed(ActionEvent e) {
4946
bindKey(tf, KeyEvent.VK_ESCAPE, "esc", new AbstractAction() {
5047
@Override
5148
public void actionPerformed(ActionEvent e) {
52-
YetAnotherInputFix.log("GuiSignBridge ESC Pressed");
49+
//YetAnotherInputFix.log("GuiSignBridge ESC Pressed");
5350
wrapper.bridgeQuit();
5451
}
5552
});

‎src/main/java/org/devinprogress/YAIF/Bridges/GuiBookBridge.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import net.minecraft.client.gui.GuiScreenBook;
44
import org.devinprogress.YAIF.InputFieldWrapper;
55

6-
/**
7-
* Created by recursiveg on 14-11-13.
8-
*/
6+
// Author: Recursive G
7+
// Source released under GPLv2
8+
// Full document under resources/LICENSE
9+
910
public class GuiBookBridge extends CommonBridgeNoField{
1011
private GuiScreenBook bookScr=null;
1112

@@ -17,8 +18,5 @@ public GuiBookBridge(GuiScreenBook screen, InputFieldWrapper wrapper) {
1718
@Override
1819
public boolean needShow(){
1920
return bookScr.bookIsUnsigned;
20-
//return true;
2121
}
22-
23-
2422
}

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
package org.devinprogress.YAIF.Bridges;
22

3-
import cpw.mods.fml.client.FMLClientHandler;
43
import net.minecraft.client.gui.GuiChat;
5-
import net.minecraft.client.gui.GuiScreen;
64
import net.minecraft.client.gui.GuiTextField;
75
import org.devinprogress.YAIF.InputFieldWrapper;
8-
import org.devinprogress.YAIF.YetAnotherInputFix;
9-
import org.lwjgl.input.Keyboard;
106

117
import javax.swing.*;
128
import java.awt.event.ActionEvent;
139
import java.awt.event.KeyEvent;
1410

15-
/**
16-
* Created by recursiveg on 14-9-13.
17-
*/
11+
// Author: Recursive G
12+
// Source released under GPLv2
13+
// Full document under resources/LICENSE
14+
1815
public class GuiChatBridge extends BaseActionBridge {
1916
private GuiChat screen=null;
2017
private GuiTextField txt=null;
@@ -47,7 +44,7 @@ public void actionPerformed(ActionEvent e) {
4744
bindKey(tf, KeyEvent.VK_ESCAPE, "esc", new AbstractAction() {
4845
@Override
4946
public void actionPerformed(ActionEvent e) {
50-
YetAnotherInputFix.log("GuiChatBridge ESC Pressed");
47+
//YetAnotherInputFix.log("GuiChatBridge ESC Pressed");
5148
wrapper.bridgeQuit();
5249
}
5350
});

‎src/main/java/org/devinprogress/YAIF/GuiStateManager.java

+8-31
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
package org.devinprogress.YAIF;
22

3-
import cpw.mods.fml.client.FMLClientHandler;
4-
import net.minecraft.client.Minecraft;
53
import net.minecraft.client.gui.GuiChat;
64
import net.minecraft.client.gui.GuiScreen;
75
import net.minecraft.client.gui.GuiScreenBook;
86
import net.minecraft.client.gui.GuiTextField;
97
import net.minecraft.client.gui.inventory.GuiContainerCreative;
108
import net.minecraft.client.gui.inventory.GuiEditSign;
119
import org.devinprogress.YAIF.Bridges.*;
12-
import org.lwjgl.opengl.Display;
1310

1411
import java.lang.reflect.Field;
1512
import java.util.HashSet;
1613
import java.util.Set;
1714

18-
/**
19-
* Created by recursiveg on 14-11-11.
20-
*/
15+
// Author: Recursive G
16+
// Source released under GPLv2
17+
// Full document under resources/LICENSE
2118

2219
/* NEVER try to figure out how this f**king machine works */
2320
public class GuiStateManager {
@@ -54,20 +51,15 @@ public void TextFieldFocusChanged(GuiScreen screen, GuiTextField textField, bool
5451
bridge=getNewBridge();
5552
wrapper.setupBridge(bridge);
5653
}else{//the TextField in a new bridge
57-
if(screen==incomingScreen||screen==currentScreen) {
54+
if(screen==incomingScreen) {
5855
currentScreen = screen;
5956
incomingScreen=null;
6057
currentTextField = textField;
6158
bridge = getNewBridge();
62-
wrapper.setupBridge(bridge);/*
63-
}else if(screen instanceof GuiContainerCreative){
64-
currentScreen = screen;
65-
currentTextField = textField;
66-
bridge = getNewBridge();
67-
wrapper.setupBridge(bridge);*/
68-
}else{
59+
wrapper.setupBridge(bridge);
60+
}/*else{
6961
YetAnotherInputFix.log("WTF TextField %s Init without screen?",textField);
70-
}
62+
}*/
7163
}
7264
}else{
7365
if(textField==currentTextField) {
@@ -98,7 +90,7 @@ else if(hasGuiTextField(currentScreen))
9890
}
9991

10092
public void onTabCompletePacket(GuiScreen screen) {
101-
GuiChat chatScreen=null;
93+
GuiChat chatScreen;
10294
if(screen instanceof GuiChat)
10395
chatScreen=(GuiChat)screen;
10496
else
@@ -123,21 +115,6 @@ public void postInitGuiEvent(GuiScreen screen) {
123115
bridge=getNewBridge();
124116
wrapper.setupBridge(bridge);
125117
}
126-
/*
127-
if(currentScreen!=null)
128-
return;
129-
130-
if(bridge==null){
131-
wrapper.closeInputField();
132-
bridge=null;
133-
this.currentScreen=null;
134-
this.currentTextField=null;
135-
this.incomingScreen=null;
136-
}else{
137-
bridge.postGuiInit();
138-
}
139-
*/
140-
141118
if (incomingScreen==screen) {
142119
currentScreen = incomingScreen;
143120
incomingScreen = null;

0 commit comments

Comments
 (0)