Skip to content

Commit a2cc351

Browse files
DylanMeeusDylanMeeus
committed
Azerty
Added support for the Azerty keyboard layout used in France and Belgium. (Correct code format)
1 parent c915b83 commit a2cc351

File tree

1 file changed

+71
-133
lines changed

1 file changed

+71
-133
lines changed

‎src/com/redomar/game/InputHandler.java‎

Lines changed: 71 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,39 @@
99
import com.redomar.game.script.PrintTypes;
1010
import com.redomar.game.script.Printing;
1111

12-
public class InputHandler implements KeyListener
13-
{
14-
12+
public class InputHandler implements KeyListener {
13+
1514
private boolean isAzertyCountry;
16-
17-
public InputHandler(Game game)
18-
{
15+
16+
public InputHandler(Game game) {
1917
InputContext context = InputContext.getInstance();
2018
// Important to know wether the keyboard is in Azerty or Qwerty.
2119
// Azerty countries used QZSD instead of WASD keys.
22-
isAzertyCountry = context.getLocale().getCountry().equals("BE") || context.getLocale().getCountry().equals("FR");
20+
isAzertyCountry = context.getLocale().getCountry().equals("BE")
21+
|| context.getLocale().getCountry().equals("FR");
2322
game.addKeyListener(this);
2423
}
2524

26-
public class Key
27-
{
25+
public class Key {
2826
private int numTimesPressed = 0;
2927
private boolean pressed = false;
3028

31-
public int getNumTimesPressed()
32-
{
29+
public int getNumTimesPressed() {
3330
return numTimesPressed;
3431
}
3532

36-
public boolean isPressed()
37-
{
33+
public boolean isPressed() {
3834
return pressed;
3935
}
4036

41-
public void toggle(boolean isPressed)
42-
{
37+
public void toggle(boolean isPressed) {
4338
pressed = isPressed;
44-
if (isPressed)
45-
{
39+
if (isPressed) {
4640
numTimesPressed++;
4741
}
4842
}
4943

50-
public void off()
51-
{
44+
public void off() {
5245
pressed = false;
5346
numTimesPressed = 0;
5447
}
@@ -64,257 +57,202 @@ public void off()
6457
private boolean ignoreInput = false;
6558
private PopUp popup = new PopUp();
6659

67-
public void keyPressed(KeyEvent e)
68-
{
60+
public void keyPressed(KeyEvent e) {
6961
toggleKey(e.getKeyCode(), true);
7062
}
7163

72-
public void keyReleased(KeyEvent e)
73-
{
64+
public void keyReleased(KeyEvent e) {
7465
toggleKey(e.getKeyCode(), false);
7566
}
7667

77-
public void keyTyped(KeyEvent e)
78-
{
68+
public void keyTyped(KeyEvent e) {
7969

8070
}
8171

82-
public void toggleKey(int keyCode, boolean isPressed)
83-
{
84-
if (isIgnoreInput() == false)
85-
{
86-
if(isAzertyCountry)
87-
{
88-
if (keyCode == KeyEvent.VK_Z || keyCode == KeyEvent.VK_UP)
89-
{
72+
public void toggleKey(int keyCode, boolean isPressed) {
73+
if (isIgnoreInput() == false) {
74+
if (isAzertyCountry) {
75+
if (keyCode == KeyEvent.VK_Z || keyCode == KeyEvent.VK_UP) {
9076
getUp().toggle(isPressed);
9177
}
92-
93-
if (keyCode == KeyEvent.VK_Q || keyCode == KeyEvent.VK_LEFT)
94-
{
78+
79+
if (keyCode == KeyEvent.VK_Q || keyCode == KeyEvent.VK_LEFT) {
9580
getLeft().toggle(isPressed);
9681
}
97-
}
98-
else
99-
{
100-
if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP)
101-
{
82+
} else {
83+
if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
10284
getUp().toggle(isPressed);
10385
}
104-
105-
if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT)
106-
{
86+
87+
if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) {
10788
getLeft().toggle(isPressed);
10889
}
10990
}
11091

111-
if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN)
112-
{
92+
if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) {
11393
getDown().toggle(isPressed);
11494
}
11595

116-
if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT)
117-
{
96+
if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
11897
getRight().toggle(isPressed);
11998
}
12099
}
121-
if (isIgnoreInput() == true)
122-
{
100+
if (isIgnoreInput() == true) {
123101
getUp().toggle(false);
124102
getDown().toggle(false);
125103
getLeft().toggle(false);
126104
getRight().toggle(false);
127105
}
128-
if (keyCode == KeyEvent.VK_M)
129-
{
106+
if (keyCode == KeyEvent.VK_M) {
130107
this.setPlayMusic(true);
131108
}
132-
133-
if(isAzertyCountry)
134-
{
135-
if (keyCode == KeyEvent.VK_W)
136-
{
109+
110+
if (isAzertyCountry) {
111+
if (keyCode == KeyEvent.VK_W) {
137112
// if (map == 0){
138113
// Game.getGame().setMap("/levels/water_level.png");
139114
// map++;
140115
// } else{
141116
// Game.getGame().setMap("/levels/custom_level.png");
142117
// map--;
143118
// }
144-
if (Game.getMap() == 2)
145-
{
119+
if (Game.getMap() == 2) {
146120
Game.setChangeLevel(true);
147121
Game.setNpc(false);
148122
}
149123
}
150-
}
151-
else
152-
{
153-
if (keyCode == KeyEvent.VK_Z)
154-
{
124+
} else {
125+
if (keyCode == KeyEvent.VK_Z) {
155126
// if (map == 0){
156127
// Game.getGame().setMap("/levels/water_level.png");
157128
// map++;
158129
// } else{
159130
// Game.getGame().setMap("/levels/custom_level.png");
160131
// map--;
161132
// }
162-
if (Game.getMap() == 2)
163-
{
133+
if (Game.getMap() == 2) {
164134
Game.setChangeLevel(true);
165135
Game.setNpc(false);
166136
}
167137
}
168138
}
169-
if (keyCode == KeyEvent.VK_N)
170-
{
171-
if (Game.getPlayer().isMoving())
172-
{
139+
if (keyCode == KeyEvent.VK_N) {
140+
if (Game.getPlayer().isMoving()) {
173141
setIgnoreInput(true);
174142
int n = popup.Warn("Stop moving before spawing dummy AI");
175-
if (n == 0)
176-
{
143+
if (n == 0) {
177144
setIgnoreInput(false);
178145
}
179146
return;
180147
}
181-
if (Game.isNpc() == false)
182-
{
148+
if (Game.isNpc() == false) {
183149
Game.setNpc(true);
184150
Game.npcSpawn();
185151
print.print("Dummy has been spawned", PrintTypes.GAME);
186152
}
187153
}
188-
if (keyCode == KeyEvent.VK_K)
189-
{
190-
if (Game.isNpc() == true)
191-
{
154+
if (keyCode == KeyEvent.VK_K) {
155+
if (Game.isNpc() == true) {
192156
Game.setNpc(false);
193157
Game.npcKill();
194158
print.print("Dummy has been despawned", PrintTypes.GAME);
195159
}
196160
}
197-
if(isAzertyCountry)
198-
{
199-
if (keyCode == KeyEvent.VK_A)
200-
{
161+
if (isAzertyCountry) {
162+
if (keyCode == KeyEvent.VK_A) {
201163
Game.setClosing(true);
202-
try
203-
{
164+
try {
204165
Thread.sleep(1000);
205-
} catch (InterruptedException e)
206-
{
166+
} catch (InterruptedException e) {
207167
e.printStackTrace();
208168
}
209-
Game.getLevel()
210-
.removeEntity(Game.getPlayer().getSantizedUsername());
169+
Game.getLevel().removeEntity(
170+
Game.getPlayer().getSantizedUsername());
211171
Game.setRunning(false);
212172
Game.getFrame().dispose();
213173
System.exit(1);
214174
}
215-
}
216-
else
217-
{
218-
if (keyCode == KeyEvent.VK_Q)
219-
{
175+
} else {
176+
if (keyCode == KeyEvent.VK_Q) {
220177
Game.setClosing(true);
221-
try
222-
{
178+
try {
223179
Thread.sleep(1000);
224-
} catch (InterruptedException e)
225-
{
180+
} catch (InterruptedException e) {
226181
e.printStackTrace();
227182
}
228-
Game.getLevel()
229-
.removeEntity(Game.getPlayer().getSantizedUsername());
183+
Game.getLevel().removeEntity(
184+
Game.getPlayer().getSantizedUsername());
230185
Game.setRunning(false);
231186
Game.getFrame().dispose();
232187
System.exit(1);
233188
}
234189
}
235190

236-
if (keyCode == KeyEvent.VK_BACK_QUOTE)
237-
{
238-
if (Game.isClosing() == false && Game.isDevMode() == false)
239-
{
191+
if (keyCode == KeyEvent.VK_BACK_QUOTE) {
192+
if (Game.isClosing() == false && Game.isDevMode() == false) {
240193
Game.setDevMode(true);
241194
new Thread(new SleepThread());
242195
}
243196
}
244197
}
245198

246-
public void untoggle(boolean toggle)
247-
{
199+
public void untoggle(boolean toggle) {
248200
this.ignoreInput = toggle;
249201
}
250202

251-
public int getMap()
252-
{
203+
public int getMap() {
253204
return map;
254205
}
255206

256-
public void setMap(int map)
257-
{
207+
public void setMap(int map) {
258208
this.map = map;
259209
}
260210

261-
public boolean isPlayMusic()
262-
{
211+
public boolean isPlayMusic() {
263212
return PlayMusic;
264213
}
265214

266-
public void setPlayMusic(boolean playMusic)
267-
{
215+
public void setPlayMusic(boolean playMusic) {
268216
PlayMusic = playMusic;
269217
}
270218

271-
public Key getUp()
272-
{
219+
public Key getUp() {
273220
return up;
274221
}
275222

276-
public void setUp(Key up)
277-
{
223+
public void setUp(Key up) {
278224
this.up = up;
279225
}
280226

281-
public Key getDown()
282-
{
227+
public Key getDown() {
283228
return down;
284229
}
285230

286-
public void setDown(Key down)
287-
{
231+
public void setDown(Key down) {
288232
this.down = down;
289233
}
290234

291-
public Key getLeft()
292-
{
235+
public Key getLeft() {
293236
return left;
294237
}
295238

296-
public void setLeft(Key left)
297-
{
239+
public void setLeft(Key left) {
298240
this.left = left;
299241
}
300242

301-
public Key getRight()
302-
{
243+
public Key getRight() {
303244
return right;
304245
}
305246

306-
public void setRight(Key right)
307-
{
247+
public void setRight(Key right) {
308248
this.right = right;
309249
}
310250

311-
public boolean isIgnoreInput()
312-
{
251+
public boolean isIgnoreInput() {
313252
return ignoreInput;
314253
}
315254

316-
public void setIgnoreInput(boolean ignoreInput)
317-
{
255+
public void setIgnoreInput(boolean ignoreInput) {
318256
this.ignoreInput = ignoreInput;
319257
}
320258

0 commit comments

Comments
 (0)