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

Automatic planet detection for content

Browse Source
This commit is contained in:
Anuken
2024-08-22 06:54:07 -04:00
parent 4cab03a1ba
commit f888b3b77e
9 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ public class DatabaseDialog extends BaseDialog{
for(var contents : allContent){
for(var content : contents){
if(content instanceof UnlockableContent u){
all.addAll(u.getDatabaseTabs());
all.addAll(u.databaseTabs);
}
}
}
@@ -101,7 +101,7 @@ public class DatabaseDialog extends BaseDialog{
ContentType type = ContentType.all[j];
Seq<UnlockableContent> array = allContent[j]
.select(c -> c instanceof UnlockableContent u && !u.isHidden() && (tab == Planets.sun || u.allDatabaseTabs || u.getDatabaseTabs().contains(tab)) &&
.select(c -> c instanceof UnlockableContent u && !u.isHidden() && (tab == Planets.sun || u.allDatabaseTabs || u.databaseTabs.contains(tab)) &&
(text.isEmpty() || u.localizedName.toLowerCase().contains(text))).as();
if(array.size == 0) continue;

2
core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
View File

@@ -172,7 +172,7 @@ public class LaunchLoadoutDialog extends BaseDialog{
Cons<Schematic> handler = s -> {
if(s.tiles.contains(tile -> !tile.block.supportsEnv(sector.planet.defaultEnv) ||
//make sure block can be built here.
tile.block.isOnPlanet(sector.planet))){
!tile.block.isOnPlanet(sector.planet))){
return;
}