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

Commit 5328853

Browse files
RecursiveGRecursiveG
committed
code format
1 parent ce2d0ba commit 5328853

16 files changed

+396
-383
lines changed

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

Lines changed: 68 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
import net.minecraft.client.gui.GuiTextField;
77
import net.minecraft.client.gui.inventory.GuiContainerCreative;
88
import net.minecraft.client.gui.inventory.GuiEditSign;
9-
import org.devinprogress.yaif.bridges.*;
9+
import org.devinprogress.yaif.bridges.BaseActionBridge;
10+
import org.devinprogress.yaif.bridges.DoNothingBridge;
11+
import org.devinprogress.yaif.bridges.EditSignBridge;
12+
import org.devinprogress.yaif.bridges.GuiChatBridge;
1013

1114
import java.lang.reflect.Field;
1215
import java.util.HashSet;
@@ -18,128 +21,131 @@
1821

1922
/* NEVER try to figure out how this f**king machine works */
2023
public class GuiStateManager {
21-
private static GuiStateManager INSTANCE=null;
22-
private InputFieldWrapper wrapper=null;
23-
private GuiScreen currentScreen=null,incomingScreen=null;
24-
private GuiTextField currentTextField=null;
25-
private BaseActionBridge bridge=null;
26-
private Set<Class> InputableGui=new HashSet<Class>(){{add(GuiEditSign.class);add(GuiScreenBook.class);}};
27-
private Set<Class> UnInputableGui=new HashSet<Class>();
28-
29-
private GuiStateManager(){
30-
if (INSTANCE!=null)
24+
private static GuiStateManager INSTANCE = null;
25+
private InputFieldWrapper wrapper = null;
26+
private GuiScreen currentScreen = null, incomingScreen = null;
27+
private GuiTextField currentTextField = null;
28+
private BaseActionBridge bridge = null;
29+
private Set<Class> InputableGui = new HashSet<Class>() {{
30+
add(GuiEditSign.class);
31+
add(GuiScreenBook.class);
32+
}};
33+
private Set<Class> UnInputableGui = new HashSet<Class>();
34+
35+
private GuiStateManager() {
36+
if (INSTANCE != null)
3137
throw new RuntimeException("Duplicated Initialization for GuiStateManager");
3238
}
3339

34-
public static GuiStateManager getInstance(){
35-
if(INSTANCE==null)
36-
INSTANCE=new GuiStateManager();
40+
public static GuiStateManager getInstance() {
41+
if (INSTANCE == null)
42+
INSTANCE = new GuiStateManager();
3743
return INSTANCE;
3844
}
3945

40-
public void setWrapper(InputFieldWrapper w){
41-
if(wrapper!=null)
46+
public void setWrapper(InputFieldWrapper w) {
47+
if (wrapper != null)
4248
throw new RuntimeException("InputFieldWrapper already set.");
43-
wrapper=w;
49+
wrapper = w;
4450
}
4551

4652
public void TextFieldFocusChanged(GuiScreen screen, GuiTextField textField, boolean isFocused) {
47-
if(isFocused){
48-
if(screen==currentScreen){//textField switched in the same GUI
53+
if (isFocused) {
54+
if (screen == currentScreen) {//textField switched in the same GUI
4955
wrapper.releaseCurrentBridge();
50-
currentTextField=textField;
51-
bridge=getNewBridge();
56+
currentTextField = textField;
57+
bridge = getNewBridge();
5258
wrapper.setupBridge(bridge);
53-
}else{//the TextField in a new bridge
54-
if(screen==incomingScreen) {
59+
} else {//the TextField in a new bridge
60+
if (screen == incomingScreen) {
5561
currentScreen = screen;
56-
incomingScreen=null;
62+
incomingScreen = null;
5763
currentTextField = textField;
5864
bridge = getNewBridge();
5965
wrapper.setupBridge(bridge);
6066
}/*else{
6167
YetAnotherInputFix.log("WTF TextField %s Init without screen?",textField);
6268
}*/
6369
}
64-
}else{
65-
if(textField==currentTextField) {
70+
} else {
71+
if (textField == currentTextField) {
6672
wrapper.releaseCurrentBridge();
6773
bridge = null;
68-
currentTextField=null;
74+
currentTextField = null;
6975
}
70-
if(currentScreen instanceof GuiContainerCreative) {
76+
if (currentScreen instanceof GuiContainerCreative) {
7177
wrapper.closeInputField();
72-
bridge=null;
78+
bridge = null;
7379
}
7480
}
7581
}
7682

7783
private BaseActionBridge getNewBridge() {
78-
if(currentScreen instanceof GuiChat)
79-
return new GuiChatBridge(currentTextField,(GuiChat)currentScreen,wrapper);
80-
else if(currentScreen instanceof GuiEditSign)
81-
return new EditSignBridge((GuiEditSign)currentScreen,wrapper);
84+
if (currentScreen instanceof GuiChat)
85+
return new GuiChatBridge(currentTextField, (GuiChat) currentScreen, wrapper);
86+
else if (currentScreen instanceof GuiEditSign)
87+
return new EditSignBridge((GuiEditSign) currentScreen, wrapper);
8288
else
8389
return new DoNothingBridge();
8490
}
8591

8692
public void onTabCompletePacket(GuiScreen screen) {
8793
GuiChat chatScreen;
88-
if(screen instanceof GuiChat)
89-
chatScreen=(GuiChat)screen;
94+
if (screen instanceof GuiChat)
95+
chatScreen = (GuiChat) screen;
9096
else
9197
throw new RuntimeException("PacketTabComplete Received but GuiChat was not shown.");
9298
bridge.onTabComplete(chatScreen);
9399
}
94100

95-
public void preInitGuiEvent(GuiScreen gui){
96-
if(hasGuiTextField(gui))
97-
incomingScreen=gui;
101+
public void preInitGuiEvent(GuiScreen gui) {
102+
if (hasGuiTextField(gui))
103+
incomingScreen = gui;
98104
else {
99105
incomingScreen = null;
100106
wrapper.closeInputField();
101-
bridge=null;
107+
bridge = null;
102108
}
103109
}
104110

105111
public void postInitGuiEvent(GuiScreen screen) {
106-
if(screen instanceof GuiEditSign||screen instanceof GuiScreenBook){
107-
currentScreen=screen;
108-
incomingScreen=null;
109-
bridge=getNewBridge();
112+
if (screen instanceof GuiEditSign || screen instanceof GuiScreenBook) {
113+
currentScreen = screen;
114+
incomingScreen = null;
115+
bridge = getNewBridge();
110116
wrapper.setupBridge(bridge);
111117
}
112-
if (incomingScreen==screen) {
118+
if (incomingScreen == screen) {
113119
currentScreen = incomingScreen;
114120
incomingScreen = null;
115-
}else if(bridge!=null){
121+
} else if (bridge != null) {
116122
bridge.postGuiInit();
117123
}
118124
}
119125

120126
public void nullGuiOpenEvent(GuiScreen currentScreen) {
121127
wrapper.closeInputField();
122-
if(currentScreen instanceof GuiEditSign||currentScreen instanceof GuiScreenBook)
123-
YetAnotherInputFix.needFocus=true;
124-
bridge=null;
125-
this.currentScreen=null;
126-
this.currentTextField=null;
127-
this.incomingScreen=null;
128+
if (currentScreen instanceof GuiEditSign || currentScreen instanceof GuiScreenBook)
129+
YetAnotherInputFix.needFocus = true;
130+
bridge = null;
131+
this.currentScreen = null;
132+
this.currentTextField = null;
133+
this.incomingScreen = null;
128134
}
129135

130-
public void inputFieldClosed(){
131-
bridge=null;
132-
this.currentScreen=null;
133-
this.currentTextField=null;
134-
this.incomingScreen=null;
135-
YetAnotherInputFix.needFocus=true;
136+
public void inputFieldClosed() {
137+
bridge = null;
138+
this.currentScreen = null;
139+
this.currentTextField = null;
140+
this.incomingScreen = null;
141+
YetAnotherInputFix.needFocus = true;
136142
}
137143

138-
private boolean hasGuiTextField(GuiScreen gui){
139-
if(gui==null)return false;
140-
Class GuiClass=gui.getClass();
141-
if(UnInputableGui.contains(GuiClass))return false;
142-
if(InputableGui.contains(GuiClass))return true;
144+
private boolean hasGuiTextField(GuiScreen gui) {
145+
if (gui == null) return false;
146+
Class GuiClass = gui.getClass();
147+
if (UnInputableGui.contains(GuiClass)) return false;
148+
if (InputableGui.contains(GuiClass)) return true;
143149
boolean hasTextField = false;
144150

145151
for (Field f : GuiClass.getDeclaredFields()) {

‎src/main/java/org/devinprogress/yaif/InputFieldWrapper.java‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.minecraftforge.fml.common.FMLCommonHandler;
66
import org.apache.logging.log4j.LogManager;
77
import org.devinprogress.yaif.bridges.BaseActionBridge;
8-
import org.lwjgl.input.Keyboard;
98
import org.lwjgl.opengl.AWTGLCanvas;
109
import org.lwjgl.opengl.Display;
1110

@@ -21,46 +20,46 @@
2120
// Full document under resources/LICENSE
2221

2322
public class InputFieldWrapper {
24-
private static final int fontSize=20;
23+
private static final int fontSize = 20;
2524

26-
private static boolean hasInitiated=false;
27-
private boolean shown =false;
28-
private BaseActionBridge bridge=null;
25+
private static boolean hasInitiated = false;
26+
private boolean shown = false;
27+
private BaseActionBridge bridge = null;
2928

3029
private AWTGLCanvas canvas = null;
31-
private JFrame frame=null;
30+
private JFrame frame = null;
3231
private JTextField textField = null;
33-
private JPanel panel=null;
32+
private JPanel panel = null;
3433

3534
public static InputFieldWrapper instance;
3635

37-
public InputFieldWrapper(int Width,int Height){ //Should be Called only once
38-
if(hasInitiated)
36+
public InputFieldWrapper(int Width, int Height) { //Should be Called only once
37+
if (hasInitiated)
3938
throw new RuntimeException("Double Initiation for InputFieldWrapper.");
40-
hasInitiated=true;
41-
instance=this;
39+
hasInitiated = true;
40+
instance = this;
4241
// Create Instances
4342
try {
4443
canvas = new AWTGLCanvas();
45-
}catch(Exception e){
44+
} catch (Exception e) {
4645
e.printStackTrace();
4746
}
48-
frame=new JFrame("Minecraft 1.9");
49-
textField=new JTextField();
50-
panel=new JPanel();
47+
frame = new JFrame("Minecraft 1.9");
48+
textField = new JTextField();
49+
panel = new JPanel();
5150

5251
// Setup Canvas
5352
canvas.setFocusable(true);
5453
try {
5554
Display.setParent(canvas);
56-
}catch(Exception e){
55+
} catch (Exception e) {
5756
e.printStackTrace();
5857
}
5958
canvas.setPreferredSize(new Dimension(Width, Height));
6059

6160
// Setup TextField
6261
textField.setVisible(shown);
63-
textField.setFont(new Font("Times New Roman",Font.PLAIN, fontSize));
62+
textField.setFont(new Font("Times New Roman", Font.PLAIN, fontSize));
6463
//textField.enableInputMethods(false);
6564

6665
// Setup Panel
@@ -69,7 +68,7 @@ public InputFieldWrapper(int Width,int Height){ //Should be Called only once
6968
panel.add(textField, BorderLayout.PAGE_END);
7069
panel.setVisible(true);
7170
panel.validate();
72-
if(Util.getOSType()==Util.EnumOS.OSX) { //OSX blacks-screen patch
71+
if (Util.getOSType() == Util.EnumOS.OSX) { //OSX blacks-screen patch
7372
panel.addComponentListener(new ComponentAdapter() {
7473
@Override
7574
public void componentResized(ComponentEvent e) {
@@ -110,13 +109,13 @@ public void windowClosing(WindowEvent e) {
110109
}
111110
}
112111

113-
public void setupBridge(BaseActionBridge bridge){
114-
if(!bridge.needShow())return;
115-
if(this.bridge!=null) {
112+
public void setupBridge(BaseActionBridge bridge) {
113+
if (!bridge.needShow()) return;
114+
if (this.bridge != null) {
116115
LogManager.getLogger("YAIF").warn("Loading new bridge without releasing previous one");
117116
releaseCurrentBridge();
118117
}
119-
this.bridge=bridge;
118+
this.bridge = bridge;
120119
textField.setText("");
121120
bridge.bindKeys(textField);
122121

@@ -125,17 +124,17 @@ public void setupBridge(BaseActionBridge bridge){
125124
//_show();
126125
}
127126

128-
public void releaseCurrentBridge(){
129-
if(bridge!=null) {
127+
public void releaseCurrentBridge() {
128+
if (bridge != null) {
130129
bridge.unlink(textField);
131130
bridge = null;
132131
textField.setText("");
133132
}
134133
}
135134

136-
public void closeInputField(){
135+
public void closeInputField() {
137136
//YetAnotherInputFix.log("try closing InputField {shown: %s}",shown);
138-
if(shown) {
137+
if (shown) {
139138
releaseCurrentBridge();
140139
textField.getActionMap().clear();
141140
textField.getInputMap().clear();
@@ -144,13 +143,13 @@ public void closeInputField(){
144143
}
145144
}
146145

147-
public void bridgeQuit(){
146+
public void bridgeQuit() {
148147
closeInputField();
149148
GuiStateManager.getInstance().inputFieldClosed();
150149
}
151150

152-
public void _show(){
153-
if(!shown) {
151+
public void _show() {
152+
if (!shown) {
154153
shown = true;
155154
canvas.setPreferredSize(canvas.getSize());
156155
textField.setVisible(true);
@@ -159,15 +158,15 @@ public void _show(){
159158
textField.getInputMethodRequests();
160159
frame.pack();
161160
frame.validate();
162-
}else {
161+
} else {
163162
FMLClientHandler.instance().getClient().setIngameNotInFocus();
164163
textField.requestFocus();
165164
}
166165
}
167166

168-
private void _hide(){
169-
if(shown){
170-
shown=false;
167+
private void _hide() {
168+
if (shown) {
169+
shown = false;
171170
canvas.setPreferredSize(canvas.getSize());
172171
SwingUtilities.invokeLater(new Runnable() {
173172
@Override
@@ -176,7 +175,7 @@ public void run() {
176175
canvas.requestFocusInWindow();
177176
try {
178177
canvas.makeCurrent();
179-
}catch(Exception e){
178+
} catch (Exception e) {
180179
e.printStackTrace();
181180
}
182181
panel.validate();
@@ -187,18 +186,18 @@ public void run() {
187186
}
188187
}
189188

190-
public String getText(){
189+
public String getText() {
191190
return textField.getText();
192191
}
193192

194-
public void setText(String text){
195-
if(text.length()==0&&textField.getText().length()==0)
193+
public void setText(String text) {
194+
if (text.length() == 0 && textField.getText().length() == 0)
196195
bridge.releaseObstacleFlag();
197196
textField.setText(text);
198197
textField.setCaretPosition(text.length());
199198
}
200199

201-
public void setText(String text,final int caretPos){
200+
public void setText(String text, final int caretPos) {
202201
textField.setText(text);
203202
textField.setCaretPosition(caretPos);
204203
}

0 commit comments

Comments
 (0)