From 4cab03a1bad2818656694a1c39c50c04fdc796d4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 22 Aug 2024 05:12:39 -0400
Subject: [PATCH] Rules.hiddenBuildItems removed

---
 core/src/mindustry/core/Logic.java                   | 3 ---
 core/src/mindustry/core/World.java                   | 1 -
 core/src/mindustry/game/Rules.java                   | 5 -----
 core/src/mindustry/type/Planet.java                  | 1 -
 core/src/mindustry/ui/dialogs/CustomRulesDialog.java | 1 -
 core/src/mindustry/world/Block.java                  | 4 +---
 6 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index be096bf715..d1c7c5ca60 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -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
diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java
index cac92019f6..a9e858a0c7 100644
--- a/core/src/mindustry/core/World.java
+++ b/core/src/mindustry/core/World.java
@@ -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)));
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index c87e3311c0..6bb08a5245 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -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. */
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index 66309f71ac..2a11f41ff2 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -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(){
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index a906d45509..6ae81fc338 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -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();
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 9c21acd8f8..64cc26af00 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -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(){