From 023f4216ec8e81fd51ace137609e65218b3b9950 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sun, 4 Jul 2021 21:18:26 +0200 Subject: [PATCH] Fix TraceCommand Signed-off-by: yoyosource --- .../features/tracer/TraceCommand.java | 8 +- .../tracer/show/ShowModeParameter.java | 35 ++----- .../tracer/show/ShowModeParameterType.java | 3 +- .../tracer/show/mode/BlockShowMode.java | 3 + .../tracer/show/mode/ParticleShowMode.java | 3 + .../show/mode/TraceEntityExplodeShowMode.java | 99 ------------------- .../tracer/show/mode/TraceEntityShowMode.java | 9 ++ 7 files changed, 26 insertions(+), 134 deletions(-) delete mode 100644 BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityExplodeShowMode.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java index 63ad3870..7df193fd 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java @@ -29,7 +29,6 @@ import de.steamwar.bausystem.features.tracer.show.StoredRecords; import de.steamwar.bausystem.features.tracer.show.TraceShowManager; import de.steamwar.bausystem.features.tracer.show.mode.BlockShowMode; import de.steamwar.bausystem.features.tracer.show.mode.ParticleShowMode; -import de.steamwar.bausystem.features.tracer.show.mode.TraceEntityExplodeShowMode; import de.steamwar.bausystem.features.tracer.show.mode.TraceEntityShowMode; import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.Linked; @@ -81,6 +80,9 @@ public class TraceCommand extends SWCommand { showModeParameterTypesMap.put("advanced", ShowModeParameterType.ADVANCED); showModeParameterTypesMap.put("a", ShowModeParameterType.ADVANCED); + showModeParameterTypesMap.put("-explode", ShowModeParameterType.EXPLODE); + showModeParameterTypesMap.put("-explodeonly", ShowModeParameterType.EXPLODE); + List tabCompletes = new ArrayList<>(showModeParameterTypesMap.keySet()); return SWCommandUtils.createMapper(s -> showModeParameterTypesMap.getOrDefault(s, null), s -> tabCompletes); } @@ -162,7 +164,6 @@ public class TraceCommand extends SWCommand { private enum ShowModeType { ENTITY, - EXPLODE, /* Entity Explode */ PARTICLE, BLOCK } @@ -183,9 +184,6 @@ public class TraceCommand extends SWCommand { case ENTITY: TraceShowManager.show(p, new TraceEntityShowMode(p, showModeParameter)); break; - case EXPLODE: - TraceShowManager.show(p, new TraceEntityExplodeShowMode(p, showModeParameter)); - break; default: BauSystem.MESSAGE.send("TRACE_MESSAGE_SHOW_UNKNOWN", p); return; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java index 810e146e..cf84bfd3 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java @@ -21,37 +21,14 @@ package de.steamwar.bausystem.features.tracer.show; -public class ShowModeParameter { +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter +public class ShowModeParameter { private boolean water = false; private boolean interpolate_Y = false; private boolean interpolate_XZ = false; - - public ShowModeParameter() { - - } - - public boolean isWater() { - return water; - } - - public boolean isInterpolate_Y() { - return interpolate_Y; - } - - public boolean isInterpolate_XZ() { - return interpolate_XZ; - } - - public void setWater(boolean water) { - this.water = water; - } - - public void setInterpolate_Y(boolean interpolate_Y) { - this.interpolate_Y = interpolate_Y; - } - - public void setInterpolate_XZ(boolean interpolate_XZ) { - this.interpolate_XZ = interpolate_XZ; - } + private boolean explodeOnly = false; } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameterType.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameterType.java index 1d54a78a..3908b840 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameterType.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameterType.java @@ -29,7 +29,8 @@ public enum ShowModeParameterType { ADVANCED(showModeParameter -> { showModeParameter.setInterpolate_Y(true); showModeParameter.setInterpolate_XZ(true); - }); + }), + EXPLODE(showModeParameter -> showModeParameter.setExplodeOnly(true)); private final Consumer showModeParameterConsumer; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/BlockShowMode.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/BlockShowMode.java index f5495a3e..3cfe1f38 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/BlockShowMode.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/BlockShowMode.java @@ -44,6 +44,9 @@ public class BlockShowMode implements ShowMode { @Override public void show(TNTPosition position) { + if (showModeParameter.isExplodeOnly() && !position.isExploded()) { + return; + } Location location = position.getLocation().toLocation(player.getWorld()); Point point = Point.fromLocation(location); if (positionSet.contains(point)) { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/ParticleShowMode.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/ParticleShowMode.java index 60ead49a..1d64acfd 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/ParticleShowMode.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/ParticleShowMode.java @@ -48,6 +48,9 @@ public class ParticleShowMode implements ShowMode { @Override public void show(TNTPosition position) { + if (showModeParameter.isExplodeOnly() && !position.isExploded()) { + return; + } if (positionSet.contains(position.getLocation())) { return; } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityExplodeShowMode.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityExplodeShowMode.java deleted file mode 100644 index 970a24bc..00000000 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityExplodeShowMode.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * / - */ - -package de.steamwar.bausystem.features.tracer.show.mode; - -import de.steamwar.bausystem.features.tracer.AbstractTraceEntity; -import de.steamwar.bausystem.features.tracer.TNTPosition; -import de.steamwar.bausystem.features.tracer.TNTTracer_15; -import de.steamwar.bausystem.features.tracer.show.ShowModeParameter; -import de.steamwar.bausystem.shared.RoundedPosition; -import de.steamwar.bausystem.shared.ShowMode; -import de.steamwar.core.VersionedCallable; -import org.bukkit.entity.Player; -import org.bukkit.util.Consumer; -import org.bukkit.util.Vector; - -import java.util.HashMap; -import java.util.Map; - -public class TraceEntityExplodeShowMode implements ShowMode { - - protected final Player player; - protected final ShowModeParameter showModeParameter; - - private final Map tntEntityMap = new HashMap<>(); - private final Map updateEntityMap = new HashMap<>(); - - public TraceEntityExplodeShowMode(Player player, ShowModeParameter showModeParameter) { - this.player = player; - this.showModeParameter = showModeParameter; - } - - @Override - public void show(TNTPosition position) { - if (!position.isExploded()) { - return; - } - - RoundedPosition roundedPosition = new RoundedPosition(position); - AbstractTraceEntity entity = tntEntityMap.computeIfAbsent(roundedPosition, pos -> createEntity(player, position.getLocation(), true)); - entity.display(player, position.isExploded()); - } - - private boolean checkWater(Vector position) { - return VersionedCallable.call(new VersionedCallable<>(() -> TNTTracer_15.inWater(player.getWorld(), position), 15)); - } - - public static AbstractTraceEntity createEntity(Player player, Vector position, boolean tnt) { - return VersionedCallable.call(new VersionedCallable<>(() -> TNTTracer_15.create(player.getWorld(), position, tnt), 15)); - } - - private void applyOnPosition(TNTPosition position, Consumer function) { - if (position.getPreviousLocation() == null) return; - - if (showModeParameter.isInterpolate_Y()) { - Vector updatePointY = position.getPreviousLocation().clone().setY(position.getLocation().getY()); - if (!position.getLocation().equals(updatePointY)) { - function.accept(updatePointY); - } - } - - if (showModeParameter.isInterpolate_XZ()) { - Vector movement = position.getLocation().clone().subtract(position.getPreviousLocation()); - Vector updatePointXZ = Math.abs(movement.getX()) > Math.abs(movement.getZ()) - ? position.getLocation().clone().setZ(position.getPreviousLocation().getZ()) - : position.getLocation().clone().setX(position.getPreviousLocation().getX()); - if (!position.getLocation().equals(updatePointXZ)) { - function.accept(updatePointXZ); - } - } - } - - @Override - public void hide() { - tntEntityMap.forEach((roundedPosition, abstractTraceEntity) -> abstractTraceEntity.hide(player, true)); - tntEntityMap.clear(); - updateEntityMap.forEach((roundedPosition, abstractTraceEntity) -> abstractTraceEntity.hide(player, true)); - updateEntityMap.clear(); - } - -} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityShowMode.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityShowMode.java index 547c34e0..3e748f63 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityShowMode.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/mode/TraceEntityShowMode.java @@ -50,6 +50,15 @@ public class TraceEntityShowMode implements ShowMode { @Override public void show(TNTPosition position) { + if (showModeParameter.isExplodeOnly()) { + if (!position.isExploded()) { + return; + } + RoundedPosition roundedPosition = new RoundedPosition(position); + AbstractTraceEntity entity = tntEntityMap.computeIfAbsent(roundedPosition, pos -> createEntity(player, position.getLocation(), true)); + entity.display(player, position.isExploded()); + return; + } if (!showModeParameter.isWater() && position.isExploded() && checkWater(position.getLocation())) { // Basic for (TNTPosition pos : position.getRecord().getPositions()) {