Add XrayCommand

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

BauSystem_15/src/de/steamwar/bausystem/features/xray/XrayWrapper15.java

@@ -0,0 +1,39 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.xray;
+
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.PacketPlayInFlying;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class XrayWrapper15 implements XrayWrapper {
+
+    @Override
+    public void setPosition(Player player, Object object) {
+        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
+        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
+        if (Float.isNaN(packetPlayInFlying.a(Float.NaN))) {
+            entityPlayer.e(packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0));
+        } else {
+            entityPlayer.setLocation(packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0), packetPlayInFlying.a(0F), packetPlayInFlying.b(0F));
+        }
+    }
+}

BauSystem_18/src/de/steamwar/bausystem/features/xray/XrayWrapper18.java

@@ -0,0 +1,39 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.xray;
+
+import net.minecraft.network.protocol.game.PacketPlayInFlying;
+import net.minecraft.server.level.EntityPlayer;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class XrayWrapper18 implements XrayWrapper {
+
+    @Override
+    public void setPosition(Player player, Object object) {
+        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
+        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
+        if (packetPlayInFlying.h) {
+            entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
+        } else {
+            entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        }
+    }
+}

BauSystem_19/src/de/steamwar/bausystem/features/xray/XrayWrapper19.java

@@ -0,0 +1,39 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.xray;
+
+import net.minecraft.network.protocol.game.PacketPlayInFlying;
+import net.minecraft.server.level.EntityPlayer;
+import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class XrayWrapper19 implements XrayWrapper {
+
+    @Override
+    public void setPosition(Player player, Object object) {
+        PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
+        EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
+        if (packetPlayInFlying.h) {
+            entityPlayer.b(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c, packetPlayInFlying.d, packetPlayInFlying.e);
+        } else {
+            entityPlayer.e(packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        }
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java

@@ -20,8 +20,10 @@
 package de.steamwar.bausystem.features.techhider;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.xray.XrayCommand;
 import de.steamwar.bausystem.linkage.LinkageType;
 import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.bausystem.linkage.LinkedInstance;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.CraftbukkitWrapper;
@@ -50,6 +52,9 @@ public class TechHiderCommand extends SWCommand implements Listener {
     private Map<Region, Optional<TechHider>> techHiders = new HashMap<>();
     private Map<Region, Set<Player>> hidden = new HashMap<>();
 
+    @LinkedInstance
+    private XrayCommand xrayCommand;
+
     @Register(description = "TECHHIDER_HELP")
     public void toggleHider(Player player) {
         Region region = Region.getRegion(player.getLocation());
@@ -87,6 +92,7 @@ public class TechHiderCommand extends SWCommand implements Listener {
             return;
         }
 
+        xrayCommand.disable(region, player);
         if (hidden.get(region).contains(player)) {
             hidden.get(region).remove(player);
             BauSystem.MESSAGE.sendPrefixless("TECHHIDER_OFF", player, ChatMessageType.ACTION_BAR);
@@ -101,6 +107,13 @@ public class TechHiderCommand extends SWCommand implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        hidden.forEach((rg, players) -> players.remove(event.getPlayer()));
+        hidden.values().forEach(set -> set.remove(event.getPlayer()));
+    }
+
+    public void disable(Region region, Player player) {
+        hidden.computeIfPresent(region, (rg, set) -> {
+            set.remove(player);
+            return set;
+        });
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java

@@ -0,0 +1,168 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.xray;
+
+import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.techhider.TechHiderCommand;
+import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.bausystem.linkage.LinkedInstance;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.utils.ProtocolAPI;
+import de.steamwar.command.SWCommand;
+import de.steamwar.core.CraftbukkitWrapper;
+import de.steamwar.techhider.TechHider;
+import net.md_5.bungee.api.ChatMessageType;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.io.File;
+import java.util.*;
+import java.util.function.BiFunction;
+
+@Linked(LinkageType.COMMAND)
+@Linked(LinkageType.LISTENER)
+public class XrayCommand extends SWCommand implements Listener {
+
+    public XrayCommand() {
+        super("xray");
+    }
+
+    private Map<Region, Optional<TechHider>> techHiders = new HashMap<>();
+    private Map<Region, Set<Material>> xrayedBlocks = new HashMap<>();
+    private Map<Region, Set<Player>> hidden = new HashMap<>();
+
+    @LinkedInstance
+    private TechHiderCommand techHiderCommand;
+
+    @Register(description = "XRAY_HELP")
+    public void toggleHider(Player player) {
+        Region region = Region.getRegion(player.getLocation());
+        if (region.isGlobal()) {
+            BauSystem.MESSAGE.send("XRAY_GLOBAL", player);
+            return;
+        }
+
+        Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
+            File file = rg.gameModeConfig();
+            if (file == null) {
+                return Optional.empty();
+            }
+
+            FileConfiguration config = YamlConfiguration.loadConfiguration(file);
+            if (!config.getBoolean("Techhider.Active", false)) {
+                Set<Material> blocks = new HashSet<>(Arrays.asList(Material.END_STONE, Material.IRON_BLOCK));
+                xrayedBlocks.put(region, blocks);
+                return Optional.of(createXray(rg, blocks));
+            }
+
+            hidden.put(rg, new HashSet<>());
+
+            String obfuscateWith = config.getString("Techhider.ObfuscateWith", "end_stone");
+
+            Set<Material> blocks = new HashSet<>(Arrays.asList(Material.getMaterial(obfuscateWith.toUpperCase())));
+            xrayedBlocks.put(region, blocks);
+            return Optional.of(createXray(rg, blocks));
+        });
+        if (!techHider.isPresent()) {
+            return;
+        }
+
+        techHiderCommand.disable(region, player);
+        if (hidden.get(region).contains(player)) {
+            hidden.get(region).remove(player);
+            BauSystem.MESSAGE.sendPrefixless("XRAY_OFF", player, ChatMessageType.ACTION_BAR);
+        } else {
+            hidden.get(region).add(player);
+            BauSystem.MESSAGE.sendPrefixless("XRAY_ON", player, ChatMessageType.ACTION_BAR);
+        }
+        region.forEachChunk((x, z) -> {
+            CraftbukkitWrapper.impl.sendChunk(player, x, z);
+        });
+    }
+
+    private static final Class<?> position = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPosition");
+    private static final Class<?> positionLook = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPositionLook");
+
+    {
+        BiFunction<Player, Object, Object> positionSetter = (player, o) -> {
+            Region region = Region.getRegion(player.getLocation());
+            if (hidden.containsKey(region) && hidden.get(region).contains(player)) {
+                Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                    XrayWrapper.impl.setPosition(player, o);
+                }, 1L);
+                return null;
+            }
+            return o;
+        };
+
+        ProtocolAPI.setIncomingHandler(position, positionSetter);
+        ProtocolAPI.setIncomingHandler(positionLook, positionSetter);
+    }
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
+        Region region = Region.getRegion(event.getPlayer().getLocation());
+        if (!(hidden.containsKey(region) && hidden.get(region).contains(event.getPlayer()))) {
+            return;
+        }
+
+        Set<Material> types = xrayedBlocks.getOrDefault(region, new HashSet<>());
+        if (event.getItem() != null && types.contains(event.getItem().getType())) {
+            return;
+        }
+        if (types.contains(event.getClickedBlock().getType())) {
+            event.getClickedBlock().setType(Material.AIR, false);
+        } else if (types.contains(event.getClickedBlock().getRelative(event.getBlockFace()).getType())) {
+            event.getClickedBlock().getRelative(event.getBlockFace()).setType(Material.AIR, false);
+        }
+    }
+
+    private TechHider createXray(Region rg, Set<Material> obfuscate) {
+        TechHider current = new TechHider((p, cX, cY) -> {
+            if (rg.chunkOutside(cX, cY)) return true;
+            return !hidden.get(rg).contains(p);
+        }, Material.STRUCTURE_VOID, obfuscate, new HashSet<>());
+        current.enable();
+        return current;
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        hidden.values().forEach(set -> set.remove(event.getPlayer()));
+    }
+
+    public void disable(Region region, Player player) {
+        hidden.computeIfPresent(region, (rg, set) -> {
+            set.remove(player);
+            return set;
+        });
+    }
+}

BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayWrapper.java

@@ -0,0 +1,30 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2022  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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.xray;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.core.VersionDependent;
+import org.bukkit.entity.Player;
+
+public interface XrayWrapper {
+    XrayWrapper impl = VersionDependent.getVersionImpl(BauSystem.getInstance());
+
+    void setPosition(Player player, Object object);
+}

BauSystem_Main/src/de/steamwar/bausystem/utils/ProtocolAPI.java

@@ -21,53 +21,50 @@ package de.steamwar.bausystem.utils;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
 import lombok.experimental.UtilityClass;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiFunction;
 
 @UtilityClass
 public class ProtocolAPI {
 
-    private static final Map<Class<?>, BiFunction<Player, Object, Object>> outgoingHandler = new HashMap<>();
+    private static final Map<Class<?>, Set<BiFunction<Player, Object, Object>>> outgoingHandler = new HashMap<>();
-    private static final Map<Class<?>, BiFunction<Player, Object, Object>> incomingHandler = new HashMap<>();
+    private static final Map<Class<?>, Set<BiFunction<Player, Object, Object>>> incomingHandler = new HashMap<>();
 
     static {
         TinyProtocol.instance.setOutFilter((receiver, channel, packet) -> {
-            BiFunction<Player, Object, Object> handler = outgoingHandler.get(packet.getClass());
+            Set<BiFunction<Player, Object, Object>> handler = outgoingHandler.get(packet.getClass());
-            if (handler == null)
+            if (handler == null || handler.isEmpty())
+                return packet;
+            for (BiFunction<Player, Object, Object> function : handler) {
+                packet = function.apply(receiver, packet);
+                if (packet == null) return null;
+            }
             return packet;
-            return handler.apply(receiver, packet);
         });
         TinyProtocol.instance.setInFilter((sender, channel, packet) -> {
-            BiFunction<Player, Object, Object> handler = incomingHandler.get(packet.getClass());
+            Set<BiFunction<Player, Object, Object>> handler = incomingHandler.get(packet.getClass());
-            if (handler == null)
+            if (handler == null || handler.isEmpty())
+                return packet;
+            for (BiFunction<Player, Object, Object> function : handler) {
+                packet = function.apply(sender, packet);
+                if (packet == null) return null;
+            }
             return packet;
-            return handler.apply(sender, packet);
         });
     }
 
     public static void setOutgoingHandler
             (Class<?> packetClass, BiFunction<Player, Object, Object> handler) {
-        outgoingHandler.put(packetClass, handler);
+        outgoingHandler.computeIfAbsent(packetClass, i -> new HashSet<>()).add(handler);
-    }
-
-    public static void removeOutgoingHandler(Class<?> packetClass) {
-        outgoingHandler.remove(packetClass);
     }
 
     public static void setIncomingHandler
             (Class<?> packetClass, BiFunction<Player, Object, Object> handler) {
-        incomingHandler.put(packetClass, handler);
+        incomingHandler.computeIfAbsent(packetClass, i -> new HashSet<>()).add(handler);
-    }
-
-    public static void removeIncomingHandler(Class<?> packetClass) {
-        incomingHandler.remove(packetClass);
-    }
-
-    public static void broadcastPacket(Object packet) {
-        Bukkit.getOnlinePlayers().stream().map(TinyProtocol.instance::getChannel).filter(TinyProtocol.instance::hasInjected).forEach(channel -> TinyProtocol.instance.sendPacket(channel, packet));
     }
 }