Remove netty Cursor render

Reviewed-on: SteamWar/SteamWar#489
Reviewed-by: YoyoNow <4+yoyonow@noreply.localhost>

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java

@@ -22,71 +22,123 @@ package de.steamwar.bausystem.features.util;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import com.mojang.authlib.GameProfile;
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.ProtocolWrapper;
 import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
-import io.papermc.paper.event.player.PlayerFailMoveEvent;
+import net.minecraft.network.protocol.game.*;
-import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
+import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.world.level.GameType;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockCanBuildEvent;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 
+import java.util.function.BiFunction;
+
 @Linked
 public class NoClipCommand extends SWCommand implements Listener {
 
     public static class NoClipData implements SWPlayer.Component {
+        private long lastTick = -1;
+
         @Override
-        public void onUnmount(SWPlayer swPlayer) {
+        public void onUnmount(SWPlayer player) {
-            Player player = swPlayer.getPlayer();
+            player.getPlayer().setGameMode(GameMode.CREATIVE);
-            showClientGameMode(player, GameMode.CREATIVE, GameMode.CREATIVE);
         }
     }
 
     public NoClipCommand() {
         super("noclip", "nc");
+
+        BiFunction<Player, ServerboundMovePlayerPacket, Object> first = (player, o) -> {
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (noClipData == null) return o;
+            if (noClipData.lastTick == TPSUtils.currentTick.get()) return o;
+            setInternalGameMode(player, GameMode.SPECTATOR);
+            noClipData.lastTick = TPSUtils.currentTick.get();
+            return o;
+        };
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, first);
+        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, first);
+
+        BiFunction<Player, Object, Object> second = (player, o) -> {
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (noClipData == null) return o;
+            setInternalGameMode(player, GameMode.CREATIVE);
+            noClipData.lastTick = TPSUtils.currentTick.get();
+            return o;
+        };
+        TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, second);
+        TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, second);
+        TinyProtocol.instance.addFilter(ServerboundContainerClickPacket.class, second);
+
+        BiFunction<Player, ServerboundSetCreativeModeSlotPacket, Object> third = (player, o) -> {
+            if (SWPlayer.of(player).hasComponent(NoClipData.class)) {
+                int index = o.slotNum();
+                if (index >= 36 && index <= 44) {
+                    index -= 36;
+                } else if (index > 44) {
+                    index -= 5;
+                } else if (index <= 8) {
+                    index = index - 8 + 36;
+                }
+                player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(o.itemStack()));
+                if (index < 9) player.getInventory().setHeldItemSlot(index);
+                player.updateInventory();
+            }
+            return o;
+        };
+        TinyProtocol.instance.addFilter(ServerboundSetCreativeModeSlotPacket.class, third);
     }
 
-    @Register
+    private void setInternalGameMode(Player player, GameMode gameMode) {
+        ((CraftPlayer) player).getHandle().gameMode.gameModeForPlayer = GameType.byId(gameMode.getValue());
+    }
+
+    @Register(help = true)
     public void genericCommand(@Validator Player player) {
         SWPlayer swPlayer = SWPlayer.of(player);
         if (swPlayer.hasComponent(NoClipData.class)) {
             swPlayer.removeComponent(NoClipData.class);
         } else {
-            player.setGameMode(GameMode.CREATIVE);
+            player.setGameMode(GameMode.SPECTATOR);
-            player.setAllowFlight(true);
+            Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
-            player.setFlying(true);
+            abilities.mayBuild = true;
+            abilities.mayfly = true;
+            abilities.instabuild = true;
+
             swPlayer.setComponent(new NoClipData());
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
-            showClientGameMode(player, GameMode.CREATIVE, GameMode.SPECTATOR);
+            TinyProtocol.instance.sendPacket(player, new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, 1F));
+            pseudoGameMode(player, GameMode.SPECTATOR);
         }
     }
 
-    @EventHandler
-    public void onPlayerFailMove(PlayerFailMoveEvent event) {
-        if (event.getFailReason() != PlayerFailMoveEvent.FailReason.CLIPPED_INTO_BLOCK) return;
-        if (!SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) return;
-        event.setAllowed(true);
-    }
-
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(player -> SWPlayer.of(player).removeComponent(NoClipData.class));
+        event.getNewSpectator().forEach(player -> {
+            SWPlayer.of(player).removeComponent(NoClipData.class);
+        });
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
     public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
         }
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
     public void onBlock(BlockCanBuildEvent event) {
         if (event.getPlayer() == null) return;
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
@@ -94,7 +146,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         }
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
     public void onPlayerToggleFlight(PlayerToggleFlightEvent event) {
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
@@ -102,13 +154,20 @@ public class NoClipCommand extends SWCommand implements Listener {
         }
     }
 
-    /**
+    @EventHandler(ignoreCancelled = true)
-     * @param player player
+    public void onPlayerTeleport(PlayerTeleportEvent event) {
-     * @param localMode GameMode for breaking and placing
+        if (event.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) {
-     * @param listedMode GameMode for noPhysics
+            return;
-     */
+        }
-    private static void showClientGameMode(Player player, GameMode localMode, GameMode listedMode) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
-        TinyProtocol.instance.sendPacket(player, new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, localMode.getValue()));
+            event.setCancelled(true);
-        TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), listedMode));
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                event.getPlayer().setSpectatorTarget(null);
+            }, 1L);
+        }
     }
-}
+
+    private static void pseudoGameMode(Player player, GameMode gameMode) {
+        TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), gameMode));
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java

@@ -131,6 +131,7 @@ public class BauScoreboard implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
+        SWScoreboard.impl.removeScoreboard(event.getPlayer());
         ADDITIONAL_SCOREBOARD_LINES.remove(event.getPlayer());
     }
 }

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java

@@ -325,7 +325,7 @@ public class FixedRegion implements Region {
         }
 
         floorLevel = prototype.getFloorOffset() != 0 ? minPoint.getY() + prototype.getFloorOffset() : 0;
-        waterLevel = prototype.getWaterOffset() != 0 ? minPoint.getX() + prototype.getWaterOffset() : 0;
+        waterLevel = prototype.getWaterOffset() != 0 ? minPoint.getY() + prototype.getWaterOffset() : 0;
 
         File found = null;
         File baseFile = new File(BauSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");

CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt

@@ -307,12 +307,12 @@ class SteamwarUser(id: EntityID<Int>) : IntEntity(id) {
             punishments[punishment] = Punishment.createPunishment(this@SteamwarUser.id.value, from, punishment, reason, time, perma)
         }
 
-    fun setLocale(locale: Locale?, manualeLocale: Boolean) {
+    fun setLocale(locale: Locale?, manualLocale: Boolean) {
         if (locale == null || (this.manualLocale && !manualLocale)) return
 
         useDb {
             this@SteamwarUser.locale = locale
-            this@SteamwarUser.manualLocale = manualeLocale
+            this@SteamwarUser.manualLocale = manualLocale
         }
     }
 

SpigotCore/SpigotCore_Main/src/de/steamwar/core/worldedit/SteamEditWand.java

@@ -30,16 +30,13 @@ import com.sk89q.worldedit.regions.selector.limit.PermissiveSelectorLimits;
 import com.sk89q.worldedit.world.World;
 import de.steamwar.core.Core;
 import de.steamwar.core.SWPlayer;
-import de.steamwar.entity.CWireframe;
-import de.steamwar.entity.REntityServer;
 import de.steamwar.inventory.SWItem;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.*;
-import org.bukkit.Bukkit;
+import org.bukkit.*;
-import org.bukkit.FluidCollisionMode;
+import org.bukkit.attribute.Attribute;
-import org.bukkit.Location;
+import org.bukkit.attribute.AttributeModifier;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -47,6 +44,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.RayTraceResult;
 
@@ -65,6 +63,16 @@ public class SteamEditWand implements Listener {
     };
     public static final ItemStack ITEM = new SWItem(MATERIAL, NAME).setLore(LORE).getItemStack();
 
+    static {
+        ItemMeta itemMeta = ITEM.getItemMeta();
+        itemMeta.addAttributeModifier(Attribute.BLOCK_INTERACTION_RANGE, new AttributeModifier(
+                NamespacedKey.fromString("range", Core.getInstance()),
+                35.0,
+                AttributeModifier.Operation.ADD_NUMBER
+        ));
+        ITEM.setItemMeta(itemMeta);
+    }
+
     private boolean noWand(Player player) {
         return player.getInventory().getItemInMainHand().getType() != SteamEditWand.MATERIAL;
     }
@@ -87,15 +95,6 @@ public class SteamEditWand implements Listener {
         TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, this::rightClick);
         TinyProtocol.instance.addFilter(ServerboundPickItemFromBlockPacket.class, this::middleClick);
         TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, this::swapHands);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, this::movePlayerPacket);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Rot.class, this::movePlayerPacket);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, this::movePlayerPacket);
-
-        Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> {
-            for (Player player : Bukkit.getOnlinePlayers()) {
-                if (noWand(player)) SWPlayer.of(player).removeComponent(SWEditCursor.class);
-            }
-        }, 1, 1);
     }
 
     @EventHandler
@@ -104,29 +103,6 @@ public class SteamEditWand implements Listener {
         event.setCancelled(true);
     }
 
-    public static class SWEditCursor implements SWPlayer.Component {
-        private Player player;
-        private REntityServer entityServer = new REntityServer();
-        private CWireframe wireframe;
-
-        @Override
-        public void onMount(SWPlayer player) {
-            this.player = player.getPlayer();
-            entityServer.addPlayer(player.getPlayer());
-            wireframe = new CWireframe(entityServer);
-        }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            entityServer.close();
-        }
-
-        public void setLocation(Location location) {
-            wireframe.setPos1And2(location, location);
-            wireframe.setBlock(WorldEditRendererCUIEditor.Type.CURSOR.getMaterial(player).createBlockData());
-        }
-    }
-
     private Packet<?> leftClick(Player player, Packet<?> packet) {
         if (noWand(player)) return packet;
         if (player.getOpenInventory().getType() != InventoryType.CREATIVE) return packet;
@@ -380,30 +356,4 @@ public class SteamEditWand implements Listener {
         });
         return null;
     }
-
-    public ServerboundMovePlayerPacket movePlayerPacket(Player player, ServerboundMovePlayerPacket packet) {
-        SWPlayer swPlayer = SWPlayer.of(player);
-
-        if (noWand(player)) {
-            swPlayer.removeComponent(SWEditCursor.class);
-            return packet;
-        }
-
-        double distance = WorldEditRendererCUIEditor.Type.CURSOR.getWidth(player).blocks;
-        RayTraceResult result = player.rayTraceBlocks(distance, FluidCollisionMode.NEVER);
-        Block block = result == null ? null : result.getHitBlock();
-        if (result == null || block == null) {
-            swPlayer.removeComponent(SWEditCursor.class);
-            return packet;
-        }
-
-        if (!swPlayer.hasComponent(SWEditCursor.class)) {
-            swPlayer.setComponent(new SWEditCursor());
-        }
-
-        swPlayer.getComponent(SWEditCursor.class).ifPresent(cursor -> {
-            cursor.setLocation(block.getLocation());
-        });
-        return packet;
-    }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java

@@ -67,7 +67,9 @@ public class SWScoreboard {
     }
 
     public void removeScoreboard(Player player) {
-        player.getScoreboard().getObjective(SIDEBAR).unregister();
+        if (player.getScoreboard().getObjective(SIDEBAR) != null) {
+            player.getScoreboard().getObjective(SIDEBAR).unregister();
+        }
         playerBoards.remove(player);
     }
 }