Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always hide content when isHidden() == true

Browse Source
This commit is contained in:
Anuken
2023-05-21 00:57:10 -04:00
parent bc94e24874
commit dc63112915
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -52,10 +52,9 @@ public class DatabaseDialog extends BaseDialog{
for(int j = 0; j < allContent.length; j++){ for(int j = 0; j < allContent.length; j++){
ContentType type = ContentType.all[j]; ContentType type = ContentType.all[j];
Seq<Content> array = allContent[j] Seq<UnlockableContent> array = allContent[j]
.select(c -> c instanceof UnlockableContent u && .select(c -> c instanceof UnlockableContent u && !u.isHidden() &&
(!u.isHidden() || u.techNode != null) && (text.isEmpty() || u.localizedName.toLowerCase().contains(text.toLowerCase()))).as();
(text.isEmpty() || u.localizedName.toLowerCase().contains(text.toLowerCase())));
if(array.size == 0) continue; if(array.size == 0) continue;
all.add("@content." + type.name() + ".name").growX().left().color(Pal.accent); all.add("@content." + type.name() + ".name").growX().left().color(Pal.accent);
@@ -69,7 +68,7 @@ public class DatabaseDialog extends BaseDialog{
int count = 0; int count = 0;
for(int i = 0; i < array.size; i++){ for(int i = 0; i < array.size; i++){
UnlockableContent unlock = (UnlockableContent)array.get(i); UnlockableContent unlock = array.get(i);
Image image = unlocked(unlock) ? new Image(unlock.uiIcon).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray); Image image = unlocked(unlock) ? new Image(unlock.uiIcon).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray);