Properly hide unfinished content

Author: MEEPofFaith

src/progressed/content/blocks/PMBlocks.java

@@ -133,6 +133,11 @@ public class PMBlocks{
 
     // endregion
 
+    /** For incomplete or test content that should not be visible publicly. */
+    public static BuildVisibility incompleteVisibility(){
+        return OS.username.equals("MEEPM") ? BuildVisibility.sandboxOnly : BuildVisibility.hidden;
+    }
+
     public static void load(){
         PMPayloads.load();
         PMModules.load();
@@ -1020,7 +1025,7 @@ public void setStats(){
         }};
 
         judgement = new NexusTurret("judgement"){{
-            requirements(Category.turret, BuildVisibility.sandboxOnly, with());
+            requirements(Category.turret, incompleteVisibility(), with());
             size = 9;
         }};
 

src/progressed/content/blocks/PMErekirBlocks.java

@@ -13,7 +13,6 @@
 import mindustry.world.blocks.defense.turrets.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.draw.*;
-import mindustry.world.meta.*;
 import progressed.content.*;
 import progressed.content.bullets.*;
 import progressed.content.effects.*;
@@ -179,7 +178,7 @@ public static void load(){
         }};
 
         matrix = new ModularTurret("matrix"){{
-            requirements(Category.turret, BuildVisibility.sandboxOnly, with());
+            requirements(Category.turret, PMBlocks.incompleteVisibility(), with());
             size = 7;
             scaledHealth = 370;
             regionSuffix = "-dark";
@@ -235,7 +234,7 @@ public static void load(){
 
         if(false){ //TODO Re-set these up once I create modules for Matrix.
             moduleAssembler = new PayloadCrafter("module-assembler"){{
-                requirements(Category.crafting, with(
+                requirements(Category.crafting, PMBlocks.incompleteVisibility(), with(
                     Items.copper, 220,
                     Items.lead, 250,
                     Items.silicon, 100
@@ -249,7 +248,7 @@ public static void load(){
             }};
 
             moduleFoundry = new PayloadCrafter("module-foundry"){{
-                requirements(Category.crafting, with(
+                requirements(Category.crafting, PMBlocks.incompleteVisibility(), with(
                     Items.lead, 540,
                     Items.silicon, 430,
                     PMItems.tenelium, 300,

src/progressed/content/blocks/PMModules.java

@@ -14,7 +14,6 @@
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.consumers.*;
-import mindustry.world.meta.*;
 import progressed.content.bullets.*;
 import progressed.content.effects.*;
 import progressed.entities.bullet.energy.*;
@@ -47,7 +46,7 @@ public class PMModules{
 
     public static void load(){
         coil = new ItemTurretModule("coil"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             outlineColor = Pal.darkOutline;
 
             Effect sfe = new MultiEffect(Fx.shootSmallColor, Fx.colorSpark);
@@ -88,7 +87,7 @@ Items.beryllium, new BasicBulletType(2f, 16){{
         }};
 
         skeet = new ItemTurretModule("skeet"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             outlineColor = Pal.darkOutline;
 
             float brange = 140f;
@@ -123,7 +122,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
         }};
 
         burst = new PowerTurretModule("burst"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             outlineColor = Pal.darkOutline;
 
             shootType = new BulletType(4.5f, 4f){{
@@ -152,7 +151,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
         }};
 
         accentuate = new SweepLaserTurretModule("accentuate"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             outlineColor = Pal.darkOutline;
 
             shootType = new PointLaserBulletType(){{
@@ -172,7 +171,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
         }};
 
         augment = new BoostModule("augment"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             outlineColor = Pal.darkOutline;
 
             hasPower = true;
@@ -183,7 +182,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
         }};
 
         abyss = new PowerTurretModule("abyss"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             moduleSize = ModuleSize.medium;
             size = 2;
             outlineColor = Pal.darkOutline;
@@ -233,7 +232,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
         }};
 
         halberd = new BeamModule("halberd"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             moduleSize = ModuleSize.medium;
             size = 2;
             outlineColor = Pal.darkOutline;
@@ -254,7 +253,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
         }};
 
         gravity = new TractorConeModule("gravity"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             moduleSize = ModuleSize.medium;
             size = 2;
             outlineColor = Pal.darkOutline;
@@ -269,7 +268,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
         }};
 
         firestorm = new ArcModule("firestorm"){{
-            requirements(Category.units, BuildVisibility.sandboxOnly, with());
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
             moduleSize = ModuleSize.large;
             size = 3;
             outlineColor = Pal.darkOutline;

src/progressed/world/blocks/defence/turret/testing/FreeTurret.java

@@ -1,13 +1,13 @@
 package progressed.world.blocks.defence.turret.testing;
 
 import arc.struct.*;
-import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.bullet.*;
 import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.blocks.defense.turrets.*;
 import mindustry.world.meta.*;
+import progressed.content.blocks.*;
 import progressed.world.meta.*;
 
 import static mindustry.type.ItemStack.*;
@@ -18,7 +18,7 @@ public class FreeTurret extends Turret{
     public FreeTurret(String name){
         super(name);
 
-        requirements(Category.turret, OS.username.equals("MEEPM") ? BuildVisibility.sandboxOnly : BuildVisibility.hidden, with());
+        requirements(Category.turret, PMBlocks.incompleteVisibility(), with());
         size = 2;
     }