Simplify tracer

Signed-off-by: yoyosource <yoyosource@nidido.de>

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPosition.java

@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.tracer;
 import de.steamwar.bausystem.features.tracer.show.Record;
 import de.steamwar.bausystem.shared.Position;
 import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
 

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/record/AutoTraceRecorder.java

@@ -52,7 +52,7 @@ public abstract class AutoTraceRecorder implements TraceRecorder {
     private Record lastRecord;
 
     private Record.TNTRecord getRecord(TNTPrimed tntPrimed) {
-        return recordMap.computeIfAbsent(tntPrimed, __ -> record.spawn(TPSUtils.currentRealTick.get() - startTime));
+        return recordMap.computeIfAbsent(tntPrimed, __ -> record.spawn());
     }
 
     protected abstract String getInactivityMessage();

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/record/SimpleTraceRecorder.java

@@ -52,7 +52,7 @@ public class SimpleTraceRecorder implements TraceRecorder, ActiveTracer {
     }
 
     private Record.TNTRecord getRecord(TNTPrimed tntPrimed) {
-        return recordMap.computeIfAbsent(tntPrimed, __ -> record.spawn(TPSUtils.currentRealTick.get() - startTime));
+        return recordMap.computeIfAbsent(tntPrimed, __ -> record.spawn());
     }
 
     @Override

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/EntityShowMode.java

@@ -205,12 +205,10 @@ public class EntityShowMode implements ShowMode<TNTPosition> {
                 entity = createEntity(position, positionType);
             }
             count++;
-            if (showModeParameter.isTicks()) {
+            if (showModeParameter.isFuse()) {
                 entity.setDisplayName(fuseTicks + "");
             } else if (showModeParameter.isCount()) {
                 entity.setDisplayName(new HashSet<>(records).size() + "");
-            } else if (showModeParameter.isTicksSinceStart()) {
-                entity.setDisplayName((80 - fuseTicks) + tntPosition.getRecord().getOffset() + "");
             }
         }
 

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/Record.java

@@ -47,8 +47,8 @@ public class Record {
         tnt.forEach(tntRecord -> tntRecord.getPositions().forEach(traceShowMode::show));
     }
 
-    public TNTRecord spawn(long offset) {
+    public TNTRecord spawn() {
-        TNTRecord record = new TNTRecord(this, offset, region);
+        TNTRecord record = new TNTRecord(this, region);
         tnt.add(record);
         return record;
     }
@@ -80,9 +80,6 @@ public class Record {
 
         private Record record;
 
-        @Getter
-        private final long offset;
-
         @Getter
         private final Region region;
 
@@ -100,9 +97,8 @@ public class Record {
         @Getter
         private boolean hasMicroMotion = false;
 
-        public TNTRecord(Record record, long offset, Region region) {
+        public TNTRecord(Record record, Region region) {
             this.record = record;
-            this.offset = offset;
             this.region = region;
         }
 

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java

@@ -28,11 +28,10 @@ public class ShowModeParameter {
     private boolean interpolateXZ = false;
     private boolean sourceOnly = false;
     private boolean explodeOnly = false;
-    private boolean ticks = false;
+    private boolean fuse = false;
     private boolean count = false;
     private boolean buildDestroyOnly = false;
     private boolean testblockDestroyOnly = false;
-    private boolean ticksSinceStart = false;
     private boolean microMotion = false;
 
     public void enableWater() {
@@ -55,8 +54,8 @@ public class ShowModeParameter {
         this.explodeOnly = true;
     }
 
-    public void enableTicks() {
+    public void enableFuse() {
-        this.ticks = true;
+        this.fuse = true;
     }
 
     public void enableCount() {
@@ -71,10 +70,6 @@ public class ShowModeParameter {
         this.testblockDestroyOnly = true;
     }
 
-    public void enableTicksSinceStart() {
-        this.ticksSinceStart = true;
-    }
-
     public void enableMicroMotion() {
         this.microMotion = true;
     }

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameterType.java

@@ -36,13 +36,12 @@ public enum ShowModeParameterType {
         showModeParameter.enableInterpolateY();
         showModeParameter.enableInterpolateXZ();
     }, Arrays.asList("-advanced", "-a"), "INTERPOLATE_Y", "INTERPOLATE_XZ"),
-    SOURCE(ShowModeParameter::enableSourceOnly, Arrays.asList("-source", "-sourceonly", "-ignite"), "TICKS", "ADVANCED", "INTERPOLATE_Y", "INTERPOLATE_XZ", "WATER"),
+    SOURCE(ShowModeParameter::enableSourceOnly, Arrays.asList("-source", "-sourceonly", "-ignite"), "FUSE", "ADVANCED", "INTERPOLATE_Y", "INTERPOLATE_XZ", "WATER"),
-    EXPLODE(ShowModeParameter::enableExplodeOnly, Arrays.asList("-explode", "-explodeonly"), "TICKS", "ADVANCED", "INTERPOLATE_Y", "INTERPOLATE_XZ", "WATER"),
+    EXPLODE(ShowModeParameter::enableExplodeOnly, Arrays.asList("-explode", "-explodeonly"), "FUSE", "ADVANCED", "INTERPOLATE_Y", "INTERPOLATE_XZ", "WATER"),
-    TICKS(ShowModeParameter::enableTicks, Arrays.asList("-ticks", "-t"), "EXPLODE", "SOURCE", "COUNT", "TICKS_SINCE_START"),
+    FUSE(ShowModeParameter::enableFuse, Arrays.asList("-fuse", "-f"), "EXPLODE", "SOURCE", "COUNT"),
-    COUNT(ShowModeParameter::enableCount, Arrays.asList("-count", "-c"), "TICKS", "TICKS_SINCE_START"),
+    COUNT(ShowModeParameter::enableCount, Arrays.asList("-count", "-c"), "FUSE"),
     BUILD_DESTROY_ONLY(ShowModeParameter::enableBuildDestroyOnly, Arrays.asList("-builddestroy", "-builddestoryonly"), "WATER", "TESTBLOCK_DESTROY_ONLY"),
     TESTBLOCK_DESTROY_ONLY(ShowModeParameter::enableTestblockDestroyOnly, Arrays.asList("-testblockdestroy", "-testblockdestroyonly"), "WATER", "BUILD_DESTROY_ONLY"),
-    TICKS_SINCE_START(ShowModeParameter::enableTicksSinceStart, Arrays.asList("-tickssincestart", "-tss"), "TICKS", "COUNT"),
     MICROMOTION(ShowModeParameter::enableMicroMotion, Arrays.asList("-micromotion", "-micro", "-m")),
     ;