reverting logically unchanged lines, renaming to stateFilters

Author: TheElenium

src/main/java/meteordevelopment/meteorclient/systems/modules/render/blockesp/BlockESP.java

@@ -42,89 +42,60 @@ public class BlockESP extends Module {
 
     // General
 
-    private final Setting<List<Block>> blocks = sgGeneral.add(
-        new BlockListSetting.Builder()
-            .name("blocks")
-            .description("Blocks to search for.")
-            .onChanged(blocks1 -> {
-                if (isActive() && Utils.canUpdate()) onActivate();
-            })
-            .build()
+    private final Setting<List<Block>> blocks = sgGeneral.add(new BlockListSetting.Builder()
+        .name("blocks")
+        .description("Blocks to search for.")
+        .onChanged(blocks1 -> {
+            if (isActive() && Utils.canUpdate()) onActivate();
+        })
+        .build()
     );
-    
-    // uncomment if NBT-Data should apply to all blocks   !!! UNTESTED !!!
-    
-    /*
-    private final Setting<List<String>> customFilters = sgGeneral.add(
-        new StringListSetting.Builder()
-            .name("NTB-Data")
-            .description(
-                "Filters with ntbdata (e.g. 'waterlogged=true')."
+
+    private final Setting<ESPBlockData> defaultBlockConfig = sgGeneral.add(new GenericSetting.Builder<ESPBlockData>()
+        .name("default-block-config")
+        .description("Default block config.")
+        .defaultValue(
+            new ESPBlockData(
+                ShapeMode.Lines,
+                new SettingColor(0, 255, 200),
+                new SettingColor(0, 255, 200, 25),
+                true,
+                new SettingColor(0, 255, 200, 125)
             )
-            .defaultValue(new ArrayList<>())
-            .onChanged(this::parseFilters)
-            .build()
+        )
+        .build()
     );
-    */  
-
-    private final Setting<ESPBlockData> defaultBlockConfig = sgGeneral.add(
-        new GenericSetting.Builder<ESPBlockData>()
-            .name("default-block-config")
-            .description("Default block config.")
-            .defaultValue(
-                new ESPBlockData(
-                    ShapeMode.Lines,
-                    new SettingColor(0, 255, 200),
-                    new SettingColor(0, 255, 200, 25),
-                    true,
-                    new SettingColor(0, 255, 200, 125)
-                )
-            )
-            .build()
+
+    private final Setting<Map<Block, ESPBlockData>> blockConfigs = sgGeneral.add(new BlockDataSetting.Builder<ESPBlockData>()
+        .name("block-configs")
+        .description("Config for each block.")
+        .defaultData(defaultBlockConfig)
+        .onChanged(configs -> {
+            if (isActive() && Utils.canUpdate()) onActivate(); 
+        })
+        .build()
     );
 
-    private final Setting<Map<Block, ESPBlockData>> blockConfigs =
-        sgGeneral.add(
-            new BlockDataSetting.Builder<ESPBlockData>()
-                .name("block-configs")
-                .description("Config for each block.")
-                .defaultData(defaultBlockConfig)
-                .onChanged(configs -> {
-                    if (isActive() && Utils.canUpdate()) onActivate();
-                })
-                .build()
-        );
-
-    private final Setting<Boolean> tracers = sgGeneral.add(
-        new BoolSetting.Builder()
-            .name("tracers")
-            .description("Render tracer lines.")
-            .defaultValue(false)
-            .build()
+    private final Setting<Boolean> tracers = sgGeneral.add(new BoolSetting.Builder()
+        .name("tracers")
+        .description("Render tracer lines.")
+        .defaultValue(false)
+        .build()
     );
 
     private final BlockPos.Mutable blockPos = new BlockPos.Mutable();
 
-    private final Map<
-        Block,
-        Map<Property<?>, Comparable<?>>
-    > activeFilterCache = new HashMap<>();
+    private final Map<Block, Map<Property<?>, Comparable<?>>> activeFilterCache = new HashMap<>();
 
-    private final Long2ObjectMap<ESPChunk> chunks =
-        new Long2ObjectOpenHashMap<>();
+    private final Long2ObjectMap<ESPChunk> chunks = new Long2ObjectOpenHashMap<>();
     private final Set<ESPGroup> groups = new ReferenceOpenHashSet<>();
-    private final ExecutorService workerThread =
-        Executors.newSingleThreadExecutor();
+    private final ExecutorService workerThread = Executors.newSingleThreadExecutor();
 
     private DimensionType lastDimension;
 
     public BlockESP() {
-        super(
-            Categories.Render,
-            "block-esp",
-            "Renders specified blocks through walls.",
-            "search"
-        );
+        super(Categories.Render, "block-esp", "Renders specified blocks through walls.", "search");
+
         RainbowColors.register(this::onTickRainbow);
     }
 

src/main/java/meteordevelopment/meteorclient/systems/modules/render/blockesp/ESPBlockData.java

@@ -31,7 +31,7 @@ public class ESPBlockData implements IGeneric<ESPBlockData>, IChangeable, IBlock
     public boolean tracer;
     public SettingColor tracerColor;
 
-    public List<String> stateFilters = new ArrayList<>();
+    public final List<String> stateFilters = new ArrayList<>();
 
     private boolean changed;
 
@@ -108,7 +108,7 @@ public NbtCompound toTag() {
         for (String filter : stateFilters) {
             filtersList.add(NbtString.of(filter));
         }
-        tag.put("NBT-Data", filtersList);
+        tag.put("stateFilters", filtersList);
 
         tag.putBoolean("changed", changed);
 
@@ -125,7 +125,7 @@ public ESPBlockData fromTag(NbtCompound tag) {
         tracerColor.fromTag(tag.getCompoundOrEmpty("tracerColor"));
 
         stateFilters.clear();
-        tag.getList("NBT-Data").ifPresent(filtersList -> {
+        tag.getList("stateFilters").ifPresent(filtersList -> {
             for (int i = 0; i < filtersList.size(); i++) {
                 filtersList.getString(i).ifPresent(stateFilters::add);
             }

src/main/java/meteordevelopment/meteorclient/systems/modules/render/blockesp/ESPBlockDataScreen.java

@@ -41,7 +41,7 @@ public void initWidgets() {
         Settings settings = new Settings();
         SettingGroup sgGeneral = settings.getDefaultGroup();
         SettingGroup sgTracer = settings.createGroup("Tracer");
-        SettingGroup sgFilters = settings.createGroup("NBT-Data");
+        SettingGroup sgFilters = settings.createGroup("stateFilters");
 
         sgGeneral.add(new EnumSetting.Builder<ShapeMode>()
             .name("shape-mode")
@@ -115,7 +115,7 @@ public void initWidgets() {
 
         // Add state filters setting
         sgFilters.add(new StringListSetting.Builder()
-            .name("NBT-Data")
+            .name("stateFilters")
             .description("Filters with states (e.g. 'waterlogged=false', 'facing=north', 'ominous=true'). Only blocks matching ALL filters will be shown.")
             .defaultValue(new ArrayList<>())
             .onModuleActivated(stringSetting -> stringSetting.set(blockData.stateFilters))