mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Rules.hiddenBuildItems removed

Browse Source
This commit is contained in:
Anuken 2024-08-22 05:12:39 -04:00
parent 20ddbe9d28
commit 4cab03a1ba
6 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/core/Logic.java
View File

@ -140,9 +140,6 @@ public class Logic implements ApplicationListener{
core.items.set(item, core.block.itemCapacity);
}
}
//set up hidden items
state.rules.hiddenBuildItems.clear();
}
//save settings

1
core/src/mindustry/core/World.java
View File

@ -321,7 +321,6 @@ public class World{
state.rules.cloudColor = sector.planet.landCloudColor;
state.rules.env = sector.planet.defaultEnv;
state.rules.planet = sector.planet;
state.rules.hiddenBuildItems.clear();
sector.planet.applyRules(state.rules);
sector.info.resources = content.toSeq();
sector.info.resources.sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id)));

5
core/src/mindustry/game/Rules.java
View File

@ -153,11 +153,6 @@ public class Rules{
public ObjectSet<Block> revealedBlocks = new ObjectSet<>();
/** Unlocked content names. Only used in multiplayer when the campaign is enabled. */
public ObjectSet<String> researched = new ObjectSet<>();
/**
* Block containing these items as requirements are hidden.
* @deprecated May be removed in the near future.
* */
public @Deprecated ObjectSet<Item> hiddenBuildItems = Items.erekirOnlyItems.asSet();
/** In-map objective executor. */
public MapObjectives objectives = new MapObjectives();
/** Flags set by objectives. Used in world processors. */

1
core/src/mindustry/type/Planet.java
View File

@ -206,7 +206,6 @@ public class Planet extends UnlockableContent{
rules.attributes.add(defaultAttributes);
rules.env = defaultEnv;
rules.planet = this;
rules.hiddenBuildItems.clear();
}
public @Nullable Sector getLastSector(){

1
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@ -338,7 +338,6 @@ public class CustomRulesDialog extends BaseDialog{
t.button("@rules.anyenv", style, () -> {
rules.env = Vars.defaultEnv;
rules.hiddenBuildItems.clear();
rules.planet = Planets.sun;
}).group(group).checked(b -> rules.planet == Planets.sun);
}).left().fill(false).expand(false, false).row();

4
core/src/mindustry/world/Block.java
View File

@ -944,9 +944,7 @@ public class Block extends UnlockableContent implements Senseable{
}
public boolean environmentBuildable(){
return
(state.rules.hiddenBuildItems.isEmpty() || !Structs.contains(requirements, i -> state.rules.hiddenBuildItems.contains(i.item))) &&
(state.getPlanet() == null || shownPlanets.isEmpty() || shownPlanets.contains(state.getPlanet()));
return isOnPlanet(state.getPlanet());
}
public boolean isStatic(){