rename DetectionType.ENTITIES -> DetectionType.ENTITY

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/DistanceDetectorPeripheral.java

@@ -54,7 +54,7 @@ public final void setDetectionMode(IArguments args) throws LuaException {
         } else if (mode instanceof String modeStr) {
             detectionType = switch (modeStr.toUpperCase()) {
                 case "BLOCK" -> DetectionType.BLOCK;
-                case "ENTITIES" -> DetectionType.ENTITIES;
+                case "ENTITY" -> DetectionType.ENTITY;
                 case "BOTH" -> DetectionType.BOTH;
                 default -> throw new LuaException("Unknown detection mode '" + mode + "'");
             };
@@ -67,13 +67,13 @@ public final void setDetectionMode(IArguments args) throws LuaException {
     @LuaFunction
     public final boolean detectsEntities() {
         DetectionType detectionType = getPeripheralOwner().tileEntity.getDetectionType();
-        return detectionType == DetectionType.ENTITIES || detectionType == DetectionType.BOTH;
+        return detectionType.detectEntity();
     }
 
     @LuaFunction
     public final boolean detectsBlocks() {
         DetectionType detectionType = getPeripheralOwner().tileEntity.getDetectionType();
-        return detectionType == DetectionType.BLOCK || detectionType == DetectionType.BOTH;
+        return detectionType.detectBlock();
     }
 
     @LuaFunction
@@ -113,9 +113,24 @@ public final double getMaxRange() {
     }
 
     public enum DetectionType {
-        BLOCK,
-        ENTITIES,
-        BOTH
+        BLOCK(true, false),
+        ENTITY(false, true),
+        BOTH(true, true);
+
+        private final boolean block, entity;
+
+        private DetectionType(boolean block, boolean entity) {
+            this.block = block;
+            this.entity = entity;
+        }
+
+        public boolean detectBlock() {
+            return this.block;
+        }
+
+        public boolean detectEntity() {
+            return this.entity;
+        }
     }
 
 }

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/DistanceDetectorEntity.java

@@ -196,7 +196,7 @@ public double calculateAndUpdateDistance() {
     private HitResult getHitResult(Vec3 to, Vec3 from) {
         Level level = this.getLevel();
         return switch (this.detectionType) {
-            case ENTITIES -> HitResultUtil.getEntityHitResult(to, from, level);
+            case ENTITY -> HitResultUtil.getEntityHitResult(to, from, level);
             case BLOCK -> HitResultUtil.getBlockHitResult(to, from, level, this.ignoreTransparent);
             default -> HitResultUtil.getHitResult(to, from, level, this.ignoreTransparent);
         };