fix: yeeted pointless class

Author: MichaelHillcox

common/src/main/java/pro/mikey/xray/core/ChunkScanTask.java

@@ -49,8 +49,8 @@ public void run() {
                         continue;
 
                     for (var target : ScanController.INSTANCE.scanStore.activeScanTargets()) {
-                        if (target.type().matches(level, pos, state, fluidState)) {
-                            renderQueue.add(new OutlineRenderTarget(pos.getX(), pos.getY(), pos.getZ(), target.color()));
+                        if (target.matches(level, pos, state, fluidState)) {
+                            renderQueue.add(new OutlineRenderTarget(pos.getX(), pos.getY(), pos.getZ(), target.colorInt()));
                         }
                     }
                 }

common/src/main/java/pro/mikey/xray/core/ScanController.java

@@ -11,8 +11,8 @@
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
 import pro.mikey.xray.XRay;
-import pro.mikey.xray.core.scanner.ActiveScanTarget;
 import pro.mikey.xray.core.scanner.ScanStore;
+import pro.mikey.xray.core.scanner.ScanType;
 
 import java.util.*;
 import java.util.concurrent.ExecutorService;
@@ -223,12 +223,12 @@ public static void onBlockChange(Level level, BlockPos pos, BlockState state) {
         // Otherwise, do we have scantarget in the active list of things to find?
         var noMatchesFound = true;
 
-        Set<ActiveScanTarget> activeScanTargets = ScanController.INSTANCE.scanStore.activeScanTargets();
+        Set<ScanType> activeScanTargets = ScanController.INSTANCE.scanStore.activeScanTargets();
         for (var scanType : activeScanTargets) {
-            if (scanType.type().matches(level, pos, state, state.getFluidState())) {
+            if (scanType.matches(level, pos, state, state.getFluidState())) {
                 // We need to tell the render system to refresh. We should manually add this black to the renderlist
                 // We're actively looking at this chunk so let's inject this block
-                outlineRenderTargets.add(new OutlineRenderTarget(pos.getX(), pos.getY(), pos.getZ(), scanType.color()));
+                outlineRenderTargets.add(new OutlineRenderTarget(pos.getX(), pos.getY(), pos.getZ(), scanType.colorInt()));
 
                 // Tell the VBO to refresh for this chunk
                 OutlineRender.refreshVBOForChunk(chunkPos);

common/src/main/java/pro/mikey/xray/core/scanner/ActiveScanTarget.java

@@ -54,7 +54,7 @@ public class ScanStore {
     private final List<Category> categories = new ArrayList<>();
 
     // In memory holder of only the enabled scan targets
-    private final Set<ActiveScanTarget> activeScanTargets = new HashSet<>();
+    private final Set<ScanType> activeScanTargets = new HashSet<>();
 
     public ScanStore() {}
 
@@ -183,8 +183,7 @@ public void updateActiveTargets() {
                     continue; // Skip disabled scan types
                 }
 
-                var target = new ActiveScanTarget(scanType, scanType.colorInt);
-                this.activeScanTargets.add(target);
+                this.activeScanTargets.add(scanType);
             }
         }
     }
@@ -193,7 +192,7 @@ public List<Category> categories() {
         return Collections.unmodifiableList(categories);
     }
 
-    public Set<ActiveScanTarget> activeScanTargets() {
+    public Set<ScanType> activeScanTargets() {
         return activeScanTargets;
     }