From b69cf344940d90ec122fea8e88a22676e88fc71a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 6 Oct 2022 14:17:55 -0400
Subject: [PATCH] Rule cleanup/clarification

---
 core/assets/bundles/bundle.properties                | 4 +++-
 core/src/mindustry/ui/dialogs/CustomRulesDialog.java | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 708635e15e..3a3fc719fc 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -644,7 +644,9 @@ resources.max = Max
 bannedblocks = Banned Blocks
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index b6bbf081a0..ea417c7601 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -180,9 +180,9 @@ public class CustomRulesDialog extends BaseDialog{
                 () -> {}, () -> {}
         )).left().width(300f).row();
 
-        check("@rules.hidebannedblocks", b -> rules.hideBannedBlocks = b, () -> rules.hideBannedBlocks);
         main.button("@bannedblocks", () -> showBanned("@bannedblocks", ContentType.block, rules.bannedBlocks, Block::canBeBuilt)).left().width(300f).row();
-        check("@whitelist", b -> rules.blockWhitelist = b, () -> rules.blockWhitelist);
+        check("@rules.hidebannedblocks", b -> rules.hideBannedBlocks = b, () -> rules.hideBannedBlocks);
+        check("@bannedblocks.whitelist", b -> rules.blockWhitelist = b, () -> rules.blockWhitelist);
 
         //TODO objectives would be nice
         if(experimental && false){
@@ -200,7 +200,7 @@ public class CustomRulesDialog extends BaseDialog{
         number("@rules.unitcostmultiplier", f -> rules.unitCostMultiplier = f, () -> rules.unitCostMultiplier);
 
         main.button("@bannedunits", () -> showBanned("@bannedunits", ContentType.unit, rules.bannedUnits, u -> !u.isHidden())).left().width(300f).row();
-        check("@whitelist", b -> rules.unitWhitelist = b, () -> rules.unitWhitelist);
+        check("@bannedunits.whitelist", b -> rules.unitWhitelist = b, () -> rules.unitWhitelist);
 
         title("@rules.title.enemy");
         check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);