Skip to content

Commit 14073d1

Browse files
committed
Cleanup
1 parent cfdf88e commit 14073d1

3 files changed

Lines changed: 10 additions & 20 deletions

File tree

src/testing/dialogs/sound/MusicsTable.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import static mindustry.Vars.*;
2626

2727
public class MusicsTable extends STable{
28-
private static Seq<Music> vanillaMusic = Seq.with(
28+
private static final Seq<Music> vanillaMusic = Seq.with(
2929
Musics.menu, Musics.launch, Musics.land, Musics.editor,
3030
Musics.game1, Musics.game2, Musics.game3, Musics.game4, Musics.fine,
3131
Musics.game5, Musics.game6, Musics.game7, Musics.game8, Musics.game9,
@@ -113,19 +113,15 @@ public void rebuild(){
113113
if(vSounds.size > 0){
114114
TUElements.divider(list, "@tu-sound-menu.vanilla", Pal.accent);
115115

116-
list.table(v -> {
117-
vanillaMusicList(v, vSounds);
118-
}).growX();
116+
list.table(v -> vanillaMusicList(v, vSounds)).growX();
119117
list.row();
120118
}
121119

122120
Seq<Music> mSounds = modMusic.select(s -> getName(s).toLowerCase().contains(text.toLowerCase()));
123121
if(mSounds.size > 0){
124122
TUElements.divider(list, "@tu-sound-menu.modded", Pal.accent);
125123

126-
list.table(m -> {
127-
modMusicList(m, mSounds);
128-
}).growX();
124+
list.table(m -> modMusicList(m, mSounds)).growX();
129125
}
130126
}).growX().padBottom(10);
131127
}
@@ -134,9 +130,8 @@ public void vanillaMusicList(Table t, Seq<Music> musics){
134130
int cols = 4;
135131
int count = 0;
136132
for(Music m : musics){
137-
TextButton mb = t.button(getName(m), () -> {
138-
selectedMusic = m;
139-
}).uniformX().grow().checked(b -> selectedMusic == m).get();
133+
TextButton mb = t.button(getName(m), () -> selectedMusic = m)
134+
.uniformX().grow().checked(b -> selectedMusic == m).get();
140135
mb.setStyle(TUStyles.toggleCentert);
141136

142137
if(overrides.containsKey(m)){
@@ -164,9 +159,8 @@ public void modMusicList(Table t, Seq<Music> musics){
164159
t.row();
165160
}
166161

167-
t.button(getName(m), () -> {
168-
selectedMusic = m;
169-
}).uniformX().grow().checked(b -> selectedMusic == m)
162+
t.button(getName(m), () -> selectedMusic = m)
163+
.uniformX().grow().checked(b -> selectedMusic == m)
170164
.get().setStyle(TUStyles.toggleCentert);
171165

172166
if((++count) % cols == 0){

src/testing/dialogs/sound/SoundsTable.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,19 +173,15 @@ public void rebuild(){
173173
if(vSounds.size > 0){
174174
TUElements.divider(list, "@tu-sound-menu.vanilla", Pal.accent);
175175

176-
list.table(v -> {
177-
vanillaSoundList(v, vSounds);
178-
}).growX();
176+
list.table(v -> vanillaSoundList(v, vSounds)).growX();
179177
list.row();
180178
}
181179

182180
Seq<Sound> mSounds = modSounds.select(s -> getName(s).toLowerCase().contains(text.toLowerCase()));
183181
if(mSounds.size > 0){
184182
TUElements.divider(list, "@tu-sound-menu.modded", Pal.accent);
185183

186-
list.table(m -> {
187-
modSoundList(m, mSounds);
188-
}).growX();
184+
list.table(m -> modSoundList(m, mSounds)).growX();
189185
}
190186
}).growX().padBottom(10);
191187
}

src/testing/ui/TerrainPainterFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static arc.Core.*;
2929
import static mindustry.Vars.*;
30-
import static testing.ui.TUDialogs.teamDialog;
30+
import static testing.ui.TUDialogs.*;
3131
import static testing.util.TUVars.*;
3232

3333
public class TerrainPainterFragment{

0 commit comments

Comments
 (0)