From b516d1d569b7bfc2f0605c24c9cec0814303c514 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sun, 16 Feb 2025 17:14:55 +0100 Subject: [PATCH 1/3] Configurable techhider interaction suppression --- .../fightsystem/utils/TechHiderWrapper.java | 6 ++++++ .../src/de/steamwar/techhider/TechHider.java | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java index a01e61b4..c45d7ab6 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java @@ -32,6 +32,7 @@ import de.steamwar.fightsystem.states.StateDependent; import de.steamwar.fightsystem.states.StateDependentListener; import de.steamwar.sql.SteamwarUser; import de.steamwar.techhider.TechHider; +import org.bukkit.GameMode; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -114,6 +115,11 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati }); } + @Override + public boolean suppressInteractions(Player player) { + return player.getGameMode() == GameMode.SPECTATOR; + } + @Override public boolean skipChunk(Player player, int chunkX, int chunkZ) { return getHiddenRegion(player).chunkOutside(chunkX, chunkZ); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java index bae5b7be..03063eb8 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java @@ -19,15 +19,16 @@ package de.steamwar.techhider; -import de.steamwar.Reflection; import com.comphenix.tinyprotocol.TinyProtocol; +import de.steamwar.Reflection; import de.steamwar.core.Core; import lombok.Getter; -import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.entity.Player; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.UnaryOperator; @@ -91,9 +92,9 @@ public class TechHider { } if(Core.getVersion() > 8){ - techhiders.put(Reflection.getClass("net.minecraft.network.protocol.game.ServerboundUseItemOnPacket"), (p, packet) -> p.getGameMode() == GameMode.SPECTATOR ? null : packet); + techhiders.put(Reflection.getClass("net.minecraft.network.protocol.game.ServerboundUseItemOnPacket"), (p, packet) -> locationEvaluator.suppressInteractions(p) ? null : packet); } - techhiders.put(Reflection.getClass("net.minecraft.network.protocol.game.ServerboundInteractPacket"), (p, packet) -> p.getGameMode() == GameMode.SPECTATOR ? null : packet); + techhiders.put(Reflection.getClass("net.minecraft.network.protocol.game.ServerboundInteractPacket"), (p, packet) -> locationEvaluator.suppressInteractions(p) ? null : packet); } @@ -161,6 +162,10 @@ public class TechHider { } public interface LocationEvaluator { + default boolean suppressInteractions(Player player) { + return false; + } + boolean skipChunk(Player player, int x, int z); default boolean skipChunkSection(Player player, int x, int y, int z) { return skipChunk(player, x, z); From 9f108a7cea8766146c1be1bebba40ec70b4726f9 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sun, 16 Feb 2025 17:25:18 +0100 Subject: [PATCH 2/3] Update VV dependency version --- settings.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index cea601bf..cd1db040 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -137,8 +137,8 @@ dependencyResolutionManagement { library("velocity", "de.steamwar:velocity:RELEASE") library("velocityapi", "com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") - library("viaapi", "com.viaversion:viaversion-api:4.3.1") - library("viavelocity", "com.viaversion:viaversion-velocity:4.3.1") + library("viaapi", "com.viaversion:viaversion-api:5.2.1") + library("viavelocity", "com.viaversion:viaversion-velocity:5.2.1") library("jda", "net.dv8tion:JDA:5.2.0") library("msgpack", "org.msgpack:msgpack-core:0.9.8") library("apolloprotos", "com.lunarclient:apollo-protos:1.0-SNAPSHOT") From e3c02cfb60deb799e0d9c9cab71f6b0fd7dfc7e4 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 1 Mar 2025 08:33:15 +0100 Subject: [PATCH 3/3] Revert "Update VV dependency version" This reverts commit 9f108a7cea8766146c1be1bebba40ec70b4726f9. --- settings.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index cd1db040..cea601bf 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -137,8 +137,8 @@ dependencyResolutionManagement { library("velocity", "de.steamwar:velocity:RELEASE") library("velocityapi", "com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") - library("viaapi", "com.viaversion:viaversion-api:5.2.1") - library("viavelocity", "com.viaversion:viaversion-velocity:5.2.1") + library("viaapi", "com.viaversion:viaversion-api:4.3.1") + library("viavelocity", "com.viaversion:viaversion-velocity:4.3.1") library("jda", "net.dv8tion:JDA:5.2.0") library("msgpack", "org.msgpack:msgpack-core:0.9.8") library("apolloprotos", "com.lunarclient:apollo-protos:1.0-SNAPSHOT")