Skip to content

Commit 0100d64

Browse files
mk124mk124
committed
Changes for shoebill-common
1 parent f3f7ff5 commit 0100d64

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

‎src/main/java/net/gtaun/wl/race/dialog/NewRacingDialog.java

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,30 @@ public class NewRacingDialog
4646
(Player player, EventManager eventManager, AbstractDialog parent, RaceServiceImpl service, Track track)
4747
{
4848
PlayerStringSet stringSet = service.getLocalizedStringSet().getStringSet(player);
49-
49+
5050
RacingManagerImpl racingManager = service.getRacingManager();
5151
String racingMode = stringSet.get((track.getStatus() == TrackStatus.EDITING) ? "Dialog.NewRacingDialog.RacingTestCaption" : "Dialog.NewRacingDialog.RacingNormalCaption");
52-
52+
5353
String[] racingName = new String[1];
5454
racingName[0] = RacingUtils.getDefaultName(player, track);
55-
55+
5656
RacingSetting setting = new RacingSetting(track);
57-
57+
5858
return WlListDialog.create(player, eventManager)
5959
.parentDialog(parent)
6060
.caption(() -> stringSet.format("Dialog.NewRacingDialog.Caption", racingMode))
61-
61+
6262
.item(() -> stringSet.format("Dialog.NewRacingDialog.Name", racingName[0]), () ->
6363
{
6464
if (track.getStatus() == TrackStatus.EDITING) return false;
6565
return true;
6666
}, (i) ->
6767
{
6868
player.playSound(1083);
69-
69+
7070
String caption = stringSet.format("Dialog.NewRacingEditNameDialog.Caption", racingMode);
7171
String message = stringSet.get("Dialog.NewRacingEditNameDialog.Text");
72-
72+
7373
WlInputDialog.create(player, eventManager)
7474
.parentDialog(i.getCurrentDialog())
7575
.caption(caption)
@@ -83,18 +83,18 @@ public class NewRacingDialog
8383
d.show();
8484
return;
8585
}
86-
86+
8787
racingName[0] = name;
8888
})
8989
.build().show();
9090
})
91-
91+
9292
.item(() -> stringSet.format("Dialog.NewRacingDialog.Track", track.getName(), track.getCheckpoints().size(), track.getLength()/1000.0f), (i) ->
9393
{
9494
player.playSound(1083);
95-
TrackDialog.create(player, eventManager, i.getCurrentDialog(), service, track).show();
95+
TrackDialog.create(player, eventManager, i.getCurrentDialog(), service, track).show();
9696
})
97-
97+
9898
.item(() ->
9999
{
100100
String trackType = stringSet.get("Track.Type.Normal");
@@ -105,43 +105,43 @@ public class NewRacingDialog
105105
player.playSound(1083);
106106
i.getCurrentDialog().show();
107107
})
108-
108+
109109
.item(ListDialogItemRadio.create()
110110
.itemText(stringSet.get("Dialog.NewRacingDialog.RacingType"))
111111
.selectedIndex(() -> setting.getRacingType().ordinal())
112-
.item(stringSet.get("Racing.Type.Normal"), Color.CORNFLOWERBLUE, () -> setting.setRacingType(RacingType.NORMAL))
113-
.item(stringSet.get("Racing.Type.Knockout"), Color.MAGENTA, () -> setting.setRacingType(RacingType.KNOCKOUT))
112+
.item(stringSet.get("Racing.Type.Normal"), Color.CORNFLOWERBLUE, (dialogItem) -> setting.setRacingType(RacingType.NORMAL))
113+
.item(stringSet.get("Racing.Type.Knockout"), Color.MAGENTA, (dialogItem) -> setting.setRacingType(RacingType.KNOCKOUT))
114114
.onSelect((i) ->
115115
{
116116
player.playSound(1083);
117117
i.getCurrentDialog().show();
118118
})
119119
.build())
120-
120+
121121
.item(() ->
122122
{
123123
String format = stringSet.get("Dialog.NewRacingDialog.DepartureInterval");
124124
int interval = setting.getDepartureInterval();
125125
if (interval == 0) return String.format(format, stringSet.get("Common.None"));
126-
return String.format(format, stringSet.format("Time.Format.S", interval));
126+
return String.format(format, stringSet.format("Time.Format.S", interval));
127127
}, (i) ->
128128
{
129129
player.playSound(1083);
130130
RacingDepartureSettingDialog.create(player, eventManager, i.getCurrentDialog(), service, setting).show();
131131
})
132-
132+
133133
.item(ListDialogItemRadio.create()
134134
.selectedIndex(() -> setting.getDeathRule().ordinal())
135135
.itemText(stringSet.get("Dialog.NewRacingDialog.DeathRule"))
136-
.item(stringSet.get("Racing.DeathRule.WaitAndReturn"), Color.AQUA, () -> setting.setDeathRule(DeathRule.WAIT_AND_RETURN))
137-
.item(stringSet.get("Racing.DeathRule.Knockout"), Color.FUCHSIA, () -> setting.setDeathRule(DeathRule.KNOCKOUT))
136+
.item(stringSet.get("Racing.DeathRule.WaitAndReturn"), Color.AQUA, (dialogItem) -> setting.setDeathRule(DeathRule.WAIT_AND_RETURN))
137+
.item(stringSet.get("Racing.DeathRule.Knockout"), Color.FUCHSIA, (dialogItem) -> setting.setDeathRule(DeathRule.KNOCKOUT))
138138
.onSelect((i) ->
139139
{
140140
player.playSound(1083);
141141
i.getCurrentDialog().show();
142142
})
143143
.build())
144-
144+
145145
.item(ListDialogItemCheck.create()
146146
.itemText(stringSet.get("Dialog.NewRacingDialog.Limit"))
147147
.item(stringSet.get("Racing.Limit.AutoRepair"), Color.LIME, () -> setting.getLimit().isAllowAutoRepair())
@@ -154,19 +154,19 @@ public class NewRacingDialog
154154
RacingLimitDialog.create(player, eventManager, i.getCurrentDialog(), service, track, setting.getLimit()).show();
155155
})
156156
.build())
157-
157+
158158
.item(() ->
159159
{
160160
int min = track.getSetting().getMinPlayers();
161161
int max = setting.getMaxPlayers();
162162
if (min != 0 && max != 0) return stringSet.format("Dialog.NewRacingDialog.PlayersLimitFormat", min, max);
163-
return stringSet.get("Dialog.NewRacingDialog.PlayersLimit") + " " + stringSet.get("Dialog.NewRacingDialog.PlayersLimitNone");
163+
return stringSet.get("Dialog.NewRacingDialog.PlayersLimit") + " " + stringSet.get("Dialog.NewRacingDialog.PlayersLimitNone");
164164
}, (i) ->
165165
{
166166
player.playSound(1083);
167167
i.getCurrentDialog().show();
168168
})
169-
169+
170170
.item(() ->
171171
{
172172
String itemText = stringSet.get("Dialog.NewRacingDialog.Password");
@@ -177,7 +177,7 @@ public class NewRacingDialog
177177
player.playSound(1083);
178178
i.getCurrentDialog().show();
179179
})
180-
180+
181181
.item(stringSet.get("Dialog.NewRacingDialog.Create"), (i) ->
182182
{
183183
Runnable startNewRacing = () ->
@@ -186,9 +186,9 @@ public class NewRacingDialog
186186
racing.teleToStartingPoint(player);
187187
racing.setSetting(setting);
188188
};
189-
189+
190190
player.playSound(1083);
191-
191+
192192
if (track.getCheckpoints().isEmpty()) return;
193193
if (racingManager.isPlayerInRacing(player))
194194
{
@@ -197,7 +197,7 @@ public class NewRacingDialog
197197
}
198198
else startNewRacing.run();
199199
})
200-
200+
201201
.build();
202202
}
203203
}

‎src/main/java/net/gtaun/wl/race/dialog/RacingLimitDialog.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,45 +20,45 @@ public class RacingLimitDialog
2020

2121
String allow = stringSet.get("Common.Allow");
2222
String disallow = stringSet.get("Common.Disallow");
23-
23+
2424
return WlListDialog.create(player, eventManager)
2525
.parentDialog(parent)
2626
.caption(() -> stringSet.get("Dialog.RacingLimitDialog.Caption"))
27-
27+
2828
.item(ListDialogItemRadio.create()
2929
.itemText(() -> stringSet.get("Racing.Limit.AutoRepair") + ":")
3030
.selectedIndex(() -> limit.isAllowAutoRepair() ? 0 : 1)
31-
.item(allow, Color.GREEN, () -> limit.setAllowAutoRepair(true))
32-
.item(disallow, Color.RED, () -> limit.setAllowAutoRepair(false))
31+
.item(allow, Color.GREEN, (i) -> limit.setAllowAutoRepair(true))
32+
.item(disallow, Color.RED, (i) -> limit.setAllowAutoRepair(false))
3333
.onSelect((i) -> i.getCurrentDialog().show())
3434
.build())
35-
35+
3636
.item(ListDialogItemRadio.create()
3737
.itemText(() -> stringSet.get("Racing.Limit.InfiniteNitrous") + ":")
3838
.selectedIndex(() -> limit.isAllowInfiniteNitrous() ? 0 : 1)
39-
.item(allow, Color.GREEN, () -> limit.setAllowInfiniteNitrous(true))
40-
.item(disallow, Color.RED, () -> limit.setAllowInfiniteNitrous(false))
39+
.item(allow, Color.GREEN, (i) -> limit.setAllowInfiniteNitrous(true))
40+
.item(disallow, Color.RED, (i) -> limit.setAllowInfiniteNitrous(false))
4141
.onSelect((i) -> i.getCurrentDialog().show())
4242
.build())
43-
43+
4444
.item(ListDialogItemRadio.create()
4545
.itemText(() -> stringSet.get("Racing.Limit.AutoFlip") + ":")
4646
.selectedIndex(() -> limit.isAllowAutoFlip() ? 0 : 1)
47-
.item(allow, Color.GREEN, () -> limit.setAllowAutoFlip(true))
48-
.item(disallow, Color.RED, () -> limit.setAllowAutoFlip(false))
47+
.item(allow, Color.GREEN, (i) -> limit.setAllowAutoFlip(true))
48+
.item(disallow, Color.RED, (i) -> limit.setAllowAutoFlip(false))
4949
.onSelect((i) -> i.getCurrentDialog().show())
5050
.build())
51-
51+
5252
.item(ListDialogItemRadio.create()
5353
.itemText(() -> stringSet.get("Racing.Limit.ChangeVehicle") + ":")
5454
.selectedIndex(() -> limit.isAllowChangeVehicle() ? 0 : 1)
55-
.item(allow, Color.GREEN, () -> limit.setAllowChangeVehicle(true))
56-
.item(disallow, Color.RED, () -> limit.setAllowChangeVehicle(false))
55+
.item(allow, Color.GREEN, (i) -> limit.setAllowChangeVehicle(true))
56+
.item(disallow, Color.RED, (i) -> limit.setAllowChangeVehicle(false))
5757
.onSelect((i) -> i.getCurrentDialog().show())
5858
.build())
59-
59+
6060
.item(() -> stringSet.get("Common.OK"), (i) -> i.getCurrentDialog().showParentDialog())
61-
61+
6262
.onClickOk((d, i) -> player.playSound(1083))
6363
.build();
6464
}

‎src/main/java/net/gtaun/wl/race/dialog/TrackCheckpointEditDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ public class TrackCheckpointEditDialog
100100
.item(ListDialogItemRadio.create()
101101
.selectedIndex(() -> checkpoint.getType() == RaceCheckpointType.NORMAL ? 0 : 1)
102102
.itemText(() -> stringSet.get("Dialog.TrackCheckpointEditDialog.Type"))
103-
.item(stringSet.get("Track.Checkpoint.Type.Normal"), Color.RED, () -> checkpoint.setType(RaceCheckpointType.NORMAL))
104-
.item(stringSet.get("Track.Checkpoint.Type.Air"), Color.BLUE, () -> checkpoint.setType(RaceCheckpointType.AIR))
103+
.item(stringSet.get("Track.Checkpoint.Type.Normal"), Color.RED, (i) -> checkpoint.setType(RaceCheckpointType.NORMAL))
104+
.item(stringSet.get("Track.Checkpoint.Type.Air"), Color.BLUE, (i) -> checkpoint.setType(RaceCheckpointType.AIR))
105105
.onSelect((i) -> i.getCurrentDialog().show())
106106
.build())
107107

0 commit comments

Comments
 (0)